Skip to content

fix(data-grid): row selection selects correct row when filtering is applied #1113

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

Merged
sadmann7 merged 2 commits into from
Feb 24, 2026
Merged

fix(data-grid): row selection selects correct row when filtering is applied #1113

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
58c1d1a
fix: row selection selects correct row when filtering is applied
sadmann7 Feb 24, 2026
61160b7
chore: sync
sadmann7 Feb 24, 2026
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
4 changes: 2 additions & 2 deletions src/app/data-grid-render/components/data-grid-render-demo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export function DataGridRenderDemo() {
onCheckedChange={(value) => {
const onRowSelect = table.options.meta?.onRowSelect;
if (onRowSelect) {
onRowSelect(row.index, !!value, false);
onRowSelect(row.id, !!value, false);
} else {
row.toggleSelected(!!value);
}
Expand All @@ -117,7 +117,7 @@ export function DataGridRenderDemo() {
event.preventDefault();
const onRowSelect = table.options.meta?.onRowSelect;
if (onRowSelect) {
onRowSelect(row.index, !row.getIsSelected(), true);
onRowSelect(row.id, !row.getIsSelected(), true);
}
}
}}
Expand Down
4 changes: 2 additions & 2 deletions src/components/data-grid/data-grid-select-column.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function DataGridSelectCell<TData>({
const onCheckedChange = React.useCallback(
(value: boolean) => {
if (meta?.onRowSelect) {
meta.onRowSelect(row.index, value, false);
meta.onRowSelect(row.id, value, false);
} else {
row.toggleSelected(value);
}
Expand All @@ -179,7 +179,7 @@ function DataGridSelectCell<TData>({
(event: React.MouseEvent<HTMLButtonElement>) => {
if (event.shiftKey) {
event.preventDefault();
meta?.onRowSelect?.(row.index, !row.getIsSelected(), true);
meta?.onRowSelect?.(row.id, !row.getIsSelected(), true);
}
},
[meta, row],
Expand Down
57 changes: 50 additions & 7 deletions src/hooks/test/use-data-grid.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1447,12 +1447,14 @@ describe("useDataGrid", () => {
useDataGrid({
data: testData,
columns: testColumns,
getRowId: (row) => row.id,
}),
{ wrapper: createWrapper() },
);

const firstRowId = result.current.table.getRowModel().rows[0]?.id;
act(() => {
result.current.tableMeta.onRowSelect?.(0, true, false);
result.current.tableMeta.onRowSelect?.(firstRowId ?? "1", true, false);
});

const rowSelection = result.current.table.getState().rowSelection;
Expand All @@ -1465,18 +1467,23 @@ describe("useDataGrid", () => {
useDataGrid({
data: testData,
columns: testColumns,
getRowId: (row) => row.id,
}),
{ wrapper: createWrapper() },
);

const rows = result.current.table.getRowModel().rows;
const firstRowId = rows[0]?.id;
const thirdRowId = rows[2]?.id;

// Select first row
act(() => {
result.current.tableMeta.onRowSelect?.(0, true, false);
result.current.tableMeta.onRowSelect?.(firstRowId ?? "1", true, false);
});

// Select third row with shift
act(() => {
result.current.tableMeta.onRowSelect?.(2, true, true);
result.current.tableMeta.onRowSelect?.(thirdRowId ?? "3", true, true);
});

const rowSelection = result.current.table.getState().rowSelection;
Expand All @@ -1489,23 +1496,59 @@ describe("useDataGrid", () => {
useDataGrid({
data: testData,
columns: testColumns,
getRowId: (row) => row.id,
}),
{ wrapper: createWrapper() },
);

const firstRowId = result.current.table.getRowModel().rows[0]?.id;

// Select row
act(() => {
result.current.tableMeta.onRowSelect?.(0, true, false);
result.current.tableMeta.onRowSelect?.(firstRowId ?? "1", true, false);
});

// Deselect row
act(() => {
result.current.tableMeta.onRowSelect?.(0, false, false);
result.current.tableMeta.onRowSelect?.(firstRowId ?? "1", false, false);
});

const rowSelection = result.current.table.getState().rowSelection;
expect(rowSelection[firstRowId ?? "1"]).toBeFalsy();
});

it("should select correct row when filtering is applied", () => {
const { result } = renderHook(
() =>
useDataGrid({
data: testData,
columns: testColumns,
getRowId: (row) => row.id,
initialState: {
columnFilters: [{ id: "name", value: "Tony" }],
},
}),
{ wrapper: createWrapper() },
);

// With filter "name contains Tony", only Tony Hawk (id: "1") should be visible
const rows = result.current.table.getRowModel().rows;
expect(rows.length).toBe(1);
const visibleRowId = rows[0]?.id;
expect(visibleRowId).toBe("1");

// Select the visible (filtered) row
act(() => {
result.current.tableMeta.onRowSelect?.(
visibleRowId ?? "1",
true,
false,
);
});

const rowSelection = result.current.table.getState().rowSelection;
const row = result.current.table.getRowModel().rows[0];
expect(rowSelection[row?.id ?? "0"]).toBeFalsy();
expect(rowSelection["1"]).toBe(true);
expect(Object.keys(rowSelection).length).toBe(1);
});
});

Expand Down
49 changes: 30 additions & 19 deletions src/hooks/use-data-grid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ interface DataGridState {
searchMatches: CellPosition[];
matchIndex: number;
searchOpen: boolean;
lastClickedRowIndex: number | null;
lastClickedRowId: string | null;
pasteDialog: PasteDialogState;
}

Expand Down Expand Up @@ -193,7 +193,7 @@ function useDataGrid<TData>({
searchMatches: [],
matchIndex: -1,
searchOpen: false,
lastClickedRowIndex: null,
lastClickedRowId: null,
pasteDialog: {
open: false,
rowsNeeded: 0,
Expand Down Expand Up @@ -1939,36 +1939,47 @@ function useDataGrid<TData>({
);

const onRowSelect = React.useCallback(
(rowIndex: number, selected: boolean, shiftKey: boolean) => {
(rowId: string, selected: boolean, shiftKey: boolean) => {
const currentState = store.getState();
const rows = tableRef.current?.getRowModel().rows ?? [];
const currentRow = rows[rowIndex];
const currentRowIndex = rows.findIndex((r) => r.id === rowId);
const currentRow = currentRowIndex >= 0 ? rows[currentRowIndex] : null;
if (!currentRow) return;

if (shiftKey && currentState.lastClickedRowIndex !== null) {
const startIndex = Math.min(currentState.lastClickedRowIndex, rowIndex);
const endIndex = Math.max(currentState.lastClickedRowIndex, rowIndex);

const newRowSelection: RowSelectionState = {
...currentState.rowSelection,
};

for (let i = startIndex; i <= endIndex; i++) {
const row = rows[i];
if (row) {
newRowSelection[row.id] = selected;
if (shiftKey && currentState.lastClickedRowId !== null) {
const lastClickedRowIndex = rows.findIndex(
(r) => r.id === currentState.lastClickedRowId,
);
if (lastClickedRowIndex >= 0) {
const startIndex = Math.min(lastClickedRowIndex, currentRowIndex);
const endIndex = Math.max(lastClickedRowIndex, currentRowIndex);

const newRowSelection: RowSelectionState = {
...currentState.rowSelection,
};

for (let i = startIndex; i <= endIndex; i++) {
const row = rows[i];
if (row) {
newRowSelection[row.id] = selected;
}
}
}

onRowSelectionChange(newRowSelection);
onRowSelectionChange(newRowSelection);
} else {
onRowSelectionChange({
...currentState.rowSelection,
[currentRow.id]: selected,
});
}
} else {
onRowSelectionChange({
...currentState.rowSelection,
[currentRow.id]: selected,
});
}

store.setState("lastClickedRowIndex", rowIndex);
store.setState("lastClickedRowId", rowId);
},
[store, onRowSelectionChange],
);
Expand Down
6 changes: 1 addition & 5 deletions src/types/data-grid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,7 @@ declare module "@tanstack/react-table" {
getVisualRowIndex?: (rowId: string) => number | undefined;
rowHeight?: RowHeightValue;
onRowHeightChange?: (value: RowHeightValue) => void;
onRowSelect?: (
rowIndex: number,
checked: boolean,
shiftKey: boolean,
) => void;
onRowSelect?: (rowId: string, checked: boolean, shiftKey: boolean) => void;
onDataUpdate?: (params: CellUpdate | Array<CellUpdate>) => void;
onRowsDelete?: (rowIndices: number[]) => void | Promise<void>;
onColumnClick?: (columnId: string) => void;
Expand Down