Skip to content
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

<DatagridBody> creates the <RecordContext> instead of <DatagridRow> #9808

Merged
merged 10 commits into from
May 13, 2024
Merged

<DatagridBody> creates the <RecordContext> instead of <DatagridRow> #9808

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5e4c790
DatagridBody creates a RecordContextProvider instead of DatagridRow
adguernier Apr 30, 2024
f1b2020
remove RecordContextProvider from Datagrid row
adguernier May 2, 2024
f3a9425
remove useless import
adguernier May 2, 2024
0e4ed7a
apply reviews
adguernier May 6, 2024
4c08e7d
Merge branch 'next' into datagrid-body-oss-should-create-a-record-con…
adguernier May 6, 2024
047c57c
fix tests
adguernier May 6, 2024
fc93cb1
fix DatagridRow.spec
adguernier May 6, 2024
c8a2efe
add diff for DatagridBody and DatagridRow
adguernier May 7, 2024
d13fbc8
using a custom DatagridRow with useRecordContext in upgrade guide an…
adguernier May 13, 2024
5c3d1f2
Update docs/Upgrade.md
djhi May 13, 2024
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
54 changes: 28 additions & 26 deletions packages/ra-ui-materialui/src/list/datagrid/DatagridBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { cloneElement, memo, FC, ReactElement } from 'react';
import PropTypes from 'prop-types';
import { SxProps, TableBody, TableBodyProps } from '@mui/material';
import clsx from 'clsx';
import { Identifier, RaRecord } from 'ra-core';
import { Identifier, RaRecord, RecordContextProvider } from 'ra-core';

import { DatagridClasses } from './useDatagridStyles';
import DatagridRow, { PureDatagridRow, RowClickFunction } from './DatagridRow';
Expand Down Expand Up @@ -34,31 +34,33 @@ const DatagridBody: FC<DatagridBodyProps> = React.forwardRef(
className={clsx('datagrid-body', className, DatagridClasses.tbody)}
{...rest}
>
{data.map((record, rowIndex) =>
cloneElement(
row,
{
className: clsx(DatagridClasses.row, {
[DatagridClasses.rowEven]: rowIndex % 2 === 0,
[DatagridClasses.rowOdd]: rowIndex % 2 !== 0,
}),
expand,
hasBulkActions: hasBulkActions && !!selectedIds,
hover,
id: record.id ?? `row${rowIndex}`,
key: record.id ?? `row${rowIndex}`,
onToggleItem,
record,
fzaninotto marked this conversation as resolved.
Show resolved Hide resolved
resource,
rowClick,
selectable: !isRowSelectable || isRowSelectable(record),
selected: selectedIds?.includes(record.id),
sx: rowSx?.(record, rowIndex),
style: rowStyle?.(record, rowIndex),
},
children
)
)}
{data.map((record, rowIndex) => (
<RecordContextProvider value={record} key={record.id}>
adguernier marked this conversation as resolved.
Show resolved Hide resolved
{cloneElement(
row,
{
className: clsx(DatagridClasses.row, {
[DatagridClasses.rowEven]: rowIndex % 2 === 0,
[DatagridClasses.rowOdd]: rowIndex % 2 !== 0,
}),
expand,
hasBulkActions: hasBulkActions && !!selectedIds,
hover,
id: record.id ?? `row${rowIndex}`,
key: record.id ?? `row${rowIndex}`,
adguernier marked this conversation as resolved.
Show resolved Hide resolved
onToggleItem,
resource,
rowClick,
selectable:
!isRowSelectable || isRowSelectable(record),
selected: selectedIds?.includes(record.id),
sx: rowSx?.(record, rowIndex),
style: rowStyle?.(record, rowIndex),
},
children
)}
</RecordContextProvider>
))}
</TableBody>
)
);
Expand Down
Loading