@mui/x-data-grid 7.12.1 → 7.13.0

package/hooks/features/rows/useGridRowAriaAttributes.js

@@ -0,0 +1,19 @@
+import * as React from 'react';
+import { selectedIdsLookupSelector } from '../rowSelection';
+import { useGridSelector } from '../../utils/useGridSelector';
+import { gridColumnGroupsHeaderMaxDepthSelector } from '../columnGrouping/gridColumnGroupsSelector';
+import { useGridPrivateApiContext } from '../../utils/useGridPrivateApiContext';
+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;
+    }
+    return ariaAttributes;
+  }, [apiRef, selectedIdsLookup, headerGroupingMaxDepth]);
+};

package/hooks/utils/useGridAriaAttributes.d.ts

@@ -1,6 +1,2 @@
-export declare const useGridAriaAttributes: () => {
-    role: string;
-    'aria-colcount': number;
-    'aria-rowcount': number;
-    'aria-multiselectable': boolean;
-};
+import * as React from 'react';
+export declare const useGridAriaAttributes: () => React.HTMLAttributes<HTMLElement>;

package/hooks/utils/useGridAriaAttributes.js

@@ -2,24 +2,21 @@ import { gridVisibleColumnDefinitionsSelector } from '../features/columns/gridCo
 import { useGridSelector } from './useGridSelector';
 import { useGridRootProps } from './useGridRootProps';
 import { gridColumnGroupsHeaderMaxDepthSelector } from '../features/columnGrouping/gridColumnGroupsSelector';
-import { gridPinnedRowsCountSelector, gridRowCountSelector } from '../features/rows/gridRowsSelector';
+import { gridPinnedRowsCountSelector } from '../features/rows/gridRowsSelector';
 import { useGridPrivateApiContext } from './useGridPrivateApiContext';
 import { isMultipleRowSelectionEnabled } from '../features/rowSelection/utils';
+import { gridExpandedRowCountSelector } from '../features/filter/gridFilterSelector';
 export const useGridAriaAttributes = () => {
   const apiRef = useGridPrivateApiContext();
   const rootProps = useGridRootProps();
   const visibleColumns = useGridSelector(apiRef, gridVisibleColumnDefinitionsSelector);
-  const totalRowCount = useGridSelector(apiRef, gridRowCountSelector);
+  const accessibleRowCount = useGridSelector(apiRef, gridExpandedRowCountSelector);
   const headerGroupingMaxDepth = useGridSelector(apiRef, gridColumnGroupsHeaderMaxDepthSelector);
   const pinnedRowsCount = useGridSelector(apiRef, gridPinnedRowsCountSelector);
-  let role = 'grid';
-  if (rootProps.treeData) {
-    role = 'treegrid';
-  }
   return {
-    role,
+    role: 'grid',
     'aria-colcount': visibleColumns.length,
-    'aria-rowcount': headerGroupingMaxDepth + 1 + pinnedRowsCount + totalRowCount,
+    'aria-rowcount': headerGroupingMaxDepth + 1 + pinnedRowsCount + accessibleRowCount,
     'aria-multiselectable': isMultipleRowSelectionEnabled(rootProps)
   };
 };

package/hooks/utils/useGridConfiguration.d.ts

@@ -0,0 +1,2 @@
+import { GridConfiguration } from '../../models/configuration/gridConfiguration';
+export declare const useGridConfiguration: () => GridConfiguration;

package/hooks/utils/useGridConfiguration.js

@@ -0,0 +1,9 @@
+import * as React from 'react';
+import { GridConfigurationContext } from '../../components/GridConfigurationContext';
+export const useGridConfiguration = () => {
+  const configuration = React.useContext(GridConfigurationContext);
+  if (configuration === undefined) {
+    throw new Error(['MUI X: Could not find the data grid configuration context.', 'It looks like you rendered your component outside of a DataGrid, DataGridPro or DataGridPremium parent component.', 'This can also happen if you are bundling multiple versions of the data grid.'].join('\n'));
+  }
+  return configuration;
+};

package/hooks/utils/useGridSelector.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
+import { fastObjectShallowCompare } from '@mui/x-internals/fastObjectShallowCompare';
 import type { GridApiCommon } from '../../models/api/gridApiCommon';
 import { OutputSelector } from '../../utils/createSelector';
