Merge branch 'main' into am-fix-act-warnings

Author: amanmahajan7

.github/workflows/patch-react19.js

@@ -3,13 +3,13 @@ import fs from 'node:fs/promises';
 const pkgText = await fs.readFile('./package.json', 'utf8');
 const pkg = JSON.parse(pkgText);
 
-pkg.devDependencies['@types/react'] = 'npm:types-react@rc';
-pkg.devDependencies['@types/react-dom'] = 'npm:types-react-dom@rc';
-pkg.devDependencies.react = 'rc';
-pkg.devDependencies['react-dom'] = 'rc';
+pkg.devDependencies['@types/react'] = '^19.0.0';
+pkg.devDependencies['@types/react-dom'] = '^19.0.0';
+pkg.devDependencies.react = '^19.0.0';
+pkg.devDependencies['react-dom'] = '^19.0.0';
 pkg.overrides = {
-  '@types/react': 'npm:types-react@rc',
-  '@types/react-dom': 'npm:types-react-dom@rc'
+  '@types/react': '^19.0.0',
+  '@types/react-dom': '^19.0.0'
 };
 
 fs.writeFile('./package.json', JSON.stringify(pkg, null, 2));

package.json

@@ -55,61 +55,61 @@
     "clsx": "^2.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
-    "@babel/plugin-transform-runtime": "^7.21.4",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-react": "^7.18.6",
-    "@babel/preset-typescript": "^7.18.6",
-    "@babel/runtime": "^7.21.5",
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-transform-runtime": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-react": "^7.26.3",
+    "@babel/preset-typescript": "^7.26.0",
+    "@babel/runtime": "^7.26.0",
     "@biomejs/biome": "1.9.4",
     "@eslint/compat": "^1.2.3",
     "@faker-js/faker": "^9.0.0",
     "@ianvs/prettier-plugin-sort-imports": "^4.0.2",
     "@linaria/core": "^6.0.0",
     "@microsoft/api-extractor": "^7.23.0",
-    "@rollup/plugin-babel": "^6.0.3",
+    "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-node-resolve": "^15.1.0",
-    "@tanstack/react-router": "1.82.1",
+    "@tanstack/react-router": "^1.85.5",
     "@tanstack/router-plugin": "^1.69.1",
     "@testing-library/dom": "^10.1.0",
     "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.5.2",
     "@types/node": "^22.0.0",
     "@types/react": "^18.3.9",
     "@types/react-dom": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^8.15.0",
-    "@typescript-eslint/parser": "^8.15.0",
-    "@vitejs/plugin-react": "^4.3.1",
-    "@vitest/browser": "^2.1.5",
-    "@vitest/coverage-v8": "^2.1.5",
-    "@vitest/eslint-plugin": "^1.1.10",
+    "@typescript-eslint/eslint-plugin": "^8.17.0",
+    "@typescript-eslint/parser": "^8.17.0",
+    "@vitejs/plugin-react": "^4.3.4",
+    "@vitest/browser": "^2.1.8",
+    "@vitest/coverage-v8": "^2.1.8",
+    "@vitest/eslint-plugin": "^1.1.14",
     "@wyw-in-js/rollup": "^0.5.0",
     "@wyw-in-js/vite": "^0.5.0",
     "babel-plugin-optimize-clsx": "^2.6.2",
     "browserslist": "^4.24.0",
-    "eslint": "^9.15.0",
+    "eslint": "^9.16.0",
     "eslint-plugin-jest-dom": "^5.5.0",
     "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-compiler": "^19.0.0-beta-0dec889-20241115",
+    "eslint-plugin-react-compiler": "^19.0.0-beta-df7b47d-20241124",
     "eslint-plugin-react-hooks": "^5.0.0",
-    "eslint-plugin-react-hooks-extra": "^1.16.1",
-    "eslint-plugin-sonarjs": "^2.0.4",
-    "eslint-plugin-testing-library": "^6.4.0",
+    "eslint-plugin-react-hooks-extra": "^1.17.3",
+    "eslint-plugin-sonarjs": "^3.0.0",
+    "eslint-plugin-testing-library": "^7.1.0",
     "jspdf": "^2.5.1",
     "jspdf-autotable": "^3.5.23",
     "playwright": "^1.45.1",
     "postcss": "^8.4.25",
-    "prettier": "3.3.3",
+    "prettier": "3.4.2",
     "react": "^18.3.1",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.3.1",
     "rollup": "^4.0.2",
     "rollup-plugin-postcss": "^4.0.2",
