Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
79 changes: 42 additions & 37 deletions packages/toolpad-core/src/Crud/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import DeleteIcon from '@mui/icons-material/Delete';
import invariant from 'invariant';
import { useDialogs } from '../useDialogs';
import { useNotifications } from '../useNotifications';
import { NoSsr } from '../shared/NoSsr';
import { CrudContext, RouterContext, WindowContext } from '../shared/context';
import { useLocaleText } from '../AppProvider/LocalizationProvider';
import { DataSourceCache } from './cache';
Expand Down Expand Up @@ -402,43 +403,47 @@ function List<D extends DataModel>(props: ListProps<D>) {
) : null}
</Stack>
<Box sx={{ flex: 1, position: 'relative', width: '100%' }}>
<DataGridSlot
rows={rowsState.rows}
rowCount={rowsState.rowCount}
columns={columns}
pagination
sortingMode="server"
filterMode="server"
paginationMode="server"
paginationModel={paginationModel}
onPaginationModelChange={setPaginationModel}
sortModel={sortModel}
onSortModelChange={setSortModel}
filterModel={filterModel}
onFilterModelChange={setFilterModel}
onRowClick={handleRowClick}
loading={isLoading}
initialState={initialState}
slots={{ toolbar: GridToolbar }}
// Prevent type conflicts if slotProps don't match DataGrid used for dataGrid slot
{...(slotProps?.dataGrid as Record<string, unknown>)}
sx={{
[`& .${gridClasses.columnHeader}, & .${gridClasses.cell}`]: {
outline: 'transparent',
},
[`& .${gridClasses.columnHeader}:focus-within, & .${gridClasses.cell}:focus-within`]: {
outline: 'none',
},
...(onRowClick
? {
[`& .${gridClasses.row}:hover`]: {
cursor: 'pointer',
},
}
: {}),
...slotProps?.dataGrid?.sx,
}}
/>
{/* Use NoSsr to prevent issue https://github.com/mui/mui-x/issues/17077 as DataGrid has no SSR support */}
<NoSsr>
<DataGridSlot
rows={rowsState.rows}
rowCount={rowsState.rowCount}
columns={columns}
pagination
sortingMode="server"
filterMode="server"
paginationMode="server"
paginationModel={paginationModel}
onPaginationModelChange={setPaginationModel}
sortModel={sortModel}
onSortModelChange={setSortModel}
filterModel={filterModel}
onFilterModelChange={setFilterModel}
onRowClick={handleRowClick}
loading={isLoading}
initialState={initialState}
slots={{ toolbar: GridToolbar }}
// Prevent type conflicts if slotProps don't match DataGrid used for dataGrid slot
{...(slotProps?.dataGrid as Record<string, unknown>)}
sx={{
[`& .${gridClasses.columnHeader}, & .${gridClasses.cell}`]: {
outline: 'transparent',
},
[`& .${gridClasses.columnHeader}:focus-within, & .${gridClasses.cell}:focus-within`]:
{
outline: 'none',
},
...(onRowClick
? {
[`& .${gridClasses.row}:hover`]: {
cursor: 'pointer',
},
}
: {}),
...slotProps?.dataGrid?.sx,
}}
/>
</NoSsr>
{error && (
<ErrorOverlay>
<Typography variant="body1">{error.message}</Typography>
Expand Down
17 changes: 17 additions & 0 deletions packages/toolpad-core/src/shared/NoSsr.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import * as React from 'react';
import useSsr from '@toolpad/utils/hooks/useSsr';

export interface NoSsrProps {
children?: React.ReactNode;
fallback?: React.ReactNode;
}

/**
* @ignore - internal component.
* Alternative version of MUI NoSsr that avoids state updates during layout effects.
*/
export function NoSsr({ children, fallback = null }: NoSsrProps) {
const isSsr = useSsr();

return <React.Fragment>{isSsr ? fallback : children}</React.Fragment>;
}