-import { fastObjectShallowCompare } from '../../utils/fastObjectShallowCompare';
 export declare const objectShallowCompare: typeof fastObjectShallowCompare;
 export declare const useGridSelector: <Api extends GridApiCommon, T>(apiRef: React.MutableRefObject<Api>, selector: ((state: Api["state"]) => T) | OutputSelector<Api["state"], T>, equals?: (a: T, b: T) => boolean) => T;

package/hooks/utils/useGridSelector.js

@@ -1,8 +1,8 @@
 import * as React from 'react';
+import { fastObjectShallowCompare } from '@mui/x-internals/fastObjectShallowCompare';
 import { useLazyRef } from './useLazyRef';
 import { useOnMount } from './useOnMount';
 import { warnOnce } from '../../internals/utils/warning';
-import { fastObjectShallowCompare } from '../../utils/fastObjectShallowCompare';
 function isOutputSelector(selector) {
   return selector.acceptsApiRef;
 }

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v7.12.1
+ * @mui/x-data-grid v7.13.0
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/internals/index.d.ts

@@ -31,6 +31,7 @@ export { useGridCsvExport } from '../hooks/features/export/useGridCsvExport';
 export { useGridPrintExport } from '../hooks/features/export/useGridPrintExport';
 export { useGridFilter, filterStateInitializer } from '../hooks/features/filter/useGridFilter';
 export { passFilterLogic } from '../hooks/features/filter/gridFilterUtils';
+export { gridFilteredChildrenCountLookupSelector, gridExpandedSortedRowTreeLevelPositionLookupSelector, } from '../hooks/features/filter/gridFilterSelector';
 export { isSingleSelectColDef } from '../components/panel/filterPanel/filterPanelUtils';
 export type { GridAggregatedFilterItemApplier, GridAggregatedFilterItemApplierResult, } from '../hooks/features/filter/gridFilterState';
 export { useGridFocus, focusStateInitializer } from '../hooks/features/focus/useGridFocus';
@@ -40,6 +41,8 @@ export { useGridPreferencesPanel, preferencePanelStateInitializer, } from '../ho
 export { useGridEditing, editingStateInitializer } from '../hooks/features/editing/useGridEditing';
 export { gridEditRowsStateSelector } from '../hooks/features/editing/gridEditingSelectors';
 export { useGridRows, rowsStateInitializer } from '../hooks/features/rows/useGridRows';
+export { useGridAriaAttributes } from '../hooks/utils/useGridAriaAttributes';
+export { useGridRowAriaAttributes } from '../hooks/features/rows/useGridRowAriaAttributes';
 export { useGridRowsPreProcessors } from '../hooks/features/rows/useGridRowsPreProcessors';
 export type { GridRowTreeCreationParams, GridRowTreeCreationValue, GridHydrateRowsValue, GridRowsPartialUpdates, GridRowsPartialUpdateAction, GridTreeDepths, GridRowTreeUpdatedGroupsManager, GridRowTreeUpdateGroupAction, GridPinnedRowsState, } from '../hooks/features/rows/gridRowsInterfaces';
 export { getTreeNodeDescendants, buildRootGroup } from '../hooks/features/rows/gridRowsUtils';
@@ -74,7 +77,6 @@ export { gridRowGroupsToFetchSelector } from '../hooks/features/rows/gridRowsSel
 export { findParentElementFromClassName, getActiveElement, isEventTargetInPortal, } from '../utils/domUtils';
 export { isNavigationKey, isPasteShortcut } from '../utils/keyboardUtils';
 export * from '../utils/utils';
-export * from '../utils/fastMemo';
 export { exportAs } from '../utils/exportAs';
 export * from '../utils/getPublicApiRef';
 export * from '../utils/cellBorderUtils';

package/internals/index.js

@@ -23,6 +23,7 @@ export { useGridCsvExport } from '../hooks/features/export/useGridCsvExport';
 export { useGridPrintExport } from '../hooks/features/export/useGridPrintExport';
 export { useGridFilter, filterStateInitializer } from '../hooks/features/filter/useGridFilter';
 export { passFilterLogic } from '../hooks/features/filter/gridFilterUtils';
+export { gridFilteredChildrenCountLookupSelector, gridExpandedSortedRowTreeLevelPositionLookupSelector } from '../hooks/features/filter/gridFilterSelector';
 export { isSingleSelectColDef } from '../components/panel/filterPanel/filterPanelUtils';
 export { useGridFocus, focusStateInitializer } from '../hooks/features/focus/useGridFocus';
 export { useGridKeyboardNavigation } from '../hooks/features/keyboardNavigation/useGridKeyboardNavigation';
