Skip to content
Open
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
2 changes: 1 addition & 1 deletion packages/material-react-table/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"dev": "pnpm lib:dev",
"lib:build": "pnpm build-lib && pnpm build-locales",
"lib:build-locales": "node build-locales.mjs",
"lib:build-lib": "rm -rf dist && rollup -c rollup.config.mjs && size-limit",
"lib:build-lib": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && rollup -c rollup.config.mjs && size-limit",
"lib:dev": "rollup -c rollup.config.mjs --watch",
"lint": "eslint .",
"size": "size-limit",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ export const MRT_TableHeadCell = <TData extends MRT_RowData>({
column={column}
table={table}
tableHeadCellRef={{
current: tableHeadCellRefs.current?.[column.id]!,
current: tableHeadCellRefs.current?.[column.id] ?? null,
}}
/>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const MRT_Table = <TData extends MRT_RowData>({
getState,
options: {
columns,
enableRowVirtualization,
enableStickyHeader,
enableTableFooter,
enableTableHead,
Expand Down Expand Up @@ -73,7 +74,8 @@ export const MRT_Table = <TData extends MRT_RowData>({
>
{!!Caption && <caption>{Caption}</caption>}
{enableTableHead && <MRT_TableHead {...commonTableGroupProps} />}
{memoMode === 'table-body' || columnSizingInfo.isResizingColumn ? (
{memoMode === 'table-body' ||
(columnSizingInfo.isResizingColumn && !enableRowVirtualization) ? (
<Memo_MRT_TableBody {...commonTableGroupProps} />
) : (
<MRT_TableBody {...commonTableGroupProps} />
Expand Down
12 changes: 7 additions & 5 deletions packages/material-react-table/src/hooks/useMRT_Effects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,12 @@ export const useMRT_Effects = <TData extends MRT_RowData>(

//fix pinned row top style when density changes
useEffect(() => {
if (enableRowPinning && getIsSomeRowsPinned()) {
setTimeout(() => {
rerender();
}, 150);
}
if (!enableRowPinning || !getIsSomeRowsPinned()) return undefined;

const timeoutId = setTimeout(() => {
rerender();
}, 150);

return () => clearTimeout(timeoutId);
}, [density]);
};
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ export const useMRT_TableOptions: <TData extends MRT_RowData>(
mrtTheme = useMemo(() => getMRTTheme(mrtTheme, theme), [mrtTheme, theme]);
aggregationFns = useMemo(
() => ({ ...MRT_AggregationFns, ...aggregationFns }),
[],
[aggregationFns],
);
filterFns = useMemo(() => ({ ...MRT_FilterFns, ...filterFns }), []);
sortingFns = useMemo(() => ({ ...MRT_SortingFns, ...sortingFns }), []);
filterFns = useMemo(() => ({ ...MRT_FilterFns, ...filterFns }), [filterFns]);
sortingFns = useMemo(() => ({ ...MRT_SortingFns, ...sortingFns }), [sortingFns]);
defaultColumn = useMemo(
() => ({ ...MRT_DefaultColumn, ...defaultColumn }),
[defaultColumn],
Expand Down