@mui/x-data-grid 8.0.0-alpha.9 → 8.0.0-beta.1

package/modern/hooks/features/rowSelection/useGridRowSelection.js

@@ -1,36 +1,31 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
-import { GridSignature, useGridApiEventHandler } from "../../utils/useGridApiEventHandler.js";
+import useEventCallback from '@mui/utils/useEventCallback';
+import { GridSignature } from "../../../constants/signature.js";
+import { useGridApiEventHandler } from "../../utils/useGridApiEventHandler.js";
 import { useGridApiMethod } from "../../utils/useGridApiMethod.js";
 import { useGridLogger } from "../../utils/useGridLogger.js";
 import { useGridSelector } from "../../utils/useGridSelector.js";
-import { gridRowsLookupSelector, gridRowMaximumTreeDepthSelector, gridRowTreeSelector } from "../rows/gridRowsSelector.js";
-import { gridRowSelectionStateSelector, selectedGridRowsSelector, selectedIdsLookupSelector } from "./gridRowSelectionSelector.js";
-import { gridPaginatedVisibleSortedGridRowIdsSelector } from "../pagination/index.js";
+import { gridRowsLookupSelector, gridRowMaximumTreeDepthSelector, gridRowNodeSelector, gridRowTreeSelector } from "../rows/gridRowsSelector.js";
+import { gridRowSelectionManagerSelector, gridRowSelectionStateSelector, gridRowSelectionCountSelector, gridRowSelectionIdsSelector } from "./gridRowSelectionSelector.js";
 import { gridFocusCellSelector } from "../focus/gridFocusStateSelector.js";
-import { gridExpandedSortedRowIdsSelector, gridFilteredRowsLookupSelector } from "../filter/gridFilterSelector.js";
+import { gridExpandedSortedRowIdsSelector, gridFilteredRowsLookupSelector, gridFilterModelSelector, gridQuickFilterValuesSelector } from "../filter/gridFilterSelector.js";
 import { GRID_CHECKBOX_SELECTION_COL_DEF, GRID_ACTIONS_COLUMN_TYPE } from "../../../colDef/index.js";
 import { GridCellModes } from "../../../models/gridEditRowModel.js";
 import { isKeyboardEvent, isNavigationKey } from "../../../utils/keyboardUtils.js";
-import { useGridVisibleRows } from "../../utils/useGridVisibleRows.js";
+import { getVisibleRows } from "../../utils/useGridVisibleRows.js";
 import { GRID_DETAIL_PANEL_TOGGLE_FIELD } from "../../../internals/constants.js";
 import { gridClasses } from "../../../constants/gridClasses.js";
 import { isEventTargetInPortal } from "../../../utils/domUtils.js";
 import { isMultipleRowSelectionEnabled, findRowsToSelect, findRowsToDeselect } from "./utils.js";
