@mui/x-data-grid 8.0.0-alpha.12 → 8.0.0-alpha.14

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

@@ -1,15 +1,15 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
+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, gridRowNodeSelector, gridRowTreeSelector } from "../rows/gridRowsSelector.js";
-import { gridRowSelectionStateSelector, selectedGridRowsSelector, selectedIdsLookupSelector } from "./gridRowSelectionSelector.js";
-import { gridPaginatedVisibleSortedGridRowIdsSelector } from "../pagination/index.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";
@@ -18,20 +18,14 @@ 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
 });
 
 /**
@@ -49,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));
-  }, [apiRef, props.rowSelectionModel]);
+    return props.rowSelectionModel;
+  }, [props.rowSelectionModel]);
   const lastRowToggled = React.useRef(null);
   apiRef.current.registerControlState({
     stateId: 'rowSelection',
@@ -90,23 +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);
     if (currentModel !== model) {
       logger.debug(`Setting selection model`);
       apiRef.current.setState(state => _extends({}, state, {
-        rowSelection: props.rowSelection ? model : []
+        rowSelection: props.rowSelection ? model : emptyModel
       }));
     }
   }, [apiRef, logger, props.rowSelection, props.signature, canHaveMultipleSelection]);
-  const isRowSelected = React.useCallback(id => gridRowSelectionStateSelector(apiRef).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;
@@ -120,7 +121,7 @@ export const useGridRowSelection = (apiRef, props) => {
     }
     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;
@@ -128,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);
@@ -138,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);
-      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);
@@ -158,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);
           }
@@ -206,13 +231,13 @@ 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]);
+  }, [logger, applyAutoSelection, canHaveMultipleSelection, apiRef, tree, props.rowSelectionPropagation?.descendants, props.rowSelectionPropagation?.parents, props.rowSelection]);
   const selectRowRange = React.useCallback(({
     startId,
     endId
@@ -251,57 +276,72 @@ export const useGridRowSelection = (apiRef, props) => {
     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 !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;
 
@@ -312,7 +352,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 {
@@ -361,10 +401,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 +465,10 @@ export const useGridRowSelection = (apiRef, props) => {
           }
         }
         const visibleRows = getVisibleRows(apiRef);
-        const rowsBetweenStartAndEnd = visibleRows.rows.slice(start, end + 1).map(row => row.id);
+        const rowsBetweenStartAndEnd = [];
+        for (let i = start; i <= end; i += 1) {
+          rowsBetweenStartAndEnd.push(visibleRows.rows[i].id);
+        }
         apiRef.current.selectRows(rowsBetweenStartAndEnd, !isNextRowSelected);
         return;
       }
@@ -425,9 +480,9 @@ 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, handleSingleRowSelection, selectRows, canHaveMultipleSelection]);
+  }, [apiRef, canHaveMultipleSelection, handleSingleRowSelection, toggleAllRows]);
   useGridApiEventHandler(apiRef, 'sortedRowsSet', runIfRowSelectionIsEnabled(() => removeOutdatedSelection(true)));
   useGridApiEventHandler(apiRef, 'filteredRowsSet', runIfRowSelectionIsEnabled(removeOutdatedSelection));
   useGridApiEventHandler(apiRef, 'rowClick', runIfRowSelectionIsEnabled(handleRowClick));
@@ -446,7 +501,7 @@ export const useGridRowSelection = (apiRef, props) => {
   }, [apiRef, propRowSelectionModel, props.rowSelection]);
   React.useEffect(() => {
     if (!props.rowSelection) {
-      apiRef.current.setRowSelectionModel([]);
+      apiRef.current.setRowSelectionModel(emptyModel);
     }
   }, [apiRef, props.rowSelection]);
   const isStateControlled = propRowSelectionModel != null;
@@ -457,10 +512,22 @@ export const useGridRowSelection = (apiRef, props) => {
 
     // props.isRowSelectable changed
     const currentSelection = gridRowSelectionStateSelector(apiRef);
-    if (isRowSelectable) {
-      const newSelection = currentSelection.filter(id => isRowSelectable(id));
-      if (newSelection.length < currentSelection.length) {
-        apiRef.current.setRowSelectionModel(newSelection);
+    if (typeof isRowSelectable === 'function') {
+      let selectableIds = new Set();
+      if (currentSelection.type === 'include') {
+        for (const id of currentSelection.ids) {
+          if (isRowSelectable(id)) {
+            selectableIds.add(id);
+          }
+        }
+      } else {
+        selectableIds = new Set(currentSelection.ids);
+      }
+      if (currentSelection.type === 'include' && selectableIds.size < currentSelection.ids.size) {
+        apiRef.current.setRowSelectionModel({
+          type: currentSelection.type,
+          ids: selectableIds
+        });
       }
     }
   }, [apiRef, isRowSelectable, isStateControlled, props.rowSelection]);
@@ -469,9 +536,9 @@ export const useGridRowSelection = (apiRef, props) => {
       return;
     }
     const currentSelection = gridRowSelectionStateSelector(apiRef);
-    if (!canHaveMultipleSelection && currentSelection.length > 1) {
+    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(() => {

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

@@ -2,9 +2,9 @@ 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';
+import { type GridRowSelectionPropagation } from "../../../models/gridRowSelectionModel.js";
 export declare const ROW_SELECTION_PROPAGATION_DEFAULT: GridRowSelectionPropagation;
-export declare function getCheckboxPropsSelector(groupId: GridRowId, autoSelectParents: boolean): import("../../..").OutputSelector<import("../../../models/gridStateCommunity").GridStateCommunity, Record<GridRowId, GridRowId>, {
+export declare function getCheckboxPropsSelector(groupId: GridRowId, autoSelectParents: boolean): import("../../..").OutputSelector<import("../../../models/gridStateCommunity").GridStateCommunity, import("../../../models/gridRowSelectionManager").RowSelectionManager, {
   isIndeterminate: boolean;
   isChecked: boolean;
 }>;

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

@@ -2,7 +2,7 @@ import { GridSignature } from "../../../constants/signature.js";
 import { GRID_ROOT_GROUP_ID } from "../rows/gridRowsUtils.js";
 import { gridFilteredRowsLookupSelector } from "../filter/gridFilterSelector.js";
 import { gridSortedRowIdsSelector } from "../sorting/gridSortingSelector.js";
-import { selectedIdsLookupSelector } from "./gridRowSelectionSelector.js";
+import { gridRowSelectionManagerSelector } from "./gridRowSelectionSelector.js";
 import { gridRowTreeSelector } from "../rows/gridRowsSelector.js";
 import { createSelector } from "../../../utils/createSelector.js";
 export const ROW_SELECTION_PROPAGATION_DEFAULT = {
@@ -30,15 +30,15 @@ function getGridRowGroupSelectableDescendants(apiRef, groupId) {
 
 // TODO v8: Use `createSelectorV8`
 export function getCheckboxPropsSelector(groupId, autoSelectParents) {
-  return createSelector(gridRowTreeSelector, gridSortedRowIdsSelector, gridFilteredRowsLookupSelector, selectedIdsLookupSelector, (rowTree, sortedRowIds, filteredRowsLookup, rowSelectionLookup) => {
+  return createSelector(gridRowTreeSelector, gridSortedRowIdsSelector, gridFilteredRowsLookupSelector, gridRowSelectionManagerSelector, (rowTree, sortedRowIds, filteredRowsLookup, rowSelectionManager) => {
     const groupNode = rowTree[groupId];
     if (!groupNode || groupNode.type !== 'group') {
       return {
         isIndeterminate: false,
-        isChecked: rowSelectionLookup[groupId] === groupId
+        isChecked: rowSelectionManager.has(groupId)
       };
     }
-    if (rowSelectionLookup[groupId] === groupId) {
+    if (rowSelectionManager.has(groupId)) {
       return {
         isIndeterminate: false,
         isChecked: true
@@ -51,14 +51,14 @@ export function getCheckboxPropsSelector(groupId, autoSelectParents) {
       const id = sortedRowIds[index];
       if (filteredRowsLookup[id] !== false) {
         selectableDescendantsCount += 1;
-        if (rowSelectionLookup[id] !== undefined) {
+        if (rowSelectionManager.has(id)) {
           selectedDescendantsCount += 1;
         }
       }
     }
     return {
-      isIndeterminate: selectedDescendantsCount > 0 && (selectedDescendantsCount < selectableDescendantsCount || rowSelectionLookup[groupId] === undefined),
-      isChecked: autoSelectParents ? selectedDescendantsCount > 0 : rowSelectionLookup[groupId] === groupId
+      isIndeterminate: selectedDescendantsCount > 0 && (selectedDescendantsCount < selectableDescendantsCount || !rowSelectionManager.has(groupId)),
+      isChecked: autoSelectParents ? selectedDescendantsCount > 0 : rowSelectionManager.has(groupId)
     };
   });
 }
@@ -96,7 +96,7 @@ const getFilteredRowNodeSiblings = (tree, filteredRows, id) => {
 };
 export const findRowsToSelect = (apiRef, tree, selectedRow, autoSelectDescendants, autoSelectParents, addRow) => {
   const filteredRows = gridFilteredRowsLookupSelector(apiRef);
-  const selectedIdsLookup = selectedIdsLookupSelector(apiRef);
+  const rowSelectionManager = gridRowSelectionManagerSelector(apiRef);
   const selectedDescendants = new Set([]);
   if (!autoSelectDescendants && !autoSelectParents) {
     return;
@@ -113,7 +113,7 @@ export const findRowsToSelect = (apiRef, tree, selectedRow, autoSelectDescendant
   }
   if (autoSelectParents) {
     const checkAllDescendantsSelected = rowId => {
-      if (selectedIdsLookup[rowId] !== rowId && !selectedDescendants.has(rowId)) {
+      if (!rowSelectionManager.has(rowId) && !selectedDescendants.has(rowId)) {
         return false;
       }
       const node = tree[rowId];
@@ -138,14 +138,14 @@ export const findRowsToSelect = (apiRef, tree, selectedRow, autoSelectDescendant
   }
 };
 export const findRowsToDeselect = (apiRef, tree, deselectedRow, autoSelectDescendants, autoSelectParents, removeRow) => {
-  const selectedIdsLookup = selectedIdsLookupSelector(apiRef);
+  const rowSelectionManager = gridRowSelectionManagerSelector(apiRef);
   if (!autoSelectParents && !autoSelectDescendants) {
     return;
   }
   if (autoSelectParents) {
     const allParents = getRowNodeParents(tree, deselectedRow);
     allParents.forEach(parent => {
-      const isSelected = selectedIdsLookup[parent] === parent;
+      const isSelected = rowSelectionManager.has(parent);
       if (isSelected) {
         removeRow(parent);
       }

package/modern/hooks/features/rows/gridRowsInterfaces.d.ts

@@ -61,7 +61,7 @@ export interface GridRowsState {
   /**
    * Contains some values of type `GridRowId` that have been requested to be fetched
    * either by `defaultGroupingExpansionDepth` or `isGroupExpandedByDefault` props.
-   * Applicable with server-side grouped data and `unstable_dataSource` only.
+   * Applicable with server-side grouped data and `dataSource` only.
    */
   groupsToFetch?: GridRowId[];
 }