@@ -31,6 +32,8 @@ export { useGridPreferencesPanel, preferencePanelStateInitializer } from '../hoo
 export { useGridEditing, editingStateInitializer } from '../hooks/features/editing/useGridEditing';
 export { gridEditRowsStateSelector } from '../hooks/features/editing/gridEditingSelectors';
 export { useGridRows, rowsStateInitializer } from '../hooks/features/rows/useGridRows';
+export { useGridAriaAttributes } from '../hooks/utils/useGridAriaAttributes';
+export { useGridRowAriaAttributes } from '../hooks/features/rows/useGridRowAriaAttributes';
 export { useGridRowsPreProcessors } from '../hooks/features/rows/useGridRowsPreProcessors';
 export { getTreeNodeDescendants, buildRootGroup } from '../hooks/features/rows/gridRowsUtils';
 export { useGridRowsMeta, rowsMetaStateInitializer } from '../hooks/features/rows/useGridRowsMeta';
@@ -59,7 +62,6 @@ export { gridRowGroupsToFetchSelector } from '../hooks/features/rows/gridRowsSel
 export { findParentElementFromClassName, getActiveElement, isEventTargetInPortal } from '../utils/domUtils';
 export { isNavigationKey, isPasteShortcut } from '../utils/keyboardUtils';
 export * from '../utils/utils';
-export * from '../utils/fastMemo';
 export { exportAs } from '../utils/exportAs';
 export * from '../utils/getPublicApiRef';
 export * from '../utils/cellBorderUtils';

package/locales/viVN.js

