@mui/x-data-grid 5.6.0 → 5.8.0

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

@@ -3,11 +3,12 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { GridEvents } from '../../../models/events';
-import { checkGridRowIdIsValid } from '../../../models/gridRows';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { useGridLogger } from '../../utils/useGridLogger';
-import { gridRowCountSelector, gridRowsLookupSelector, gridRowTreeSelector, gridRowIdsSelector } from './gridRowsSelector';
+import { gridRowCountSelector, gridRowsLookupSelector, gridRowTreeSelector, gridRowIdsSelector, gridRowGroupingNameSelector } from './gridRowsSelector';
 import { GridSignature, useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
+import { useGridVisibleRows } from '../../utils/useGridVisibleRows';
+import { checkGridRowIdIsValid } from './gridRowsUtils';
 
 function getGridRowId(rowModel, getRowId, detailErrorMessage) {
   var id = getRowId ? getRowId(rowModel) : rowModel.id;
@@ -46,17 +47,15 @@ var convertGridRowsPropToState = function convertGridRowsPropToState(_ref) {
 var getRowsStateFromCache = function getRowsStateFromCache(rowsCache, previousTree, apiRef, rowCountProp) {
   var value = rowsCache.state.value;
   var rowCount = rowCountProp != null ? rowCountProp : 0;
-  var groupingResponse = apiRef.current.unstable_groupRows(_extends({}, value, {
+  var groupingResponse = apiRef.current.unstable_applyStrategyProcessor('rowTreeCreation', _extends({}, value, {
     previousTree: previousTree
   }));
-  var dataTopLevelRowCount = Object.values(groupingResponse.tree).filter(function (node) {
+  var dataTopLevelRowCount = groupingResponse.treeDepth === 1 ? groupingResponse.ids.length : Object.values(groupingResponse.tree).filter(function (node) {
     return node.parent == null;
   }).length;
-  var totalRowCount = rowCount > groupingResponse.ids.length ? rowCount : groupingResponse.ids.length;
-  var totalTopLevelRowCount = rowCount > dataTopLevelRowCount ? rowCount : dataTopLevelRowCount;
   return _extends({}, groupingResponse, {
-    totalRowCount: totalRowCount,
-    totalTopLevelRowCount: totalTopLevelRowCount
+    totalRowCount: Math.max(rowCount, groupingResponse.ids.length),
+    totalTopLevelRowCount: Math.max(rowCount, dataTopLevelRowCount)
   });
 };
 
@@ -82,10 +81,6 @@ export var rowsStateInitializer = function rowsStateInitializer(state, props, ap
 
   });
 };
-/**
- * @requires useGridRowGroupsPreProcessing (method)
- */
-
 export var useGridRows = function useGridRows(apiRef, props) {
   if (process.env.NODE_ENV !== 'production') {
     // Freeze rows for immutability
@@ -95,11 +90,19 @@ export var useGridRows = function useGridRows(apiRef, props) {
   var logger = useGridLogger(apiRef, 'useGridRows');
   var rowsCache = React.useRef(apiRef.current.state.rowsCache); // To avoid listing rowsCache as useEffect dep
 
+  var currentPage = useGridVisibleRows(apiRef, props);
   var getRow = React.useCallback(function (id) {
-    var _gridRowsLookupSelect;
+    var _ref2;
 
-    return (_gridRowsLookupSelect = gridRowsLookupSelector(apiRef)[id]) != null ? _gridRowsLookupSelect : null;
+    return (_ref2 = gridRowsLookupSelector(apiRef)[id]) != null ? _ref2 : null;
   }, [apiRef]);
+  var lookup = React.useMemo(function () {
+    return currentPage.rows.reduce(function (acc, _ref3, index) {
+      var id = _ref3.id;
+      acc[id] = index;
+      return acc;
+    }, {});
+  }, [currentPage.rows]);
   var throttledRowsChange = React.useCallback(function (newState, throttle) {
     var run = function run() {
       rowsCache.current.timeout = null;
@@ -134,6 +137,10 @@ export var useGridRows = function useGridRows(apiRef, props) {
 
     run();
   }, [props.throttleRowsMs, props.rowCount, apiRef]);
+  /**
+   * API METHODS
+   */
+
   var setRows = React.useCallback(function (rows) {
     logger.debug("Updating all rows, new length ".concat(rows.length));
     throttledRowsChange(convertGridRowsPropToState({
@@ -146,7 +153,7 @@ export var useGridRows = function useGridRows(apiRef, props) {
     if (props.signature === GridSignature.DataGrid && updates.length > 1) {
       // TODO: Add test with direct call to `apiRef.current.updateRows` in DataGrid after enabling the `apiRef` on the free plan.
       throw new Error(["MUI: You can't update several rows at once in `apiRef.current.updateRows` on the DataGrid.", 'You need to upgrade to the DataGridPro component to unlock this feature.'].join('\n'));
-    } // we removes duplicate updates. A server can batch updates, and send several updates for the same row in one fn call.
+    } // we remove duplicate updates. A server can batch updates, and send several updates for the same row in one fn call.
 
 
     var uniqUpdates = new Map();
@@ -208,6 +215,9 @@ export var useGridRows = function useGridRows(apiRef, props) {
   var getAllRowIds = React.useCallback(function () {
     return gridRowIdsSelector(apiRef);
   }, [apiRef]);
+  var getRowIndexRelativeToVisibleRows = React.useCallback(function (id) {
+    return lookup[id];
+  }, [lookup]);
   var setRowChildrenExpansion = React.useCallback(function (id, isExpanded) {
     var currentNode = apiRef.current.getRowNode(id);
 
@@ -234,6 +244,61 @@ export var useGridRows = function useGridRows(apiRef, props) {
 
     return (_gridRowTreeSelector$ = gridRowTreeSelector(apiRef)[id]) != null ? _gridRowTreeSelector$ : null;
   }, [apiRef]);
+  var rowApi = {
+    getRow: getRow,
+    getRowModels: getRowModels,
+    getRowsCount: getRowsCount,
+    getAllRowIds: getAllRowIds,
+    setRows: setRows,
+    updateRows: updateRows,
+    setRowChildrenExpansion: setRowChildrenExpansion,
+    getRowNode: getRowNode,
+    getRowIndexRelativeToVisibleRows: getRowIndexRelativeToVisibleRows
+  };
+  /**
+   * EVENTS
+   */
+
+  var groupRows = React.useCallback(function () {
+    logger.info("Row grouping pre-processing have changed, regenerating the row tree");
+    var rows;
+
+    if (rowsCache.current.state.rowsBeforePartialUpdates === props.rows) {
+      // The `props.rows` has not changed since the last row grouping
+      // We can keep the potential updates stored in `inputRowsAfterUpdates` on the new grouping
+      rows = undefined;
+    } else {
+      // The `props.rows` has changed since the last row grouping
+      // We must use the new `props.rows` on the new grouping
+      // This occurs because this event is triggered before the `useEffect` on the rows when both the grouping pre-processing and the rows changes on the same render
+      rows = props.rows;
+    }
+
+    throttledRowsChange(convertGridRowsPropToState({
+      rows: rows,
+      getRowId: props.getRowId,
+      prevState: rowsCache.current.state
+    }), false);
+  }, [logger, throttledRowsChange, props.getRowId, props.rows]);
+  var handleStrategyProcessorChange = React.useCallback(function (methodName) {
+    if (methodName === 'rowTreeCreation') {
+      groupRows();
+    }
+  }, [groupRows]);
+  var handleStrategyActivityChange = React.useCallback(function () {
+    // `rowTreeCreation` is the only processor ran when `strategyAvailabilityChange` is fired.
+    // All the other processors listen to `rowsSet` which will be published by the `groupRows` method below.
+    if (apiRef.current.unstable_getActiveStrategy('rowTree') !== gridRowGroupingNameSelector(apiRef)) {
+      groupRows();
+    }
+  }, [apiRef, groupRows]);
+  useGridApiEventHandler(apiRef, GridEvents.activeStrategyProcessorChange, handleStrategyProcessorChange);
+  useGridApiEventHandler(apiRef, GridEvents.strategyAvailabilityChange, handleStrategyActivityChange);
+  useGridApiMethod(apiRef, rowApi, 'GridRowApi');
+  /**
+   * EFFECTS
+   */
+
   React.useEffect(function () {
     return function () {
       if (rowsCache.current.timeout !== null) {
@@ -263,37 +328,4 @@ export var useGridRows = function useGridRows(apiRef, props) {
       prevState: rowsCache.current.state
     }), false);
   }, [props.rows, props.rowCount, props.getRowId, logger, throttledRowsChange]);
-  var handleGroupRows = React.useCallback(function () {
-    logger.info("Row grouping pre-processing have changed, regenerating the row tree");
-    var rows;
-
-    if (rowsCache.current.state.rowsBeforePartialUpdates === props.rows) {
-      // The `props.rows` has not changed since the last row grouping
-      // We can keep the potential updates stored in `inputRowsAfterUpdates` on the new grouping
-      rows = undefined;
-    } else {
-      // The `props.rows` has changed since the last row grouping
-      // We must use the new `props.rows` on the new grouping
-      // This occurs because this event is triggered before the `useEffect` on the rows when both the grouping pre-processing and the rows changes on the same render
-      rows = props.rows;
-    }
-
-    throttledRowsChange(convertGridRowsPropToState({
-      rows: rows,
-      getRowId: props.getRowId,
-      prevState: rowsCache.current.state
-    }), false);
-  }, [logger, throttledRowsChange, props.getRowId, props.rows]);
-  useGridApiEventHandler(apiRef, GridEvents.rowGroupsPreProcessingChange, handleGroupRows);
-  var rowApi = {
-    getRow: getRow,
-    getRowModels: getRowModels,
-    getRowsCount: getRowsCount,
-    getAllRowIds: getAllRowIds,
-    setRows: setRows,
-    updateRows: updateRows,
-    setRowChildrenExpansion: setRowChildrenExpansion,
-    getRowNode: getRowNode
-  };
-  useGridApiMethod(apiRef, rowApi, 'GridRowApi');
 };

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

@@ -1,15 +1,22 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
-import { getCurrentPageRows } from '../../utils/useCurrentPageRows';
+import { useGridVisibleRows } from '../../utils/useGridVisibleRows';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { useGridSelector } from '../../utils/useGridSelector';
 import { gridDensityRowHeightSelector, gridDensityFactorSelector } from '../density/densitySelector';
 import { gridFilterStateSelector } from '../filter/gridFilterSelector';
 import { gridPaginationSelector } from '../pagination/gridPaginationSelector';
 import { gridSortingStateSelector } from '../sorting/gridSortingSelector';
-import { useGridStateInit } from '../../utils/useGridStateInit';
 import { GridEvents } from '../../../models/events/gridEvents';
 import { useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
+export var rowsMetaStateInitializer = function rowsMetaStateInitializer(state) {
+  return _extends({}, state, {
+    rowsMeta: {
+      currentPageTotalHeight: 0,
+      positions: []
+    }
+  });
+};
 /**
  * @requires useGridPageSize (method)
  * @requires useGridPage (method)
@@ -17,33 +24,19 @@ import { useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
 
 export var useGridRowsMeta = function useGridRowsMeta(apiRef, props) {
   var getRowHeight = props.getRowHeight,
-      pagination = props.pagination,
-      paginationMode = props.paginationMode;
+      getRowSpacing = props.getRowSpacing;
   var rowsHeightLookup = React.useRef({});
   var rowHeight = useGridSelector(apiRef, gridDensityRowHeightSelector);
   var filterState = useGridSelector(apiRef, gridFilterStateSelector);
   var paginationState = useGridSelector(apiRef, gridPaginationSelector);
   var sortingState = useGridSelector(apiRef, gridSortingStateSelector);
-  useGridStateInit(apiRef, function (state) {
-    return _extends({}, state, {
-      rowsMeta: {
-        currentPageTotalHeight: 0,
-        positions: []
-      }
-    });
-  });
+  var currentPage = useGridVisibleRows(apiRef, props);
   var hydrateRowsMeta = React.useCallback(function () {
-    var _getCurrentPageRows = getCurrentPageRows(apiRef, {
-      pagination: pagination,
-      paginationMode: paginationMode
-    }),
-        rows = _getCurrentPageRows.rows;
-
     apiRef.current.setState(function (state) {
       var positions = [];
       var densityFactor = gridDensityFactorSelector(state, apiRef.current.instanceId);
       var currentRowHeight = gridDensityRowHeightSelector(state, apiRef.current.instanceId);
-      var currentPageTotalHeight = rows.reduce(function (acc, row) {
+      var currentPageTotalHeight = currentPage.rows.reduce(function (acc, row) {
         positions.push(acc);
         var baseRowHeight;
         var isResized = rowsHeightLookup.current[row.id] && rowsHeightLookup.current[row.id].isResized || false;
@@ -62,17 +55,32 @@ export var useGridRowsMeta = function useGridRowsMeta(apiRef, props) {
               densityFactor: densityFactor
             }))) != null ? _getRowHeight : currentRowHeight;
           }
-        }
+        } // We use an object to make simple to check if a height is already added or not
 
-        var heights = apiRef.current.unstable_applyPreProcessors('rowHeight', {
+
+        var initialHeights = {
           base: baseRowHeight
-        }, // We use an object to make simple to check if a size was already added or not
-        row);
-        var finalRowHeight = Object.values(heights).reduce(function (acc2, value) {
+        };
+
+        if (getRowSpacing) {
+          var _spacing$top, _spacing$bottom;
+
+          var index = apiRef.current.getRowIndexRelativeToVisibleRows(row.id);
+          var spacing = getRowSpacing(_extends({}, row, {
+            isFirstVisible: index === 0,
+            isLastVisible: index === currentPage.rows.length - 1
+          }));
+          initialHeights.spacingTop = (_spacing$top = spacing.top) != null ? _spacing$top : 0;
+          initialHeights.spacingBottom = (_spacing$bottom = spacing.bottom) != null ? _spacing$bottom : 0;
+        }
+
+        var sizes = apiRef.current.unstable_applyPipeProcessors('rowHeight', initialHeights, row);
+        var finalRowHeight = Object.values(sizes).reduce(function (acc2, value) {
           return acc2 + value;
         }, 0);
         rowsHeightLookup.current[row.id] = {
           value: baseRowHeight,
+          sizes: sizes,
           isResized: isResized
         };
         return acc + finalRowHeight;
@@ -85,7 +93,7 @@ export var useGridRowsMeta = function useGridRowsMeta(apiRef, props) {
       });
     });
     apiRef.current.forceUpdate();
-  }, [apiRef, pagination, paginationMode, getRowHeight]);
+  }, [apiRef, currentPage.rows, getRowSpacing, getRowHeight]);
 
   var getTargetRowHeight = function getTargetRowHeight(rowId) {
     var _rowsHeightLookup$cur;
@@ -93,10 +101,19 @@ export var useGridRowsMeta = function useGridRowsMeta(apiRef, props) {
     return ((_rowsHeightLookup$cur = rowsHeightLookup.current[rowId]) == null ? void 0 : _rowsHeightLookup$cur.value) || rowHeight;
   };
 
+  var getRowInternalSizes = function getRowInternalSizes(rowId) {
+    var _rowsHeightLookup$cur2;
+
+    return (_rowsHeightLookup$cur2 = rowsHeightLookup.current[rowId]) == null ? void 0 : _rowsHeightLookup$cur2.sizes;
+  };
+
   var setRowHeight = React.useCallback(function (id, height) {
     rowsHeightLookup.current[id] = {
       value: height,
-      isResized: true
+      isResized: true,
+      sizes: _extends({}, rowsHeightLookup.current[id].sizes, {
+        base: height
+      })
     };
     hydrateRowsMeta();
   }, [hydrateRowsMeta]); // The effect is used to build the rows meta data - currentPageTotalHeight and positions.
@@ -105,16 +122,17 @@ export var useGridRowsMeta = function useGridRowsMeta(apiRef, props) {
   React.useEffect(function () {
     hydrateRowsMeta();
   }, [rowHeight, filterState, paginationState, sortingState, hydrateRowsMeta]);
-  var handlePreProcessorRegister = React.useCallback(function (name) {
+  var handlepipeProcessorRegister = React.useCallback(function (name) {
     if (name !== 'rowHeight') {
       return;
     }
 
     hydrateRowsMeta();
   }, [hydrateRowsMeta]);
-  useGridApiEventHandler(apiRef, GridEvents.preProcessorRegister, handlePreProcessorRegister);
+  useGridApiEventHandler(apiRef, GridEvents.pipeProcessorRegister, handlepipeProcessorRegister);
   var rowsMetaApi = {
     unstable_getRowHeight: getTargetRowHeight,
+    unstable_getRowInternalSizes: getRowInternalSizes,
     unstable_setRowHeight: setRowHeight
   };
   useGridApiMethod(apiRef, rowsMetaApi, 'GridRowsMetaApi');

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

@@ -0,0 +1,36 @@
+import { GRID_DEFAULT_STRATEGY, useGridRegisterStrategyProcessor } from '../../core/strategyProcessing';
+
+var flatRowTreeCreationMethod = function flatRowTreeCreationMethod(_ref) {
+  var ids = _ref.ids,
+      idRowsLookup = _ref.idRowsLookup,
+      previousTree = _ref.previousTree;
+  var tree = {};
+
+  for (var i = 0; i < ids.length; i += 1) {
+    var rowId = ids[i];
+
+    if (previousTree && previousTree[rowId]) {
+      tree[rowId] = previousTree[rowId];
+    } else {
+      tree[rowId] = {
+        id: rowId,
+        depth: 0,
+        parent: null,
+        groupingKey: '',
+        groupingField: null
+      };
+    }
+  }
+
+  return {
+    groupingName: GRID_DEFAULT_STRATEGY,
+    tree: tree,
+    treeDepth: 1,
+    idRowsLookup: idRowsLookup,
+    ids: ids
+  };
+};
+
+export var useGridRowsPreProcessors = function useGridRowsPreProcessors(apiRef) {
+  useGridRegisterStrategyProcessor(apiRef, GRID_DEFAULT_STRATEGY, 'rowTreeCreation', flatRowTreeCreationMethod);
+};

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

@@ -5,8 +5,7 @@ import { gridColumnPositionsSelector, gridVisibleColumnDefinitionsSelector } fro
 import { gridPageSelector, gridPageSizeSelector } from '../pagination/gridPaginationSelector';
 import { gridRowCountSelector } from '../rows/gridRowsSelector';
 import { gridRowsMetaSelector } from '../rows/gridRowsMetaSelector';
-import { useGridApiMethod } from '../../utils/useGridApiMethod';
-import { useGridNativeEventListener } from '../../utils/useGridNativeEventListener'; // Logic copied from https://www.w3.org/TR/wai-aria-practices/examples/listbox/js/listbox.js
+import { useGridApiMethod } from '../../utils/useGridApiMethod'; // 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) {
@@ -41,8 +40,9 @@ export var useGridScroll = function useGridScroll(apiRef, props) {
   var scrollToIndexes = React.useCallback(function (params) {
     var totalRowCount = gridRowCountSelector(apiRef);
     var visibleColumns = gridVisibleColumnDefinitionsSelector(apiRef);
+    var scrollToHeader = params.rowIndex == null;
 
-    if (totalRowCount === 0 || visibleColumns.length === 0) {
+    if (!scrollToHeader && totalRowCount === 0 || visibleColumns.length === 0) {
       return false;
     }
 
@@ -73,7 +73,7 @@ export var useGridScroll = function useGridScroll(apiRef, props) {
       });
     }
 
-    scrollCoordinates = apiRef.current.unstable_applyPreProcessors('scrollToIndexes', scrollCoordinates, params);
+    scrollCoordinates = apiRef.current.unstable_applyPipeProcessors('scrollToIndexes', scrollCoordinates, params);
 
     if (_typeof(scrollCoordinates.left) !== undefined || _typeof(scrollCoordinates.top) !== undefined) {
       apiRef.current.scroll(scrollCoordinates);
@@ -115,13 +115,4 @@ export var useGridScroll = function useGridScroll(apiRef, props) {
     getScrollPosition: getScrollPosition
   };
   useGridApiMethod(apiRef, scrollApi, 'GridScrollApi');
-  var preventScroll = React.useCallback(function (event) {
-    event.target.scrollLeft = 0;
-    event.target.scrollTop = 0;
-  }, []);
-  useGridNativeEventListener(apiRef, function () {
-    var _apiRef$current, _apiRef$current$rende, _apiRef$current$rende2;
-
-    return (_apiRef$current = apiRef.current) == null ? void 0 : (_apiRef$current$rende = _apiRef$current.renderingZoneRef) == null ? void 0 : (_apiRef$current$rende2 = _apiRef$current$rende.current) == null ? void 0 : _apiRef$current$rende2.parentElement;
-  }, 'scroll', preventScroll);
 };

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

@@ -6,38 +6,50 @@ import { useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { useGridLogger } from '../../utils/useGridLogger';
 import { gridRowsLookupSelector } from '../rows/gridRowsSelector';
-import { isGridCellRoot } from '../../../utils/domUtils';
 import { gridSelectionStateSelector, selectedGridRowsSelector, selectedIdsLookupSelector } from './gridSelectionSelector';
 import { gridPaginatedVisibleSortedGridRowIdsSelector } from '../pagination';
+import { gridFocusCellSelector } from '../focus/gridFocusStateSelector';
 import { gridVisibleSortedRowIdsSelector } from '../filter/gridFilterSelector';
 import { GRID_CHECKBOX_SELECTION_COL_DEF, GRID_ACTIONS_COLUMN_TYPE } from '../../../colDef';
-import { useGridStateInit } from '../../utils/useGridStateInit';
 import { GridCellModes } from '../../../models/gridEditRowModel';
-import { isKeyboardEvent } from '../../../utils/keyboardUtils';
-import { getCurrentPageRows } from '../../utils/useCurrentPageRows';
+import { isKeyboardEvent, isNavigationKey } from '../../../utils/keyboardUtils';
+import { getVisibleRows, useGridVisibleRows } from '../../utils/useGridVisibleRows';
+
+var getSelectionModelPropValue = function getSelectionModelPropValue(selectionModelProp, prevSelectionModel) {
+  if (selectionModelProp == null) {
+    return selectionModelProp;
+  }
+
+  if (Array.isArray(selectionModelProp)) {
+    return selectionModelProp;
+  }
+
+  if (prevSelectionModel && prevSelectionModel[0] === selectionModelProp) {
+    return prevSelectionModel;
+  }
+
+  return [selectionModelProp];
+};
+
+export var selectionStateInitializer = function selectionStateInitializer(state, props) {
+  var _getSelectionModelPro;
+
+  return _extends({}, state, {
+    selection: (_getSelectionModelPro = getSelectionModelPropValue(props.selectionModel)) != null ? _getSelectionModelPro : []
+  });
+};
 /**
- * @requires useGridRows (state, method)
- * @requires useGridParamsApi (method)
+ * @requires useGridRows (state, method) - can be after
+ * @requires useGridParamsApi (method) - can be after
+ * @requires useGridFocus (state) - can be after
+ * @requires useGridKeyboardNavigation (`cellKeyDown` event must first be consumed by it)
  */
 
 export var useGridSelection = function useGridSelection(apiRef, props) {
   var logger = useGridLogger(apiRef, 'useGridSelection');
   var propSelectionModel = React.useMemo(function () {
-    if (props.selectionModel == null) {
-      return props.selectionModel;
-    }
-
-    if (Array.isArray(props.selectionModel)) {
-      return props.selectionModel;
-    }
-
-    return [props.selectionModel];
-  }, [props.selectionModel]);
-  useGridStateInit(apiRef, function (state) {
-    return _extends({}, state, {
-      selection: propSelectionModel != null ? propSelectionModel : []
-    });
-  });
+    return getSelectionModelPropValue(props.selectionModel, gridSelectionStateSelector(apiRef.current.state));
+  }, [apiRef, props.selectionModel]);
   var lastRowToggled = React.useRef(null);
   apiRef.current.unstable_updateControlState({
     stateId: 'selection',
@@ -53,7 +65,8 @@ export var useGridSelection = function useGridSelection(apiRef, props) {
       pagination = props.pagination,
       paginationMode = props.paginationMode;
   var canHaveMultipleSelection = !disableMultipleSelection || checkboxSelection;
-  var expandRowRangeSelection = React.useCallback(function (id) {
+  var visibleRows = useGridVisibleRows(apiRef, props);
+  var expandMouseRowRangeSelection = React.useCallback(function (id) {
     var _lastRowToggled$curre;
 
     var endId = id;
@@ -69,6 +82,10 @@ export var useGridSelection = function useGridSelection(apiRef, props) {
         return rowId === endId;
       });
 
+      if (startIndex === endIndex) {
+        return;
+      }
+
       if (startIndex > endIndex) {
         endId = visibleRowIds[endIndex + 1];
       } else {
@@ -177,17 +194,18 @@ export var useGridSelection = function useGridSelection(apiRef, props) {
       return;
     }
 
-    logger.debug("Expanding selection from row ".concat(startId, " to row ").concat(endId));
-    var visibleRowIds = gridVisibleSortedRowIdsSelector(apiRef);
-    var startIndex = visibleRowIds.indexOf(startId);
-    var endIndex = visibleRowIds.indexOf(endId);
+    logger.debug("Expanding selection from row ".concat(startId, " to row ").concat(endId)); // Using rows from all pages allow to select a range across several pages
+
+    var allPagesRowIds = gridVisibleSortedRowIdsSelector(apiRef);
+    var startIndex = allPagesRowIds.indexOf(startId);
+    var endIndex = allPagesRowIds.indexOf(endId);
 
     var _ref2 = startIndex > endIndex ? [endIndex, startIndex] : [startIndex, endIndex],
         _ref3 = _slicedToArray(_ref2, 2),
         start = _ref3[0],
         end = _ref3[1];
 
-    var rowsBetweenStartAndEnd = visibleRowIds.slice(start, end + 1);
+    var rowsBetweenStartAndEnd = allPagesRowIds.slice(start, end + 1);
     apiRef.current.selectRows(rowsBetweenStartAndEnd, isSelected, resetSelection);
   }, [apiRef, logger]);
   var selectionApi = {
@@ -261,11 +279,11 @@ export var useGridSelection = function useGridSelection(apiRef, props) {
     }
 
     if (event.shiftKey && (canHaveMultipleSelection || checkboxSelection)) {
-      expandRowRangeSelection(params.id);
+      expandMouseRowRangeSelection(params.id);
     } else {
       handleSingleRowSelection(params.id, event);
     }
-  }, [disableSelectionOnClick, canHaveMultipleSelection, checkboxSelection, apiRef, expandRowRangeSelection, handleSingleRowSelection]);
+  }, [disableSelectionOnClick, canHaveMultipleSelection, checkboxSelection, apiRef, expandMouseRowRangeSelection, handleSingleRowSelection]);
   var preventSelectionOnShift = React.useCallback(function (params, event) {
     if (canHaveMultipleSelection && event.shiftKey) {
       var _window$getSelection;
@@ -275,35 +293,80 @@ export var useGridSelection = function useGridSelection(apiRef, props) {
   }, [canHaveMultipleSelection]);
   var handleRowSelectionCheckboxChange = React.useCallback(function (params, event) {
     if (event.nativeEvent.shiftKey) {
-      expandRowRangeSelection(params.id);
+      expandMouseRowRangeSelection(params.id);
     } else {
       apiRef.current.selectRow(params.id, params.value);
     }
-  }, [apiRef, expandRowRangeSelection]);
+  }, [apiRef, expandMouseRowRangeSelection]);
   var handleHeaderSelectionCheckboxChange = React.useCallback(function (params) {
     var shouldLimitSelectionToCurrentPage = props.checkboxSelectionVisibleOnly && props.pagination;
     var rowsToBeSelected = shouldLimitSelectionToCurrentPage ? gridPaginatedVisibleSortedGridRowIdsSelector(apiRef) : gridVisibleSortedRowIdsSelector(apiRef);
     apiRef.current.selectRows(rowsToBeSelected, params.value);
   }, [apiRef, props.checkboxSelectionVisibleOnly, props.pagination]);
   var handleCellKeyDown = React.useCallback(function (params, event) {
-    // Ignore portal
+    // Get the most recent cell mode because it may have been changed by another listener
+    if (apiRef.current.getCellMode(params.id, params.field) === GridCellModes.Edit) {
+      return;
+    } // Ignore portal
     // Do not apply shortcuts if the focus is not on the cell root component
-    // TODO replace with !event.currentTarget.contains(event.target as Element)
-    if (!isGridCellRoot(event.target)) {
+
+
+    if (!event.currentTarget.contains(event.target)) {
       return;
-    } // Get the most recent params because the cell mode may have changed by another listener
+    }
 
+    if (isNavigationKey(event.key) && event.shiftKey) {
+      // The cell that has focus after the keyboard navigation
+      var focusCell = gridFocusCellSelector(apiRef);
 
-    var cellParams = apiRef.current.getCellParams(params.id, params.field);
-    var isEditMode = cellParams.cellMode === GridCellModes.Edit;
+      if (focusCell && focusCell.id !== params.id) {
+        event.preventDefault();
+        var isNextRowSelected = apiRef.current.isRowSelected(focusCell.id);
 
-    if (isEditMode) {
-      return;
+        if (!canHaveMultipleSelection) {
+          apiRef.current.selectRow(focusCell.id, !isNextRowSelected, true);
+          return;
+        }
+
+        var newRowIndex = apiRef.current.getRowIndexRelativeToVisibleRows(focusCell.id);
+        var previousRowIndex = apiRef.current.getRowIndexRelativeToVisibleRows(params.id);
+        var start;
+        var end;
+
+        if (newRowIndex > previousRowIndex) {
+          if (isNextRowSelected) {
+            // We are navigating to the bottom of the page and adding selected rows
+            start = previousRowIndex;
+            end = newRowIndex - 1;
+          } else {
+            // We are navigating to the bottom of the page and removing selected rows
+            start = previousRowIndex;
+            end = newRowIndex;
+          }
+        } else {
+          // eslint-disable-next-line no-lonely-if
+          if (isNextRowSelected) {
+            // We are navigating to the top of the page and removing selected rows
+            start = newRowIndex + 1;
+            end = previousRowIndex;
+          } else {
+            // We are navigating to the top of the page and adding selected rows
+            start = newRowIndex;
+            end = previousRowIndex;
+          }
+        }
+
+        var rowsBetweenStartAndEnd = visibleRows.rows.slice(start, end + 1).map(function (row) {
+          return row.id;
+        });
+        apiRef.current.selectRows(rowsBetweenStartAndEnd, !isNextRowSelected);
+        return;
+      }
     }
 
     if (event.key === ' ' && event.shiftKey) {
       event.preventDefault();
-      handleSingleRowSelection(cellParams.id, event);
+      handleSingleRowSelection(params.id, event);
       return;
     }
 
@@ -311,7 +374,7 @@ export var useGridSelection = function useGridSelection(apiRef, props) {
       event.preventDefault();
       selectRows(apiRef.current.getAllRowIds(), true);
     }
-  }, [apiRef, handleSingleRowSelection, selectRows]);
+  }, [apiRef, handleSingleRowSelection, selectRows, visibleRows.rows, canHaveMultipleSelection]);
   useGridApiEventHandler(apiRef, GridEvents.visibleRowsSet, removeOutdatedSelection);
   useGridApiEventHandler(apiRef, GridEvents.cellClick, handleCellClick);
   useGridApiEventHandler(apiRef, GridEvents.rowSelectionCheckboxChange, handleRowSelectionCheckboxChange);
@@ -350,11 +413,11 @@ export var useGridSelection = function useGridSelection(apiRef, props) {
     var currentSelection = gridSelectionStateSelector(apiRef.current.state);
 
     if (!canHaveMultipleSelection && currentSelection.length > 1) {
-      var _getCurrentPageRows = getCurrentPageRows(apiRef, {
+      var _getVisibleRows = getVisibleRows(apiRef, {
         pagination: pagination,
         paginationMode: paginationMode
       }),
-          currentPageRows = _getCurrentPageRows.rows;
+          currentPageRows = _getVisibleRows.rows;
 
       var currentPageRowsLookup = currentPageRows.reduce(function (acc, _ref4) {
         var id = _ref4.id;