package/modern/hooks/features/rows/gridRowsUtils.d.ts

@@ -1,5 +1,5 @@
 import { RefObject } from '@mui/x-internals/types';
-import { GridAutoGeneratedGroupNode, GridAutoGeneratedPinnedRowNode, GridFooterNode, GridGroupNode, GridRowId, GridRowIdGetter, GridRowModel, GridRowModelUpdate, GridRowTreeConfig, GridSkeletonRowNode, GridTreeNode } from "../../../models/index.js";
+import { GridAutoGeneratedGroupNode, GridAutoGeneratedPinnedRowNode, GridColDef, GridFooterNode, GridGroupNode, GridRowId, GridRowIdGetter, GridRowModel, GridRowModelUpdate, GridRowTreeConfig, GridSkeletonRowNode, GridTreeNode, GridValidRowModel } from "../../../models/index.js";
 import { DataGridProcessedProps } from "../../../models/props/DataGridProps.js";
 import { GridApiCommunity, GridPrivateApiCommunity } from "../../../models/api/gridApiCommunity.js";
 import { GridRowsInternalCache, GridRowsState, GridRowTreeCreationParams } from "./gridRowsInterfaces.js";
@@ -14,6 +14,7 @@ export declare const buildRootGroup: () => GridGroupNode;
  */
 export declare function checkGridRowIdIsValid(id: GridRowId, row: GridRowModel | Partial<GridRowModel>, detailErrorMessage?: string): void;
 export declare const getRowIdFromRowModel: (rowModel: GridRowModel, getRowId?: GridRowIdGetter, detailErrorMessage?: string) => GridRowId;
