Skip to content

Commit

Permalink
[DataGrid] Fix conflict with onResize added to `React.HTMLAttribute…
Browse files Browse the repository at this point in the history
…s` (#6797)
  • Loading branch information
vizv authored and m4theushw committed Nov 16, 2022
1 parent 54b1175 commit d7ffa60
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"@types/mocha": "^9.1.1",
"@types/node": "^18.7.15",
"@types/prettier": "^2.7.0",
"@types/react": "^18.0.17",
"@types/react": "^18.0.25",
"@types/react-dom": "^18.0.6",
"@types/requestidlecallback": "^0.3.4",
"@types/sinon": "^10.0.13",
Expand Down
3 changes: 2 additions & 1 deletion packages/grid/x-data-grid/src/components/GridAutoSizer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<React.HTMLAttributes<HTMLDivElement>, 'children'> {
export interface AutoSizerProps
extends Omit<React.HTMLAttributes<HTMLDivElement>, 'children' | 'onResize'> {
/**
* Function responsible for rendering children.
* @param {AutoSizerSize} size The grid's size.
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3583,10 +3583,10 @@
dependencies:
"@types/react" "*"

"@types/react@*", "@types/react@^18.0.17":
version "18.0.17"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.17.tgz#4583d9c322d67efe4b39a935d223edcc7050ccf4"
integrity sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ==
"@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" "*"
Expand Down

0 comments on commit d7ffa60

Please sign in to comment.