Skip to content

Fix onSelectedCellChange arguments #3641

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
amanmahajan7 merged 2 commits into from
Nov 22, 2024
Merged

Fix onSelectedCellChange arguments #3641

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
c81292a
Fix `onSelectedCellChange` arguments
amanmahajan7 Nov 22, 2024
112924e
Pin router
amanmahajan7 Nov 22, 2024
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@microsoft/api-extractor": "^7.23.0",
"@rollup/plugin-babel": "^6.0.3",
"@rollup/plugin-node-resolve": "^15.1.0",
"@tanstack/react-router": "^1.70.0",
"@tanstack/react-router": "1.82.1",
"@tanstack/router-plugin": "^1.69.1",
"@testing-library/dom": "^10.1.0",
"@testing-library/react": "^16.0.0",
Expand Down
4 changes: 2 additions & 2 deletions src/DataGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,10 +755,10 @@ function DataGrid<R, SR, K extends Key>(
if (!isCellWithinSelectionBounds(position)) return;
commitEditorChanges();

const row = rows[position.rowIdx];
const samePosition = isSamePosition(selectedPosition, position);

if (enableEditor && isCellEditable(position)) {
const row = rows[position.rowIdx];
setSelectedPosition({ ...position, mode: 'EDIT', row, originalRow: row });
} else if (samePosition) {
// Avoid re-renders if the selected cell state is the same
Expand All @@ -771,7 +771,7 @@ function DataGrid<R, SR, K extends Key>(
if (onSelectedCellChange && !samePosition) {
onSelectedCellChange({
rowIdx: position.rowIdx,
row,
row: isRowIdxWithinViewportBounds(position.rowIdx) ? rows[position.rowIdx] : undefined,
column: columns[position.idx]
Comment on lines 773 to 775
Copy link
Collaborator Author

@amanmahajan7 amanmahajan7 Nov 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can change the type to include row type similar to
https://github.com/adazzle/react-data-grid/blob/main/src/types.ts#L284

});
}
Expand Down
2 changes: 1 addition & 1 deletion src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ export type CellKeyDownArgs<TRow, TSummaryRow = unknown> =

export interface CellSelectArgs<TRow, TSummaryRow = unknown> {
rowIdx: number;
row: TRow;
row: TRow | undefined;
column: CalculatedColumn<TRow, TSummaryRow>;
}

Expand Down
8 changes: 8 additions & 0 deletions test/browser/events.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,14 @@ describe('Events', () => {
rowIdx: 0
});
expect(onSelectedCellChange).toHaveBeenCalledTimes(5);

// go to the header row
await userEvent.keyboard('{ArrowUp}');
expect(onSelectedCellChange).toHaveBeenCalledWith({
column: expect.objectContaining(columns[1]),
row: undefined,
rowIdx: -1
});
});
});

Expand Down