Skip to content

fix scroll jump avoiding conditional render #1421

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

Open
wants to merge 2 commits into
base: v3
Choose a base branch
from
Open

fix scroll jump avoiding conditional render #1421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fdc9f3
fix scroll jump avoiding conditional render
avightclav Jun 9, 2025
7c0d198
type composition improved
avightclav Jun 9, 2025
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
20 changes: 14 additions & 6 deletions packages/material-react-table/src/components/body/MRT_TableBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ export interface MRT_TableBodyProps<TData extends MRT_RowData>
table: MRT_TableInstance<TData>;
}

type MRT_TableBody_WithMemoizationHintsProps<TData extends MRT_RowData> = MRT_TableBodyProps<TData> & { skipMemoization?: boolean; }

export const MRT_TableBody = <TData extends MRT_RowData>({
columnVirtualizer,
table,
Expand Down Expand Up @@ -134,9 +136,8 @@ export const MRT_TableBody = <TData extends MRT_RowData>({
sx={{
color: 'text.secondary',
fontStyle: 'italic',
maxWidth: `min(100vw, ${
tablePaperRef.current?.clientWidth ?? 360
}px)`,
maxWidth: `min(100vw, ${tablePaperRef.current?.clientWidth ?? 360
}px)`,
py: '2rem',
textAlign: 'center',
width: '100%',
Expand Down Expand Up @@ -215,7 +216,14 @@ export const MRT_TableBody = <TData extends MRT_RowData>({
);
};

const MRT_TableBody_WithMemoizationHints = <TData extends MRT_RowData>(props: MRT_TableBody_WithMemoizationHintsProps<TData>) => {
const { skipMemoization, ...rest } = props;
return <MRT_TableBody {...rest} />;
};

export const Memo_MRT_TableBody = memo(
MRT_TableBody,
(prev, next) => prev.table.options.data === next.table.options.data,
) as typeof MRT_TableBody;
MRT_TableBody_WithMemoizationHints,
(prev, next) =>
prev.table.options.data === next.table.options.data &&
!next.skipMemoization
) as typeof MRT_TableBody_WithMemoizationHints
11 changes: 5 additions & 6 deletions packages/material-react-table/src/components/table/MRT_Table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useMRT_ColumnVirtualizer } from '../../hooks/useMRT_ColumnVirtualizer';
import { type MRT_RowData, type MRT_TableInstance } from '../../types';
import { parseCSSVarId } from '../../utils/style.utils';
import { parseFromValuesOrFunc } from '../../utils/utils';
import { MRT_TableBody, Memo_MRT_TableBody } from '../body/MRT_TableBody';
import { Memo_MRT_TableBody } from '../body/MRT_TableBody';
import { MRT_TableFooter } from '../footer/MRT_TableFooter';
import { MRT_TableHead } from '../head/MRT_TableHead';

Expand Down Expand Up @@ -73,11 +73,10 @@ export const MRT_Table = <TData extends MRT_RowData>({
>
{!!Caption && <caption>{Caption}</caption>}
{enableTableHead && <MRT_TableHead {...commonTableGroupProps} />}
{memoMode === 'table-body' || columnSizingInfo.isResizingColumn ? (
<Memo_MRT_TableBody {...commonTableGroupProps} />
) : (
<MRT_TableBody {...commonTableGroupProps} />
)}
<Memo_MRT_TableBody
{...commonTableGroupProps}
skipMemoization={!(memoMode === 'table-body' || columnSizingInfo.isResizingColumn)}
/>
{enableTableFooter && <MRT_TableFooter {...commonTableGroupProps} />}
</Table>
);
Expand Down
Loading