@mui/x-data-grid 8.8.0 → 8.9.1

package/esm/hooks/core/pipeProcessing/useGridPipeProcessing.js

@@ -49,7 +49,8 @@ export const useGridPipeProcessing = apiRef => {
       cache.current[group] = {
         processors: new Map(),
         processorsAsArray: [],
-        appliers: {}
+        appliers: {},
+        processorsUpdated: false
       };
     }
     const groupCache = cache.current[group];
@@ -57,19 +58,20 @@ export const useGridPipeProcessing = apiRef => {
     if (oldProcessor !== processor) {
       groupCache.processors.set(id, processor);
       groupCache.processorsAsArray = Array.from(cache.current[group].processors.values()).filter(processorValue => processorValue !== null);
-      runAppliers(groupCache);
+      groupCache.processorsUpdated = true;
     }
     return () => {
       cache.current[group].processors.set(id, null);
       cache.current[group].processorsAsArray = Array.from(cache.current[group].processors.values()).filter(processorValue => processorValue !== null);
     };
-  }, [runAppliers]);
+  }, []);
   const registerPipeApplier = React.useCallback((group, id, applier) => {
     if (!cache.current[group]) {
       cache.current[group] = {
         processors: new Map(),
         processorsAsArray: [],
-        appliers: {}
+        appliers: {},
+        processorsUpdated: false
       };
     }
     cache.current[group].appliers[id] = applier;
@@ -82,6 +84,18 @@ export const useGridPipeProcessing = apiRef => {
   const requestPipeProcessorsApplication = React.useCallback(group => {
     runAppliers(cache.current[group]);
   }, [runAppliers]);
+  const runAppliersForPendingProcessors = React.useCallback(() => {
+    for (const group in cache.current) {
+      if (!Object.prototype.hasOwnProperty.call(cache.current, group)) {
+        continue;
+      }
+      const groupCache = cache.current[group];
+      if (groupCache.processorsUpdated) {
+        groupCache.processorsUpdated = false;
+        runAppliers(groupCache);
+      }
+    }
+  }, [runAppliers]);
   const applyPipeProcessors = React.useCallback((...args) => {
     const [group, value, context] = args;
     if (!cache.current[group]) {
@@ -97,7 +111,8 @@ export const useGridPipeProcessing = apiRef => {
   const preProcessingPrivateApi = {
     registerPipeProcessor,
     registerPipeApplier,
-    requestPipeProcessorsApplication
+    requestPipeProcessorsApplication,
+    runAppliersForPendingProcessors
   };
   const preProcessingPublicApi = {
     unstable_applyPipeProcessors: applyPipeProcessors

package/esm/hooks/core/useGridProps.d.ts

@@ -1,8 +1,8 @@
 import type { RefObject } from '@mui/x-internals/types';
-import type { DataGridProps } from "../../models/props/DataGridProps.js";
+import type { DataGridProcessedProps } from "../../models/props/DataGridProps.js";
 import type { GridPrivateApiCommon } from "../../models/api/gridApiCommon.js";
 import type { GridStateInitializer } from "../utils/useGridInitializeState.js";
-type Props = Pick<DataGridProps, 'getRowId'>;
+type Props = Pick<DataGridProcessedProps, 'getRowId' | 'listView'>;
 export declare const propsStateInitializer: GridStateInitializer<Props>;
 export declare const useGridProps: <PrivateApi extends GridPrivateApiCommon>(apiRef: RefObject<PrivateApi>, props: Props) => void;
 export {};

package/esm/hooks/core/useGridProps.js

@@ -5,6 +5,7 @@ import * as React from 'react';
 export const propsStateInitializer = (state, props) => {
   return _extends({}, state, {
     props: {
+      listView: props.listView,
       getRowId: props.getRowId
     }
   });
@@ -13,8 +14,9 @@ export const useGridProps = (apiRef, props) => {
   React.useEffect(() => {
     apiRef.current.setState(state => _extends({}, state, {
       props: {
+        listView: props.listView,
         getRowId: props.getRowId
       }
     }));
-  }, [apiRef, props.getRowId]);
+  }, [apiRef, props.listView, props.getRowId]);
 };

package/esm/hooks/features/columnGrouping/gridColumnGroupsInterfaces.d.ts

@@ -1,4 +1,4 @@
-import { GridColumnGroup } from "../../../models/gridColumnGrouping.js";
+import { GridColumnGroup, GridColumnGroupingModel } from "../../../models/gridColumnGrouping.js";
 export type GridColumnGroupLookup = {
   [groupId: string]: Omit<GridColumnGroup, 'children'>;
 };
@@ -13,4 +13,7 @@ export interface GridColumnsGroupingState {
     [columnField: string]: GridColumnGroup['groupId'][];
   };
   maxDepth: number;
+}
+export interface GridColumnGroupingInternalCache {
+  lastColumnGroupingModel?: GridColumnGroupingModel;
 }

package/esm/hooks/features/columnGrouping/gridColumnGroupsUtils.js

@@ -1,4 +1,3 @@
-import { isDeepEqual } from '@mui/x-internals/isDeepEqual';
 import { isLeaf } from "../../../models/gridColumnGrouping.js";
 // This is the recurrence function that help writing `unwrapGroupingColumnModel()`
 const recurrentUnwrapGroupingColumnModel = (columnGroupNode, parents, unwrappedGroupingModelToComplete) => {
@@ -37,45 +36,49 @@ export const unwrapGroupingColumnModel = columnGroupingModel => {
 export const getColumnGroupsHeaderStructure = (orderedColumns, unwrappedGroupingModel, pinnedFields) => {
   const getParents = field => unwrappedGroupingModel[field] ?? [];
   const groupingHeaderStructure = [];
-  const maxDepth = Math.max(...orderedColumns.map(field => getParents(field).length));
-  const haveSameParents = (field1, field2, depth) => isDeepEqual(getParents(field1).slice(0, depth + 1), getParents(field2).slice(0, depth + 1));
-  const haveDifferentContainers = (field1, field2) => {
-    if (pinnedFields?.left && pinnedFields.left.includes(field1) && !pinnedFields.left.includes(field2)) {
-      return true;
-    }
-    if (pinnedFields?.right && !pinnedFields.right.includes(field1) && pinnedFields.right.includes(field2)) {
-      return true;
+  const maxDepth = Math.max(0, ...orderedColumns.map(field => getParents(field).length));
+  const haveSameParents = (field1, field2, depth) => {
+    const a = getParents(field1);
+    const b = getParents(field2);
+    for (let i = 0; i <= depth; i += 1) {
+      if (a[i] !== b[i]) {
+        return false;
+      }
     }
-    return false;
+    return true;
+  };
+  const haveDifferentContainers = (field1, field2) => {
+    const left = pinnedFields?.left;
+    const right = pinnedFields?.right;
+    const inLeft1 = !!left?.includes(field1);
+    const inLeft2 = !!left?.includes(field2);
+    const inRight1 = !!right?.includes(field1);
+    const inRight2 = !!right?.includes(field2);
+    return inLeft1 !== inLeft2 || inRight1 !== inRight2;
   };
   for (let depth = 0; depth < maxDepth; depth += 1) {
-    const depthStructure = orderedColumns.reduce((structure, newField) => {
-      const groupId = getParents(newField)[depth] ?? null;
-      if (structure.length === 0) {
-        return [{
-          columnFields: [newField],
+    const depthStructure = [];
+    for (let i = 0; i < orderedColumns.length; i += 1) {
+      const field = orderedColumns[i];
+      const groupId = getParents(field)[depth] ?? null;
+      if (depthStructure.length === 0) {
+        depthStructure.push({
+          columnFields: [field],
           groupId
-        }];
+        });
+        continue;
       }
-      const lastGroup = structure[structure.length - 1];
+      const lastGroup = depthStructure[depthStructure.length - 1];
       const prevField = lastGroup.columnFields[lastGroup.columnFields.length - 1];
-      const prevGroupId = lastGroup.groupId;
-      if (prevGroupId !== groupId || !haveSameParents(prevField, newField, depth) ||
-      // Fix for https://github.com/mui/mui-x/issues/7041
-      haveDifferentContainers(prevField, newField)) {
-        // It's a new group
-        return [...structure, {
-          columnFields: [newField],
+      if (lastGroup.groupId !== groupId || !haveSameParents(prevField, field, depth) || haveDifferentContainers(prevField, field)) {
+        depthStructure.push({
+          columnFields: [field],
           groupId
-        }];
+        });
+      } else {
+        lastGroup.columnFields.push(field);
       }
-
-      // It extends the previous group
-      return [...structure.slice(0, structure.length - 1), {
-        columnFields: [...lastGroup.columnFields, newField],
-        groupId
-      }];
-    }, []);
+    }
     groupingHeaderStructure.push(depthStructure);
   }
   return groupingHeaderStructure;

package/esm/hooks/features/columnGrouping/useGridColumnGrouping.js

@@ -11,10 +11,11 @@ import { getColumnGroupsHeaderStructure, unwrapGroupingColumnModel } from "./gri
 import { useGridEvent } from "../../utils/useGridEvent.js";
 import { gridColumnFieldsSelector, gridVisibleColumnFieldsSelector } from "../columns/index.js";
 const createGroupLookup = columnGroupingModel => {
-  let groupLookup = {};
-  columnGroupingModel.forEach(node => {
+  const groupLookup = {};
+  for (let i = 0; i < columnGroupingModel.length; i += 1) {
+    const node = columnGroupingModel[i];
     if (isLeaf(node)) {
-      return;
+      continue;
     }
     const {
         groupId,
@@ -24,10 +25,8 @@ const createGroupLookup = columnGroupingModel => {
     if (!groupId) {
       throw new Error('MUI X: An element of the columnGroupingModel does not have either `field` or `groupId`.');
     }
-    if (process.env.NODE_ENV !== 'production') {
-      if (!children) {
-        console.warn(`MUI X: group groupId=${groupId} has no children.`);
-      }
+    if (process.env.NODE_ENV !== 'production' && !children) {
+      console.warn(`MUI X: group groupId=${groupId} has no children.`);
     }
     const groupParam = _extends({}, other, {
       groupId
@@ -36,13 +35,15 @@ const createGroupLookup = columnGroupingModel => {
     if (subTreeLookup[groupId] !== undefined || groupLookup[groupId] !== undefined) {
       throw new Error(`MUI X: The groupId ${groupId} is used multiple times in the columnGroupingModel.`);
     }
-    groupLookup = _extends({}, groupLookup, subTreeLookup, {
-      [groupId]: groupParam
-    });
-  });
-  return _extends({}, groupLookup);
+    Object.assign(groupLookup, subTreeLookup);
+    groupLookup[groupId] = groupParam;
+  }
+  return groupLookup;
 };
 export const columnGroupsStateInitializer = (state, props, apiRef) => {
+  apiRef.current.caches.columnGrouping = {
+    lastColumnGroupingModel: props.columnGroupingModel
+  };
   if (!props.columnGroupingModel) {
     return state;
   }
@@ -97,6 +98,7 @@ export const useGridColumnGrouping = (apiRef, props) => {
     });
   }, [apiRef, props.columnGroupingModel]);
   const updateColumnGroupingState = React.useCallback(columnGroupingModel => {
+    apiRef.current.caches.columnGrouping.lastColumnGroupingModel = columnGroupingModel;
     // @ts-expect-error Move this logic to `Pro` package
     const pinnedColumns = apiRef.current.getPinnedColumns?.() ?? {};
     const columnFields = gridColumnFieldsSelector(apiRef);
@@ -128,6 +130,9 @@ export const useGridColumnGrouping = (apiRef, props) => {
    * EFFECTS
    */
   React.useEffect(() => {
+    if (props.columnGroupingModel === apiRef.current.caches.columnGrouping.lastColumnGroupingModel) {
+      return;
+    }
     updateColumnGroupingState(props.columnGroupingModel);
-  }, [updateColumnGroupingState, props.columnGroupingModel]);
+  }, [apiRef, updateColumnGroupingState, props.columnGroupingModel]);
 };

package/esm/hooks/features/columns/gridColumnsInterfaces.d.ts

@@ -1,4 +1,4 @@
-import { GridColDef, GridStateColDef } from "../../../models/colDef/gridColDef.js";
+import type { GridColDef, GridStateColDef } from "../../../models/colDef/gridColDef.js";
 import type { GridColumnDimensionProperties } from "./gridColumnsUtils.js";
 export declare enum GridPinnedColumnPosition {
   LEFT = "left",
@@ -21,8 +21,8 @@ export interface GridPinnedColumnFields {
   right?: string[];
 }
 export declare const EMPTY_PINNED_COLUMN_FIELDS: {
-  left: string[];
-  right: string[];
+  left: never[];
+  right: never[];
 };
 export interface GridPinnedColumns {
   left: GridStateColDef[];

package/esm/hooks/features/columns/gridColumnsSelector.js

@@ -1,6 +1,7 @@
 import { createSelector, createSelectorMemoized, createRootSelector } from "../../../utils/createSelector.js";
 import { EMPTY_PINNED_COLUMN_FIELDS } from "./gridColumnsInterfaces.js";
 import { gridIsRtlSelector } from "../../core/gridCoreSelector.js";
+import { gridListColumnSelector, gridListViewSelector } from "../listView/index.js";
 
 /**
  * Get the columns state
@@ -45,7 +46,7 @@ export const gridInitialColumnVisibilityModelSelector = createSelector(gridColum
  * Get the visible columns as a lookup (an object containing the field for keys and the definition for values).
  * @category Visible Columns
  */
-export const gridVisibleColumnDefinitionsSelector = createSelectorMemoized(gridColumnDefinitionsSelector, gridColumnVisibilityModelSelector, (columns, columnVisibilityModel) => columns.filter(column => columnVisibilityModel[column.field] !== false));
+export const gridVisibleColumnDefinitionsSelector = createSelectorMemoized(gridColumnDefinitionsSelector, gridColumnVisibilityModelSelector, gridListViewSelector, gridListColumnSelector, (columns, columnVisibilityModel, listView, listColumn) => listView && listColumn ? [listColumn] : columns.filter(column => columnVisibilityModel[column.field] !== false));
 
 /**
  * Get the field of each visible column.
@@ -70,7 +71,10 @@ export const gridExistingPinnedColumnSelector = createSelectorMemoized(gridPinne
  * Get the visible pinned columns.
  * @category Visible Columns
  */
-export const gridVisiblePinnedColumnDefinitionsSelector = createSelectorMemoized(gridColumnsStateSelector, gridPinnedColumnsSelector, gridVisibleColumnFieldsSelector, gridIsRtlSelector, (columnsState, model, visibleColumnFields, isRtl) => {
+export const gridVisiblePinnedColumnDefinitionsSelector = createSelectorMemoized(gridColumnsStateSelector, gridPinnedColumnsSelector, gridVisibleColumnFieldsSelector, gridIsRtlSelector, gridListViewSelector, (columnsState, model, visibleColumnFields, isRtl, listView) => {
+  if (listView) {
+    return EMPTY_PINNED_COLUMN_FIELDS;
+  }
   const visiblePinnedFields = filterMissingColumns(model, visibleColumnFields, isRtl);
   const visiblePinnedColumns = {
     left: visiblePinnedFields.left.map(field => columnsState.lookup[field]),

package/esm/hooks/features/columns/gridColumnsUtils.js

@@ -242,11 +242,13 @@ export const createColumnsState = ({
       initialColumnVisibilityModel: updateInitialVisibilityModel ? columnVisibilityModel : currentState.initialColumnVisibilityModel
     };
   }
-  let columnsToKeep = {};
+  const columnsToKeep = {};
   if (keepOnlyColumnsToUpsert && !isInsideStateInitializer) {
-    columnsToKeep = Object.keys(columnsState.lookup).reduce((acc, key) => _extends({}, acc, {
-      [key]: false
-    }), {});
+    for (const key in columnsState.lookup) {
+      if (Object.prototype.hasOwnProperty.call(columnsState.lookup, key)) {
+        columnsToKeep[key] = false;
+      }
+    }
   }
   const columnsToUpsertLookup = {};
   columnsToUpsert.forEach(newColumn => {

package/esm/hooks/features/columns/useGridColumns.js

@@ -14,6 +14,9 @@ import { GridPreferencePanelsValue } from "../preferencesPanel/index.js";
 import { gridPivotActiveSelector } from "../pivoting/index.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 export const columnsStateInitializer = (state, props, apiRef) => {
+  apiRef.current.caches.columns = {
+    lastColumnsProp: props.columns
+  };
   const columnsState = createColumnsState({
     apiRef,
     columnsToUpsert: props.columns,
@@ -36,7 +39,6 @@ export const columnsStateInitializer = (state, props, apiRef) => {
  */
 export function useGridColumns(apiRef, props) {
   const logger = useGridLogger(apiRef, 'useGridColumns');
-  const previousColumnsProp = React.useRef(props.columns);
   apiRef.current.registerControlState({
     stateId: 'visibleColumns',
     propModel: props.columnVisibilityModel,
@@ -299,27 +301,23 @@ export function useGridColumns(apiRef, props) {
    */
   // The effect do not track any value defined synchronously during the 1st render by hooks called after `useGridColumns`
   // As a consequence, the state generated by the 1st run of this useEffect will always be equal to the initialization one
-  const isFirstRender = React.useRef(true);
   React.useEffect(() => {
-    if (isFirstRender.current) {
-      isFirstRender.current = false;
+    if (apiRef.current.caches.columns.lastColumnsProp === props.columns) {
       return;
     }
+    apiRef.current.caches.columns.lastColumnsProp = props.columns;
     logger.info(`GridColumns have changed, new length ${props.columns.length}`);
-    if (previousColumnsProp.current === props.columns) {
-      return;
-    }
     const columnsState = createColumnsState({
       apiRef,
       initialState: undefined,
       // If the user provides a model, we don't want to set it in the state here because it has it's dedicated `useEffect` which calls `setColumnVisibilityModel`
       columnsToUpsert: props.columns,
       keepOnlyColumnsToUpsert: true,
-      updateInitialVisibilityModel: true
+      updateInitialVisibilityModel: true,
+      columnVisibilityModel: props.columnVisibilityModel
     });
-    previousColumnsProp.current = props.columns;
     setGridColumnsState(columnsState);
-  }, [logger, apiRef, setGridColumnsState, props.columns]);
+  }, [logger, apiRef, setGridColumnsState, props.columns, props.columnVisibilityModel]);
   React.useEffect(() => {
     if (props.columnVisibilityModel !== undefined) {
       apiRef.current.setColumnVisibilityModel(props.columnVisibilityModel);

package/esm/hooks/features/export/utils.js

@@ -17,7 +17,7 @@ export const getColumnsToExport = ({
     }, []);
   }
   const validColumns = options.allColumns ? columns : gridVisibleColumnDefinitionsSelector(apiRef);
-  return validColumns.filter(column => !column.disableExport);
+  return validColumns.filter(column => column.disableExport !== true);
 };
 export const defaultGetRowsToExport = ({
   apiRef

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

@@ -342,9 +342,9 @@ export const useGridFilter = (apiRef, props) => {
   useGridEvent(apiRef, 'rowExpansionChange', updateVisibleRowsLookupState);
   useGridEvent(apiRef, 'columnVisibilityModelChange', () => {
     const filterModel = gridFilterModelSelector(apiRef);
-    if (filterModel.quickFilterValues && shouldQuickFilterExcludeHiddenColumns(filterModel)) {
+    if (filterModel.quickFilterValues?.length && shouldQuickFilterExcludeHiddenColumns(filterModel)) {
       // re-apply filters because the quick filter results may have changed
-      apiRef.current.unstable_applyFilters();
+      updateFilteredRows();
     }
   });
 
@@ -352,7 +352,7 @@ export const useGridFilter = (apiRef, props) => {
    * 1ST RENDER
    */
   useFirstRender(() => {
-    apiRef.current.unstable_applyFilters();
+    updateFilteredRows();
   });
 
   /**

package/esm/hooks/features/keyboardNavigation/useGridKeyboardNavigation.d.ts

@@ -10,4 +10,4 @@ import { DataGridProcessedProps } from "../../../models/props/DataGridProps.js";
  * @requires useGridScroll (method) - can be after
  * @requires useGridColumnSpanning (method) - can be after
  */
-export declare const useGridKeyboardNavigation: (apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, "pagination" | "paginationMode" | "getRowId" | "signature" | "headerFilters" | "listView">) => void;
+export declare const useGridKeyboardNavigation: (apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, "pagination" | "paginationMode" | "getRowId" | "signature" | "headerFilters">) => void;

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

@@ -16,7 +16,6 @@ import { gridHeaderFilteringEditFieldSelector, gridHeaderFilteringMenuSelector }
 import { useGridRegisterPipeProcessor } from "../../core/pipeProcessing/index.js";
 import { isEventTargetInPortal } from "../../../utils/domUtils.js";
 import { getLeftColumnIndex, getRightColumnIndex, findNonRowSpannedCell } from "./utils.js";
-import { gridListColumnSelector } from "../listView/gridListViewSelectors.js";
 import { createSelectorMemoized } from "../../../utils/createSelector.js";
 import { gridVisibleRowsSelector } from "../pagination/index.js";
 import { gridPinnedRowsSelector } from "../rows/gridRowsSelector.js";
@@ -36,7 +35,6 @@ const gridVisibleRowsWithPinnedRowsSelector = createSelectorMemoized(gridVisible
 export const useGridKeyboardNavigation = (apiRef, props) => {
   const logger = useGridLogger(apiRef, 'useGridKeyboardNavigation');
   const isRtl = useRtl();
-  const listView = props.listView;
   const getCurrentPageRows = React.useCallback(() => {
     return gridVisibleRowsWithPinnedRowsSelector(apiRef);
   }, [apiRef]);
@@ -59,7 +57,7 @@ export const useGridKeyboardNavigation = (apiRef, props) => {
         colIndex = nextCellColSpanInfo.rightVisibleCellIndex;
       }
     }
-    const field = listView ? gridListColumnSelector(apiRef).field : gridVisibleColumnFieldsSelector(apiRef)[colIndex];
+    const field = gridVisibleColumnFieldsSelector(apiRef)[colIndex];
     const nonRowSpannedRowId = findNonRowSpannedCell(apiRef, rowId, field, rowSpanScanDirection);
     // `scrollToIndexes` requires a rowIndex relative to all visible rows.
     // Those rows do not include pinned rows, but pinned rows do not need scroll anyway.
@@ -70,7 +68,7 @@ export const useGridKeyboardNavigation = (apiRef, props) => {
       rowIndex: rowIndexRelativeToAllRows
     });
     apiRef.current.setCellFocus(nonRowSpannedRowId, field);
-  }, [apiRef, logger, listView]);
+  }, [apiRef, logger]);
   const goToHeader = React.useCallback((colIndex, event) => {
     logger.debug(`Navigating to header col ${colIndex}`);
     apiRef.current.scrollToIndexes({
@@ -395,14 +393,12 @@ export const useGridKeyboardNavigation = (apiRef, props) => {
       return;
     }
     const viewportPageSize = apiRef.current.getViewportPageSize();
-    const getColumnIndexFn = listView ? () => 0 : apiRef.current.getColumnIndex;
-    const colIndexBefore = params.field ? getColumnIndexFn(params.field) : 0;
+    const colIndexBefore = params.field ? apiRef.current.getColumnIndex(params.field) : 0;
     const rowIndexBefore = currentPageRows.findIndex(row => row.id === params.id);
     const firstRowIndexInPage = 0;
     const lastRowIndexInPage = currentPageRows.length - 1;
     const firstColIndex = 0;
-    const visibleColumns = listView ? [gridListColumnSelector(apiRef)] : gridVisibleColumnDefinitionsSelector(apiRef);
-    const lastColIndex = visibleColumns.length - 1;
+    const lastColIndex = gridVisibleColumnDefinitionsSelector(apiRef).length - 1;
     let shouldPreventDefault = true;
     switch (event.key) {
       case 'ArrowDown':
@@ -519,7 +515,7 @@ export const useGridKeyboardNavigation = (apiRef, props) => {
     if (shouldPreventDefault) {
       event.preventDefault();
     }
-  }, [apiRef, getCurrentPageRows, isRtl, goToCell, getRowIdFromIndex, headerFilteringEnabled, goToHeaderFilter, goToHeader, listView]);
+  }, [apiRef, getCurrentPageRows, isRtl, goToCell, getRowIdFromIndex, headerFilteringEnabled, goToHeaderFilter, goToHeader]);
   const checkIfCanStartEditing = React.useCallback((initialValue, {
     event
   }) => {

package/esm/hooks/features/listView/gridListViewSelectors.d.ts

@@ -1,7 +1,14 @@
 import { GridStateCommunity } from "../../../models/gridStateCommunity.js";
+import type { GridStateColDef } from "../../../models/colDef/gridColDef.js";
+/**
+ * Get the list view state
+ * @category List View
+ * @ignore - Do not document
+ */
+export declare const gridListViewSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, unknown, boolean>;
 /**
  * Get the list column definition
  * @category List View
  * @ignore - Do not document
  */
-export declare const gridListColumnSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, unknown, import("./useGridListView.js").GridListViewState>;
+export declare const gridListColumnSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, unknown, GridStateColDef>;

package/esm/hooks/features/listView/gridListViewSelectors.js

@@ -1,4 +1,11 @@
 import { createRootSelector } from "../../../utils/createSelector.js";
+/**
+ * Get the list view state
+ * @category List View
+ * @ignore - Do not document
+ */
+export const gridListViewSelector = createRootSelector(state => state.props.listView ?? false);
+
 /**
  * Get the list column definition
  * @category List View

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

@@ -299,12 +299,13 @@ export const useGridRowSelection = (apiRef, props) => {
     }
     const currentSelection = gridRowSelectionStateSelector(apiRef);
     const rowsLookup = gridRowsLookupSelector(apiRef);
+    const rowTree = gridRowTreeSelector(apiRef);
     const filteredRowsLookup = gridFilteredRowsLookupSelector(apiRef);
     const isNonExistent = id => {
       if (props.filterMode === 'server') {
         return !rowsLookup[id];
       }
-      return !rowsLookup[id] || filteredRowsLookup[id] === false;
+      return !rowTree[id] || filteredRowsLookup[id] === false;
     };
     const newSelectionModel = {
       type: currentSelection.type,
@@ -430,15 +431,15 @@ export const useGridRowSelection = (apiRef, props) => {
     const filterModel = gridFilterModelSelector(apiRef);
     const quickFilterModel = gridQuickFilterValuesSelector(apiRef);
     const hasFilters = filterModel.items.length > 0 || quickFilterModel?.some(val => val.length);
-    if (!props.isRowSelectable && !props.checkboxSelectionVisibleOnly && applyAutoSelection && !hasFilters) {
+    if (!props.isRowSelectable && !props.checkboxSelectionVisibleOnly && (!isNestedData || props.rowSelectionPropagation?.descendants) && !hasFilters) {
       apiRef.current.setRowSelectionModel({
         type: value ? 'exclude' : 'include',
         ids: new Set()
-      });
+      }, 'multipleRowsSelection');
     } else {
       apiRef.current.selectRows(getRowsToBeSelected(), value);
     }
-  }, [apiRef, applyAutoSelection, getRowsToBeSelected, props.checkboxSelectionVisibleOnly, props.isRowSelectable]);
+  }, [apiRef, getRowsToBeSelected, props.checkboxSelectionVisibleOnly, props.isRowSelectable, props.rowSelectionPropagation?.descendants, isNestedData]);
   const handleHeaderSelectionCheckboxChange = React.useCallback(params => {
     toggleAllRows(params.value);
   }, [toggleAllRows]);

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

@@ -42,7 +42,7 @@ export declare const getRowsStateFromCache: ({
 }) => GridRowsState;
 export declare const isAutogeneratedRow: (row: GridRowModel) => boolean;
 export declare const isAutogeneratedRowNode: (rowNode: GridTreeNode) => rowNode is GridFooterNode | GridSkeletonRowNode | GridAutoGeneratedGroupNode | GridAutoGeneratedPinnedRowNode;
-export declare const getTreeNodeDescendants: (tree: GridRowTreeConfig, parentId: GridRowId, skipAutoGeneratedRows: boolean) => GridRowId[];
+export declare const getTreeNodeDescendants: (tree: GridRowTreeConfig, parentId: GridRowId, skipAutoGeneratedRows: boolean, directChildrenOnly?: boolean) => GridRowId[];
 export declare const updateCacheWithNewRows: ({
   previousCache,
   getRowId,

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

@@ -127,7 +127,7 @@ export const getRowsStateFromCache = ({
 };
 export const isAutogeneratedRow = row => GRID_ID_AUTOGENERATED in row;
 export const isAutogeneratedRowNode = rowNode => rowNode.type === 'skeletonRow' || rowNode.type === 'footer' || rowNode.type === 'group' && rowNode.isAutoGenerated || rowNode.type === 'pinnedRow' && rowNode.isAutoGenerated;
-export const getTreeNodeDescendants = (tree, parentId, skipAutoGeneratedRows) => {
+export const getTreeNodeDescendants = (tree, parentId, skipAutoGeneratedRows, directChildrenOnly) => {
   const node = tree[parentId];
   if (node.type !== 'group') {
     return [];
@@ -138,7 +138,10 @@ export const getTreeNodeDescendants = (tree, parentId, skipAutoGeneratedRows) =>
     if (!skipAutoGeneratedRows || !isAutogeneratedRowNode(tree[child])) {
       validDescendants.push(child);
     }
-    const childDescendants = getTreeNodeDescendants(tree, child, skipAutoGeneratedRows);
+    if (directChildrenOnly) {
+      continue;
+    }
+    const childDescendants = getTreeNodeDescendants(tree, child, skipAutoGeneratedRows, directChildrenOnly);
     for (let j = 0; j < childDescendants.length; j += 1) {
       validDescendants.push(childDescendants[j]);
     }

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

@@ -198,7 +198,8 @@ export const useGridRows = (apiRef, props) => {
     skipAutoGeneratedRows = true,
     groupId,
     applySorting,
-    applyFiltering
+    applyFiltering,
+    directChildrenOnly = false
   }) => {
     const tree = gridRowTreeSelector(apiRef);
     let children;
@@ -210,14 +211,14 @@ export const useGridRows = (apiRef, props) => {
       const sortedRowIds = gridSortedRowIdsSelector(apiRef);
       children = [];
       const startIndex = sortedRowIds.findIndex(id => id === groupId) + 1;
-      for (let index = startIndex; index < sortedRowIds.length && tree[sortedRowIds[index]].depth > groupNode.depth; index += 1) {
+      for (let index = startIndex; index < sortedRowIds.length && (directChildrenOnly ? tree[sortedRowIds[index]].depth === groupNode.depth + 1 : tree[sortedRowIds[index]].depth > groupNode.depth); index += 1) {
         const id = sortedRowIds[index];
         if (!skipAutoGeneratedRows || !isAutogeneratedRowNode(tree[id])) {
           children.push(id);
         }
       }
     } else {
-      children = getTreeNodeDescendants(tree, groupId, skipAutoGeneratedRows);
+      children = getTreeNodeDescendants(tree, groupId, skipAutoGeneratedRows, directChildrenOnly);
     }
     if (applyFiltering) {
       const filteredRowsLookup = gridFilteredRowsLookupSelector(apiRef);

package/esm/hooks/features/scroll/useGridScroll.d.ts

@@ -9,4 +9,4 @@ import { DataGridProcessedProps } from "../../../models/props/DataGridProps.js";
  * @requires useGridFilter (state)
  * @requires useGridColumnSpanning (method)
  */
-export declare const useGridScroll: (apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, "pagination" | "listView">) => void;
+export declare const useGridScroll: (apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, "pagination">) => void;

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

@@ -9,7 +9,6 @@ import { gridRowsMetaSelector } from "../rows/gridRowsMetaSelector.js";
 import { useGridApiMethod } from "../../utils/useGridApiMethod.js";
 import { gridExpandedSortedRowEntriesSelector } from "../filter/gridFilterSelector.js";
 import { gridDimensionsSelector } from "../dimensions/index.js";
-import { gridListColumnSelector } from "../listView/gridListViewSelectors.js";
 
 // 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
@@ -52,7 +51,7 @@ export const useGridScroll = (apiRef, props) => {
   const scrollToIndexes = React.useCallback(params => {
     const dimensions = gridDimensionsSelector(apiRef);
     const totalRowCount = gridRowCountSelector(apiRef);
-    const visibleColumns = props.listView ? [gridListColumnSelector(apiRef)] : gridVisibleColumnDefinitionsSelector(apiRef);
+    const visibleColumns = gridVisibleColumnDefinitionsSelector(apiRef);
     const scrollToHeader = params.rowIndex == null;
     if (!scrollToHeader && totalRowCount === 0 || visibleColumns.length === 0) {
       return false;
@@ -99,7 +98,7 @@ export const useGridScroll = (apiRef, props) => {
       return true;
     }
     return false;
-  }, [logger, apiRef, virtualScrollerRef, props.pagination, visibleSortedRows, props.listView]);
+  }, [logger, apiRef, virtualScrollerRef, props.pagination, visibleSortedRows]);
   const scroll = React.useCallback(params => {
     if (virtualScrollerRef.current && params.left !== undefined && colRef.current) {
       const direction = isRtl ? -1 : 1;