@@ -30,11 +30,10 @@ const viVNGrid = {
   toolbarExportPrint: 'In',
   toolbarExportExcel: 'Xuất Excel',
   // Columns management text
-  // columnsManagementSearchTitle: 'Search',
-  // columnsManagementNoColumns: 'No columns',
-  // columnsManagementShowHideAllText: 'Show/Hide All',
-  // columnsManagementReset: 'Reset',
-
+  columnsManagementSearchTitle: 'Tìm kiếm',
+  columnsManagementNoColumns: 'Không có cột',
+  columnsManagementShowHideAllText: 'Hiện/Ẩn Tất cả',
+  columnsManagementReset: 'Đặt lại',
   // Filter panel text
   filterPanelAddFilter: 'Thêm bộ lọc',
   filterPanelRemoveAll: 'Xóa tất cả',

package/models/configuration/gridConfiguration.d.ts

@@ -0,0 +1,10 @@
+import * as React from 'react';
+import { GridRowAriaAttributesInternalHook } from './gridRowConfiguration';
+export interface GridAriaAttributesInternalHook {
+    useGridAriaAttributes: () => React.HTMLAttributes<HTMLElement>;
+}
+export interface GridInternalHook extends GridAriaAttributesInternalHook, GridRowAriaAttributesInternalHook {
+}
+export interface GridConfiguration {
+    hooks: GridInternalHook;
+}

package/models/configuration/gridConfiguration.js

@@ -0,0 +1 @@
+export {};

package/models/configuration/gridRowConfiguration.d.ts

@@ -0,0 +1,12 @@
+import * as React from 'react';
+import { GridTreeNode } from '../gridRows';
+/**
+ * Get the ARIA attributes for a row
+ * @param {GridTreeNode} rowNode The row node
+ * @param {number} index The position index of the row
+ * @returns {React.HTMLAttributes<HTMLElement>} The ARIA attributes
+ */
+export type GetRowAriaAttributesFn = (rowNode: GridTreeNode, index: number) => React.HTMLAttributes<HTMLElement>;
+export interface GridRowAriaAttributesInternalHook {
+    useGridRowAriaAttributes: () => GetRowAriaAttributesFn;
+}

package/models/configuration/gridRowConfiguration.js

@@ -0,0 +1 @@
+export {};

package/models/gridDataSource.d.ts

@@ -63,7 +63,8 @@ export interface GridDataSource {
     /**
      * Used to determine the number of children a row has on server.
      * @param {GridRowModel} row The row to check the number of children
-     * @returns {number} The number of children the row has
+     * @returns {number} The number of children the row has.
+     * If the children count is not available for some reason, but there are some children, `getChildrenCount` should return `-1`.
      */
     getChildrenCount?: (row: GridRowModel) => number;
 }

package/models/gridRows.d.ts

@@ -104,9 +104,9 @@ export interface GridDataGroupNode extends GridBasicGroupNode {
 }
 export interface GridDataSourceGroupNode extends GridDataGroupNode {
     /**
-     * If true, this node has children on server.
+     * Number of children this node has on the server. Equals to `-1` if there are some children but the count is unknown.
      */
-    hasServerChildren: boolean;
+    serverChildrenCount: number;
     /**
      * The cached path to be passed on as `groupKey` to the server.
      */

package/models/props/DataGridProps.d.ts

@@ -441,7 +441,7 @@ export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel =
     /**
      * Determines if a row can be selected.
      * @param {GridRowParams} params With all properties from [[GridRowParams]].
-     * @returns {boolean} A boolean indicating if the cell is selectable.
+     * @returns {boolean} A boolean indicating if the row is selectable.
      */
     isRowSelectable?: (params: GridRowParams<R>) => boolean;
     /**

package/modern/DataGrid/DataGrid.js

@@ -4,11 +4,19 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { GridBody, GridFooterPlaceholder, GridHeader, GridRoot } from '../components';
+import { useGridAriaAttributes } from '../hooks/utils/useGridAriaAttributes';
+import { useGridRowAriaAttributes } from '../hooks/features/rows/useGridRowAriaAttributes';
 import { GridContextProvider } from '../context/GridContextProvider';
 import { useDataGridComponent } from './useDataGridComponent';
 import { useDataGridProps } from './useDataGridProps';
 import { propValidatorsDataGrid, validateProps } from '../internals/utils/propValidation';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const configuration = {
+  hooks: {
+    useGridAriaAttributes,
+    useGridRowAriaAttributes
+  }
+};
 let propValidators;
 if (process.env.NODE_ENV !== 'production') {
   propValidators = [...propValidatorsDataGrid,
@@ -23,6 +31,7 @@ const DataGridRaw = /*#__PURE__*/React.forwardRef(function DataGrid(inProps, ref
   }
   return /*#__PURE__*/_jsx(GridContextProvider, {
     privateApiRef: privateApiRef,
+    configuration: configuration,
     props: props,
     children: /*#__PURE__*/_jsxs(GridRoot, _extends({
       className: props.className,
@@ -321,7 +330,7 @@ DataGridRaw.propTypes = {
   /**
    * Determines if a row can be selected.
    * @param {GridRowParams} params With all properties from [[GridRowParams]].
-   * @returns {boolean} A boolean indicating if the cell is selectable.
+   * @returns {boolean} A boolean indicating if the row is selectable.
    */
   isRowSelectable: PropTypes.func,
   /**

package/modern/components/GridColumnHeaders.js

@@ -3,7 +3,7 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 const _excluded = ["className", "visibleColumns", "sortColumnLookup", "filterColumnLookup", "columnHeaderTabIndexState", "columnGroupHeaderTabIndexState", "columnHeaderFocus", "columnGroupHeaderFocus", "headerGroupingMaxDepth", "columnMenuState", "columnVisibility", "columnGroupsHeaderStructure", "hasOtherElementInTabSequence"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { fastMemo } from '../utils/fastMemo';
+import { fastMemo } from '@mui/x-internals/fastMemo';
 import { useGridColumnHeaders } from '../hooks/features/columnHeaders/useGridColumnHeaders';
 import { GridBaseColumnHeaders } from './columnHeaders/GridBaseColumnHeaders';
 import { jsxs as _jsxs } from "react/jsx-runtime";

package/modern/components/GridConfigurationContext.js

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export const GridConfigurationContext = /*#__PURE__*/React.createContext(undefined);
+if (process.env.NODE_ENV !== 'production') {
+  GridConfigurationContext.displayName = 'GridConfigurationContext';
+}

package/modern/components/GridHeaders.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
-import { fastMemo } from '../utils/fastMemo';
+import { fastMemo } from '@mui/x-internals/fastMemo';
 import { useGridPrivateApiContext } from '../hooks/utils/useGridPrivateApiContext';
 import { useGridSelector } from '../hooks/utils/useGridSelector';
 import { useGridRootProps } from '../hooks/utils/useGridRootProps';

package/modern/components/GridRow.js

@@ -5,7 +5,7 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { unstable_useForkRef as useForkRef } from '@mui/utils';
-import { fastMemo } from '../utils/fastMemo';
+import { fastMemo } from '@mui/x-internals/fastMemo';
 import { GridEditModes, GridRowModes, GridCellModes } from '../models/gridEditRowModel';
 import { useGridApiContext } from '../hooks/utils/useGridApiContext';
 import { gridClasses } from '../constants/gridClasses';
@@ -20,11 +20,11 @@ import { GRID_ACTIONS_COLUMN_TYPE } from '../colDef/gridActionsColDef';
 import { GRID_DETAIL_PANEL_TOGGLE_FIELD } from '../constants/gridDetailPanelToggleField';
 import { gridSortModelSelector } from '../hooks/features/sorting/gridSortingSelector';
 import { gridRowMaximumTreeDepthSelector } from '../hooks/features/rows/gridRowsSelector';
-import { gridColumnGroupsHeaderMaxDepthSelector } from '../hooks/features/columnGrouping/gridColumnGroupsSelector';
 import { gridEditRowsStateSelector } from '../hooks/features/editing/gridEditingSelectors';
 import { PinnedPosition, gridPinnedColumnPositionLookup } from './cell/GridCell';
 import { GridScrollbarFillerCell as ScrollbarFiller } from './GridScrollbarFillerCell';
 import { getPinnedCellOffset } from '../internals/utils/getPinnedCellOffset';
+import { useGridConfiguration } from '../hooks/utils/useGridConfiguration';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function EmptyCell({
   width
@@ -68,12 +68,12 @@ const GridRow = /*#__PURE__*/React.forwardRef(function GridRow(props, refProp) {
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const apiRef = useGridApiContext();
+  const configuration = useGridConfiguration();
   const ref = React.useRef(null);
   const rootProps = useGridRootProps();
   const currentPage = useGridVisibleRows(apiRef, rootProps);
   const sortModel = useGridSelector(apiRef, gridSortModelSelector);
   const treeDepth = useGridSelector(apiRef, gridRowMaximumTreeDepthSelector);
-  const headerGroupingMaxDepth = useGridSelector(apiRef, gridColumnGroupsHeaderMaxDepthSelector);
   const columnPositions = useGridSelector(apiRef, gridColumnPositionsSelector);
   const editRowsState = useGridSelector(apiRef, gridEditRowsStateSelector);
   const handleRef = useForkRef(ref, refProp);
@@ -85,11 +85,10 @@ const GridRow = /*#__PURE__*/React.forwardRef(function GridRow(props, refProp) {
   const hasFocusCell = focusedColumnIndex !== undefined;
   const hasVirtualFocusCellLeft = hasFocusCell && focusedColumnIndex >= pinnedColumns.left.length && focusedColumnIndex < renderContext.firstColumnIndex;
   const hasVirtualFocusCellRight = hasFocusCell && focusedColumnIndex < visibleColumns.length - pinnedColumns.right.length && focusedColumnIndex >= renderContext.lastColumnIndex;
-  const ariaRowIndex = index + headerGroupingMaxDepth + 2; // 1 for the header row and 1 as it's 1-based
-
   const classes = composeGridClasses(rootProps.classes, {
     root: ['row', selected && 'selected', editable && 'row--editable', editing && 'row--editing', isFirstVisible && 'row--firstVisible', isLastVisible && 'row--lastVisible', showBottomBorder && 'row--borderBottom', rowHeight === 'auto' && 'row--dynamicHeight']
   });
+  const getRowAriaAttributes = configuration.hooks.useGridRowAriaAttributes();
   React.useLayoutEffect(() => {
     if (currentPage.range) {
       // The index prop is relative to the rows from all pages. As example, the index prop of the
@@ -212,6 +211,7 @@ const GridRow = /*#__PURE__*/React.forwardRef(function GridRow(props, refProp) {
     return rowStyle;
   }, [isNotVisible, rowHeight, styleProp, minHeight, sizes, rootProps.rowSpacingType]);
   const rowClassNames = apiRef.current.unstable_applyPipeProcessors('rowClassName', [], rowId);
+  const ariaAttributes = rowNode ? getRowAriaAttributes(rowNode, index) : undefined;
   if (typeof rootProps.getRowClassName === 'function') {
     const indexRelativeToCurrentPage = index - (currentPage.range?.firstRowIndex || 0);
     const rowParams = _extends({}, apiRef.current.getRowParams(rowId), {
@@ -308,10 +308,8 @@ const GridRow = /*#__PURE__*/React.forwardRef(function GridRow(props, refProp) {
     "data-rowindex": index,
     role: "row",
     className: clsx(...rowClassNames, classes.root, className),
-    "aria-rowindex": ariaRowIndex,
-    "aria-selected": selected,
     style: style
-  }, eventHandlers, other, {
+  }, ariaAttributes, eventHandlers, other, {
     children: [leftCells, /*#__PURE__*/_jsx("div", {
       role: "presentation",
       className: gridClasses.cellOffsetLeft,

package/modern/components/GridScrollArea.js

@@ -3,6 +3,7 @@ import * as React from 'react';
 import clsx from 'clsx';
 import { unstable_composeClasses as composeClasses, unstable_useEventCallback as useEventCallback } from '@mui/utils';
 import { styled } from '@mui/system';
+import { fastMemo } from '@mui/x-internals/fastMemo';
 import { useGridRootProps } from '../hooks/utils/useGridRootProps';
 import { getDataGridUtilityClass, gridClasses } from '../constants';
 import { useGridApiContext } from '../hooks/utils/useGridApiContext';
@@ -13,7 +14,6 @@ import { gridDensityFactorSelector } from '../hooks/features/density/densitySele
 import { gridColumnsTotalWidthSelector } from '../hooks/features/columns/gridColumnsSelector';
 import { useTimeout } from '../hooks/utils/useTimeout';
 import { getTotalHeaderHeight } from '../hooks/features/columns/gridColumnsUtils';
-import { fastMemo } from '../utils/fastMemo';
 import { jsx as _jsx } from "react/jsx-runtime";
 const CLIFF = 1;
 const SLOP = 1.5;

package/modern/components/GridSkeletonLoadingOverlay.js

@@ -119,7 +119,7 @@ const GridSkeletonLoadingOverlay = /*#__PURE__*/React.forwardRef(function GridSk
         if (hasScrollbarFiller) {
           rowCells.push( /*#__PURE__*/_jsx(GridScrollbarFillerCell, {
             pinnedRight: pinnedColumns.right.length > 0
-          }));
+          }, `skeleton-scrollbar-filler-${i}`));
         }
       }
       array.push( /*#__PURE__*/_jsx("div", {

package/modern/components/cell/GridCell.js

@@ -6,7 +6,7 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { unstable_useForkRef as useForkRef, unstable_composeClasses as composeClasses, unstable_ownerDocument as ownerDocument, unstable_capitalize as capitalize } from '@mui/utils';
-import { fastMemo } from '../../utils/fastMemo';
+import { fastMemo } from '@mui/x-internals/fastMemo';
 import { doesSupportPreventScroll } from '../../utils/doesSupportPreventScroll';
 import { getDataGridUtilityClass, gridClasses } from '../../constants/gridClasses';
 import { GridCellModes } from '../../models';

package/modern/components/cell/GridSkeletonCell.js

@@ -3,10 +3,10 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 const _excluded = ["field", "type", "align", "width", "height", "empty", "style", "className"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import clsx from 'clsx';
 import Skeleton from '@mui/material/Skeleton';
 import { unstable_composeClasses as composeClasses, unstable_capitalize as capitalize } from '@mui/utils';
-import clsx from 'clsx';
-import { fastMemo } from '../../utils/fastMemo';
+import { fastMemo } from '@mui/x-internals/fastMemo';
 import { createRandomNumberGenerator } from '../../utils/utils';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { getDataGridUtilityClass } from '../../constants/gridClasses';

package/modern/components/columnHeaders/GridColumnHeaderItem.js

@@ -3,7 +3,7 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { unstable_composeClasses as composeClasses, unstable_useId as useId } from '@mui/utils';
-import { fastMemo } from '../../utils/fastMemo';
+import { fastMemo } from '@mui/x-internals/fastMemo';
 import { useGridPrivateApiContext } from '../../hooks/utils/useGridPrivateApiContext';
 import { ColumnHeaderMenuIcon } from './ColumnHeaderMenuIcon';
 import { GridColumnHeaderMenu } from '../menu/columnMenu/GridColumnHeaderMenu';

package/modern/components/containers/GridRootStyles.js

@@ -668,9 +668,16 @@ export const GridRootStyles = styled('div', {
     [`& .${c['filler--borderTop']}`]: {
       borderTop: '1px solid var(--DataGrid-rowBorderColor)'
     },
-    /* Hide grid rows and vertical scrollbar when skeleton overlay is visible */
+    /* Hide grid rows, row filler, and vertical scrollbar when skeleton overlay is visible */
     [`& .${c['main--hasSkeletonLoadingOverlay']}`]: {
-      [`& .${c.virtualScrollerContent}, & .${c['scrollbar--vertical']}, & .${c.pinnedRows}`]: {
+      [`& .${c.virtualScrollerContent}`]: {
+        // We use visibility hidden so that the virtual scroller content retains its height.
+        // Position fixed is used to remove the virtual scroller content from the flow.
+        // https://github.com/mui/mui-x/issues/14061
+        position: 'fixed',
+        visibility: 'hidden'
+      },
+      [`& .${c['scrollbar--vertical']}, & .${c.pinnedRows}, & .${c.virtualScroller} > .${c.filler}`]: {
         display: 'none'
       }
     }

package/modern/components/virtualization/GridMainContainer.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { styled } from '@mui/system';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { useGridAriaAttributes } from '../../hooks/utils/useGridAriaAttributes';
+import { useGridConfiguration } from '../../hooks/utils/useGridConfiguration';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const GridPanelAnchor = styled('div')({
   position: 'absolute',
@@ -19,8 +19,9 @@ const Element = styled('div', {
   overflow: 'hidden'
 });
 export const GridMainContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
-  const ariaAttributes = useGridAriaAttributes();
   const rootProps = useGridRootProps();
+  const configuration = useGridConfiguration();
+  const ariaAttributes = configuration.hooks.useGridAriaAttributes();
   return /*#__PURE__*/_jsxs(Element, _extends({
     ref: ref,
     ownerState: rootProps,

package/modern/components/virtualization/GridVirtualScrollerFiller.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { styled } from '@mui/system';
-import { fastMemo } from '../../utils/fastMemo';
+import { fastMemo } from '@mui/x-internals/fastMemo';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { gridDimensionsSelector } from '../../hooks/features/dimensions';

package/modern/context/GridContextProvider.js

@@ -2,20 +2,25 @@ import * as React from 'react';
 import { GridApiContext } from '../components/GridApiContext';
 import { GridPrivateApiContext } from '../hooks/utils/useGridPrivateApiContext';
 import { GridRootPropsContext } from './GridRootPropsContext';
+import { GridConfigurationContext } from '../components/GridConfigurationContext';
 import { jsx as _jsx } from "react/jsx-runtime";
 export function GridContextProvider({
   privateApiRef,
+  configuration,
   props,
   children
 }) {
   const apiRef = React.useRef(privateApiRef.current.getPublicApi());
-  return /*#__PURE__*/_jsx(GridRootPropsContext.Provider, {
-    value: props,
-    children: /*#__PURE__*/_jsx(GridPrivateApiContext.Provider, {
-      value: privateApiRef,
-      children: /*#__PURE__*/_jsx(GridApiContext.Provider, {
-        value: apiRef,
-        children: children
+  return /*#__PURE__*/_jsx(GridConfigurationContext.Provider, {
+    value: configuration,
+    children: /*#__PURE__*/_jsx(GridRootPropsContext.Provider, {
+      value: props,
+      children: /*#__PURE__*/_jsx(GridPrivateApiContext.Provider, {
+        value: privateApiRef,
+        children: /*#__PURE__*/_jsx(GridApiContext.Provider, {
+          value: apiRef,
+          children: children
+        })
       })
     })
   });

package/modern/hooks/core/useGridStateInitialization.js

@@ -48,9 +48,7 @@ export const useGridStateInitialization = apiRef => {
     if (!ignoreSetState) {
       // We always assign it as we mutate rows for perf reason.
       apiRef.current.state = newState;
-      if (apiRef.current.publishEvent) {
-        apiRef.current.publishEvent('stateChange', newState);
-      }
+      apiRef.current.publishEvent('stateChange', newState);
       apiRef.current.store.update(newState);
     }
     if (updatedControlStateIds.length === 1) {

package/modern/hooks/features/dimensions/useGridDimensions.js

@@ -1,9 +1,9 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { unstable_ownerDocument as ownerDocument, unstable_useEnhancedEffect as useEnhancedEffect, unstable_useEventCallback as useEventCallback, unstable_ownerWindow as ownerWindow } from '@mui/utils';
+import { throttle } from '@mui/x-internals/throttle';
 import { useGridApiEventHandler, useGridApiOptionHandler } from '../../utils/useGridApiEventHandler';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
-import { throttle } from '../../../utils/throttle';
 import { useGridLogger } from '../../utils/useGridLogger';
 import { gridColumnsTotalWidthSelector, gridVisiblePinnedColumnDefinitionsSelector } from '../columns';
 import { gridDimensionsSelector } from './gridDimensionsSelectors';

package/modern/hooks/features/export/serializers/csvSerializer.js

@@ -1,6 +1,9 @@
 import { GRID_CHECKBOX_SELECTION_COL_DEF } from '../../../../colDef';
 import { warnOnce } from '../../../../internals/utils/warning';
 function sanitizeCellValue(value, csvOptions) {
+  if (value === null || value === undefined) {
+    return '';
+  }
   const valueStr = typeof value === 'string' ? value : `${value}`;
   if (csvOptions.shouldAppendQuotes || csvOptions.escapeFormulas) {
     const escapedValue = valueStr.replace(/"/g, '""');
@@ -51,9 +54,7 @@ class CSVRow {
     if (!this.isEmpty) {
       this.rowString += this.options.csvOptions.delimiter;
     }
-    if (value === null || value === undefined) {
-      this.rowString += '';
-    } else if (typeof this.options.sanitizeCellValue === 'function') {
+    if (typeof this.options.sanitizeCellValue === 'function') {
       this.rowString += this.options.sanitizeCellValue(value, this.options.csvOptions);
     } else {
       this.rowString += value;

package/modern/hooks/features/filter/gridFilterSelector.js

@@ -32,6 +32,12 @@ export const gridVisibleRowsLookupSelector = state => state.visibleRowsLookup;
  */
 export const gridFilteredRowsLookupSelector = createSelector(gridFilterStateSelector, filterState => filterState.filteredRowsLookup);
 
+/**
+ * @category Filtering
+ * @ignore - do not document.
+ */
+export const gridFilteredChildrenCountLookupSelector = createSelector(gridFilterStateSelector, filterState => filterState.filteredChildrenCountLookup);
+
 /**
  * @category Filtering
  * @ignore - do not document.
@@ -66,6 +72,34 @@ export const gridFilteredSortedRowEntriesSelector = createSelectorMemoized(gridF
  */
 export const gridFilteredSortedRowIdsSelector = createSelectorMemoized(gridFilteredSortedRowEntriesSelector, filteredSortedRowEntries => filteredSortedRowEntries.map(row => row.id));
 
+/**
+ * Get the ids to position in the current tree level lookup of the rows accessible after the filtering process.
+ * Does not contain the collapsed children.
+ * @category Filtering
+ * @ignore - do not document.
+ */
+export const gridExpandedSortedRowTreeLevelPositionLookupSelector = createSelectorMemoized(gridExpandedSortedRowIdsSelector, gridRowTreeSelector, (visibleSortedRowIds, rowTree) => {
+  const depthPositionCounter = {};
+  let lastDepth = 0;
+  return visibleSortedRowIds.reduce((acc, rowId) => {
+    const rowNode = rowTree[rowId];
+    if (!depthPositionCounter[rowNode.depth]) {
+      depthPositionCounter[rowNode.depth] = 0;
+    }
+
+    // going deeper in the tree should reset the counter
+    // since it might have been used in some other branch at the same level, up in the tree
+    // going back up should keep the counter and continue where it left off
+    if (rowNode.depth > lastDepth) {
+      depthPositionCounter[rowNode.depth] = 0;
+    }
+    lastDepth = rowNode.depth;
+    depthPositionCounter[rowNode.depth] += 1;
+    acc[rowId] = depthPositionCounter[rowNode.depth];
+    return acc;
+  }, {});
+});
+
 /**
  * Get the id and the model of the top level rows accessible after the filtering process.
  * @category Filtering

package/modern/hooks/features/filter/index.js

@@ -1,2 +1,2 @@
 export { getDefaultGridFilterModel } from './gridFilterState';
-export * from './gridFilterSelector';
+export { gridFilterModelSelector, gridQuickFilterValuesSelector, gridVisibleRowsLookupSelector, gridFilteredRowsLookupSelector, gridFilteredDescendantCountLookupSelector, gridExpandedSortedRowEntriesSelector, gridExpandedSortedRowIdsSelector, gridFilteredSortedRowEntriesSelector, gridFilteredSortedRowIdsSelector, gridFilteredSortedTopLevelRowEntriesSelector, gridExpandedRowCountSelector, gridFilteredTopLevelRowCountSelector, gridFilteredRowCountSelector, gridFilteredDescendantRowCountSelector, gridFilterActiveItemsSelector, gridFilterActiveItemsLookupSelector } from './gridFilterSelector';