From 07d29b40a03a3944e88522a87f739ce08056f6b4 Mon Sep 17 00:00:00 2001 From: Viz Date: Tue, 15 Nov 2022 06:03:56 +0800 Subject: [PATCH] [DataGrid] Fix conflict with `onResize` added to `React.HTMLAttributes` (#6797) --- package.json | 2 +- .../grid/x-data-grid/src/components/GridAutoSizer.tsx | 3 ++- yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 353ffc7fb70a..31b208c2567a 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "@types/mocha": "^10.0.0", "@types/node": "^18.11.9", "@types/prettier": "^2.7.1", - "@types/react": "^18.0.24", + "@types/react": "^18.0.25", "@types/react-dom": "^18.0.8", "@types/requestidlecallback": "^0.3.5", "@types/sinon": "^10.0.13", diff --git a/packages/grid/x-data-grid/src/components/GridAutoSizer.tsx b/packages/grid/x-data-grid/src/components/GridAutoSizer.tsx index 4c55839534de..eab27bbbdb75 100644 --- a/packages/grid/x-data-grid/src/components/GridAutoSizer.tsx +++ b/packages/grid/x-data-grid/src/components/GridAutoSizer.tsx @@ -17,7 +17,8 @@ export interface AutoSizerSize { // Credit to https://github.com/bvaughn/react-virtualized/blob/master/source/AutoSizer/AutoSizer.js // for the sources. -export interface AutoSizerProps extends Omit, 'children'> { +export interface AutoSizerProps + extends Omit, 'children' | 'onResize'> { /** * Function responsible for rendering children. * @param {AutoSizerSize} size The grid's size. diff --git a/yarn.lock b/yarn.lock index 08167c3e1580..64d1069db06c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3501,10 +3501,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.0.24": - version "18.0.24" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.24.tgz#2f79ed5b27f08d05107aab45c17919754cc44c20" - integrity sha512-wRJWT6ouziGUy+9uX0aW4YOJxAY0bG6/AOk5AW5QSvZqI7dk6VBIbXvcVgIw/W5Jrl24f77df98GEKTJGOLx7Q== +"@types/react@*", "@types/react@^18.0.25": + version "18.0.25" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.25.tgz#8b1dcd7e56fe7315535a4af25435e0bb55c8ae44" + integrity sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g== dependencies: "@types/prop-types" "*" "@types/scheduler" "*"