diff --git a/docs/pages/x/api/data-grid/data-grid-premium.json b/docs/pages/x/api/data-grid/data-grid-premium.json index 9b0f8b3cc43e..d036b6795882 100644 --- a/docs/pages/x/api/data-grid/data-grid-premium.json +++ b/docs/pages/x/api/data-grid/data-grid-premium.json @@ -4,7 +4,10 @@ "type": { "name": "arrayOf", "description": "Array<object>" }, "required": true }, - "rows": { "type": { "name": "array" }, "required": true }, + "rows": { + "type": { "name": "arrayOf", "description": "Array<object>" }, + "required": true + }, "aggregationFunctions": { "type": { "name": "object" }, "default": "GRID_AGGREGATION_FUNCTIONS" @@ -194,7 +197,12 @@ "description": "{ left?: Array<string>, right?: Array<string> }" } }, - "pinnedRows": { "type": { "name": "shape", "description": "{ bottom?: array, top?: array }" } }, + "pinnedRows": { + "type": { + "name": "shape", + "description": "{ bottom?: Array<object>, top?: Array<object> }" + } + }, "processRowUpdate": { "type": { "name": "func" } }, "rowBuffer": { "type": { "name": "number" }, "default": "3" }, "rowCount": { "type": { "name": "number" } }, diff --git a/docs/pages/x/api/data-grid/data-grid-pro.json b/docs/pages/x/api/data-grid/data-grid-pro.json index 843ab9a530c1..27da28e9a10e 100644 --- a/docs/pages/x/api/data-grid/data-grid-pro.json +++ b/docs/pages/x/api/data-grid/data-grid-pro.json @@ -4,7 +4,10 @@ "type": { "name": "arrayOf", "description": "Array<object>" }, "required": true }, - "rows": { "type": { "name": "array" }, "required": true }, + "rows": { + "type": { "name": "arrayOf", "description": "Array<object>" }, + "required": true + }, "apiRef": { "type": { "name": "shape", "description": "{ current: object }" } }, "aria-label": { "type": { "name": "string" } }, "aria-labelledby": { "type": { "name": "string" } }, @@ -177,7 +180,12 @@ "description": "{ left?: Array<string>, right?: Array<string> }" } }, - "pinnedRows": { "type": { "name": "shape", "description": "{ bottom?: array, top?: array }" } }, + "pinnedRows": { + "type": { + "name": "shape", + "description": "{ bottom?: Array<object>, top?: Array<object> }" + } + }, "processRowUpdate": { "type": { "name": "func" } }, "rowBuffer": { "type": { "name": "number" }, "default": "3" }, "rowCount": { "type": { "name": "number" } }, diff --git a/docs/pages/x/api/data-grid/data-grid.json b/docs/pages/x/api/data-grid/data-grid.json index c92205b78d67..e162e51a3c7d 100644 --- a/docs/pages/x/api/data-grid/data-grid.json +++ b/docs/pages/x/api/data-grid/data-grid.json @@ -1,7 +1,10 @@ { "props": { "columns": { "type": { "name": "custom", "description": "array" }, "required": true }, - "rows": { "type": { "name": "array" }, "required": true }, + "rows": { + "type": { "name": "arrayOf", "description": "Array<object>" }, + "required": true + }, "aria-label": { "type": { "name": "string" } }, "aria-labelledby": { "type": { "name": "string" } }, "autoHeight": { "type": { "name": "bool" } }, diff --git a/package.json b/package.json index ce8c38d31405..b78b1da84555 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "@mnajdova/enzyme-adapter-react-18": "^0.2.0", "@mui/icons-material": "^5.10.3", "@mui/material": "^5.10.4", - "@mui/monorepo": "https://github.com/m4theushw/material-ui.git#master", + "@mui/monorepo": "https://github.com/flaviendelangle/material-ui.git#master", "@mui/utils": "^5.10.3", "@octokit/plugin-retry": "^3.0.9", "@octokit/rest": "^18.12.0", diff --git a/packages/grid/x-data-grid-premium/src/DataGridPremium/DataGridPremium.tsx b/packages/grid/x-data-grid-premium/src/DataGridPremium/DataGridPremium.tsx index 2e6b955f04d2..647db9951e8c 100644 --- a/packages/grid/x-data-grid-premium/src/DataGridPremium/DataGridPremium.tsx +++ b/packages/grid/x-data-grid-premium/src/DataGridPremium/DataGridPremium.tsx @@ -833,8 +833,8 @@ DataGridPremiumRaw.propTypes = { * Rows data to pin on top or bottom. */ pinnedRows: PropTypes.shape({ - bottom: PropTypes.array, - top: PropTypes.array, + bottom: PropTypes.arrayOf(PropTypes.object), + top: PropTypes.arrayOf(PropTypes.object), }), /** * Callback called before updating a row with new values in the row and cell editing. @@ -882,7 +882,7 @@ DataGridPremiumRaw.propTypes = { /** * Set of rows of type [[GridRowsProp]]. */ - rows: PropTypes.array.isRequired, + rows: PropTypes.arrayOf(PropTypes.object).isRequired, /** * Loading rows can be processed on the server or client-side. * Set it to 'client' if you would like enable infnite loading. diff --git a/packages/grid/x-data-grid-premium/src/components/GridExcelExportMenuItem.tsx b/packages/grid/x-data-grid-premium/src/components/GridExcelExportMenuItem.tsx index 79e6e187b885..d7d83d437737 100644 --- a/packages/grid/x-data-grid-premium/src/components/GridExcelExportMenuItem.tsx +++ b/packages/grid/x-data-grid-premium/src/components/GridExcelExportMenuItem.tsx @@ -31,7 +31,17 @@ GridExcelExportMenuItem.propTypes = { // ---------------------------------------------------------------------- hideMenu: PropTypes.func, options: PropTypes.shape({ + allColumns: PropTypes.bool, + columnsStyles: PropTypes.object, disableToolbarButton: PropTypes.bool, + exceljsPostProcess: PropTypes.func, + exceljsPreProcess: PropTypes.func, + fields: PropTypes.arrayOf(PropTypes.string), + fileName: PropTypes.string, + getRowsToExport: PropTypes.func, + includeColumnGroupsHeaders: PropTypes.bool, + includeHeaders: PropTypes.bool, + valueOptionsSheetName: PropTypes.string, }), } as any; diff --git a/packages/grid/x-data-grid-pro/src/DataGridPro/DataGridPro.tsx b/packages/grid/x-data-grid-pro/src/DataGridPro/DataGridPro.tsx index 5af063bfef75..7fb91609a25f 100644 --- a/packages/grid/x-data-grid-pro/src/DataGridPro/DataGridPro.tsx +++ b/packages/grid/x-data-grid-pro/src/DataGridPro/DataGridPro.tsx @@ -784,8 +784,8 @@ DataGridProRaw.propTypes = { * Rows data to pin on top or bottom. */ pinnedRows: PropTypes.shape({ - bottom: PropTypes.array, - top: PropTypes.array, + bottom: PropTypes.arrayOf(PropTypes.object), + top: PropTypes.arrayOf(PropTypes.object), }), /** * Callback called before updating a row with new values in the row and cell editing. @@ -823,7 +823,7 @@ DataGridProRaw.propTypes = { /** * Set of rows of type [[GridRowsProp]]. */ - rows: PropTypes.array.isRequired, + rows: PropTypes.arrayOf(PropTypes.object).isRequired, /** * Loading rows can be processed on the server or client-side. * Set it to 'client' if you would like enable infnite loading. diff --git a/packages/grid/x-data-grid-pro/src/components/GridDetailPanelToggleCell.tsx b/packages/grid/x-data-grid-pro/src/components/GridDetailPanelToggleCell.tsx index 2b388d6dddf0..c7536e6c89bc 100644 --- a/packages/grid/x-data-grid-pro/src/components/GridDetailPanelToggleCell.tsx +++ b/packages/grid/x-data-grid-pro/src/components/GridDetailPanelToggleCell.tsx @@ -115,7 +115,7 @@ GridDetailPanelToggleCell.propTypes = { /** * The row model of the row that the current cell belongs to. */ - row: PropTypes.object.isRequired, + row: PropTypes.any.isRequired, /** * The node of the row that the current cell belongs to. */ diff --git a/packages/grid/x-data-grid-pro/src/components/GridTreeDataGroupingCell.tsx b/packages/grid/x-data-grid-pro/src/components/GridTreeDataGroupingCell.tsx index 733153536142..721694bbd3a9 100644 --- a/packages/grid/x-data-grid-pro/src/components/GridTreeDataGroupingCell.tsx +++ b/packages/grid/x-data-grid-pro/src/components/GridTreeDataGroupingCell.tsx @@ -154,7 +154,7 @@ GridTreeDataGroupingCell.propTypes = { /** * The row model of the row that the current cell belongs to. */ - row: PropTypes.object.isRequired, + row: PropTypes.any.isRequired, /** * The node of the row that the current cell belongs to. */ diff --git a/packages/grid/x-data-grid/src/DataGrid/DataGrid.tsx b/packages/grid/x-data-grid/src/DataGrid/DataGrid.tsx index 7058730b11b5..b6df72756cfe 100644 --- a/packages/grid/x-data-grid/src/DataGrid/DataGrid.tsx +++ b/packages/grid/x-data-grid/src/DataGrid/DataGrid.tsx @@ -663,7 +663,7 @@ DataGridRaw.propTypes = { /** * Set of rows of type [[GridRowsProp]]. */ - rows: PropTypes.array.isRequired, + rows: PropTypes.arrayOf(PropTypes.object).isRequired, /** * Sets the type of space between rows added by `getRowSpacing`. * @default "margin" diff --git a/packages/grid/x-data-grid/src/components/cell/GridActionsCell.tsx b/packages/grid/x-data-grid/src/components/cell/GridActionsCell.tsx index def9355e9270..879440ff6503 100644 --- a/packages/grid/x-data-grid/src/components/cell/GridActionsCell.tsx +++ b/packages/grid/x-data-grid/src/components/cell/GridActionsCell.tsx @@ -302,7 +302,7 @@ GridActionsCell.propTypes = { /** * The row model of the row that the current cell belongs to. */ - row: PropTypes.object.isRequired, + row: PropTypes.any.isRequired, /** * The node of the row that the current cell belongs to. */ diff --git a/packages/grid/x-data-grid/src/components/cell/GridBooleanCell.tsx b/packages/grid/x-data-grid/src/components/cell/GridBooleanCell.tsx index a8af71a5e287..ddd528b763c8 100644 --- a/packages/grid/x-data-grid/src/components/cell/GridBooleanCell.tsx +++ b/packages/grid/x-data-grid/src/components/cell/GridBooleanCell.tsx @@ -129,7 +129,7 @@ GridBooleanCellRaw.propTypes = { /** * The row model of the row that the current cell belongs to. */ - row: PropTypes.object.isRequired, + row: PropTypes.any.isRequired, /** * The node of the row that the current cell belongs to. */ diff --git a/packages/grid/x-data-grid/src/components/cell/GridEditBooleanCell.tsx b/packages/grid/x-data-grid/src/components/cell/GridEditBooleanCell.tsx index 3cbcd3f1fd25..352dc3aee36d 100644 --- a/packages/grid/x-data-grid/src/components/cell/GridEditBooleanCell.tsx +++ b/packages/grid/x-data-grid/src/components/cell/GridEditBooleanCell.tsx @@ -170,7 +170,7 @@ GridEditBooleanCell.propTypes = { /** * The row model of the row that the current cell belongs to. */ - row: PropTypes.object.isRequired, + row: PropTypes.any.isRequired, /** * The node of the row that the current cell belongs to. */ diff --git a/packages/grid/x-data-grid/src/components/cell/GridEditDateCell.tsx b/packages/grid/x-data-grid/src/components/cell/GridEditDateCell.tsx index 532798fdec61..59f7ba32ca75 100644 --- a/packages/grid/x-data-grid/src/components/cell/GridEditDateCell.tsx +++ b/packages/grid/x-data-grid/src/components/cell/GridEditDateCell.tsx @@ -220,7 +220,7 @@ GridEditDateCell.propTypes = { /** * The row model of the row that the current cell belongs to. */ - row: PropTypes.object.isRequired, + row: PropTypes.any.isRequired, /** * The node of the row that the current cell belongs to. */ diff --git a/packages/grid/x-data-grid/src/components/cell/GridEditInputCell.tsx b/packages/grid/x-data-grid/src/components/cell/GridEditInputCell.tsx index c5f77ed1bb46..8200eba4c22a 100644 --- a/packages/grid/x-data-grid/src/components/cell/GridEditInputCell.tsx +++ b/packages/grid/x-data-grid/src/components/cell/GridEditInputCell.tsx @@ -200,7 +200,7 @@ GridEditInputCell.propTypes = { /** * The row model of the row that the current cell belongs to. */ - row: PropTypes.object, + row: PropTypes.any, /** * The node of the row that the current cell belongs to. */ diff --git a/packages/grid/x-data-grid/src/components/cell/GridEditSingleSelectCell.tsx b/packages/grid/x-data-grid/src/components/cell/GridEditSingleSelectCell.tsx index abeea1b5d93b..59f16861596f 100644 --- a/packages/grid/x-data-grid/src/components/cell/GridEditSingleSelectCell.tsx +++ b/packages/grid/x-data-grid/src/components/cell/GridEditSingleSelectCell.tsx @@ -256,7 +256,7 @@ GridEditSingleSelectCell.propTypes = { /** * The row model of the row that the current cell belongs to. */ - row: PropTypes.object.isRequired, + row: PropTypes.any.isRequired, /** * The node of the row that the current cell belongs to. */ diff --git a/packages/grid/x-data-grid/src/components/columnSelection/GridCellCheckboxRenderer.tsx b/packages/grid/x-data-grid/src/components/columnSelection/GridCellCheckboxRenderer.tsx index 9acac0b7da42..a659ff93b418 100644 --- a/packages/grid/x-data-grid/src/components/columnSelection/GridCellCheckboxRenderer.tsx +++ b/packages/grid/x-data-grid/src/components/columnSelection/GridCellCheckboxRenderer.tsx @@ -181,7 +181,7 @@ GridCellCheckboxForwardRef.propTypes = { /** * The row model of the row that the current cell belongs to. */ - row: PropTypes.object.isRequired, + row: PropTypes.any.isRequired, /** * The node of the row that the current cell belongs to. */ diff --git a/yarn.lock b/yarn.lock index b948efe12f4e..11572ff72b7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2518,9 +2518,9 @@ react-is "^18.2.0" react-transition-group "^4.4.5" -"@mui/monorepo@https://github.com/m4theushw/material-ui.git#master": - version "5.10.4" - resolved "https://github.com/m4theushw/material-ui.git#0189797d23c6469438c7dc68db214f490697ebce" +"@mui/monorepo@https://github.com/flaviendelangle/material-ui.git#master": + version "5.10.5" + resolved "https://github.com/flaviendelangle/material-ui.git#002ab79b77d4d88add840e21c5101137a4a7de5a" "@mui/private-theming@^5.10.3": version "5.10.3"