Skip to content

Commit a34794b

Browse files
vizvm4theushw
authored andcommitted
[DataGrid] Fix conflict with onResize added to React.HTMLAttributes (mui#6797)
1 parent 54b1175 commit a34794b

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"@types/mocha": "^9.1.1",
9696
"@types/node": "^18.7.15",
9797
"@types/prettier": "^2.7.0",
98-
"@types/react": "^18.0.17",
98+
"@types/react": "^18.0.25",
9999
"@types/react-dom": "^18.0.6",
100100
"@types/requestidlecallback": "^0.3.4",
101101
"@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

+10-1
Original file line numberDiff line numberDiff line change
@@ -3583,7 +3583,7 @@
35833583
dependencies:
35843584
"@types/react" "*"
35853585

3586-
"@types/react@*", "@types/react@^18.0.17":
3586+
"@types/react@*":
35873587
version "18.0.17"
35883588
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.17.tgz#4583d9c322d67efe4b39a935d223edcc7050ccf4"
35893589
integrity sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ==
@@ -3592,6 +3592,15 @@
35923592
"@types/scheduler" "*"
35933593
csstype "^3.0.2"
35943594

3595+
"@types/react@^18.0.25":
3596+
version "18.0.25"
3597+
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.25.tgz#8b1dcd7e56fe7315535a4af25435e0bb55c8ae44"
3598+
integrity sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g==
3599+
dependencies:
3600+
"@types/prop-types" "*"
3601+
"@types/scheduler" "*"
3602+
csstype "^3.0.2"
3603+
35953604
"@types/requestidlecallback@^0.3.4":
35963605
version "0.3.4"
35973606
resolved "https://registry.yarnpkg.com/@types/requestidlecallback/-/requestidlecallback-0.3.4.tgz#819e22b8994cf547e1f17f9cb79805a5a3bb1db5"

0 commit comments

Comments
 (0)