-const getSelectionModelPropValue = (selectionModelProp, prevSelectionModel) => {
-  if (selectionModelProp == null) {
-    return selectionModelProp;
-  }
-  if (Array.isArray(selectionModelProp)) {
-    return selectionModelProp;
-  }
-  if (prevSelectionModel && prevSelectionModel[0] === selectionModelProp) {
-    return prevSelectionModel;
-  }
-  return [selectionModelProp];
+import { createRowSelectionManager } from "../../../models/gridRowSelectionManager.js";
+import { gridPaginatedVisibleSortedGridRowIdsSelector } from "../pagination/index.js";
+const emptyModel = {
+  type: 'include',
+  ids: new Set()
 };
 export const rowSelectionStateInitializer = (state, props) => _extends({}, state, {
-  rowSelection: props.rowSelection ? getSelectionModelPropValue(props.rowSelectionModel) ?? [] : []
+  rowSelection: props.rowSelection ? props.rowSelectionModel ?? emptyModel : emptyModel
 });
 
 /**
@@ -48,8 +43,8 @@ export const useGridRowSelection = (apiRef, props) => {
   }, [props.rowSelection]);
   const applyAutoSelection = props.signature !== GridSignature.DataGrid && (props.rowSelectionPropagation?.parents || props.rowSelectionPropagation?.descendants);
   const propRowSelectionModel = React.useMemo(() => {
-    return getSelectionModelPropValue(props.rowSelectionModel, gridRowSelectionStateSelector(apiRef.current.state));
-  }, [apiRef, props.rowSelectionModel]);
+    return props.rowSelectionModel;
+  }, [props.rowSelectionModel]);
   const lastRowToggled = React.useRef(null);
   apiRef.current.registerControlState({
     stateId: 'rowSelection',
@@ -64,7 +59,6 @@ export const useGridRowSelection = (apiRef, props) => {
     isRowSelectable: propIsRowSelectable
   } = props;
   const canHaveMultipleSelection = isMultipleRowSelectionEnabled(props);
-  const visibleRows = useGridVisibleRows(apiRef, props);
   const tree = useGridSelector(apiRef, gridRowTreeSelector);
   const isNestedData = useGridSelector(apiRef, gridRowMaximumTreeDepthSelector) > 1;
   const expandMouseRowRangeSelection = React.useCallback(id => {
@@ -90,24 +84,30 @@ export const useGridRowSelection = (apiRef, props) => {
       endId
     }, !isSelected);
   }, [apiRef]);
+  const getRowsToBeSelected = useEventCallback(() => {
+    const rowsToBeSelected = props.pagination && props.checkboxSelectionVisibleOnly && props.paginationMode === 'client' ? gridPaginatedVisibleSortedGridRowIdsSelector(apiRef) : gridExpandedSortedRowIdsSelector(apiRef);
+    return rowsToBeSelected;
+  });
 
   /*
    * API METHODS
    */
   const setRowSelectionModel = React.useCallback(model => {
-    if (props.signature === GridSignature.DataGrid && !canHaveMultipleSelection && Array.isArray(model) && model.length > 1) {
+    if (props.signature === GridSignature.DataGrid && !canHaveMultipleSelection && (model.type !== 'include' || model.ids.size > 1)) {
       throw new Error(['MUI X: `rowSelectionModel` can only contain 1 item in DataGrid.', 'You need to upgrade to DataGridPro or DataGridPremium component to unlock multiple selection.'].join('\n'));
     }
-    const currentModel = gridRowSelectionStateSelector(apiRef.current.state);
+    const currentModel = gridRowSelectionStateSelector(apiRef);
     if (currentModel !== model) {
       logger.debug(`Setting selection model`);
       apiRef.current.setState(state => _extends({}, state, {
-        rowSelection: props.rowSelection ? model : []
+        rowSelection: props.rowSelection ? model : emptyModel
       }));
-      apiRef.current.forceUpdate();
     }
   }, [apiRef, logger, props.rowSelection, props.signature, canHaveMultipleSelection]);
-  const isRowSelected = React.useCallback(id => gridRowSelectionStateSelector(apiRef.current.state).includes(id), [apiRef]);
+  const isRowSelected = React.useCallback(id => {
+    const selectionManager = gridRowSelectionManagerSelector(apiRef);
+    return selectionManager.has(id);
+  }, [apiRef]);
   const isRowSelectable = React.useCallback(id => {
     if (props.rowSelection === false) {
       return false;
@@ -115,13 +115,13 @@ export const useGridRowSelection = (apiRef, props) => {
     if (propIsRowSelectable && !propIsRowSelectable(apiRef.current.getRowParams(id))) {
       return false;
     }
-    const rowNode = apiRef.current.getRowNode(id);
+    const rowNode = gridRowNodeSelector(apiRef, id);
     if (rowNode?.type === 'footer' || rowNode?.type === 'pinnedRow') {
       return false;
     }
     return true;
   }, [apiRef, props.rowSelection, propIsRowSelectable]);
-  const getSelectedRows = React.useCallback(() => selectedGridRowsSelector(apiRef), [apiRef]);
+  const getSelectedRows = React.useCallback(() => gridRowSelectionIdsSelector(apiRef), [apiRef]);
   const selectRow = React.useCallback((id, isSelected = true, resetSelection = false) => {
     if (!apiRef.current.isRowSelectable(id)) {
       return;
@@ -129,9 +129,12 @@ export const useGridRowSelection = (apiRef, props) => {
     lastRowToggled.current = id;
     if (resetSelection) {
       logger.debug(`Setting selection for row ${id}`);
-      const newSelection = [];
+      const newSelectionModel = {
+        type: 'include',
+        ids: new Set()
+      };
       const addRow = rowId => {
-        newSelection.push(rowId);
+        newSelectionModel.ids.add(rowId);
       };
       if (isSelected) {
         addRow(id);
@@ -139,17 +142,21 @@ export const useGridRowSelection = (apiRef, props) => {
           findRowsToSelect(apiRef, tree, id, props.rowSelectionPropagation?.descendants ?? false, props.rowSelectionPropagation?.parents ?? false, addRow);
         }
       }
-      apiRef.current.setRowSelectionModel(newSelection);
+      apiRef.current.setRowSelectionModel(newSelectionModel);
     } else {
       logger.debug(`Toggling selection for row ${id}`);
-      const selection = gridRowSelectionStateSelector(apiRef.current.state);
-      const newSelection = new Set(selection);
-      newSelection.delete(id);
+      const selectionModel = gridRowSelectionStateSelector(apiRef);
+      const newSelectionModel = {
+        type: selectionModel.type,
+        ids: new Set(selectionModel.ids)
+      };
+      const selectionManager = createRowSelectionManager(newSelectionModel);
+      selectionManager.unselect(id);
       const addRow = rowId => {
-        newSelection.add(rowId);
+        selectionManager.select(rowId);
       };
       const removeRow = rowId => {
-        newSelection.delete(rowId);
+        selectionManager.unselect(rowId);
       };
       if (isSelected) {
         addRow(id);
@@ -159,45 +166,62 @@ export const useGridRowSelection = (apiRef, props) => {
       } else if (applyAutoSelection) {
         findRowsToDeselect(apiRef, tree, id, props.rowSelectionPropagation?.descendants ?? false, props.rowSelectionPropagation?.parents ?? false, removeRow);
       }
-      const isSelectionValid = newSelection.size < 2 || canHaveMultipleSelection;
+      const isSelectionValid = newSelectionModel.type === 'include' && newSelectionModel.ids.size < 2 || canHaveMultipleSelection;
       if (isSelectionValid) {
-        apiRef.current.setRowSelectionModel(Array.from(newSelection));
+        apiRef.current.setRowSelectionModel(newSelectionModel);
       }
     }
   }, [apiRef, logger, applyAutoSelection, tree, props.rowSelectionPropagation?.descendants, props.rowSelectionPropagation?.parents, canHaveMultipleSelection]);
   const selectRows = React.useCallback((ids, isSelected = true, resetSelection = false) => {
     logger.debug(`Setting selection for several rows`);
-    const selectableIds = ids.filter(id => apiRef.current.isRowSelectable(id));
-    let newSelection;
+    if (props.rowSelection === false) {
+      return;
+    }
+    const selectableIds = new Set();
+    for (let i = 0; i < ids.length; i += 1) {
+      const id = ids[i];
+      if (apiRef.current.isRowSelectable(id)) {
+        selectableIds.add(id);
+      }
+    }
+    const currentSelectionModel = gridRowSelectionStateSelector(apiRef);
+    let newSelectionModel;
     if (resetSelection) {
+      newSelectionModel = {
+        type: 'include',
+        ids: selectableIds
+      };
       if (isSelected) {
-        newSelection = new Set(selectableIds);
+        const selectionManager = createRowSelectionManager(newSelectionModel);
         if (applyAutoSelection) {
           const addRow = rowId => {
-            newSelection.add(rowId);
+            selectionManager.select(rowId);
           };
-          selectableIds.forEach(id => {
+          for (const id of selectableIds) {
             findRowsToSelect(apiRef, tree, id, props.rowSelectionPropagation?.descendants ?? false, props.rowSelectionPropagation?.parents ?? false, addRow);
-          });
+          }
         }
       } else {
-        newSelection = new Set();
+        newSelectionModel.ids = new Set();
       }
-      const currentLookup = selectedIdsLookupSelector(apiRef);
-      if (newSelection.size === Object.keys(currentLookup).length && Array.from(newSelection).every(id => currentLookup[id] === id)) {
+      if (currentSelectionModel.type === newSelectionModel.type && newSelectionModel.ids.size === currentSelectionModel.ids.size && Array.from(newSelectionModel.ids).every(id => currentSelectionModel.ids.has(id))) {
         return;
       }
     } else {
-      newSelection = new Set(Object.values(selectedIdsLookupSelector(apiRef)));
+      newSelectionModel = {
+        type: currentSelectionModel.type,
+        ids: new Set(currentSelectionModel.ids)
+      };
+      const selectionManager = createRowSelectionManager(newSelectionModel);
       const addRow = rowId => {
-        newSelection.add(rowId);
+        selectionManager.select(rowId);
       };
       const removeRow = rowId => {
-        newSelection.delete(rowId);
+        selectionManager.unselect(rowId);
       };
-      selectableIds.forEach(id => {
+      for (const id of selectableIds) {
         if (isSelected) {
-          newSelection.add(id);
+          selectionManager.select(id);
           if (applyAutoSelection) {
             findRowsToSelect(apiRef, tree, id, props.rowSelectionPropagation?.descendants ?? false, props.rowSelectionPropagation?.parents ?? false, addRow);
           }
@@ -207,13 +231,30 @@ export const useGridRowSelection = (apiRef, props) => {
             findRowsToDeselect(apiRef, tree, id, props.rowSelectionPropagation?.descendants ?? false, props.rowSelectionPropagation?.parents ?? false, removeRow);
           }
         }
-      });
+      }
     }
-    const isSelectionValid = newSelection.size < 2 || canHaveMultipleSelection;
+    const isSelectionValid = newSelectionModel.type === 'include' && newSelectionModel.ids.size < 2 || canHaveMultipleSelection;
     if (isSelectionValid) {
-      apiRef.current.setRowSelectionModel(Array.from(newSelection));
+      apiRef.current.setRowSelectionModel(newSelectionModel);
+    }
+  }, [logger, applyAutoSelection, canHaveMultipleSelection, apiRef, tree, props.rowSelectionPropagation?.descendants, props.rowSelectionPropagation?.parents, props.rowSelection]);
+  const getPropagatedRowSelectionModel = React.useCallback(inputSelectionModel => {
+    if (!isNestedData || !applyAutoSelection || inputSelectionModel.ids.size === 0 && inputSelectionModel.type === 'include') {
+      return inputSelectionModel;
+    }
+    const propagatedSelectionModel = {
+      type: inputSelectionModel.type,
+      ids: new Set(inputSelectionModel.ids)
+    };
+    const selectionManager = createRowSelectionManager(propagatedSelectionModel);
+    const addRow = rowId => {
+      selectionManager.select(rowId);
+    };
+    for (const id of inputSelectionModel.ids) {
+      findRowsToSelect(apiRef, tree, id, props.rowSelectionPropagation?.descendants ?? false, props.rowSelectionPropagation?.parents ?? false, addRow, selectionManager);
     }
-  }, [logger, applyAutoSelection, canHaveMultipleSelection, apiRef, tree, props.rowSelectionPropagation?.descendants, props.rowSelectionPropagation?.parents]);
+    return propagatedSelectionModel;
+  }, [apiRef, tree, props.rowSelectionPropagation?.descendants, props.rowSelectionPropagation?.parents, isNestedData, applyAutoSelection]);
   const selectRowRange = React.useCallback(({
     startId,
     endId
@@ -240,7 +281,8 @@ export const useGridRowSelection = (apiRef, props) => {
   };
   const selectionPrivateApi = {
     selectRows,
-    selectRowRange
+    selectRowRange,
+    getPropagatedRowSelectionModel
   };
   useGridApiMethod(apiRef, selectionPublicApi, 'public');
   useGridApiMethod(apiRef, selectionPrivateApi, props.signature === GridSignature.DataGrid ? 'private' : 'public');
@@ -248,61 +290,80 @@ export const useGridRowSelection = (apiRef, props) => {
   /*
    * EVENTS
    */
+  const isFirstRender = React.useRef(true);
   const removeOutdatedSelection = React.useCallback((sortModelUpdated = false) => {
-    const currentSelection = gridRowSelectionStateSelector(apiRef.current.state);
+    if (isFirstRender.current) {
+      return;
+    }
+    const currentSelection = gridRowSelectionStateSelector(apiRef);
     const rowsLookup = gridRowsLookupSelector(apiRef);
     const filteredRowsLookup = gridFilteredRowsLookupSelector(apiRef);
-
-    // We clone the existing object to avoid mutating the same object returned by the selector to others part of the project
-    const selectionLookup = _extends({}, selectedIdsLookupSelector(apiRef));
     const isNonExistent = id => {
       if (props.filterMode === 'server') {
         return !rowsLookup[id];
       }
-      return filteredRowsLookup[id] !== true;
+      return !rowsLookup[id] || filteredRowsLookup[id] === false;
+    };
+    const newSelectionModel = {
+      type: currentSelection.type,
+      ids: new Set(currentSelection.ids)
     };
+    const selectionManager = createRowSelectionManager(newSelectionModel);
     let hasChanged = false;
-    currentSelection.forEach(id => {
+    for (const id of currentSelection.ids) {
       if (isNonExistent(id)) {
         if (props.keepNonExistentRowsSelected) {
-          return;
+          continue;
         }
-        delete selectionLookup[id];
+        selectionManager.unselect(id);
         hasChanged = true;
-        return;
+        continue;
       }
       if (!props.rowSelectionPropagation?.parents) {
-        return;
+        continue;
       }
       const node = tree[id];
-      if (node.type === 'group') {
+      if (node?.type === 'group') {
         const isAutoGenerated = node.isAutoGenerated;
         if (isAutoGenerated) {
-          delete selectionLookup[id];
+          selectionManager.unselect(id);
           hasChanged = true;
-          return;
+          continue;
         }
         // Keep previously selected tree data parents selected if all their children are filtered out
         if (!node.children.every(childId => filteredRowsLookup[childId] === false)) {
-          delete selectionLookup[id];
+          selectionManager.unselect(id);
           hasChanged = true;
         }
       }
-    });
+    }
 
     // For nested data, on row tree updation (filtering, adding rows, etc.) when the selection is
     // not empty, we need to re-run scanning of the tree to propagate the selection changes
     // Example: A parent whose de-selected children are filtered out should now be selected
-    const shouldReapplyPropagation = isNestedData && props.rowSelectionPropagation?.parents && Object.keys(selectionLookup).length > 0;
+    const shouldReapplyPropagation = isNestedData && props.rowSelectionPropagation?.parents && (newSelectionModel.ids.size > 0 ||
+    // In case of exclude selection, newSelectionModel.ids.size === 0 means all rows are selected
+    newSelectionModel.type === 'exclude');
     if (hasChanged || shouldReapplyPropagation && !sortModelUpdated) {
-      const newSelection = Object.values(selectionLookup);
       if (shouldReapplyPropagation) {
-        apiRef.current.selectRows(newSelection, true, true);
+        if (newSelectionModel.type === 'exclude') {
+          const unfilteredSelectedRowIds = getRowsToBeSelected();
+          const selectedRowIds = [];
+          for (let i = 0; i < unfilteredSelectedRowIds.length; i += 1) {
+            const rowId = unfilteredSelectedRowIds[i];
+            if ((props.keepNonExistentRowsSelected || !isNonExistent(rowId)) && selectionManager.has(rowId)) {
+              selectedRowIds.push(rowId);
+            }
+          }
+          apiRef.current.selectRows(selectedRowIds, true, true);
+        } else {
+          apiRef.current.selectRows(Array.from(newSelectionModel.ids), true, true);
+        }
       } else {
-        apiRef.current.setRowSelectionModel(newSelection);
+        apiRef.current.setRowSelectionModel(newSelectionModel);
       }
     }
-  }, [apiRef, isNestedData, props.rowSelectionPropagation?.parents, props.keepNonExistentRowsSelected, props.filterMode, tree]);
+  }, [apiRef, isNestedData, props.rowSelectionPropagation?.parents, props.keepNonExistentRowsSelected, props.filterMode, tree, getRowsToBeSelected]);
   const handleSingleRowSelection = React.useCallback((id, event) => {
     const hasCtrlKey = event.metaKey || event.ctrlKey;
 
@@ -313,7 +374,7 @@ export const useGridRowSelection = (apiRef, props) => {
 
     const isMultipleSelectionDisabled = !checkboxSelection && !hasCtrlKey && !isKeyboardEvent(event);
     const resetSelection = !canHaveMultipleSelection || isMultipleSelectionDisabled;
-    const selectedRowsCount = apiRef.current.getSelectedRows().size;
+    const selectedRowsCount = gridRowSelectionCountSelector(apiRef);
     if (canHaveMultipleSelection && selectedRowsCount > 1 && !hasCtrlKey) {
       apiRef.current.selectRow(id, true, resetSelection);
     } else {
@@ -340,7 +401,7 @@ export const useGridRowSelection = (apiRef, props) => {
         return;
       }
     }
-    const rowNode = apiRef.current.getRowNode(params.id);
+    const rowNode = gridRowNodeSelector(apiRef, params.id);
     if (rowNode.type === 'pinnedRow') {
       return;
     }
@@ -362,10 +423,22 @@ export const useGridRowSelection = (apiRef, props) => {
       apiRef.current.selectRow(params.id, params.value, !canHaveMultipleSelection);
     }
   }, [apiRef, expandMouseRowRangeSelection, canHaveMultipleSelection]);
+  const toggleAllRows = React.useCallback(value => {
+    const filterModel = gridFilterModelSelector(apiRef);
+    const quickFilterModel = gridQuickFilterValuesSelector(apiRef);
+    const hasFilters = filterModel.items.length > 0 || (quickFilterModel?.length || 0) > 0;
+    if (!props.isRowSelectable && !props.checkboxSelectionVisibleOnly && applyAutoSelection && !hasFilters) {
+      apiRef.current.setRowSelectionModel({
+        type: value ? 'exclude' : 'include',
+        ids: new Set()
+      });
+    } else {
+      apiRef.current.selectRows(getRowsToBeSelected(), value);
+    }
+  }, [apiRef, applyAutoSelection, getRowsToBeSelected, props.checkboxSelectionVisibleOnly, props.isRowSelectable]);
   const handleHeaderSelectionCheckboxChange = React.useCallback(params => {
-    const rowsToBeSelected = props.pagination && props.checkboxSelectionVisibleOnly && props.paginationMode === 'client' ? gridPaginatedVisibleSortedGridRowIdsSelector(apiRef) : gridExpandedSortedRowIdsSelector(apiRef);
-    apiRef.current.selectRows(rowsToBeSelected, params.value);
-  }, [apiRef, props.checkboxSelectionVisibleOnly, props.pagination, props.paginationMode]);
+    toggleAllRows(params.value);
+  }, [toggleAllRows]);
   const handleCellKeyDown = React.useCallback((params, event) => {
     // 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) {
@@ -413,7 +486,11 @@ export const useGridRowSelection = (apiRef, props) => {
             end = previousRowIndex;
           }
         }
-        const rowsBetweenStartAndEnd = visibleRows.rows.slice(start, end + 1).map(row => row.id);
+        const visibleRows = getVisibleRows(apiRef);
+        const rowsBetweenStartAndEnd = [];
+        for (let i = start; i <= end; i += 1) {
+          rowsBetweenStartAndEnd.push(visibleRows.rows[i].id);
+        }
         apiRef.current.selectRows(rowsBetweenStartAndEnd, !isNextRowSelected);
         return;
       }
@@ -425,11 +502,30 @@ export const useGridRowSelection = (apiRef, props) => {
     }
     if (String.fromCharCode(event.keyCode) === 'A' && (event.ctrlKey || event.metaKey)) {
       event.preventDefault();
-      selectRows(apiRef.current.getAllRowIds(), true);
+      toggleAllRows(true);
+    }
+  }, [apiRef, canHaveMultipleSelection, handleSingleRowSelection, toggleAllRows]);
+  const syncControlledState = useEventCallback(() => {
+    if (!props.rowSelection) {
+      apiRef.current.setRowSelectionModel(emptyModel);
+      return;
+    }
+    if (propRowSelectionModel === undefined) {
+      return;
+    }
+    if (!applyAutoSelection || !isNestedData || propRowSelectionModel.type === 'include' && propRowSelectionModel.ids.size === 0) {
+      apiRef.current.setRowSelectionModel(propRowSelectionModel);
+      return;
+    }
+    const newSelectionModel = apiRef.current.getPropagatedRowSelectionModel(propRowSelectionModel);
+    if (newSelectionModel.type !== propRowSelectionModel.type || newSelectionModel.ids.size !== propRowSelectionModel.ids.size || !Array.from(propRowSelectionModel.ids).every(id => newSelectionModel.ids.has(id))) {
+      apiRef.current.setRowSelectionModel(newSelectionModel);
+      return;
     }
-  }, [apiRef, handleSingleRowSelection, selectRows, visibleRows.rows, canHaveMultipleSelection]);
+    apiRef.current.setRowSelectionModel(propRowSelectionModel);
+  });
   useGridApiEventHandler(apiRef, 'sortedRowsSet', runIfRowSelectionIsEnabled(() => removeOutdatedSelection(true)));
-  useGridApiEventHandler(apiRef, 'filteredRowsSet', runIfRowSelectionIsEnabled(removeOutdatedSelection));
+  useGridApiEventHandler(apiRef, 'filteredRowsSet', runIfRowSelectionIsEnabled(() => removeOutdatedSelection()));
   useGridApiEventHandler(apiRef, 'rowClick', runIfRowSelectionIsEnabled(handleRowClick));
   useGridApiEventHandler(apiRef, 'rowSelectionCheckboxChange', runIfRowSelectionIsEnabled(handleRowSelectionCheckboxChange));
   useGridApiEventHandler(apiRef, 'headerSelectionCheckboxChange', handleHeaderSelectionCheckboxChange);
@@ -440,41 +536,48 @@ export const useGridRowSelection = (apiRef, props) => {
    * EFFECTS
    */
   React.useEffect(() => {
-    if (propRowSelectionModel !== undefined) {
-      apiRef.current.setRowSelectionModel(propRowSelectionModel);
-    }
-  }, [apiRef, propRowSelectionModel, props.rowSelection]);
-  React.useEffect(() => {
-    if (!props.rowSelection) {
-      apiRef.current.setRowSelectionModel([]);
-    }
-  }, [apiRef, props.rowSelection]);
+    syncControlledState();
+  }, [apiRef, propRowSelectionModel, props.rowSelection, syncControlledState]);
   const isStateControlled = propRowSelectionModel != null;
   React.useEffect(() => {
-    if (isStateControlled || !props.rowSelection) {
+    if (isStateControlled || !props.rowSelection || typeof isRowSelectable !== 'function') {
       return;
     }
 
     // props.isRowSelectable changed
-    const currentSelection = gridRowSelectionStateSelector(apiRef.current.state);
-    if (isRowSelectable) {
-      const newSelection = currentSelection.filter(id => isRowSelectable(id));
-      if (newSelection.length < currentSelection.length) {
-        apiRef.current.setRowSelectionModel(newSelection);
+    const currentSelection = gridRowSelectionStateSelector(apiRef);
+    if (currentSelection.type !== 'include') {
+      return;
+    }
+    const selectableIds = new Set();
+    for (const id of currentSelection.ids) {
+      if (isRowSelectable(id)) {
+        selectableIds.add(id);
       }
     }
+    if (selectableIds.size < currentSelection.ids.size) {
+      apiRef.current.setRowSelectionModel({
+        type: currentSelection.type,
+        ids: selectableIds
+      });
+    }
   }, [apiRef, isRowSelectable, isStateControlled, props.rowSelection]);
   React.useEffect(() => {
     if (!props.rowSelection || isStateControlled) {
       return;
     }
-    const currentSelection = gridRowSelectionStateSelector(apiRef.current.state);
-    if (!canHaveMultipleSelection && currentSelection.length > 1) {
+    const currentSelection = gridRowSelectionStateSelector(apiRef);
+    if (!canHaveMultipleSelection && (currentSelection.type === 'include' && currentSelection.ids.size > 1 || currentSelection.type === 'exclude')) {
       // See https://github.com/mui/mui-x/issues/8455
-      apiRef.current.setRowSelectionModel([]);
+      apiRef.current.setRowSelectionModel(emptyModel);
     }
   }, [apiRef, canHaveMultipleSelection, checkboxSelection, isStateControlled, props.rowSelection]);
   React.useEffect(() => {
     runIfRowSelectionIsEnabled(removeOutdatedSelection);
   }, [removeOutdatedSelection, runIfRowSelectionIsEnabled]);
+  React.useEffect(() => {
+    if (isFirstRender.current) {
+      isFirstRender.current = false;
+    }
+  }, []);
 };

package/modern/hooks/features/rowSelection/useGridRowSelectionPreProcessors.d.ts

@@ -0,0 +1,4 @@
+import { RefObject } from '@mui/x-internals/types';
+import { DataGridProcessedProps } from "../../../models/props/DataGridProps.js";
+import { GridPrivateApiCommunity } from "../../../models/api/gridApiCommunity.js";
+export declare const useGridRowSelectionPreProcessors: (apiRef: RefObject<GridPrivateApiCommunity>, props: DataGridProcessedProps) => void;

package/modern/hooks/features/rowSelection/utils.d.ts

@@ -0,0 +1,14 @@
+import { RefObject } from '@mui/x-internals/types';
+import type { GridRowId, GridRowTreeConfig } from '../../../models/gridRows';
+import type { DataGridProcessedProps } from '../../../models/props/DataGridProps';
+import type { GridPrivateApiCommunity } from '../../../models/api/gridApiCommunity';
+import { type GridRowSelectionPropagation } from "../../../models/gridRowSelectionModel.js";
+import { type RowSelectionManager } from "../../../models/gridRowSelectionManager.js";
+export declare const ROW_SELECTION_PROPAGATION_DEFAULT: GridRowSelectionPropagation;
+export declare function getCheckboxPropsSelector(groupId: GridRowId, autoSelectParents: boolean): import("../../..").OutputSelector<import("../../../models/gridStateCommunity").GridStateCommunity, RowSelectionManager, {
+  isIndeterminate: boolean;
+  isChecked: boolean;
+}>;
+export declare function isMultipleRowSelectionEnabled(props: Pick<DataGridProcessedProps, 'signature' | 'disableMultipleRowSelection' | 'checkboxSelection'>): boolean;
+export declare const findRowsToSelect: (apiRef: RefObject<GridPrivateApiCommunity>, tree: GridRowTreeConfig, selectedRow: GridRowId, autoSelectDescendants: boolean, autoSelectParents: boolean, addRow: (rowId: GridRowId) => void, rowSelectionManager?: RowSelectionManager) => void;
+export declare const findRowsToDeselect: (apiRef: RefObject<GridPrivateApiCommunity>, tree: GridRowTreeConfig, deselectedRow: GridRowId, autoSelectDescendants: boolean, autoSelectParents: boolean, removeRow: (rowId: GridRowId) => void) => void;