@mui/x-data-grid 5.8.0 → 5.9.0

package/legacy/hooks/features/filter/useGridFilter.js

@@ -45,11 +45,7 @@ export var useGridFilter = function useGridFilter(apiRef, props) {
     stateSelector: gridFilterModelSelector,
     changeEvent: GridEvents.filterModelChange
   });
-  /**
-   * API METHODS
-   */
-
-  var applyFilters = React.useCallback(function () {
+  var updateFilteredRows = React.useCallback(function () {
     apiRef.current.setState(function (state) {
       var filterModel = gridFilterModelSelector(state, apiRef.current.instanceId);
       var isRowMatchingFilters = props.filterMode === GridFeatureModeConstant.client ? buildAggregatedFilterApplier(filterModel, apiRef) : null;
@@ -60,9 +56,16 @@ export var useGridFilter = function useGridFilter(apiRef, props) {
         filter: _extends({}, state.filter, filteringResult)
       });
     });
-    apiRef.current.publishEvent(GridEvents.visibleRowsSet);
+    apiRef.current.publishEvent(GridEvents.filteredRowsSet);
+  }, [props.filterMode, apiRef]);
+  /**
+   * API METHODS
+   */
+
+  var applyFilters = React.useCallback(function () {
+    updateFilteredRows();
     apiRef.current.forceUpdate();
-  }, [apiRef, props.filterMode]);
+  }, [apiRef, updateFilteredRows]);
   var upsertFilterItem = React.useCallback(function (item) {
     var filterModel = gridFilterModelSelector(apiRef);
 
@@ -260,8 +263,10 @@ export var useGridFilter = function useGridFilter(apiRef, props) {
     if (methodName === 'filtering') {
       apiRef.current.unstable_applyFilters();
     }
-  }, [apiRef]);
-  useGridApiEventHandler(apiRef, GridEvents.rowsSet, apiRef.current.unstable_applyFilters);
+  }, [apiRef]); // Do not call `apiRef.current.forceUpdate` to avoid re-render before updating the sorted rows.
+  // Otherwise, the state is not consistent during the render
+
+  useGridApiEventHandler(apiRef, GridEvents.rowsSet, updateFilteredRows);
   useGridApiEventHandler(apiRef, GridEvents.rowExpansionChange, apiRef.current.unstable_applyFilters);
   useGridApiEventHandler(apiRef, GridEvents.columnsChange, handleColumnsChange);
   useGridApiEventHandler(apiRef, GridEvents.activeStrategyProcessorChange, handleStrategyProcessorChange);

package/legacy/hooks/features/focus/useGridFocus.js

@@ -105,21 +105,31 @@ export var useGridFocus = function useGridFocus(apiRef, props) {
       rowIndexToFocus += 1;
     }
 
+    var currentPage = getVisibleRows(apiRef, {
+      pagination: props.pagination,
+      paginationMode: props.paginationMode
+    });
+
     if (columnIndexToFocus >= visibleColumns.length) {
-      // Go to next row if we are at the last column
+      // Go to next row if we are after the last column
       rowIndexToFocus += 1;
-      columnIndexToFocus = 0;
+
+      if (rowIndexToFocus < currentPage.rows.length) {
+        // Go to first column of the next row if there's one more row
+        columnIndexToFocus = 0;
+      }
     } else if (columnIndexToFocus < 0) {
-      // Go to previous row if we are at the first column
+      // Go to previous row if we are before the first column
       rowIndexToFocus -= 1;
-      columnIndexToFocus = visibleColumns.length - 1;
+
+      if (rowIndexToFocus >= 0) {
+        // Go to last column of the previous if there's one more row
+        columnIndexToFocus = visibleColumns.length - 1;
+      }
     }
 
-    var currentPage = getVisibleRows(apiRef, {
-      pagination: props.pagination,
-      paginationMode: props.paginationMode
-    });
-    rowIndexToFocus = clamp(rowIndexToFocus, currentPage.range.firstRowIndex, currentPage.range.lastRowIndex);
+    rowIndexToFocus = clamp(rowIndexToFocus, 0, currentPage.rows.length - 1);
+    columnIndexToFocus = clamp(columnIndexToFocus, 0, visibleColumns.length - 1);
     var rowToFocus = currentPage.rows[rowIndexToFocus];
     var columnToFocus = visibleColumns[columnIndexToFocus];
     apiRef.current.setCellFocus(rowToFocus.id, columnToFocus.field);