-    "typescript": "~5.6.2",
-    "vite": "^5.4.11",
-    "vitest": "^2.1.5",
-    "vitest-browser-react": "^0.0.3"
+    "typescript": "~5.7.2",
+    "vite": "^6.0.2",
+    "vitest": "^2.1.8",
+    "vitest-browser-react": "^0.0.4"
   },
   "peerDependencies": {
     "react": "^18.0 || ^19.0",

src/Cell.tsx

@@ -66,7 +66,7 @@ function Cell<R, SR>(
   function handleClick(event: React.MouseEvent<HTMLDivElement>) {
     if (onClick) {
       const cellEvent = createCellEvent(event);
-      onClick({ row, column, selectCell: selectCellWrapper }, cellEvent);
+      onClick({ rowIdx, row, column, selectCell: selectCellWrapper }, cellEvent);
       if (cellEvent.isGridDefaultPrevented()) return;
     }
     selectCellWrapper();
@@ -75,7 +75,7 @@ function Cell<R, SR>(
   function handleContextMenu(event: React.MouseEvent<HTMLDivElement>) {
     if (onContextMenu) {
       const cellEvent = createCellEvent(event);
-      onContextMenu({ row, column, selectCell: selectCellWrapper }, cellEvent);
+      onContextMenu({ rowIdx, row, column, selectCell: selectCellWrapper }, cellEvent);
       if (cellEvent.isGridDefaultPrevented()) return;
     }
     selectCellWrapper();
@@ -84,7 +84,7 @@ function Cell<R, SR>(
   function handleDoubleClick(event: React.MouseEvent<HTMLDivElement>) {
     if (onDoubleClick) {
       const cellEvent = createCellEvent(event);
-      onDoubleClick({ row, column, selectCell: selectCellWrapper }, cellEvent);
+      onDoubleClick({ rowIdx, row, column, selectCell: selectCellWrapper }, cellEvent);
       if (cellEvent.isGridDefaultPrevented()) return;
     }
     selectCellWrapper(true);

src/DataGrid.tsx

@@ -187,7 +187,7 @@ export interface DataGridProps<R, SR = unknown, K extends Key = Key> extends Sha
   /** Called when the grid is scrolled */
   onScroll?: Maybe<(event: React.UIEvent<HTMLDivElement>) => void>;
   /** Called when a column is resized */
-  onColumnResize?: Maybe<(idx: number, width: number) => void>;
+  onColumnResize?: Maybe<(column: CalculatedColumn<R, SR>, width: number) => void>;
   /** Called when a column is reordered */
   onColumnsReorder?: Maybe<(sourceColumnKey: string, targetColumnKey: string) => void>;
 

src/HeaderRow.tsx

@@ -58,6 +58,8 @@ function HeaderRow<R, SR, K extends React.Key>({
   shouldFocusGrid,
   direction
 }: HeaderRowProps<R, SR, K>) {
+  // eslint-disable-next-line react-compiler/react-compiler
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const dragDropKey = useId();
 
   const cells = [];

src/hooks/useColumnWidths.ts

@@ -96,7 +96,7 @@ export function useColumnWidths<R, SR>(
       updateMeasuredWidths(columnsToMeasure);
     });
 
-    onColumnResize?.(column.idx, measuredWidth);
+    onColumnResize?.(column, measuredWidth);
   }
 
   return {

src/types.ts

@@ -168,6 +168,7 @@ export type CellMouseEvent = CellEvent<React.MouseEvent<HTMLDivElement>>;
 export type CellKeyboardEvent = CellEvent<React.KeyboardEvent<HTMLDivElement>>;
 
 export interface CellClickArgs<TRow, TSummaryRow = unknown> {
+  rowIdx: number;
   row: TRow;
   column: CalculatedColumn<TRow, TSummaryRow>;
   selectCell: (enableEditor?: boolean) => void;

test/browser/column/resizable.test.tsx

@@ -64,12 +64,16 @@ test('cannot not resize or auto resize column when resizable is not specified',
 });
 
 test('should resize column when dragging the handle', async () => {
-  setup<Row, unknown>({ columns, rows: [] });
+  const onColumnResize = vi.fn();
+  setup<Row, unknown>({ columns, rows: [], onColumnResize });
   const [, col2] = getHeaderCells();
   const grid = getGrid();
+  expect(onColumnResize).not.toHaveBeenCalled();
   await expect.element(grid).toHaveStyle({ gridTemplateColumns: '100px 200px' });
   await resize({ column: col2.element(), resizeBy: -50 });
   await expect.element(grid).toHaveStyle({ gridTemplateColumns: '100px 150px' });
+  expect(onColumnResize).toHaveBeenCalledTimes(1);
+  expect(onColumnResize).toHaveBeenCalledWith(expect.objectContaining(columns[1]), 150);
 });
 
 test('should use the maxWidth if specified', async () => {