Skip to content

Commit

Permalink
fixes Warning: Encountered two children with the same key, `undefined…
Browse files Browse the repository at this point in the history
…`. Keys should be unique. #808
  • Loading branch information
KevinVandy committed Dec 5, 2023
1 parent 857a77b commit ab962a4
Showing 1 changed file with 18 additions and 23 deletions.
41 changes: 18 additions & 23 deletions packages/material-react-table/src/body/MRT_TableBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,15 @@ export const MRT_TableBody = <TData extends MRT_RowData>({
? rowVirtualizer.getVirtualItems()
: undefined;

const commonRowProps = {
columnVirtualizer,
numRows: rows.length,
table,
virtualColumns,
virtualPaddingLeft,
virtualPaddingRight,
};

return (
<>
{!rowPinningDisplayMode?.includes('sticky') &&
Expand All @@ -202,15 +211,9 @@ export const MRT_TableBody = <TData extends MRT_RowData>({
>
{getTopRows().map((row, rowIndex) => {
const props = {
columnVirtualizer,
measureElement: rowVirtualizer?.measureElement,
numRows: rows.length,
...commonRowProps,
row,
rowIndex,
table,
virtualColumns,
virtualPaddingLeft,
virtualPaddingRight,
};
return memoMode === 'rows' ? (
<Memo_MRT_TableBodyRow key={row.id} {...props} />
Expand Down Expand Up @@ -275,24 +278,22 @@ export const MRT_TableBody = <TData extends MRT_RowData>({
? rows[rowOrVirtualRow.index]
: (rowOrVirtualRow as MRT_Row<TData>);
const props = {
columnVirtualizer,
...commonRowProps,
measureElement: rowVirtualizer?.measureElement,
numRows: rows.length,
pinnedRowIds,
row,
rowIndex: rowVirtualizer ? rowOrVirtualRow.index : rowIndex,
table,
virtualColumns,
virtualPaddingLeft,
virtualPaddingRight,
virtualRow: rowVirtualizer
? (rowOrVirtualRow as VirtualItem)
: undefined,
};
return memoMode === 'rows' ? (
<Memo_MRT_TableBodyRow key={row.id} {...props} />
<Memo_MRT_TableBodyRow
key={`${row.id}${row.index}`}
{...props}
/>
) : (
<MRT_TableBodyRow key={row.id} {...props} />
<MRT_TableBodyRow key={`${row.id}${row.index}`} {...props} />
);
})}
</>
Expand All @@ -312,18 +313,12 @@ export const MRT_TableBody = <TData extends MRT_RowData>({
>
{getBottomRows().map((row, rowIndex) => {
const props = {
columnVirtualizer,
measureElement: rowVirtualizer?.measureElement,
numRows: rows.length,
...commonRowProps,
row,
rowIndex,
table,
virtualColumns,
virtualPaddingLeft,
virtualPaddingRight,
};
return memoMode === 'rows' ? (
<Memo_MRT_TableBodyRow key={row.id} {...props} />
<Memo_MRT_TableBodyRow key={`${row.id}`} {...props} />
) : (
<MRT_TableBodyRow key={row.id} {...props} />
);
Expand Down

1 comment on commit ab962a4

@vercel
Copy link

@vercel vercel bot commented on ab962a4 Dec 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.