package/legacy/hooks/features/keyboardNavigation/useGridKeyboardNavigation.js

@@ -9,6 +9,7 @@ import { GRID_CHECKBOX_SELECTION_COL_DEF } from '../../../colDef/gridCheckboxSel
 import { gridClasses } from '../../../constants/gridClasses';
 import { GridCellModes } from '../../../models/gridEditRowModel';
 import { isNavigationKey } from '../../../utils/keyboardUtils';
+import { GRID_DETAIL_PANEL_TOGGLE_FIELD } from '../../../constants/gridDetailPanelToggleField';
 /**
  * @requires useGridSorting (method) - can be after
  * @requires useGridFilter (state) - can be after
@@ -16,21 +17,41 @@ import { isNavigationKey } from '../../../utils/keyboardUtils';
  * @requires useGridDimensions (method) - can be after
  * @requires useGridFocus (method) - can be after
  * @requires useGridScroll (method) - can be after
+ * @requires useGridColumnSpanning (method) - can be after
  */
 
 export var useGridKeyboardNavigation = function useGridKeyboardNavigation(apiRef, props) {
   var logger = useGridLogger(apiRef, 'useGridKeyboardNavigation');
   var currentPage = useGridVisibleRows(apiRef, props);
+  /**
+   * @param {number} colIndex Index of the column to focus
+   * @param {number} rowIndex index of the row to focus
+   * @param {string} closestColumnToUse Which closest column cell to use when the cell is spanned by `colSpan`.
+   */
+
   var goToCell = React.useCallback(function (colIndex, rowIndex) {
+    var _visibleSortedRows$ro;
+
+    var closestColumnToUse = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'left';
+    var visibleSortedRows = gridVisibleSortedRowEntriesSelector(apiRef);
+    var rowId = (_visibleSortedRows$ro = visibleSortedRows[rowIndex]) == null ? void 0 : _visibleSortedRows$ro.id;
+    var nextCellColSpanInfo = apiRef.current.unstable_getCellColSpanInfo(rowId, colIndex);
+
+    if (nextCellColSpanInfo && nextCellColSpanInfo.spannedByColSpan) {
+      if (closestColumnToUse === 'left') {
+        colIndex = nextCellColSpanInfo.leftVisibleCellIndex;
+      } else if (closestColumnToUse === 'right') {
+        colIndex = nextCellColSpanInfo.rightVisibleCellIndex;
+      }
+    }
+
     logger.debug("Navigating to cell row ".concat(rowIndex, ", col ").concat(colIndex));
     apiRef.current.scrollToIndexes({
       colIndex: colIndex,
       rowIndex: rowIndex
     });
     var field = apiRef.current.getVisibleColumns()[colIndex].field;
-    var visibleSortedRows = gridVisibleSortedRowEntriesSelector(apiRef);
-    var node = visibleSortedRows[rowIndex];
-    apiRef.current.setCellFocus(node.id, field);
+    apiRef.current.setCellFocus(rowId, field);
   }, [apiRef, logger]);
   var goToHeader = React.useCallback(function (colIndex, event) {
     logger.debug("Navigating to header col ".concat(colIndex));
@@ -85,7 +106,7 @@ export var useGridKeyboardNavigation = function useGridKeyboardNavigation(apiRef
       case 'ArrowRight':
         {
           if (colIndexBefore < lastColIndex) {
-            goToCell(colIndexBefore + 1, rowIndexBefore);
+            goToCell(colIndexBefore + 1, rowIndexBefore, 'right');
           }
 
           break;
@@ -104,9 +125,9 @@ export var useGridKeyboardNavigation = function useGridKeyboardNavigation(apiRef
         {
           // "Tab" is only triggered by the row / cell editing feature
           if (event.shiftKey && colIndexBefore > firstColIndex) {
-            goToCell(colIndexBefore - 1, rowIndexBefore);
+            goToCell(colIndexBefore - 1, rowIndexBefore, 'left');
           } else if (!event.shiftKey && colIndexBefore < lastColIndex) {
-            goToCell(colIndexBefore + 1, rowIndexBefore);
+            goToCell(colIndexBefore + 1, rowIndexBefore, 'right');
           }
 
           break;
@@ -114,6 +135,18 @@ export var useGridKeyboardNavigation = function useGridKeyboardNavigation(apiRef
 
       case ' ':
         {
+          var field = params.field;
+
+          if (field === GRID_DETAIL_PANEL_TOGGLE_FIELD) {
+            break;
+          }
+
+          var colDef = params.colDef;
+
+          if (colDef && colDef.type === 'treeDataGroup') {
+            break;
+          }
+
           if (!event.shiftKey && rowIndexBefore < lastRowIndexInPage) {
             goToCell(colIndexBefore, Math.min(rowIndexBefore + viewportPageSize, lastRowIndexInPage));
           }

package/legacy/hooks/features/rows/gridRowsSelector.js

@@ -5,6 +5,9 @@ export var gridRowsStateSelector = function gridRowsStateSelector(state) {
 export var gridRowCountSelector = createSelector(gridRowsStateSelector, function (rows) {
   return rows.totalRowCount;
 });
+export var gridRowsLoadingSelector = createSelector(gridRowsStateSelector, function (rows) {
+  return rows.loading;
+});
 export var gridTopLevelRowCountSelector = createSelector(gridRowsStateSelector, function (rows) {
   return rows.totalTopLevelRowCount;
 });

package/legacy/hooks/features/rows/useGridRows.js

@@ -44,7 +44,7 @@ var convertGridRowsPropToState = function convertGridRowsPropToState(_ref) {
   };
 };
 
-var getRowsStateFromCache = function getRowsStateFromCache(rowsCache, previousTree, apiRef, rowCountProp) {
+var getRowsStateFromCache = function getRowsStateFromCache(rowsCache, previousTree, apiRef, rowCountProp, loadingProp) {
   var value = rowsCache.state.value;
   var rowCount = rowCountProp != null ? rowCountProp : 0;
   var groupingResponse = apiRef.current.unstable_applyStrategyProcessor('rowTreeCreation', _extends({}, value, {
@@ -54,6 +54,7 @@ var getRowsStateFromCache = function getRowsStateFromCache(rowsCache, previousTr
     return node.parent == null;
   }).length;
   return _extends({}, groupingResponse, {
+    loading: loadingProp,
     totalRowCount: Math.max(rowCount, groupingResponse.ids.length),
     totalTopLevelRowCount: Math.max(rowCount, dataTopLevelRowCount)
   });
@@ -76,7 +77,7 @@ export var rowsStateInitializer = function rowsStateInitializer(state, props, ap
     lastUpdateMs: Date.now()
   };
   return _extends({}, state, {
-    rows: getRowsStateFromCache(rowsCache, null, apiRef, props.rowCount),
+    rows: getRowsStateFromCache(rowsCache, null, apiRef, props.rowCount, props.loading),
     rowsCache: rowsCache // TODO remove from state
 
   });
@@ -109,7 +110,7 @@ export var useGridRows = function useGridRows(apiRef, props) {
       rowsCache.current.lastUpdateMs = Date.now();
       apiRef.current.setState(function (state) {
         return _extends({}, state, {
-          rows: getRowsStateFromCache(rowsCache.current, gridRowTreeSelector(apiRef), apiRef, props.rowCount)
+          rows: getRowsStateFromCache(rowsCache.current, gridRowTreeSelector(apiRef), apiRef, props.rowCount, props.loading)
         });
       });
       apiRef.current.publishEvent(GridEvents.rowsSet);
@@ -136,7 +137,7 @@ export var useGridRows = function useGridRows(apiRef, props) {
     }
 
     run();
-  }, [props.throttleRowsMs, props.rowCount, apiRef]);
+  }, [props.throttleRowsMs, props.rowCount, props.loading, apiRef]);
   /**
    * API METHODS
    */

package/legacy/hooks/features/rows/useGridRowsMeta.js

@@ -7,8 +7,7 @@ import { gridDensityRowHeightSelector, gridDensityFactorSelector } from '../dens
 import { gridFilterStateSelector } from '../filter/gridFilterSelector';
 import { gridPaginationSelector } from '../pagination/gridPaginationSelector';
 import { gridSortingStateSelector } from '../sorting/gridSortingSelector';
-import { GridEvents } from '../../../models/events/gridEvents';
-import { useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
+import { useGridRegisterPipeApplier } from '../../core/pipeProcessing';
 export var rowsMetaStateInitializer = function rowsMetaStateInitializer(state) {
   return _extends({}, state, {
     rowsMeta: {
@@ -65,10 +64,11 @@ export var useGridRowsMeta = function useGridRowsMeta(apiRef, props) {
         if (getRowSpacing) {
           var _spacing$top, _spacing$bottom;
 
-          var index = apiRef.current.getRowIndexRelativeToVisibleRows(row.id);
+          var indexRelativeToCurrentPage = apiRef.current.getRowIndexRelativeToVisibleRows(row.id);
           var spacing = getRowSpacing(_extends({}, row, {
-            isFirstVisible: index === 0,
-            isLastVisible: index === currentPage.rows.length - 1
+            isFirstVisible: indexRelativeToCurrentPage === 0,
+            isLastVisible: indexRelativeToCurrentPage === currentPage.rows.length - 1,
+            indexRelativeToCurrentPage: indexRelativeToCurrentPage
           }));
           initialHeights.spacingTop = (_spacing$top = spacing.top) != null ? _spacing$top : 0;
           initialHeights.spacingBottom = (_spacing$bottom = spacing.bottom) != null ? _spacing$bottom : 0;
@@ -122,14 +122,7 @@ export var useGridRowsMeta = function useGridRowsMeta(apiRef, props) {
   React.useEffect(function () {
     hydrateRowsMeta();
   }, [rowHeight, filterState, paginationState, sortingState, hydrateRowsMeta]);
-  var handlepipeProcessorRegister = React.useCallback(function (name) {
-    if (name !== 'rowHeight') {
-      return;
-    }
-
-    hydrateRowsMeta();
-  }, [hydrateRowsMeta]);
-  useGridApiEventHandler(apiRef, GridEvents.pipeProcessorRegister, handlepipeProcessorRegister);
+  useGridRegisterPipeApplier(apiRef, 'rowHeight', hydrateRowsMeta);
   var rowsMetaApi = {
     unstable_getRowHeight: getTargetRowHeight,
     unstable_getRowInternalSizes: getRowInternalSizes,

package/legacy/hooks/features/scroll/useGridScroll.js

@@ -2,10 +2,12 @@ import _typeof from "@babel/runtime/helpers/esm/typeof";
 import * as React from 'react';
 import { useGridLogger } from '../../utils/useGridLogger';
 import { gridColumnPositionsSelector, gridVisibleColumnDefinitionsSelector } from '../columns/gridColumnsSelector';
+import { useGridSelector } from '../../utils/useGridSelector';
 import { gridPageSelector, gridPageSizeSelector } from '../pagination/gridPaginationSelector';
 import { gridRowCountSelector } from '../rows/gridRowsSelector';
 import { gridRowsMetaSelector } from '../rows/gridRowsMetaSelector';
-import { useGridApiMethod } from '../../utils/useGridApiMethod'; // Logic copied from https://www.w3.org/TR/wai-aria-practices/examples/listbox/js/listbox.js
+import { useGridApiMethod } from '../../utils/useGridApiMethod';
+import { gridVisibleSortedRowEntriesSelector } from '../filter/gridFilterSelector'; // Logic copied from https://www.w3.org/TR/wai-aria-practices/examples/listbox/js/listbox.js
 // Similar to https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollIntoView
 
 function scrollIntoView(dimensions) {
@@ -30,6 +32,8 @@ function scrollIntoView(dimensions) {
  * @requires useGridColumns (state) - can be after, async only
  * @requires useGridRows (state) - can be after, async only
  * @requires useGridRowsMeta (state) - can be after, async only
+ * @requires useGridFilter (state)
+ * @requires useGridColumnSpanning (method)
  */
 
 
@@ -37,6 +41,7 @@ export var useGridScroll = function useGridScroll(apiRef, props) {
   var logger = useGridLogger(apiRef, 'useGridScroll');
   var colRef = apiRef.current.columnHeadersElementRef;
   var windowRef = apiRef.current.windowRef;
+  var visibleSortedRows = useGridSelector(apiRef, gridVisibleSortedRowEntriesSelector);
   var scrollToIndexes = React.useCallback(function (params) {
     var totalRowCount = gridRowCountSelector(apiRef);
     var visibleColumns = gridVisibleColumnDefinitionsSelector(apiRef);
@@ -51,10 +56,27 @@ export var useGridScroll = function useGridScroll(apiRef, props) {
 
     if (params.colIndex != null) {
       var columnPositions = gridColumnPositionsSelector(apiRef);
+      var cellWidth;
+
+      if (typeof params.rowIndex !== 'undefined') {
+        var _visibleSortedRows$pa;
+
+        var rowId = (_visibleSortedRows$pa = visibleSortedRows[params.rowIndex]) == null ? void 0 : _visibleSortedRows$pa.id;
+        var cellColSpanInfo = apiRef.current.unstable_getCellColSpanInfo(rowId, params.colIndex);
+
+        if (cellColSpanInfo && !cellColSpanInfo.spannedByColSpan) {
+          cellWidth = cellColSpanInfo.cellProps.width;
+        }
+      }
+
+      if (typeof cellWidth === 'undefined') {
+        cellWidth = visibleColumns[params.colIndex].computedWidth;
+      }
+
       scrollCoordinates.left = scrollIntoView({
         clientHeight: windowRef.current.clientWidth,
         scrollTop: windowRef.current.scrollLeft,
-        offsetHeight: visibleColumns[params.colIndex].computedWidth,
+        offsetHeight: cellWidth,
         offsetTop: columnPositions[params.colIndex]
       });
     }
@@ -81,7 +103,7 @@ export var useGridScroll = function useGridScroll(apiRef, props) {
     }
 
     return false;
-  }, [logger, apiRef, windowRef, props.pagination]);
+  }, [logger, apiRef, windowRef, props.pagination, visibleSortedRows]);
   var scroll = React.useCallback(function (params) {
     if (windowRef.current && params.left != null && colRef.current) {
       colRef.current.scrollLeft = params.left;

package/legacy/hooks/features/selection/useGridSelection.js

@@ -14,6 +14,7 @@ import { GRID_CHECKBOX_SELECTION_COL_DEF, GRID_ACTIONS_COLUMN_TYPE } from '../..
 import { GridCellModes } from '../../../models/gridEditRowModel';
 import { isKeyboardEvent, isNavigationKey } from '../../../utils/keyboardUtils';
 import { getVisibleRows, useGridVisibleRows } from '../../utils/useGridVisibleRows';
+import { GRID_DETAIL_PANEL_TOGGLE_FIELD } from '../../../constants/gridDetailPanelToggleField';
 
 var getSelectionModelPropValue = function getSelectionModelPropValue(selectionModelProp, prevSelectionModel) {
   if (selectionModelProp == null) {
@@ -265,7 +266,7 @@ export var useGridSelection = function useGridSelection(apiRef, props) {
       return;
     }
 
-    if (params.field === '__detail_panel_toggle__') {
+    if (params.field === GRID_DETAIL_PANEL_TOGGLE_FIELD) {
       // click to open the detail panel should not select the row
       return;
     }
@@ -375,7 +376,7 @@ export var useGridSelection = function useGridSelection(apiRef, props) {
       selectRows(apiRef.current.getAllRowIds(), true);
     }
   }, [apiRef, handleSingleRowSelection, selectRows, visibleRows.rows, canHaveMultipleSelection]);
-  useGridApiEventHandler(apiRef, GridEvents.visibleRowsSet, removeOutdatedSelection);
+  useGridApiEventHandler(apiRef, GridEvents.sortedRowsSet, removeOutdatedSelection);
   useGridApiEventHandler(apiRef, GridEvents.cellClick, handleCellClick);
   useGridApiEventHandler(apiRef, GridEvents.rowSelectionCheckboxChange, handleRowSelectionCheckboxChange);
   useGridApiEventHandler(apiRef, GridEvents.headerSelectionCheckboxChange, handleHeaderSelectionCheckboxChange);

package/legacy/hooks/features/sorting/useGridSorting.js

@@ -86,19 +86,16 @@ export var useGridSorting = function useGridSorting(apiRef, props) {
    */
 
   var applySorting = React.useCallback(function () {
-    if (props.sortingMode === GridFeatureModeConstant.server) {
-      logger.debug('Skipping sorting rows as sortingMode = server');
-      apiRef.current.setState(function (state) {
+    apiRef.current.setState(function (state) {
+      if (props.sortingMode === GridFeatureModeConstant.server) {
+        logger.debug('Skipping sorting rows as sortingMode = server');
         return _extends({}, state, {
           sorting: _extends({}, state.sorting, {
             sortedRows: gridRowIdsSelector(state, apiRef.current.instanceId)
           })
         });
-      });
-      return;
-    }
+      }
 
-    apiRef.current.setState(function (state) {
       var sortModel = gridSortModelSelector(state, apiRef.current.instanceId);
       var sortRowList = buildAggregatedSortingApplier(sortModel, apiRef);
       var sortedRows = apiRef.current.unstable_applyStrategyProcessor('sorting', {
@@ -110,6 +107,7 @@ export var useGridSorting = function useGridSorting(apiRef, props) {
         })
       });
     });
+    apiRef.current.publishEvent(GridEvents.sortedRowsSet);
     apiRef.current.forceUpdate();
   }, [apiRef, logger, props.sortingMode]);
   var setSortModel = React.useCallback(function (model) {

package/legacy/hooks/features/virtualization/useGridVirtualScroller.js

@@ -3,6 +3,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["style"];
 import * as React from 'react';
+import * as ReactDOM from 'react-dom';
 import { useForkRef } from '@mui/material/utils';
 import { useGridApiContext } from '../../utils/useGridApiContext';
 import { useGridRootProps } from '../../utils/useGridRootProps';
@@ -17,8 +18,9 @@ import { useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
 import { clamp } from '../../../utils/utils';
 import { selectedIdsLookupSelector } from '../selection/gridSelectionSelector';
 import { gridRowsMetaSelector } from '../rows/gridRowsMetaSelector';
+import { getFirstNonSpannedColumnToRender } from '../columns/gridColumnsUtils'; // Uses binary search to avoid looping through all possible positions
+
 import { jsx as _jsx } from "react/jsx-runtime";
-// Uses binary search to avoid looping through all possible positions
 export function getIndexFromScroll(offset, positions) {
   var sliceStart = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   var sliceEnd = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : positions.length;
@@ -35,9 +37,15 @@ export function getIndexFromScroll(offset, positions) {
   var itemOffset = positions[pivot];
   return offset <= itemOffset ? getIndexFromScroll(offset, positions, sliceStart, pivot) : getIndexFromScroll(offset, positions, pivot + 1, sliceEnd);
 }
+export var getRenderableIndexes = function getRenderableIndexes(_ref) {
+  var firstIndex = _ref.firstIndex,
+      lastIndex = _ref.lastIndex,
+      buffer = _ref.buffer,
+      minFirstIndex = _ref.minFirstIndex,
+      maxLastIndex = _ref.maxLastIndex;
+  return [clamp(firstIndex - buffer, minFirstIndex, maxLastIndex), clamp(lastIndex + buffer, minFirstIndex, maxLastIndex)];
+};
 export var useGridVirtualScroller = function useGridVirtualScroller(props) {
-  var _currentPage$range2;
-
   var apiRef = useGridApiContext();
   var rootProps = useGridRootProps();
   var visibleColumns = useGridSelector(apiRef, gridVisibleColumnDefinitionsSelector);
@@ -89,9 +97,9 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       };
     }
 
-    var _ref = scrollPosition.current,
-        top = _ref.top,
-        left = _ref.left;
+    var _ref2 = scrollPosition.current,
+        top = _ref2.top,
+        left = _ref2.left;
     var firstRowIndex = getIndexFromScroll(top, rowsMeta.positions);
     var lastRowIndex = rootProps.autoHeight ? firstRowIndex + currentPage.rows.length : getIndexFromScroll(top + rootRef.current.clientHeight, rowsMeta.positions);
     var firstColumnIndex = getIndexFromScroll(left, columnPositions);
@@ -121,28 +129,17 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
     }
   }, []);
   useGridApiEventHandler(apiRef, GridEvents.resize, handleResize);
-
-  var getRenderableIndexes = function getRenderableIndexes(_ref2) {
-    var firstIndex = _ref2.firstIndex,
-        lastIndex = _ref2.lastIndex,
-        buffer = _ref2.buffer,
-        minFirstIndex = _ref2.minFirstIndex,
-        maxLastIndex = _ref2.maxLastIndex;
-    return [clamp(firstIndex - buffer, minFirstIndex, maxLastIndex), clamp(lastIndex + buffer, minFirstIndex, maxLastIndex)];
-  };
-
   var updateRenderZonePosition = React.useCallback(function (nextRenderContext) {
-    var _currentPage$range;
-
     var _getRenderableIndexes = getRenderableIndexes({
       firstIndex: nextRenderContext.firstRowIndex,
       lastIndex: nextRenderContext.lastRowIndex,
       minFirstIndex: 0,
-      maxLastIndex: ((_currentPage$range = currentPage.range) == null ? void 0 : _currentPage$range.lastRowIndex) || 0,
+      maxLastIndex: currentPage.rows.length,
       buffer: rootProps.rowBuffer
     }),
-        _getRenderableIndexes2 = _slicedToArray(_getRenderableIndexes, 1),
-        firstRowToRender = _getRenderableIndexes2[0];
+        _getRenderableIndexes2 = _slicedToArray(_getRenderableIndexes, 2),
+        firstRowToRender = _getRenderableIndexes2[0],
+        lastRowToRender = _getRenderableIndexes2[1];
 
     var _getRenderableIndexes3 = getRenderableIndexes({
       firstIndex: nextRenderContext.firstColumnIndex,
@@ -152,8 +149,15 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       buffer: rootProps.columnBuffer
     }),
         _getRenderableIndexes4 = _slicedToArray(_getRenderableIndexes3, 1),
-        firstColumnToRender = _getRenderableIndexes4[0];
-
+        initialFirstColumnToRender = _getRenderableIndexes4[0];
+
+    var firstColumnToRender = getFirstNonSpannedColumnToRender({
+      firstColumnToRender: initialFirstColumnToRender,
+      apiRef: apiRef,
+      firstRowToRender: firstRowToRender,
+      lastRowToRender: lastRowToRender,
+      visibleRows: currentPage.rows
+    });
     var top = gridRowsMetaSelector(apiRef.current.state).positions[firstRowToRender];
     var left = gridColumnPositionsSelector(apiRef)[firstColumnToRender]; // Call directly the selector because it might be outdated when this method is called
 
@@ -165,19 +169,22 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
         left: left
       });
     }
-  }, [apiRef, (_currentPage$range2 = currentPage.range) == null ? void 0 : _currentPage$range2.lastRowIndex, onRenderZonePositioning, renderZoneMaxColumnIndex, renderZoneMinColumnIndex, rootProps.columnBuffer, rootProps.rowBuffer]);
+  }, [apiRef, currentPage.rows, onRenderZonePositioning, renderZoneMinColumnIndex, renderZoneMaxColumnIndex, rootProps.columnBuffer, rootProps.rowBuffer]);
+  React.useLayoutEffect(function () {
+    if (renderContext) {
+      updateRenderZonePosition(renderContext);
+    }
+  }, [renderContext, updateRenderZonePosition]);
   var updateRenderContext = React.useCallback(function (nextRenderContext) {
     setRenderContext(nextRenderContext);
-    updateRenderZonePosition(nextRenderContext);
     prevRenderContext.current = nextRenderContext;
-  }, [setRenderContext, prevRenderContext, updateRenderZonePosition]);
+  }, [setRenderContext, prevRenderContext]);
   React.useEffect(function () {
     if (containerWidth == null) {
       return;
     }
 
     var initialRenderContext = computeRenderContext();
-    prevRenderContext.current = initialRenderContext;
     updateRenderContext(initialRenderContext);
     var _ref3 = scrollPosition.current,
         top = _ref3.top,
@@ -213,10 +220,13 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       top: scrollTop,
       left: scrollLeft,
       renderContext: shouldSetState ? nextRenderContext : prevRenderContext.current
-    });
+    }, event);
 
     if (shouldSetState) {
-      updateRenderContext(nextRenderContext);
+      // Prevents batching render context changes
+      ReactDOM.flushSync(function () {
+        updateRenderContext(nextRenderContext);
+      });
       prevTotalWidth.current = columnsTotalWidth;
     }
   };
@@ -251,6 +261,18 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
         firstRowToRender = _getRenderableIndexes6[0],
         lastRowToRender = _getRenderableIndexes6[1];
 
+    var renderedRows = [];
+
+    for (var i = firstRowToRender; i < lastRowToRender; i += 1) {
+      var row = currentPage.rows[i];
+      renderedRows.push(row);
+      apiRef.current.unstable_calculateColSpan({
+        rowId: row.id,
+        minFirstColumn: minFirstColumn,
+        maxLastColumn: maxLastColumn
+      });
+    }
+
     var _getRenderableIndexes7 = getRenderableIndexes({
       firstIndex: nextRenderContext.firstColumnIndex,
       lastIndex: nextRenderContext.lastColumnIndex,
@@ -259,20 +281,26 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       buffer: columnBuffer
     }),
         _getRenderableIndexes8 = _slicedToArray(_getRenderableIndexes7, 2),
-        firstColumnToRender = _getRenderableIndexes8[0],
+        initialFirstColumnToRender = _getRenderableIndexes8[0],
         lastColumnToRender = _getRenderableIndexes8[1];
 
-    var renderedRows = currentPage.rows.slice(firstRowToRender, lastRowToRender);
+    var firstColumnToRender = getFirstNonSpannedColumnToRender({
+      firstColumnToRender: initialFirstColumnToRender,
+      apiRef: apiRef,
+      firstRowToRender: firstRowToRender,
+      lastRowToRender: lastRowToRender,
+      visibleRows: currentPage.rows
+    });
     var renderedColumns = visibleColumns.slice(firstColumnToRender, lastColumnToRender);
     var rows = [];
 
-    for (var i = 0; i < renderedRows.length; i += 1) {
+    for (var _i = 0; _i < renderedRows.length; _i += 1) {
       var _rootProps$components;
 
-      var _renderedRows$i = renderedRows[i],
-          _id = _renderedRows$i.id,
-          _model = _renderedRows$i.model;
-      var lastVisibleRowIndex = firstRowToRender + i === currentPage.rows.length - 1;
+      var _renderedRows$_i = renderedRows[_i],
+          _id = _renderedRows$_i.id,
+          _model = _renderedRows$_i.model;
+      var lastVisibleRowIndex = firstRowToRender + _i === currentPage.rows.length - 1;
       var targetRowHeight = apiRef.current.unstable_getRowHeight(_id);
       var isSelected = void 0;
 
@@ -299,7 +327,7 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
         firstColumnToRender: firstColumnToRender,
         lastColumnToRender: lastColumnToRender,
         selected: isSelected,
-        index: currentPage.range.firstRowIndex + firstRowToRender + i,
+        index: currentPage.range.firstRowIndex + firstRowToRender + _i,
         containerWidth: availableSpace,
         isLastVisible: lastVisibleRowIndex
       }, typeof getRowProps === 'function' ? getRowProps(_id, _model) : {}, (_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.row), _id));

package/legacy/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v5.8.0
+/** @license MUI v5.9.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/legacy/internals/index.js

@@ -10,6 +10,7 @@ export { useGridClipboard } from '../hooks/features/clipboard/useGridClipboard';
 export { useGridColumnHeaders } from '../hooks/features/columnHeaders/useGridColumnHeaders';
 export { useGridColumnMenu, columnMenuStateInitializer } from '../hooks/features/columnMenu/useGridColumnMenu';
 export { useGridColumns, columnsStateInitializer } from '../hooks/features/columns/useGridColumns';
+export { useGridColumnSpanning } from '../hooks/features/columns/useGridColumnSpanning';
 export { useGridDensity, densityStateInitializer } from '../hooks/features/density/useGridDensity';
 export { useGridCsvExport } from '../hooks/features/export/useGridCsvExport';
 export { useGridPrintExport } from '../hooks/features/export/useGridPrintExport';