@mui/x-data-grid 5.6.1 → 5.9.0

package/node/DataGrid/DataGrid.js

@@ -206,6 +206,7 @@ DataGridRaw.propTypes = {
    * For each feature, if the flag is not explicitly set to `true`, the feature will be fully disabled and any property / method call will not have any effect.
    */
   experimentalFeatures: _propTypes.default.shape({
+    newEditingApi: _propTypes.default.bool,
     preventCommitWhileValidating: _propTypes.default.bool,
     warnIfFocusStateIsNotSynced: _propTypes.default.bool
   }),
@@ -480,7 +481,7 @@ DataGridRaw.propTypes = {
    * @param {GridEditCellPropsParams} params With all properties from [[GridEditCellPropsParams]].
    * @param {MuiEvent<React.SyntheticEvent>} event The event that caused this prop to be called.
    * @param {GridCallbackDetails} details Additional details for this callback.
-   * @deprecated use `preProcessEditCellProps` from the [`GridColDef`](/api/data-grid/grid-col-def/)
+   * @deprecated use `preProcessEditCellProps` from the [`GridColDef`](/x/api/data-grid/grid-col-def/)
    */
   onEditCellPropsChange: _propTypes.default.func,
 
@@ -520,6 +521,28 @@ DataGridRaw.propTypes = {
    */
   onPageSizeChange: _propTypes.default.func,
 
+  /**
+   * Callback fired when the preferences panel is closed.
+   * @param {GridPreferencePanelParams} params With all properties from [[GridPreferencePanelParams]].
+   * @param {MuiEvent<{}>} event The event object.
+   * @param {GridCallbackDetails} details Additional details for this callback.
+   */
+  onPreferencePanelClose: _propTypes.default.func,
+
+  /**
+   * Callback fired when the preferences panel is opened.
+   * @param {GridPreferencePanelParams} params With all properties from [[GridPreferencePanelParams]].
+   * @param {MuiEvent<{}>} event The event object.
+   * @param {GridCallbackDetails} details Additional details for this callback.
+   */
+  onPreferencePanelOpen: _propTypes.default.func,
+
+  /**
+   * Callback called when `processRowUpdate` throws an error or rejects.
+   * @param {any} error The error thrown.
+   */
+  onProcessRowUpdateError: _propTypes.default.func,
+
   /**
    * Callback fired when the grid is resized.
    * @param {ElementSize} containerSize With all properties from [[ElementSize]].
@@ -623,6 +646,16 @@ DataGridRaw.propTypes = {
    */
   paginationMode: _propTypes.default.oneOf(['client', 'server']),
 
+  /**
+   * Callback called before updating a row with new values in the row and cell editing.
+   * Only applied if `props.experimentalFeatures.newEditingApi: true`.
+   * @template R
+   * @param {R} newRow Row object with the new values.
+   * @param {R} oldRow Row object with the old values.
+   * @returns {Promise<R> | R} The final values to update the row.
+   */
+  processRowUpdate: _propTypes.default.func,
+
   /**
    * Number of extra rows to be rendered before/after the visible slice.
    * @default 3
@@ -644,7 +677,7 @@ DataGridRaw.propTypes = {
   /**
    * Set of rows of type [[GridRowsProp]].
    */
-  rows: _propTypes.default.arrayOf(_propTypes.default.object).isRequired,
+  rows: _propTypes.default.array.isRequired,
 
   /**
    * Sets the type of space between rows added by `getRowSpacing`.

package/node/DataGrid/useDataGridComponent.js

@@ -25,18 +25,20 @@ var _useGridFilter = require("../hooks/features/filter/useGridFilter");
 
 var _useGridFocus = require("../hooks/features/focus/useGridFocus");
 
-var _useGridKeyboard = require("../hooks/features/keyboard/useGridKeyboard");
-
-var _useGridKeyboardNavigation = require("../hooks/features/keyboard/useGridKeyboardNavigation");
+var _useGridKeyboardNavigation = require("../hooks/features/keyboardNavigation/useGridKeyboardNavigation");
 
 var _useGridPagination = require("../hooks/features/pagination/useGridPagination");
 
 var _useGridPreferencesPanel = require("../hooks/features/preferencesPanel/useGridPreferencesPanel");
 
-var _useGridEditing = require("../hooks/features/editRows/useGridEditing");
+var _useGridEditing = require("../hooks/features/editRows/useGridEditing.old");
+
+var _useGridEditing2 = require("../hooks/features/editRows/useGridEditing.new");
 
 var _useGridRows = require("../hooks/features/rows/useGridRows");
 
+var _useGridRowsPreProcessors = require("../hooks/features/rows/useGridRowsPreProcessors");
+
 var _useGridParamsApi = require("../hooks/features/rows/useGridParamsApi");
 
 var _useGridSelection = require("../hooks/features/selection/useGridSelection");
@@ -55,13 +57,18 @@ var _useGridRowsMeta = require("../hooks/features/rows/useGridRowsMeta");
 
 var _useGridStatePersistence = require("../hooks/features/statePersistence/useGridStatePersistence");
 
+var _useGridColumnSpanning = require("../hooks/features/columns/useGridColumnSpanning");
+
 const useDataGridComponent = props => {
+  var _props$experimentalFe, _props$experimentalFe2;
+
   const apiRef = (0, _useGridInitialization.useGridInitialization)(undefined, props);
   /**
    * Register all pre-processors called during state initialization here.
    */
 
   (0, _useGridSelectionPreProcessors.useGridSelectionPreProcessors)(apiRef, props);
+  (0, _useGridRowsPreProcessors.useGridRowsPreProcessors)(apiRef);
   /**
    * Register all state initializers here.
    */
@@ -69,7 +76,7 @@ const useDataGridComponent = props => {
   (0, _useGridInitializeState.useGridInitializeState)(_useGridSelection.selectionStateInitializer, apiRef, props);
   (0, _useGridInitializeState.useGridInitializeState)(_useGridColumns.columnsStateInitializer, apiRef, props);
   (0, _useGridInitializeState.useGridInitializeState)(_useGridRows.rowsStateInitializer, apiRef, props);
-  (0, _useGridInitializeState.useGridInitializeState)(_useGridEditing.editingStateInitializer, apiRef, props);
+  (0, _useGridInitializeState.useGridInitializeState)((_props$experimentalFe = props.experimentalFeatures) != null && _props$experimentalFe.newEditingApi ? _useGridEditing2.editingStateInitializer : _useGridEditing.editingStateInitializer, apiRef, props);
   (0, _useGridInitializeState.useGridInitializeState)(_useGridFocus.focusStateInitializer, apiRef, props);
   (0, _useGridInitializeState.useGridInitializeState)(_useGridSorting.sortingStateInitializer, apiRef, props);
   (0, _useGridInitializeState.useGridInitializeState)(_useGridPreferencesPanel.preferencePanelStateInitializer, apiRef, props);
@@ -78,22 +85,23 @@ const useDataGridComponent = props => {
   (0, _useGridInitializeState.useGridInitializeState)(_useGridPagination.paginationStateInitializer, apiRef, props);
   (0, _useGridInitializeState.useGridInitializeState)(_useGridRowsMeta.rowsMetaStateInitializer, apiRef, props);
   (0, _useGridInitializeState.useGridInitializeState)(_useGridColumnMenu.columnMenuStateInitializer, apiRef, props);
+  (0, _useGridKeyboardNavigation.useGridKeyboardNavigation)(apiRef, props);
   (0, _useGridSelection.useGridSelection)(apiRef, props);
   (0, _useGridColumns.useGridColumns)(apiRef, props);
   (0, _useGridRows.useGridRows)(apiRef, props);
   (0, _useGridParamsApi.useGridParamsApi)(apiRef);
-  (0, _useGridEditing.useGridEditing)(apiRef, props);
+  (0, _useGridColumnSpanning.useGridColumnSpanning)(apiRef);
+  const useGridEditing = (_props$experimentalFe2 = props.experimentalFeatures) != null && _props$experimentalFe2.newEditingApi ? _useGridEditing2.useGridEditing : _useGridEditing.useGridEditing;
+  useGridEditing(apiRef, props);
   (0, _useGridFocus.useGridFocus)(apiRef, props);
-  (0, _useGridSorting.useGridSorting)(apiRef, props);
   (0, _useGridPreferencesPanel.useGridPreferencesPanel)(apiRef);
   (0, _useGridFilter.useGridFilter)(apiRef, props);
+  (0, _useGridSorting.useGridSorting)(apiRef, props);
   (0, _useGridDensity.useGridDensity)(apiRef, props);
   (0, _useGridPagination.useGridPagination)(apiRef, props);
   (0, _useGridRowsMeta.useGridRowsMeta)(apiRef, props);
   (0, _useGridScroll.useGridScroll)(apiRef, props);
   (0, _useGridColumnMenu.useGridColumnMenu)(apiRef);
-  (0, _useGridKeyboard.useGridKeyboard)(apiRef);
-  (0, _useGridKeyboardNavigation.useGridKeyboardNavigation)(apiRef, props);
   (0, _useGridCsvExport.useGridCsvExport)(apiRef);
   (0, _useGridPrintExport.useGridPrintExport)(apiRef, props);
   (0, _useGridClipboard.useGridClipboard)(apiRef);

package/node/colDef/gridDateColDef.js

@@ -26,7 +26,7 @@ function gridDateFormatter({
     return value.toLocaleDateString();
   }
 
-  return value;
+  return value != null ? value : '';
 }
 
 function gridDateTimeFormatter({
@@ -36,7 +36,7 @@ function gridDateTimeFormatter({
     return value.toLocaleString();
   }
 
-  return value;
+  return value != null ? value : '';
 }
 
 const GRID_DATE_COL_DEF = (0, _extends2.default)({}, _gridStringColDef.GRID_STRING_COL_DEF, {

package/node/{models/colDef → colDef}/gridDefaultColumnTypes.js

@@ -5,17 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getGridDefaultColumnTypes = exports.DEFAULT_GRID_COL_TYPE_KEY = void 0;
 
-var _gridStringColDef = require("../../colDef/gridStringColDef");
+var _gridStringColDef = require("./gridStringColDef");
 
-var _gridNumericColDef = require("../../colDef/gridNumericColDef");
+var _gridNumericColDef = require("./gridNumericColDef");
 
-var _gridDateColDef = require("../../colDef/gridDateColDef");
+var _gridDateColDef = require("./gridDateColDef");
 
-var _gridBooleanColDef = require("../../colDef/gridBooleanColDef");
+var _gridBooleanColDef = require("./gridBooleanColDef");
 
-var _gridSingleSelectColDef = require("../../colDef/gridSingleSelectColDef");
+var _gridSingleSelectColDef = require("./gridSingleSelectColDef");
 
-var _gridActionsColDef = require("../../colDef/gridActionsColDef");
+var _gridActionsColDef = require("./gridActionsColDef");
 
 const DEFAULT_GRID_COL_TYPE_KEY = '__default__';
 exports.DEFAULT_GRID_COL_TYPE_KEY = DEFAULT_GRID_COL_TYPE_KEY;

package/node/colDef/index.js

@@ -158,4 +158,17 @@ Object.keys(_gridStringOperators).forEach(function (key) {
       return _gridStringOperators[key];
     }
   });
+});
+
+var _gridDefaultColumnTypes = require("./gridDefaultColumnTypes");
+
+Object.keys(_gridDefaultColumnTypes).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _gridDefaultColumnTypes[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _gridDefaultColumnTypes[key];
+    }
+  });
 });

package/node/components/ErrorOverlay.js

@@ -17,6 +17,10 @@ var _useGridApiContext = require("../hooks/utils/useGridApiContext");
 
 var _GridOverlay = require("./containers/GridOverlay");
 
+var _useGridSelector = require("../hooks/utils/useGridSelector");
+
+var _densitySelector = require("../hooks/features/density/densitySelector");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 const _excluded = ["message", "hasError", "errorInfo"];
@@ -33,8 +37,13 @@ const ErrorOverlay = /*#__PURE__*/React.forwardRef(function ErrorOverlay(props,
         other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   const apiRef = (0, _useGridApiContext.useGridApiContext)();
   const defaultLabel = apiRef.current.getLocaleText('errorOverlayDefaultLabel');
+  const rowHeight = (0, _useGridSelector.useGridSelector)(apiRef, _densitySelector.gridDensityRowHeightSelector);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridOverlay.GridOverlay, (0, _extends2.default)({
-    ref: ref
+    ref: ref,
+    sx: {
+      width: '100%',
+      minHeight: 2 * rowHeight
+    }
   }, other, {
     children: message || defaultLabel
   }));

package/node/components/GridLoadingOverlay.js

@@ -11,6 +11,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var React = _interopRequireWildcard(require("react"));
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 
 var _GridOverlay = require("./containers/GridOverlay");
@@ -28,4 +30,11 @@ const GridLoadingOverlay = /*#__PURE__*/React.forwardRef(function GridLoadingOve
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {})
   }));
 });
