Skip to content

fix(row-action-menu): avoid duplicate key 'edit' when consumer supplies custom action #1458

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
wants to merge 1 commit into
base: v3
Choose a base branch
from
Open

fix(row-action-menu): avoid duplicate key 'edit' when consumer supplies custom action #1458

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions packages/material-react-table/src/components/menus/MRT_RowActionMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReactNode, useMemo, type MouseEvent } from 'react';
import { isValidElement, ReactNode, useMemo, type MouseEvent } from 'react';
import Menu, { type MenuProps } from '@mui/material/Menu';
import { MRT_ActionMenuItem } from './MRT_ActionMenuItem';
import {
Expand Down Expand Up @@ -42,7 +42,19 @@ export const MRT_RowActionMenu = <TData extends MRT_RowData>({

const menuItems = useMemo(() => {
const items: ReactNode[] = [];
const editItem = parseFromValuesOrFunc(enableEditing, row) &&

const rowActionMenuItems = renderRowActionMenuItems?.({
closeMenu: () => setAnchorEl(null),
row,
staticRowIndex,
table,
});

const hasEditItem = rowActionMenuItems?.some(
(item) => isValidElement(item) && item.key === 'edit',
);

const editItem = !hasEditItem && parseFromValuesOrFunc(enableEditing, row) &&
['modal', 'row'].includes(editDisplayMode!) && (
<MRT_ActionMenuItem
key={'edit'}
Expand All @@ -53,12 +65,6 @@ export const MRT_RowActionMenu = <TData extends MRT_RowData>({
/>
);
if (editItem) items.push(editItem);
const rowActionMenuItems = renderRowActionMenuItems?.({
closeMenu: () => setAnchorEl(null),
row,
staticRowIndex,
table,
});
if (rowActionMenuItems?.length) items.push(...rowActionMenuItems);
return items;
}, [renderRowActionMenuItems, row, staticRowIndex, table]);
Expand Down