Skip to content

Commit a8d7c85

Browse files
fix: correctly handle disabled toolbar with top content
1 parent 79a62b3 commit a8d7c85

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

packages/material-react-table/src/components/head/MRT_TableHead.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export const MRT_TableHead = <TData extends MRT_RowData>({
2525
options: {
2626
enableStickyHeader,
2727
enableTopContent,
28+
enableTopToolbar,
2829
layoutMode,
2930
muiTableHeadProps,
3031
positionToolbarAlertBanner,
@@ -57,7 +58,7 @@ export const MRT_TableHead = <TData extends MRT_RowData>({
5758
top:
5859
stickyHeader && layoutMode?.startsWith('grid')
5960
? 0
60-
: enableStickyHeader && enableTopContent
61+
: enableStickyHeader && enableTopContent && enableTopToolbar
6162
? getCommonToolbarStyles({ table, theme }).minHeight
6263
: undefined,
6364
zIndex: stickyHeader ? 2 : undefined,

packages/material-react-table/src/components/toolbar/MRT_TopContent.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const MRT_TopContent = <TData extends MRT_RowData>({
1111
table,
1212
}: MRT_TopContentProps<TData>) => {
1313
const {
14-
options: { renderTopContent },
14+
options: { renderTopContent, enableTopToolbar },
1515
} = table;
1616
return (
1717
<>
@@ -23,7 +23,7 @@ export const MRT_TopContent = <TData extends MRT_RowData>({
2323
>
2424
{parseFromValuesOrFunc(renderTopContent, { table })}
2525
</Box>
26-
<MRT_TopToolbar table={table} />
26+
{enableTopToolbar && <MRT_TopToolbar table={table} />}
2727
</>
2828
);
2929
};

packages/material-react-table/stories/styling/TopContent.stories.tsx

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const data = [...Array(88)].map(() => ({
4545
state: faker.location.state(),
4646
}));
4747

48-
export const TopContentWithStaticHeader = () => (
48+
export const TopContentWithStaticHeaderDefault = () => (
4949
<MaterialReactTable
5050
columns={columns}
5151
data={data}
@@ -97,3 +97,22 @@ export const TopContentWithStickyHeaderShorterTable = () => (
9797
)}
9898
/>
9999
);
100+
101+
export const TopContentWithHiddenTopToolbar = () => (
102+
<MaterialReactTable
103+
columns={columns}
104+
data={data}
105+
initialState={{ pagination: { pageIndex: 0, pageSize: 25 } }}
106+
muiTableContainerProps={{ sx: { maxHeight: 400 } }}
107+
enableStickyHeader
108+
enableTopToolbar={false}
109+
enableTopContent={true}
110+
renderTopContent={({ table }) => (
111+
<Paper elevation={3} sx={{ padding: '0.5rem', margin: '0.5rem' }}>
112+
<h2 style={{ margin: '2rem', textAlign: 'center' }}>
113+
Total rows: {table.getRowCount()}
114+
</h2>
115+
</Paper>
116+
)}
117+
/>
118+
);

0 commit comments

Comments
 (0)