Skip to content

Commit 07d29b4

Browse files
authored
[DataGrid] Fix conflict with onResize added to React.HTMLAttributes (#6797)
1 parent 8e98c5f commit 07d29b4

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"@types/mocha": "^10.0.0",
9999
"@types/node": "^18.11.9",
100100
"@types/prettier": "^2.7.1",
101-
"@types/react": "^18.0.24",
101+
"@types/react": "^18.0.25",
102102
"@types/react-dom": "^18.0.8",
103103
"@types/requestidlecallback": "^0.3.5",
104104
"@types/sinon": "^10.0.13",

packages/grid/x-data-grid/src/components/GridAutoSizer.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ export interface AutoSizerSize {
1717
// Credit to https://github.com/bvaughn/react-virtualized/blob/master/source/AutoSizer/AutoSizer.js
1818
// for the sources.
1919

20-
export interface AutoSizerProps extends Omit<React.HTMLAttributes<HTMLDivElement>, 'children'> {
20+
export interface AutoSizerProps
21+
extends Omit<React.HTMLAttributes<HTMLDivElement>, 'children' | 'onResize'> {
2122
/**
2223
* Function responsible for rendering children.
2324
* @param {AutoSizerSize} size The grid's size.

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -3501,10 +3501,10 @@
35013501
dependencies:
35023502
"@types/react" "*"
35033503

3504-
"@types/react@*", "@types/react@^18.0.24":
3505-
version "18.0.24"
3506-
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.24.tgz#2f79ed5b27f08d05107aab45c17919754cc44c20"
3507-
integrity sha512-wRJWT6ouziGUy+9uX0aW4YOJxAY0bG6/AOk5AW5QSvZqI7dk6VBIbXvcVgIw/W5Jrl24f77df98GEKTJGOLx7Q==
3504+
"@types/react@*", "@types/react@^18.0.25":
3505+
version "18.0.25"
3506+
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.25.tgz#8b1dcd7e56fe7315535a4af25435e0bb55c8ae44"
3507+
integrity sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g==
35083508
dependencies:
35093509
"@types/prop-types" "*"
35103510
"@types/scheduler" "*"

0 commit comments

Comments
 (0)