-exports.GridLoadingOverlay = GridLoadingOverlay;
+exports.GridLoadingOverlay = GridLoadingOverlay;
+process.env.NODE_ENV !== "production" ? GridLoadingOverlay.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  sx: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object, _propTypes.default.bool])), _propTypes.default.func, _propTypes.default.object])
+} : void 0;

package/node/components/GridNoRowsOverlay.js

@@ -11,6 +11,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var React = _interopRequireWildcard(require("react"));
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _useGridApiContext = require("../hooks/utils/useGridApiContext");
 
 var _GridOverlay = require("./containers/GridOverlay");
@@ -30,4 +32,11 @@ const GridNoRowsOverlay = /*#__PURE__*/React.forwardRef(function GridNoRowsOverl
     children: noRowsLabel
   }));
 });
-exports.GridNoRowsOverlay = GridNoRowsOverlay;
+exports.GridNoRowsOverlay = GridNoRowsOverlay;
+process.env.NODE_ENV !== "production" ? GridNoRowsOverlay.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  sx: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object, _propTypes.default.bool])), _propTypes.default.func, _propTypes.default.object])
+} : void 0;

package/node/components/GridRow.js

@@ -41,6 +41,8 @@ var _gridCheckboxSelectionColDef = require("../colDef/gridCheckboxSelectionColDe
 
 var _gridActionsColDef = require("../colDef/gridActionsColDef");
 
+var _gridDetailPanelToggleField = require("../constants/gridDetailPanelToggleField");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 const _excluded = ["selected", "rowId", "row", "index", "style", "rowHeight", "className", "visibleColumns", "renderedColumns", "containerWidth", "firstColumnToRender", "lastColumnToRender", "cellFocus", "cellTabIndex", "editRowsState", "isLastVisible", "onClick", "onDoubleClick", "onMouseEnter", "onMouseLeave"];
@@ -87,6 +89,7 @@ function GridRow(props) {
   const {
     selected,
     rowId,
+    row,
     index,
     style: styleProp,
     rowHeight,
@@ -157,7 +160,7 @@ function GridRow(props) {
       } // User opened a detail panel
 
 
-      if (field === '__detail_panel_toggle__') {
+      if (field === _gridDetailPanelToggleField.GRID_DETAIL_PANEL_TOGGLE_FIELD) {
         return;
       } // User is editing a cell
 
@@ -198,7 +201,8 @@ function GridRow(props) {
     const indexRelativeToCurrentPage = index - currentPage.range.firstRowIndex;
     const rowParams = (0, _extends2.default)({}, apiRef.current.getRowParams(rowId), {
       isFirstVisible: indexRelativeToCurrentPage === 0,
-      isLastVisible: indexRelativeToCurrentPage === currentPage.rows.length - 1
+      isLastVisible: indexRelativeToCurrentPage === currentPage.rows.length - 1,
+      indexRelativeToCurrentPage
     });
     rowClassName = rootProps.getRowClassName(rowParams);
   }
@@ -206,8 +210,6 @@ function GridRow(props) {
   const cells = [];
 
   for (let i = 0; i < renderedColumns.length; i += 1) {
-    var _rootProps$components;
-
     const column = renderedColumns[i];
     const indexRelativeToAllColumns = firstColumnToRender + i;
     const isLastColumn = indexRelativeToAllColumns === visibleColumns.length - 1;
@@ -236,7 +238,16 @@ function GridRow(props) {
     if (editCellState != null && column.renderEditCell) {
       var _rootProps$classes2;
 
-      const params = (0, _extends2.default)({}, cellParams, editCellState, {
+      let updatedRow = row;
+
+      if (apiRef.current.unstable_getRowWithUpdatedValues) {
+        // Only the new editing API has this method
+        updatedRow = apiRef.current.unstable_getRowWithUpdatedValues(rowId, column.field);
+      }
+
+      const params = (0, _extends2.default)({}, cellParams, {
+        row: updatedRow
+      }, editCellState, {
         api: apiRef.current
       });
       content = column.renderEditCell(params); // TODO move to GridCell
@@ -251,24 +262,35 @@ function GridRow(props) {
 
     const hasFocus = cellFocus !== null && cellFocus.id === rowId && cellFocus.field === column.field;
     const tabIndex = cellTabIndex !== null && cellTabIndex.id === rowId && cellTabIndex.field === column.field && cellParams.cellMode === 'view' ? 0 : -1;
-    cells.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.components.Cell, (0, _extends2.default)({
-      value: cellParams.value,
-      field: column.field,
-      width: column.computedWidth,
-      rowId: rowId,
-      height: rowHeight,
-      showRightBorder: showRightBorder,
-      formattedValue: cellParams.formattedValue,
-      align: column.align || 'left',
-      cellMode: cellParams.cellMode,
-      colIndex: indexRelativeToAllColumns,
-      isEditable: cellParams.isEditable,
-      hasFocus: hasFocus,
-      tabIndex: tabIndex,
-      className: (0, _clsx.default)(classNames)
-    }, (_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.cell, {
-      children: content
-    }), column.field));
+    const cellColSpanInfo = apiRef.current.unstable_getCellColSpanInfo(rowId, indexRelativeToAllColumns);
+
+    if (cellColSpanInfo && !cellColSpanInfo.spannedByColSpan) {
+      var _rootProps$components;
+
+      const {
+        colSpan,
+        width
+      } = cellColSpanInfo.cellProps;
+      cells.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.components.Cell, (0, _extends2.default)({
+        value: cellParams.value,
+        field: column.field,
+        width: width,
+        rowId: rowId,
+        height: rowHeight,
+        showRightBorder: showRightBorder,
+        formattedValue: cellParams.formattedValue,
+        align: column.align || 'left',
+        cellMode: cellParams.cellMode,
+        colIndex: indexRelativeToAllColumns,
+        isEditable: cellParams.isEditable,
+        hasFocus: hasFocus,
+        tabIndex: tabIndex,
+        className: (0, _clsx.default)(classNames),
+        colSpan: colSpan
+      }, (_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.cell, {
+        children: content
+      }), column.field));
+    }
   }
 
   const emptyCellWidth = containerWidth - columnsTotalWidth;
@@ -302,11 +324,16 @@ process.env.NODE_ENV !== "production" ? GridRow.propTypes = {
   containerWidth: _propTypes.default.number.isRequired,
   editRowsState: _propTypes.default.object.isRequired,
   firstColumnToRender: _propTypes.default.number.isRequired,
+
+  /**
+   * Index of the row in the whole sorted and filtered dataset.
+   * If some rows above have expanded children, this index also take those children into account.
+   */
   index: _propTypes.default.number.isRequired,
   isLastVisible: _propTypes.default.bool,
   lastColumnToRender: _propTypes.default.number.isRequired,
   renderedColumns: _propTypes.default.arrayOf(_propTypes.default.object).isRequired,
-  row: _propTypes.default.object.isRequired,
+  row: _propTypes.default.any.isRequired,
   rowHeight: _propTypes.default.number.isRequired,
   rowId: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]).isRequired,
   selected: _propTypes.default.bool.isRequired,

package/node/components/base/GridErrorHandler.js

@@ -13,8 +13,6 @@ var React = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _styles = require("@mui/material/styles");
-
 var _useGridApiContext = require("../../hooks/utils/useGridApiContext");
 
 var _useGridLogger = require("../../hooks/utils/useGridLogger");
@@ -25,23 +23,12 @@ var _ErrorBoundary = require("../ErrorBoundary");
 
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
 
-var _GridAutoSizer = require("../GridAutoSizer");
-
-var _gridEvents = require("../../models/events/gridEvents");
-
 var _jsxRuntime = require("react/jsx-runtime");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-const ErrorOverlayWrapper = (0, _styles.styled)('div')({
-  position: 'absolute',
-  top: 0,
-  width: '100%',
-  height: '100%'
-});
-
 function GridErrorHandler(props) {
   const {
     children
@@ -50,28 +37,18 @@ function GridErrorHandler(props) {
   const logger = (0, _useGridLogger.useGridLogger)(apiRef, 'GridErrorHandler');
   const rootProps = (0, _useGridRootProps.useGridRootProps)();
   const error = apiRef.current.state.error;
-  const handleResize = React.useCallback(size => {
-    apiRef.current.publishEvent(_gridEvents.GridEvents.resize, size);
-  }, [apiRef]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ErrorBoundary.ErrorBoundary, {
     hasError: error != null,
     componentProps: error,
     api: apiRef,
     logger: logger,
-    render: errorProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridMainContainer.GridMainContainer, {
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridAutoSizer.GridAutoSizer, {
-        nonce: rootProps.nonce,
-        disableHeight: rootProps.autoHeight,
-        onResize: handleResize,
-        children: () => {
-          var _rootProps$components;
-
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(ErrorOverlayWrapper, {
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.components.ErrorOverlay, (0, _extends2.default)({}, errorProps, (_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.errorOverlay))
-          });
-        }
-      })
-    }),
+    render: errorProps => {
+      var _rootProps$components;
+
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridMainContainer.GridMainContainer, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.components.ErrorOverlay, (0, _extends2.default)({}, errorProps, (_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.errorOverlay))
+      });
+    },
     children: children
   });
 }

package/node/components/base/GridOverlays.js

@@ -78,8 +78,9 @@ function GridOverlays() {
   const rootProps = (0, _useGridRootProps.useGridRootProps)();
   const totalRowCount = (0, _useGridSelector.useGridSelector)(apiRef, _gridRowsSelector.gridRowCountSelector);
   const visibleRowCount = (0, _useGridSelector.useGridSelector)(apiRef, _gridFilterSelector.gridVisibleRowCountSelector);
-  const showNoRowsOverlay = !rootProps.loading && totalRowCount === 0;
-  const showNoResultsOverlay = !rootProps.loading && totalRowCount > 0 && visibleRowCount === 0;
+  const loading = (0, _useGridSelector.useGridSelector)(apiRef, _gridRowsSelector.gridRowsLoadingSelector);
+  const showNoRowsOverlay = !loading && totalRowCount === 0;
+  const showNoResultsOverlay = !loading && totalRowCount > 0 && visibleRowCount === 0;
   let overlay = null;
 
   if (showNoRowsOverlay) {