@mui/x-data-grid 6.0.0-alpha.0 → 6.0.0-alpha.2

package/legacy/hooks/features/sorting/useGridSorting.js

@@ -1,18 +1,18 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
-import { GridFeatureModeConstant } from '../../../models/gridFeatureMode';
 import { isEnterKey } from '../../../utils/keyboardUtils';
 import { useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { useGridLogger } from '../../utils/useGridLogger';
 import { gridColumnLookupSelector } from '../columns/gridColumnsSelector';
 import { gridSortedRowEntriesSelector, gridSortedRowIdsSelector, gridSortModelSelector } from './gridSortingSelector';
-import { gridRowIdsSelector, gridRowTreeSelector } from '../rows';
+import { GRID_ROOT_GROUP_ID, gridRowTreeSelector } from '../rows';
 import { useFirstRender } from '../../utils/useFirstRender';
 import { useGridRegisterStrategyProcessor, GRID_DEFAULT_STRATEGY } from '../../core/strategyProcessing';
 import { buildAggregatedSortingApplier, mergeStateWithSortModel, getNextGridSortDirection, sanitizeSortModel } from './gridSortingUtils';
 import { useGridRegisterPipeProcessor } from '../../core/pipeProcessing';
+import { getTreeNodeDescendants } from '../rows/gridRowsUtils';
 export var sortingStateInitializer = function sortingStateInitializer(state, props) {
   var _ref, _props$sortModel, _props$initialState, _props$initialState$s;
 
@@ -88,11 +88,11 @@ export var useGridSorting = function useGridSorting(apiRef, props) {
 
   var applySorting = React.useCallback(function () {
     apiRef.current.setState(function (state) {
-      if (props.sortingMode === GridFeatureModeConstant.server) {
+      if (props.sortingMode === 'server') {
         logger.debug('Skipping sorting rows as sortingMode = server');
         return _extends({}, state, {
           sorting: _extends({}, state.sorting, {
-            sortedRows: gridRowIdsSelector(state, apiRef.current.instanceId)
+            sortedRows: getTreeNodeDescendants(gridRowTreeSelector(apiRef), GRID_ROOT_GROUP_ID, false)
           })
         });
       }
@@ -206,38 +206,16 @@ export var useGridSorting = function useGridSorting(apiRef, props) {
   }, [apiRef, props.disableMultipleColumnsSorting]);
   var flatSortingMethod = React.useCallback(function (params) {
     var rowTree = gridRowTreeSelector(apiRef);
+    var rootGroupNode = rowTree[GRID_ROOT_GROUP_ID];
+    var sortedChildren = params.sortRowList ? params.sortRowList(rootGroupNode.children.map(function (childId) {
+      return rowTree[childId];
+    })) : _toConsumableArray(rootGroupNode.children);
 
-    if (!params.sortRowList) {
-      var bodyRowIds = [];
-      var _footerRowIds = [];
-      gridRowIdsSelector(apiRef).forEach(function (rowId) {
-        if (rowTree[rowId].isPinned) {
-          return;
-        }
-
-        if (rowTree[rowId].position === 'footer') {
-          _footerRowIds.push(rowId);
-        } else {
-          bodyRowIds.push(rowId);
-        }
-      });
-      return [].concat(bodyRowIds, _footerRowIds);
+    if (rootGroupNode.footerId != null) {
+      sortedChildren.push(rootGroupNode.footerId);
     }
 
-    var bodyRows = [];
-    var footerRowIds = [];
-    Object.values(rowTree).forEach(function (rowNode) {
-      if (rowNode.isPinned) {
-        return;
-      }
-
-      if (rowNode.position === 'footer') {
-        footerRowIds.push(rowNode.id);
-      } else {
-        bodyRows.push(rowNode);
-      }
-    });
-    return [].concat(_toConsumableArray(params.sortRowList(bodyRows)), footerRowIds);
+    return sortedChildren;
   }, [apiRef]);
   useGridRegisterPipeProcessor(apiRef, 'exportState', stateExportPreProcessing);
   useGridRegisterPipeProcessor(apiRef, 'restoreState', stateRestorePreProcessing);

package/legacy/hooks/features/virtualization/useGridVirtualScroller.js

@@ -9,7 +9,6 @@ import { useGridApiContext } from '../../utils/useGridApiContext';
 import { useGridRootProps } from '../../utils/useGridRootProps';
 import { useGridSelector } from '../../utils/useGridSelector';
 import { gridVisibleColumnDefinitionsSelector, gridColumnsTotalWidthSelector, gridColumnPositionsSelector } from '../columns/gridColumnsSelector';
-import { gridDensityRowHeightSelector } from '../density/densitySelector';
 import { gridFocusCellSelector, gridTabIndexCellSelector } from '../focus/gridFocusStateSelector';
 import { gridEditRowsStateSelector } from '../editRows/gridEditRowsSelector';
 import { useGridVisibleRows } from '../../utils/useGridVisibleRows';
@@ -17,7 +16,8 @@ import { useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
 import { clamp } from '../../../utils/utils';
 import { selectedIdsLookupSelector } from '../selection/gridSelectionSelector';
 import { gridRowsMetaSelector } from '../rows/gridRowsMetaSelector';
-import { getFirstNonSpannedColumnToRender } from '../columns/gridColumnsUtils'; // Uses binary search to avoid looping through all possible positions
+import { getFirstNonSpannedColumnToRender } from '../columns/gridColumnsUtils';
+import { getMinimalContentHeight } from '../rows/gridRowsUtils'; // Uses binary search to avoid looping through all possible positions
 
 import { jsx as _jsx } from "react/jsx-runtime";
 export function binarySearch(offset, positions) {
@@ -72,7 +72,6 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       getRowProps = props.getRowProps;
   var columnPositions = useGridSelector(apiRef, gridColumnPositionsSelector);
   var columnsTotalWidth = useGridSelector(apiRef, gridColumnsTotalWidthSelector);
-  var rowHeight = useGridSelector(apiRef, gridDensityRowHeightSelector);
   var cellFocus = useGridSelector(apiRef, gridFocusCellSelector);
   var cellTabIndex = useGridSelector(apiRef, gridTabIndexCellSelector);
   var rowsMeta = useGridSelector(apiRef, gridRowsMetaSelector);
@@ -104,16 +103,16 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
     var _currentPage$range, _currentPage$range2;
 
     var lastMeasuredIndexRelativeToAllRows = apiRef.current.unstable_getLastMeasuredRowIndex();
-    var lastMeasuredIndexRelativeToCurrentPage = lastMeasuredIndexRelativeToAllRows - (((_currentPage$range = currentPage.range) == null ? void 0 : _currentPage$range.firstRowIndex) || 0);
-    var lastMeasuredIndex = Math.max(0, lastMeasuredIndexRelativeToCurrentPage);
-    var allRowsMeasured = lastMeasuredIndex === Infinity;
+    var allRowsMeasured = lastMeasuredIndexRelativeToAllRows === Infinity;
 
-    if ((_currentPage$range2 = currentPage.range) != null && _currentPage$range2.lastRowIndex && !allRowsMeasured) {
+    if ((_currentPage$range = currentPage.range) != null && _currentPage$range.lastRowIndex && !allRowsMeasured) {
       // Check if all rows in this page are already measured
-      allRowsMeasured = lastMeasuredIndex >= currentPage.range.lastRowIndex;
+      allRowsMeasured = lastMeasuredIndexRelativeToAllRows >= currentPage.range.lastRowIndex;
     }
 
-    if (allRowsMeasured || rowsMeta.positions[lastMeasuredIndex] >= offset) {
+    var lastMeasuredIndexRelativeToCurrentPage = clamp(lastMeasuredIndexRelativeToAllRows - (((_currentPage$range2 = currentPage.range) == null ? void 0 : _currentPage$range2.firstRowIndex) || 0), 0, rowsMeta.positions.length);
+
+    if (allRowsMeasured || rowsMeta.positions[lastMeasuredIndexRelativeToCurrentPage] >= offset) {
       // If all rows were measured (when no row has "auto" as height) or all rows before the offset
       // were measured, then use a binary search because it's faster.
       return binarySearch(offset, rowsMeta.positions);
@@ -123,7 +122,7 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
     // Inspired by https://github.com/bvaughn/react-virtualized/blob/master/source/Grid/utils/CellSizeAndPositionManager.js
 
 
-    return exponentialSearch(offset, rowsMeta.positions, lastMeasuredIndex);
+    return exponentialSearch(offset, rowsMeta.positions, lastMeasuredIndexRelativeToCurrentPage);
   }, [apiRef, (_currentPage$range3 = currentPage.range) == null ? void 0 : _currentPage$range3.firstRowIndex, (_currentPage$range4 = currentPage.range) == null ? void 0 : _currentPage$range4.lastRowIndex, rowsMeta.positions]);
   var computeRenderContext = React.useCallback(function () {
     if (disableVirtualization) {
@@ -458,19 +457,14 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       height: height,
       minHeight: shouldExtendContent ? '100%' : 'auto'
     };
-
-    if (rootProps.autoHeight && currentPage.rows.length === 0) {
-      size.height = 2 * rowHeight; // Give room to show the overlay when there's no row.
-    }
-
     return size;
-  }, [rootRef, columnsTotalWidth, rowsMeta.currentPageTotalHeight, currentPage.rows.length, needsHorizontalScrollbar, rootProps.autoHeight, rowHeight]);
+  }, [rootRef, columnsTotalWidth, rowsMeta.currentPageTotalHeight, needsHorizontalScrollbar]);
   React.useEffect(function () {
     apiRef.current.publishEvent('virtualScrollerContentSizeChange');
   }, [apiRef, contentSize]);
 
   if (rootProps.autoHeight && currentPage.rows.length === 0) {
-    contentSize.height = 2 * rowHeight; // Give room to show the overlay when there no rows.
+    contentSize.height = getMinimalContentHeight(apiRef); // Give room to show the overlay when there no rows.
   }
 
   var rootStyle = {};

package/legacy/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v6.0.0-alpha.0
+/** @license MUI v6.0.0-alpha.2
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/legacy/internals/index.js

@@ -26,6 +26,7 @@ export { useGridEditing as useGridEditing_new, editingStateInitializer as editin
 export { useGridEditing as useGridEditing_old, editingStateInitializer as editingStateInitializer_old } from '../hooks/features/editRows/useGridEditing.old';
 export { useGridRows, rowsStateInitializer } from '../hooks/features/rows/useGridRows';
 export { useGridRowsPreProcessors } from '../hooks/features/rows/useGridRowsPreProcessors';
+export { getTreeNodeDescendants, buildRootGroup } from '../hooks/features/rows/gridRowsUtils';
 export { useGridRowsMeta, rowsMetaStateInitializer } from '../hooks/features/rows/useGridRowsMeta';
 export { useGridParamsApi } from '../hooks/features/rows/useGridParamsApi';
 export { getRowIdFromRowModel } from '../hooks/features/rows/gridRowsUtils';

package/legacy/models/gridFeatureMode.js

@@ -1,4 +1 @@
-export var GridFeatureModeConstant = {
-  client: 'client',
-  server: 'server'
-};
+export {};

package/models/api/gridParamsApi.d.ts

@@ -1,4 +1,4 @@
-import { GridValidRowModel, GridRowId } from '../gridRows';
+import { GridValidRowModel, GridRowId, GridTreeNode } from '../gridRows';
 import { GridCellParams } from '../params/gridCellParams';
 import { GridColumnHeaderParams } from '../params/gridColumnHeaderParams';
 import { GridRowParams } from '../params/gridRowParams';
@@ -24,7 +24,7 @@ export interface GridParamsApi {
      * @param {string} field The column field.
      * @returns {GridCellParams} The cell params.
      */
-    getCellParams: <V = any, R extends GridValidRowModel = any, F = V>(id: GridRowId, field: string) => GridCellParams<V, R, F>;
+    getCellParams: <V = any, R extends GridValidRowModel = any, F = V, N extends GridTreeNode = GridTreeNode>(id: GridRowId, field: string) => GridCellParams<V, R, F, N>;
     /**
      * Gets the [[GridRowParams]] object that is passed as argument in events.
      * @param {GridRowId} id The id of the row.

package/models/api/gridRowApi.d.ts

@@ -1,4 +1,4 @@
-import { GridRowModel, GridRowId, GridRowModelUpdate, GridRowTreeNodeConfig, GridValidRowModel } from '../gridRows';
+import { GridRowModel, GridRowId, GridRowModelUpdate, GridValidRowModel, GridTreeNode } from '../gridRows';
 export interface GridRowGroupChildrenGetterParams {
     /**
      * The row id of the group
@@ -36,6 +36,7 @@ export interface GridRowApi {
     getRowsCount: () => number;
     /**
      * Gets the list of row ids.
+     * TODO rows v6: Rename or remove ?
      * @returns {GridRowId[]} A list of ids.
      */
     getAllRowIds: () => GridRowId[];
@@ -51,7 +52,7 @@ export interface GridRowApi {
      */
     setRowIndex: (rowId: GridRowId, targetIndex: number) => void;
     /**
-     * Allows to updates, insert and delete rows in a single call.
+     * Allows to update, insert and delete rows.
      * @param {GridRowModelUpdate[]} updates An array of rows with an `action` specifying what to do.
      */
     updateRows: (updates: GridRowModelUpdate[]) => void;
@@ -63,10 +64,11 @@ export interface GridRowApi {
     getRow: <R extends GridValidRowModel = any>(id: GridRowId) => R | null;
     /**
      * Gets the row node from the internal tree structure.
+     * TODO rows v6: Rename `getTreeNode`
      * @param {GridRowId} id The id of the row.
-     * @returns {GridRowTreeNodeConfig} The row data.
+     * @returns {GridTreeNode} The tree node.
      */
-    getRowNode: (id: GridRowId) => GridRowTreeNodeConfig | null;
+    getRowNode: <N extends GridTreeNode>(id: GridRowId) => N | null;
     /**
      * Expand or collapse a row children.
      * @param {GridRowId} id the ID of the row to expand or collapse.
@@ -82,7 +84,7 @@ export interface GridRowApi {
     /**
      * Gets the rows of a grouping criteria.
      * Only contains the rows provided to the grid, not the rows automatically generated by it.
-     * @param {GridRowGroupChildrenParams} params Object containing parameters for the getter.
+     * @param {GridRowGroupChildrenGetterParams} params Object containing parameters for the getter.
      * @returns {GridRowId[]} The id of each row in the grouping criteria.
      */
     getRowGroupChildren: (params: GridRowGroupChildrenGetterParams) => GridRowId[];

package/models/events/gridEventLookup.d.ts

@@ -8,7 +8,7 @@ import type { GridEditRowsModel } from '../gridEditRowModel';
 import type { GridSelectionModel } from '../gridSelectionModel';
 import type { ElementSize } from '../elementSize';
 import type { MuiBaseEvent } from '../muiEvent';
-import type { GridRowId, GridRowTreeNodeConfig } from '../gridRows';
+import type { GridGroupNode, GridRowId } from '../gridRows';
 import type { GridColumnVisibilityModel } from '../../hooks/features/columns';
 import type { GridStrategyProcessorName } from '../../hooks/core/strategyProcessing';
 import { GridRowEditStartParams, GridRowEditStopParams } from '../params/gridRowParams';
@@ -388,11 +388,11 @@ export interface GridEventLookup extends GridRowEventLookup, GridColumnHeaderEve
      */
     sortedRowsSet: {};
     /**
-     * Fired when the expansion of a row is changed. Called with a [[GridRowTreeNodeConfig]] object.
+     * Fired when the expansion of a row is changed. Called with a [[GridGroupNode]] object.
      * @ignore - do not document.
      */
     rowExpansionChange: {
-        params: GridRowTreeNodeConfig;
+        params: GridGroupNode;
     };
     /**
      * Fired when the rendered rows index interval changes. Called with a [[GridRenderedRowsIntervalChangeParams]] object.

package/models/gridApiCaches.d.ts

@@ -1,4 +1,4 @@
-import { GridRowsInternalCache } from '../hooks/features/rows/gridRowsState';
+import { GridRowsInternalCache } from '../hooks/features/rows/gridRowsInterfaces';
 export interface GridApiCaches {
     rows: GridRowsInternalCache;
 }

package/models/gridFeatureMode.d.ts

@@ -1,5 +1 @@
-export declare const GridFeatureModeConstant: {
-    client: "client";
-    server: "server";
-};
 export declare type GridFeatureMode = 'client' | 'server';

package/models/gridFeatureMode.js

@@ -1,4 +1 @@
-export const GridFeatureModeConstant = {
-  client: 'client',
-  server: 'server'
-};
+export {};

package/models/gridRows.d.ts

@@ -15,33 +15,42 @@ export declare type GridUpdateAction = 'delete';
 export interface GridRowModelUpdate extends GridRowModel {
     _action?: GridUpdateAction;
 }
-export interface GridRowTreeNodeConfig {
+/**
+ * The grid rows total height and row positions.
+ */
+export interface GridRowsMeta {
     /**
-     * The grid row id.
+     * The sum of all grid rows.
      */
-    id: GridRowId;
+    totalHeight: number;
     /**
-     * The id of the row children.
-     * @default []
+     * The grid rows positions.
      */
-    children?: GridRowId[];
+    positions: number[];
+}
+export interface GridTreeBasicNode {
     /**
-     * The id of the footer
+     * The uniq id of this node.
      */
-    footerId?: GridRowId | null;
+    id: GridRowId;
     /**
-     * The row id of the parent (null if this row is a top level row).
+     * Depth of this node in the tree.
      */
-    parent: GridRowId | null;
+    depth: number;
+}
+export interface GridLeafNode extends GridTreeBasicNode {
+    type: 'leaf';
     /**
-     * Current expansion status of the row.
-     * @default false
+     * The id of the group containing this node.
      */
-    childrenExpanded?: boolean;
+    parent: GridRowId;
     /**
-     * 0-based depth of the row in the tree.
+     * The key used to group the children of this row.
      */
-    depth: number;
+    groupingKey: GridKeyValue | null;
+}
+export interface GridBasicGroupNode extends GridTreeBasicNode {
+    type: 'group';
     /**
      * The key used to group the children of this row.
      */
@@ -52,36 +61,96 @@ export interface GridRowTreeNodeConfig {
      */
     groupingField: string | null;
     /**
-     * If `true`, this node has been automatically added to fill a gap in the tree structure.
+     * The id of the body children nodes.
+     * Only contains the children of type "group" and "leaf".
+     */
+    children: GridRowId[];
+    /**
+     * The id of the footer child node.
+     */
+    footerId?: GridRowId | null;
+    /**
+     * The id of the children nodes, grouped by grouping field and grouping key.
+     * Only contains the children of type "group" and "leaf".
+     * Empty for flat tree.
+     */
+    childrenFromPath: GridChildrenFromPathLookup;
+    /**
+     * If `true`, the children of this group are not visible.
      * @default false
      */
-    isAutoGenerated?: boolean;
+    childrenExpanded?: boolean;
     /**
-     * Position of the row among its sibling.
-     * @default 'body'
+     * The id of the group containing this node (null for the root group).
      */
-    position?: 'body' | 'footer';
+    parent: GridRowId | null;
     /**
      * If `true`, this row is pinned.
      * @default false
      */
     isPinned?: boolean;
 }
-/**
- * The grid rows total height and row positions.
- */
-export interface GridRowsMeta {
+export interface GridAutoGeneratedGroupNode extends GridBasicGroupNode {
     /**
-     * The sum of all grid rows.
+     * If `true`, this node has been automatically generated by the grid.
+     * In the row grouping, all groups are auto-generated
+     * In the tree data, some groups can be passed in the rows
      */
-    totalHeight: number;
+    isAutoGenerated: true;
+}
+export interface GridDataGroupNode extends GridBasicGroupNode {
     /**
-     * The grid rows positions.
+     * If `true`, this node has been automatically generated by the grid.
+     * In the row grouping, all groups are auto-generated
+     * In the tree data, some groups can be passed in the rows
      */
-    positions: number[];
+    isAutoGenerated: false;
+}
+export declare type GridGroupNode = GridDataGroupNode | GridAutoGeneratedGroupNode;
+export declare type GridChildrenFromPathLookup = {
+    [groupingField: string]: {
+        [groupingKey: string]: GridRowId;
+    };
+};
+export interface GridFooterNode extends GridTreeBasicNode {
+    type: 'footer';
+    /**
+     * The id of the group containing this node.
+     */
+    parent: GridRowId;
+}
+export interface GridSkeletonRowNode extends GridTreeBasicNode {
+    type: 'skeletonRow';
+    /**
+     * The id of the group containing this node.
+     * Is always equal to `GRID_ROOT_GROUP_ID`.
+     */
+    parent: GridRowId;
+}
+interface GridBasicPinnedRowNode extends GridTreeBasicNode {
+    type: 'pinnedRow';
+    /**
+     * The id of the group containing this node.
+     * Is always equal to `GRID_ROOT_GROUP_ID`.
+     */
+    parent: GridRowId;
+}
+export interface GridDataPinnedRowNode extends GridBasicPinnedRowNode {
+    /**
+     * If `true`, this node has been automatically generated by the grid.
+     */
+    isAutoGenerated: true;
+}
+export interface GridAutoGeneratedPinnedRowNode extends GridBasicPinnedRowNode {
+    /**
+     * If `true`, this node has been automatically generated by the grid.
+     */
+    isAutoGenerated: false;
 }
-export declare type GridRowTreeConfig = Record<GridRowId, GridRowTreeNodeConfig>;
-export declare type GridRowsLookup<R extends GridValidRowModel = GridValidRowModel> = Record<GridRowId, R>;
+export declare type GridPinnedRowNode = GridDataPinnedRowNode | GridAutoGeneratedPinnedRowNode;
+export declare type GridTreeNode = GridLeafNode | GridGroupNode | GridFooterNode | GridPinnedRowNode | GridSkeletonRowNode;
+export declare type GridTreeNodeWithRender = GridLeafNode | GridGroupNode | GridFooterNode | GridPinnedRowNode;
+export declare type GridRowTreeConfig = Record<GridRowId, GridTreeNode>;
 /**
  * The type of Id supported by the grid.
  */
@@ -100,3 +169,4 @@ export interface GridRowEntry<R extends GridValidRowModel = GridValidRowModel> {
  * The function to retrieve the id of a [[GridRowModel]].
  */
 export declare type GridRowIdGetter<R extends GridValidRowModel = GridValidRowModel> = (row: R) => GridRowId;
+export {};

package/models/gridSortModel.d.ts

@@ -1,10 +1,10 @@
-import { GridRowId, GridRowTreeNodeConfig } from './gridRows';
+import { GridRowId, GridTreeNode } from './gridRows';
 export declare type GridSortDirection = 'asc' | 'desc' | null | undefined;
 export interface GridSortCellParams<V = any> {
     id: GridRowId;
     field: string;
     value: V;
-    rowNode: GridRowTreeNodeConfig;
+    rowNode: GridTreeNode;
     /**
      * @deprecated Use the `apiRef` returned by `useGridApiContext` or `useGridApiRef` (only available in `@mui/x-data-grid-pro`)
      */

package/models/params/gridCellParams.d.ts

@@ -1,12 +1,12 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { GridCellMode } from '../gridCell';
-import { GridRowId, GridRowModel, GridRowTreeNodeConfig, GridValidRowModel } from '../gridRows';
+import { GridRowId, GridRowModel, GridTreeNode, GridTreeNodeWithRender, GridValidRowModel } from '../gridRows';
 import type { GridStateColDef } from '../colDef/gridColDef';
 import { GridEditCellProps } from '../gridEditRowModel';
 /**
  * Object passed as parameter in the column [[GridColDef]] cell renderer.
  */
-export interface GridCellParams<V = any, R extends GridValidRowModel = any, F = V> {
+export interface GridCellParams<V = any, R extends GridValidRowModel = any, F = V, N extends GridTreeNode = GridTreeNode> {
     /**
      * The grid row id.
      */
@@ -31,7 +31,7 @@ export interface GridCellParams<V = any, R extends GridValidRowModel = any, F =
     /**
      * The node of the row that the current cell belongs to.
      */
-    rowNode: GridRowTreeNodeConfig;
+    rowNode: N;
     /**
      * The column of the row that the current cell belongs to.
      */
@@ -67,7 +67,7 @@ export interface FocusElement {
 /**
  * GridCellParams containing api.
  */
-export interface GridRenderCellParams<V = any, R extends GridValidRowModel = any, F = V> extends GridCellParams<V, R, F> {
+export interface GridRenderCellParams<V = any, R extends GridValidRowModel = any, F = V, N extends GridTreeNodeWithRender = GridTreeNodeWithRender> extends GridCellParams<V, R, F, N> {
     /**
      * GridApi that let you manipulate the grid.
      * @deprecated Use the `apiRef` returned by `useGridApiContext` or `useGridApiRef` (only available in `@mui/x-data-grid-pro`)
@@ -83,7 +83,7 @@ export interface GridRenderCellParams<V = any, R extends GridValidRowModel = any
 /**
  * GridEditCellProps containing api.
  */
-export interface GridRenderEditCellParams<V = any, R extends GridValidRowModel = any, F = V> extends GridCellParams<V, R, F>, GridEditCellProps<V> {
+export interface GridRenderEditCellParams<V = any, R extends GridValidRowModel = any, F = V, N extends GridTreeNodeWithRender = GridTreeNodeWithRender> extends GridCellParams<V, R, F, N>, GridEditCellProps<V> {
     /**
      * GridApi that let you manipulate the grid.
      * @deprecated Use the `apiRef` returned by `useGridApiContext` or `useGridApiRef` (only available in `@mui/x-data-grid-pro`)
@@ -93,7 +93,7 @@ export interface GridRenderEditCellParams<V = any, R extends GridValidRowModel =
 /**
  * Parameters passed to `colDef.valueGetter`.
  */
-export interface GridValueGetterParams<V = any, R extends GridValidRowModel = GridValidRowModel> extends Omit<GridCellParams<V, R, any>, 'formattedValue' | 'isEditable'> {
+export interface GridValueGetterParams<V = any, R extends GridValidRowModel = GridValidRowModel, N extends GridTreeNodeWithRender = GridTreeNodeWithRender> extends Omit<GridCellParams<V, R, any, N>, 'formattedValue' | 'isEditable'> {
     /**
      * GridApi that let you manipulate the grid.
      * @deprecated Use the `apiRef` returned by `useGridApiContext` or `useGridApiRef` (only available in `@mui/x-data-grid-pro`)
@@ -104,10 +104,6 @@ export interface GridValueGetterParams<V = any, R extends GridValidRowModel = Gr
      */
     value: GridCellParams<V, R, any>['value'];
 }
-/**
- * @deprecated Use `GridValueGetterParams` instead.
- */
-export declare type GridValueGetterFullParams<V = any, R extends GridValidRowModel = any> = GridValueGetterParams<V, R>;
 /**
  * Object passed as parameter in the column [[GridColDef]] value setter callback.
  */

package/modern/DataGrid/useDataGridProps.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { useThemeProps } from '@mui/material/styles';
 import { DATA_GRID_DEFAULT_SLOTS_COMPONENTS, GRID_DEFAULT_LOCALE_TEXT } from '../constants';
-import { GridDensityTypes, GridEditModes, GridFeatureModeConstant } from '../models';
+import { GridDensityTypes, GridEditModes } from '../models';
 const DATA_GRID_FORCED_PROPS = {
   apiRef: undefined,
   disableMultipleColumnsFiltering: true,
@@ -43,7 +43,7 @@ export const DATA_GRID_PROPS_DEFAULT_VALUES = {
   disableVirtualization: false,
   disableIgnoreModificationsIfProcessingProps: false,
   editMode: GridEditModes.Cell,
-  filterMode: GridFeatureModeConstant.client,
+  filterMode: 'client',
   headerHeight: 56,
   hideFooter: false,
   hideFooterPagination: false,
@@ -52,14 +52,14 @@ export const DATA_GRID_PROPS_DEFAULT_VALUES = {
   logger: console,
   logLevel: process.env.NODE_ENV === 'production' ? 'error' : 'warn',
   pagination: false,
-  paginationMode: GridFeatureModeConstant.client,
+  paginationMode: 'client',
   rowHeight: 52,
   rowsPerPageOptions: [25, 50, 100],
   rowSpacingType: 'margin',
   showCellRightBorder: false,
   showColumnRightBorder: false,
   sortingOrder: ['asc', 'desc', null],
-  sortingMode: GridFeatureModeConstant.client,
+  sortingMode: 'client',
   throttleRowsMs: 0,
   disableColumnReorder: false,
   disableColumnResize: false,

package/modern/components/DataGridVirtualScroller.js

@@ -6,7 +6,9 @@ import { GridVirtualScroller } from './virtualization/GridVirtualScroller';
 import { GridVirtualScrollerContent } from './virtualization/GridVirtualScrollerContent';
 import { GridVirtualScrollerRenderZone } from './virtualization/GridVirtualScrollerRenderZone';
 import { useGridVirtualScroller } from '../hooks/features/virtualization/useGridVirtualScroller';
+import { GridOverlays } from './base/GridOverlays';
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 const DataGridVirtualScroller = /*#__PURE__*/React.forwardRef(function DataGridVirtualScroller(props, ref) {
   const {
     className,
@@ -23,14 +25,14 @@ const DataGridVirtualScroller = /*#__PURE__*/React.forwardRef(function DataGridV
     ref,
     disableVirtualization
   });
-  return /*#__PURE__*/_jsx(GridVirtualScroller, _extends({
+  return /*#__PURE__*/_jsxs(GridVirtualScroller, _extends({
     className: className
   }, getRootProps(other), {
-    children: /*#__PURE__*/_jsx(GridVirtualScrollerContent, _extends({}, getContentProps(), {
+    children: [/*#__PURE__*/_jsx(GridOverlays, {}), /*#__PURE__*/_jsx(GridVirtualScrollerContent, _extends({}, getContentProps(), {
       children: /*#__PURE__*/_jsx(GridVirtualScrollerRenderZone, _extends({}, getRenderZoneProps(), {
         children: getRows()
       }))
-    }))
+    }))]
   }));
 });
 export { DataGridVirtualScroller };

package/modern/components/GridPagination.js

@@ -47,8 +47,7 @@ export const GridPagination = /*#__PURE__*/React.forwardRef(function GridPaginat
   }
 
   return /*#__PURE__*/_jsx(GridPaginationRoot, _extends({
-    ref: ref // @ts-ignore
-    ,
+    ref: ref,
     component: "div",
     count: paginationState.rowCount,
     page: paginationState.page <= lastPage ? paginationState.page : lastPage,