Skip to content

Change renderExtraExportMenuItems to an array of ReactNodes #1205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juhanikat wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Change renderExtraExportMenuItems to an array of ReactNodes #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
618679f
Change renderExtraExportMenuItems from a ReactNode to an array of Rea…
juhanikat Jun 16, 2026
081d805
update typing and extramenuitem rendering
juhanikat Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions frontend/src/components/CrossSearch/CrossSearchTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,13 +1118,11 @@ export const CrossSearchTable = ({ selectorFn }: { selectorFn?: (newObject: Cros
svgExport={svgExport}
isError={isError}
error={error}
renderExtraExportMenuItems={handleClose => (
<>
<OccurrenceDwcExportMenuItem handleClose={handleClose} />
<OccurrenceDwcDpExportMenuItem handleClose={handleClose} />
<OccurrenceFullDarwinCoreExportMenuItem handleClose={handleClose} />
</>
)}
renderExtraExportMenuItems={[
handleClose => <OccurrenceDwcExportMenuItem handleClose={handleClose} />,
handleClose => <OccurrenceDwcDpExportMenuItem handleClose={handleClose} />,
handleClose => <OccurrenceFullDarwinCoreExportMenuItem handleClose={handleClose} />,
]}
/>
</>
)
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Locality/LocalityTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ export const LocalityTable = ({ selectorFn }: { selectorFn?: (newObject: Localit
url="locality"
kmlExport={kmlExport}
svgExport={svgExport}
renderExtraExportMenuItems={handleClose => <LocalityDwcExportMenuItem handleClose={handleClose} />}
renderExtraExportMenuItems={[handleClose => <LocalityDwcExportMenuItem handleClose={handleClose} />]}
enableColumnFilterModes={true}
tableRowAction={handleLocalityRowActionClick}
/>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Species/SpeciesTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ export const SpeciesTable = ({ selectorFn }: { selectorFn?: (id: Species) => voi
tableRowAction={handleSpeciesRowActionClick}
filterFns={synonymFilterFns}
renderRowActionExtras={renderCommentAction}
renderExtraExportMenuItems={handleClose => <SpeciesDwcExportMenuItem handleClose={handleClose} />}
renderExtraExportMenuItems={[handleClose => <SpeciesDwcExportMenuItem handleClose={handleClose} />]}
/>
<SpeciesCommentDialog
open={commentModalOpen}
Expand Down
10 changes: 7 additions & 3 deletions frontend/src/components/TableView/TableToolBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { ContactForm } from '../DetailView/common/ContactForm'
import FileDownloadIcon from '@mui/icons-material/FileDownload'
import ViewColumnIcon from '@mui/icons-material/ViewColumn'
import '../../styles/TableToolBar.css'
import { useState, type ReactNode } from 'react'
import { Fragment, useState, type ReactNode } from 'react'
import { Link, useLocation } from 'react-router-dom'
import AddCircleIcon from '@mui/icons-material/AddCircle'
import { CrossSearchExportMenuItem } from '../CrossSearch/CrossSearchExportMenuItem'
Expand Down Expand Up @@ -50,7 +50,7 @@ export const TableToolBar = <T extends MRT_RowData>({
showNewButton?: boolean
hideLeftButtons?: boolean
columnVisibilityGroups?: ColumnVisibilityGroup[]
renderExtraExportMenuItems?: (handleClose: () => void) => ReactNode
renderExtraExportMenuItems?: ((handleClose: () => void) => ReactNode)[]
}) => {
const { previousTableUrls, setPreviousTableUrls } = usePageContext<T>()
const { notify, setMessage: setNotificationMessage } = useNotify()
Expand Down Expand Up @@ -317,7 +317,11 @@ export const TableToolBar = <T extends MRT_RowData>({
</MenuItem>
)}

{renderExtraExportMenuItems ? renderExtraExportMenuItems(handleClose) : null}
{renderExtraExportMenuItems
? renderExtraExportMenuItems.map((renderFn, index) => (
<Fragment key={index}>{renderFn(handleClose)}</Fragment>
))
: null}

{kmlExport && (
<MenuItem
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/TableView/TableView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export const TableView = <T extends MRT_RowData>({
error?: FetchBaseQueryError | SerializedError
filterFns?: Record<string, MRT_FilterFn<T>>
renderRowActionExtras?: ({ row }: { row: MRT_Row<T> }) => ReactNode
renderExtraExportMenuItems?: (handleClose: () => void) => ReactNode
renderExtraExportMenuItems?: ((handleClose: () => void) => ReactNode)[]
paginationPlacement?: 'top' | 'bottom' | 'both'
tableContainerMaxHeight?: string | number
columnVisibilityGroups?: ColumnVisibilityGroup[]
Expand Down
Loading