+export declare const getRowValue: (row: GridValidRowModel, colDef: GridColDef, apiRef: RefObject<GridApiCommunity>) => any;
 export declare const createRowsInternalCache: ({
   rows,
   getRowId,

package/modern/hooks/features/rows/gridRowsUtils.js

@@ -31,6 +31,14 @@ export const getRowIdFromRowModel = (rowModel, getRowId, detailErrorMessage) =>
   checkGridRowIdIsValid(id, rowModel, detailErrorMessage);
   return id;
 };
+export const getRowValue = (row, colDef, apiRef) => {
+  const field = colDef.field;
+  if (!colDef || !colDef.valueGetter) {
+    return row[field];
+  }
+  const value = row[colDef.field];
+  return colDef.valueGetter(value, row, colDef, apiRef);
+};
 export const createRowsInternalCache = ({
   rows,
   getRowId,

package/modern/hooks/features/rows/useGridParamsApi.js

@@ -4,6 +4,7 @@ import { useGridApiMethod } from "../../utils/useGridApiMethod.js";
 import { gridFocusCellSelector, gridTabIndexCellSelector } from "../focus/gridFocusStateSelector.js";
 import { gridListColumnSelector } from "../listView/gridListViewSelectors.js";
 import { gridRowNodeSelector } from "./gridRowsSelector.js";
+import { getRowValue as getRowValueFn } from "./gridRowsUtils.js";
 export class MissingRowIdError extends Error {}
 
 /**
@@ -88,14 +89,7 @@ export function useGridParamsApi(apiRef, props) {
     }
     return colDef.valueGetter(row[colDef.field], row, colDef, apiRef);
   }, [apiRef]);
-  const getRowValue = React.useCallback((row, colDef) => {
-    const field = colDef.field;
-    if (!colDef || !colDef.valueGetter) {
-      return row[field];
-    }
-    const value = row[colDef.field];
-    return colDef.valueGetter(value, row, colDef, apiRef);
-  }, [apiRef]);
+  const getRowValue = React.useCallback((row, colDef) => getRowValueFn(row, colDef, apiRef), [apiRef]);
   const getRowFormattedValue = React.useCallback((row, colDef) => {
     const value = getRowValue(row, colDef);
     if (!colDef || !colDef.valueFormatter) {

package/modern/hooks/features/rows/useGridRowAriaAttributes.js

@@ -1,19 +1,17 @@
 import * as React from 'react';
-import { selectedIdsLookupSelector } from "../rowSelection/index.js";
 import { useGridSelector } from "../../utils/useGridSelector.js";
 import { gridColumnGroupsHeaderMaxDepthSelector } from "../columnGrouping/gridColumnGroupsSelector.js";
 import { useGridPrivateApiContext } from "../../utils/useGridPrivateApiContext.js";
 export const useGridRowAriaAttributes = () => {
   const apiRef = useGridPrivateApiContext();
-  const selectedIdsLookup = useGridSelector(apiRef, selectedIdsLookupSelector);
   const headerGroupingMaxDepth = useGridSelector(apiRef, gridColumnGroupsHeaderMaxDepthSelector);
   return React.useCallback((rowNode, index) => {
     const ariaAttributes = {};
     const ariaRowIndex = index + headerGroupingMaxDepth + 2; // 1 for the header row and 1 as it's 1-based
     ariaAttributes['aria-rowindex'] = ariaRowIndex;
     if (apiRef.current.isRowSelectable(rowNode.id)) {
-      ariaAttributes['aria-selected'] = selectedIdsLookup[rowNode.id] !== undefined;
+      ariaAttributes['aria-selected'] = apiRef.current.isRowSelected(rowNode.id);
     }
     return ariaAttributes;
-  }, [apiRef, selectedIdsLookup, headerGroupingMaxDepth]);
+  }, [apiRef, headerGroupingMaxDepth]);
 };

package/modern/hooks/features/rows/useGridRows.d.ts

@@ -2,5 +2,5 @@ import { RefObject } from '@mui/x-internals/types';
 import { DataGridProcessedProps } from "../../../models/props/DataGridProps.js";
 import { GridPrivateApiCommunity } from "../../../models/api/gridApiCommunity.js";
 import { GridStateInitializer } from "../../utils/useGridInitializeState.js";
-export declare const rowsStateInitializer: GridStateInitializer<Pick<DataGridProcessedProps, 'unstable_dataSource' | 'rows' | 'rowCount' | 'getRowId' | 'loading'>>;
-export declare const useGridRows: (apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, "rows" | "getRowId" | "rowCount" | "throttleRowsMs" | "signature" | "pagination" | "paginationMode" | "loading" | "unstable_dataSource">) => void;
+export declare const rowsStateInitializer: GridStateInitializer<Pick<DataGridProcessedProps, 'dataSource' | 'rows' | 'rowCount' | 'getRowId' | 'loading'>>;
+export declare const useGridRows: (apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, "rows" | "getRowId" | "rowCount" | "throttleRowsMs" | "signature" | "pagination" | "paginationMode" | "loading" | "dataSource">) => void;