@mui/x-data-grid 9.3.0 → 9.4.0

package/CHANGELOG.md

@@ -1,5 +1,201 @@
 # Changelog
 
+## 9.4.0
+
+<!-- generated comparing v9.3.0..master -->
+
+_Jun 4, 2026_
+
+We'd like to extend a big thank you to the 21 contributors who made this release possible. Here are some highlights ✨:
+
+- 🎉 Scheduler is now in Beta shipping with Timeline vitualization and lazy loading
+- 📆 Implement Event Timeline virtualization (#22339)
+- 🫧 Introduce bubble charts (#22537)
+- 🐞 Bugfixes
+- 📚 Documentation improvements
+
+Special thanks go out to these community members for their valuable contributions:
+@imxv, @mixelburg, @mustafajw07
+
+The following team members contributed to this release:
+@aemartos, @alexfauquette, @arminmeh, @bernardobelchior, @cherniavskii, @flaviendelangle, @hasdfa, @Janpot, @JCQuintas, @joserodolfofreitas, @LukasTy, @MBilalShafi, @michelengelen, @mj12albert, @noraleonte, @oliviertassinari, @rita-codes, @romgrk, @sai6855
+
+### Data Grid
+
+#### `@mui/x-data-grid@9.4.0`
+
+- [DataGrid] Fix `avg` aggregation when the average is zero (#22652) @mj12albert
+- [DataGrid] Inherit icon `fontSize` from `baseIconButton` size (#22187) @imxv
+- [DataGrid] Fix `noRowsOverlay` flicker between `dataSource` re-fetches (#22465) @LukasTy
+
+#### `@mui/x-data-grid-pro@9.4.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-data-grid@9.4.0`.
+
+#### `@mui/x-data-grid-premium@9.4.0` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
+
+> This release includes a version bump of the `@mui/x-internal-exceljs-fork` package to address the vulnerable dependencies.
+> The following CVEs are fixed:
+>
+> - <https://github.com/advisories/GHSA-ph9p-34f9-6g65>
+> - <https://github.com/isaacs/minimatch/security/advisories/GHSA-23c5-xmqv-rm74>
+> - <https://github.com/advisories/GHSA-w5hq-g745-h8pq>
+>
+> To make this security update possible, we bumped the `node` version requirement from `>=14.0.0` to `>=14.17.0`.
+> [Node.js 14.17.0](https://nodejs.org/en/blog/release/v14.17.0) was released in May 2021, so we consider it safe to bump the requirement without causing issues for our users.
+
+Same changes as in `@mui/x-data-grid-pro@9.4.0`, plus:
+
+- [DataGridPremium] Nested Lazy Loading (#21043) @MBilalShafi
+- [DataGridPremium] Update exceljs fork (#22658) @cherniavskii
+
+### Date and Time Pickers
+
+#### `@mui/x-date-pickers@9.4.0`
+
+Internal changes.
+
+#### `@mui/x-date-pickers-pro@9.4.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-date-pickers@9.4.0`.
+
+### Charts
+
+#### `@mui/x-charts@9.4.0`
+
+- [charts] Add functionality to hide elements during chart export (#22525) @sai6855
+- [charts] Add option to show marks only on the first/last values (#22645) @alexfauquette
+- [charts] Add text customization section and demo for axis labels (#22597) @sai6855
+- [charts] Allow axes to scale according to the visible series only (#22566) @alexfauquette
+- [charts] Correctly handle different identifiers for each series (#22556) @sai6855
+- [charts] Fix inverted Y axis zoom/pan on ordinal scales (#22654) @JCQuintas
+- [charts] Introduce bubble charts (#22537) @alexfauquette
+- [charts] Let scatter chart tooltip ignore hidden series (#22614) @alexfauquette
+- [charts] Make `'sqrt'` size mapping the default (#22683) @alexfauquette
+- [charts] Remove unused proptypes (#22618) @alexfauquette
+- [charts] Support module augmentation for slots (#22519) @sai6855
+- [charts] Support multiple marker size in `findClosestPoint` (#22622) @alexfauquette
+- [charts] Upgrade bezier-easing to v3 and use it for line chart hit-detection (#22608) @sai6855
+- [charts] Use `useLayoutEffect` with `ResizeObserver` (#22646) @JCQuintas
+
+#### `@mui/x-charts-pro@9.4.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-charts@9.4.0`, plus:
+
+- [charts-pro] Auto-select range button matching current zoom (#22137) @JCQuintas
+- [charts-pro] Support range values in `initialZoom` (#22563) @JCQuintas
+
+#### `@mui/x-charts-premium@9.4.0` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
+
+Same changes as in `@mui/x-charts-pro@9.4.0`, plus:
+
+- [charts-premium] Support range-bar series in WebGL bar renderer (#22607) @JCQuintas
+- [charts-premium] Fix `onAxisClick` for radial bar and lines (#22522) @alexfauquette
+
+### Tree View
+
+#### `@mui/x-tree-view@9.4.0`
+
+Internal changes.
+
+#### `@mui/x-tree-view-pro@9.4.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-tree-view@9.4.0`.
+
+### Scheduler
+
+#### Breaking changes
+
+The theme `styleOverrides` slots for the skeleton and the error container were
+renamed and unified. The CSS utility class names (for example
+`.MuiEventCalendar-eventSkeleton`) are **not** affected — only
+`theme.components.*` overrides need updating.
+
+**Event skeleton**
+
+| Before                                  | After                          |
+| --------------------------------------- | ------------------------------ |
+| `MuiEventCalendar` slot `EventSkeleton` | `MuiEventSkeleton` slot `Root` |
+| `MuiEventTimeline` slot `EventSkeleton` | `MuiEventSkeleton` slot `Root` |
+
+**Error container**
+
+| Before                                                        | After                                   |
+| ------------------------------------------------------------- | --------------------------------------- |
+| `MuiEventCalendar` / `MuiEventTimeline` slot `ErrorContainer` | `MuiEventErrorContainer` slot `Root`    |
+| `MuiEventCalendar` / `MuiEventTimeline` slot `ErrorAlert`     | `MuiEventErrorContainer` slot `Alert`   |
+| `MuiEventCalendar` / `MuiEventTimeline` slot `ErrorMessage`   | `MuiEventErrorContainer` slot `Message` |
+
+If you customized these through the theme, update the component name and slot
+names accordingly:
+
+```diff
+ components: {
+-  MuiEventCalendar: {
++  MuiEventSkeleton: {
+     styleOverrides: {
+-      EventSkeleton: { /* ... */ },
++      Root: { /* ... */ },
+     },
+    },
+  },
+ }
+```
+
+#### `@mui/x-scheduler@9.0.0-beta.0`
+
+- [scheduler] Add a prop to control whether the resource of an event can be cleared (#22464) @rita-codes
+- [scheduler] Add week number labels to agenda, day and week views (#22594) @mustafajw07
+- [scheduler] Add `weekStartsOn` preference and update date functions to support custom week start (#22426) @mustafajw07
+- [scheduler] Export premium version of the standalone views (#22621) @flaviendelangle
+- [scheduler] Implement timeline virtualization (#22339) @romgrk
+- [scheduler] Split scheduler overview (#22453) @joserodolfofreitas
+- [scheduler] Unify `EventSkeleton` and `ErrorContainer` between `EventCalendar` and `EventTimeline` (#22676) @noraleonte
+
+#### `@mui/x-scheduler-premium@9.0.0-beta.0` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
+
+Same changes as in `@mui/x-scheduler@9.0.0-beta.0`.
+
+### Docs
+
+- [docs] Add a performance docs page for charts (#22656) @alexfauquette
+- [docs] Add real dataset for maps documentation (#22599) @alexfauquette
+- [docs] Add spacing between selects on charts overview demo (#22589) @bernardobelchior
+- [docs] Reorganize existing chat docs navigation (#22478) @hasdfa
+- [docs] Switch to visionscarto's world atlas dataset (#22669) @cherniavskii
+- [docs] Update TreeView `domstructure` docs and add demo (#22420) @mj12albert
+- [docs] Fix indexation of Scheduler (#22567) @oliviertassinari
+- [docs] Fix wide layout on event timeline lazy loading and Import title (#22604) @rita-codes
+- [docs] Derive class name owners for shared charts classes (#22674) @JCQuintas
+
+### Core
+
+- [code-infra] Drop unused and now-transitive deps from docs/package.json (#22549) @LukasTy
+- [code-infra] Refresh CI Node pins to 22.22.3 (#22598) @LukasTy
+- [code-infra] Skip empty product sections in changelog (#22541) @rita-codes
+- [code-infra] Stabilize DataGridScrollRestoration visual regression test (#22553) @Janpot
+- [internal] Add license to the `x-data-grid-generator` (#22240) @arminmeh
+- [internal] Express default value for resource_class (#22569) @oliviertassinari
+- [internal] Fix use of ellipsis (#21852) @oliviertassinari
+- [internal] `useLayoutEffect` with `ResizeObserver` (#22428) @romgrk
+
+### Miscellaneous
+
+- [chat-headless] Add built-in chat adapters (#22479) @hasdfa
+- [chat-headless] Harden runtime model and message errors (#22480) @hasdfa
+- [core] Prepare for TypeScript 6 bump (#22551) @LukasTy
+- [core] Use CircleCI Gen2 resource classes (#22610) @LukasTy
+- [infra] Fix broken tag retrieval on `master` during release (#22174) @michelengelen
+- [infra] Group Base UI renovate updates (#22590) @LukasTy
+- [pnpm] Add security settings to pnpm-workspace.yaml (#22611) @Janpot
+- [release] Fix release PR scripts (#22680) @JCQuintas
+- [test] Add a Tree View regression test for lazy loading with getChildrenCount returning -1 (#22605) @mixelburg
+- [test] Disable LCD subpixel antialiasing in regression screenshots (#22602) @Janpot
+- [test] Fix flaky Data Grid Pro data source tree data tests (#22659) @LukasTy
+- [test] Remove stale form-submit TODO from e2e suite (#22564) @LukasTy
+- [x-license] Exclude test keys from the published npm package (#22647) @aemartos
+- [test] Fix flaky WebGL benchmark by polling for canvas content (#22535) @JCQuintas
+
 ## 9.3.0
 
 _May 21, 2026_

package/components/GridRow.js

@@ -16,6 +16,7 @@ var _useForkRef = _interopRequireDefault(require("@mui/utils/useForkRef"));
 var _fastMemo = require("@mui/x-internals/fastMemo");
 var _forwardRef = require("@mui/x-internals/forwardRef");
 var _isObjectEmpty = require("@mui/x-internals/isObjectEmpty");
+var _cssVariables = require("../constants/cssVariables");
 var _gridEditRowModel = require("../models/gridEditRowModel");
 var _gridClasses = require("../constants/gridClasses");
 var _composeGridClasses = require("../utils/composeGridClasses");
@@ -236,7 +237,14 @@ const GridRow = (0, _forwardRef.forwardRef)(function GridRow(props, refProp) {
         width: width,
         height: rowHeight,
         field: column.field,
-        align: column.align
+        align: column.align,
+        skeletonProps: {
+          style: {
+            marginLeft: indexRelativeToAllColumns === 0 && rowNode.depth > 0 ?
+            // TODO: Make the factor configurable
+            _cssVariables.vars.spacing(rowNode.depth * 2) : '0px'
+          }
+        }
       }, column.field);
     }
 

package/components/GridRow.mjs

@@ -10,6 +10,7 @@ import useForkRef from '@mui/utils/useForkRef';
 import { fastMemo } from '@mui/x-internals/fastMemo';
 import { forwardRef } from '@mui/x-internals/forwardRef';
 import { isObjectEmpty } from '@mui/x-internals/isObjectEmpty';
+import { vars } from "../constants/cssVariables.mjs";
 import { GridEditModes, GridCellModes } from "../models/gridEditRowModel.mjs";
 import { gridClasses } from "../constants/gridClasses.mjs";
 import { composeGridClasses } from "../utils/composeGridClasses.mjs";
@@ -229,7 +230,14 @@ const GridRow = forwardRef(function GridRow(props, refProp) {
         width: width,
         height: rowHeight,
         field: column.field,
-        align: column.align
+        align: column.align,
+        skeletonProps: {
+          style: {
+            marginLeft: indexRelativeToAllColumns === 0 && rowNode.depth > 0 ?
+            // TODO: Make the factor configurable
+            vars.spacing(rowNode.depth * 2) : '0px'
+          }
+        }
       }, column.field);
     }
 

package/components/cell/GridActionsCellItem.js

@@ -36,7 +36,7 @@ const GridActionsCellItem = exports.GridActionsCellItem = (0, _forwardRef.forwar
     }, rootProps.slotProps?.baseIconButton, {
       ref: ref,
       children: /*#__PURE__*/React.cloneElement(icon, {
-        fontSize: 'small'
+        fontSize: 'inherit'
       })
     }));
   }

package/components/cell/GridActionsCellItem.mjs

@@ -29,7 +29,7 @@ const GridActionsCellItem = forwardRef((props, ref) => {
     }, rootProps.slotProps?.baseIconButton, {
       ref: ref,
       children: /*#__PURE__*/React.cloneElement(icon, {
-        fontSize: 'small'
+        fontSize: 'inherit'
       })
     }));
   }

package/components/cell/GridSkeletonCell.d.mts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { GridColType } from "../../models/index.mjs";
+import type { GridColType, GridSlotProps } from "../../models/index.mjs";
 export interface GridSkeletonCellProps extends React.HTMLAttributes<HTMLDivElement> {
   type?: GridColType;
   width?: number | string;
@@ -11,6 +11,7 @@ export interface GridSkeletonCellProps extends React.HTMLAttributes<HTMLDivEleme
    * @default false
    */
   empty?: boolean;
+  skeletonProps?: GridSlotProps['baseSkeleton'];
 }
 declare function GridSkeletonCell(props: GridSkeletonCellProps): import("react/jsx-runtime").JSX.Element;
 declare namespace GridSkeletonCell {

package/components/cell/GridSkeletonCell.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { GridColType } from "../../models/index.js";
+import type { GridColType, GridSlotProps } from "../../models/index.js";
 export interface GridSkeletonCellProps extends React.HTMLAttributes<HTMLDivElement> {
   type?: GridColType;
   width?: number | string;
@@ -11,6 +11,7 @@ export interface GridSkeletonCellProps extends React.HTMLAttributes<HTMLDivEleme
    * @default false
    */
   empty?: boolean;
+  skeletonProps?: GridSlotProps['baseSkeleton'];
 }
 declare function GridSkeletonCell(props: GridSkeletonCellProps): import("react/jsx-runtime").JSX.Element;
 declare namespace GridSkeletonCell {

package/components/cell/GridSkeletonCell.js

@@ -18,7 +18,7 @@ var _utils = require("../../utils/utils");
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
 var _gridClasses = require("../../constants/gridClasses");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["field", "type", "align", "width", "height", "empty", "style", "className"];
+const _excluded = ["field", "type", "align", "width", "height", "empty", "style", "className", "skeletonProps"];
 const CIRCULAR_CONTENT_SIZE = '1.3em';
 const CONTENT_HEIGHT = '1.2em';
 const DEFAULT_CONTENT_WIDTH_RANGE = [40, 80];
@@ -50,7 +50,8 @@ function GridSkeletonCell(props) {
       height,
       empty = false,
       style,
-      className
+      className,
+      skeletonProps: skeletonPropsOverride
     } = props,
     other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   const rootProps = (0, _useGridRootProps.useGridRootProps)();
@@ -62,7 +63,7 @@ function GridSkeletonCell(props) {
   const classes = useUtilityClasses(ownerState);
 
   // Memo prevents the non-circular skeleton widths changing to random widths on every render
-  const skeletonProps = React.useMemo(() => {
+  const baseSkeletonProps = React.useMemo(() => {
     const isCircularContent = type === 'boolean' || type === 'actions';
     if (isCircularContent) {
       return {
@@ -81,6 +82,10 @@ function GridSkeletonCell(props) {
       height: CONTENT_HEIGHT
     };
   }, [type]);
+
+  // Merge caller overrides outside the memo so an inline `skeletonProps` object
+  // doesn't bust the memo and re-roll the random width on every render
+  const skeletonProps = skeletonPropsOverride && Object.keys(skeletonPropsOverride).length > 0 ? (0, _extends2.default)({}, baseSkeletonProps, skeletonPropsOverride) : baseSkeletonProps;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", (0, _extends2.default)({
     "data-field": field,
     className: (0, _clsx.default)(classes.root, className),

package/components/cell/GridSkeletonCell.mjs

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["field", "type", "align", "width", "height", "empty", "style", "className"];
+const _excluded = ["field", "type", "align", "width", "height", "empty", "style", "className", "skeletonProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
@@ -42,7 +42,8 @@ function GridSkeletonCell(props) {
       height,
       empty = false,
       style,
-      className
+      className,
+      skeletonProps: skeletonPropsOverride
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const rootProps = useGridRootProps();
@@ -54,7 +55,7 @@ function GridSkeletonCell(props) {
   const classes = useUtilityClasses(ownerState);
 
   // Memo prevents the non-circular skeleton widths changing to random widths on every render
-  const skeletonProps = React.useMemo(() => {
+  const baseSkeletonProps = React.useMemo(() => {
     const isCircularContent = type === 'boolean' || type === 'actions';
     if (isCircularContent) {
       return {
@@ -73,6 +74,10 @@ function GridSkeletonCell(props) {
       height: CONTENT_HEIGHT
     };
   }, [type]);
+
+  // Merge caller overrides outside the memo so an inline `skeletonProps` object
+  // doesn't bust the memo and re-roll the random width on every render
+  const skeletonProps = skeletonPropsOverride && Object.keys(skeletonPropsOverride).length > 0 ? _extends({}, baseSkeletonProps, skeletonPropsOverride) : baseSkeletonProps;
   return /*#__PURE__*/_jsx("div", _extends({
     "data-field": field,
     className: clsx(classes.root, className),

package/hooks/core/strategyProcessing/gridStrategyProcessingApi.d.mts

@@ -2,6 +2,7 @@ import type { GridRowTreeCreationParams, GridRowTreeCreationValue, GridRowsState
 import type { GridFilteringMethodParams, GridFilteringMethodValue, GridFilterState, GridVisibleRowsLookupState } from "../../features/filter/gridFilterState.mjs";
 import type { GridSortingMethodParams, GridSortingMethodValue } from "../../features/sorting/gridSortingState.mjs";
 import type { GridGetRowsParams, GridGetRowsResponse, GridGetRowsOptions } from "../../../models/gridDataSource.mjs";
+import type { GridRowId } from "../../../models/gridRows.mjs";
 export type GridStrategyProcessorName = keyof GridStrategyProcessingLookup;
 export declare enum GridStrategyGroup {
   DataSource = "dataSource",
@@ -9,7 +10,7 @@ export declare enum GridStrategyGroup {
 }
 export type GridStrategyGroupValue = `${GridStrategyGroup}`;
 export interface GridStrategyProcessingLookup {
-  dataSourceRowsUpdate: {
+  dataSourceRootRowsUpdate: {
     group: GridStrategyGroup.DataSource;
     params: {
       response: GridGetRowsResponse;
@@ -22,6 +23,21 @@ export interface GridStrategyProcessingLookup {
     };
     value: void;
   };
+  dataSourceNestedRowsUpdate: {
+    group: GridStrategyGroup.DataSource;
+    params: {
+      parentId: GridRowId;
+      path: string[];
+      response: GridGetRowsResponse;
+      fetchParams: GridGetRowsParams;
+    } | {
+      parentId: GridRowId;
+      path: string[];
+      error: Error;
+      fetchParams: GridGetRowsParams;
+    };
+    value: void;
+  };
   rowTreeCreation: {
     group: GridStrategyGroup.RowTree;
     params: GridRowTreeCreationParams;

package/hooks/core/strategyProcessing/gridStrategyProcessingApi.d.ts

@@ -2,6 +2,7 @@ import type { GridRowTreeCreationParams, GridRowTreeCreationValue, GridRowsState
 import type { GridFilteringMethodParams, GridFilteringMethodValue, GridFilterState, GridVisibleRowsLookupState } from "../../features/filter/gridFilterState.js";
 import type { GridSortingMethodParams, GridSortingMethodValue } from "../../features/sorting/gridSortingState.js";
 import type { GridGetRowsParams, GridGetRowsResponse, GridGetRowsOptions } from "../../../models/gridDataSource.js";
+import type { GridRowId } from "../../../models/gridRows.js";
 export type GridStrategyProcessorName = keyof GridStrategyProcessingLookup;
 export declare enum GridStrategyGroup {
   DataSource = "dataSource",
@@ -9,7 +10,7 @@ export declare enum GridStrategyGroup {
 }
 export type GridStrategyGroupValue = `${GridStrategyGroup}`;
 export interface GridStrategyProcessingLookup {
-  dataSourceRowsUpdate: {
+  dataSourceRootRowsUpdate: {
     group: GridStrategyGroup.DataSource;
     params: {
       response: GridGetRowsResponse;
@@ -22,6 +23,21 @@ export interface GridStrategyProcessingLookup {
     };
     value: void;
   };
+  dataSourceNestedRowsUpdate: {
+    group: GridStrategyGroup.DataSource;
+    params: {
+      parentId: GridRowId;
+      path: string[];
+      response: GridGetRowsResponse;
+      fetchParams: GridGetRowsParams;
+    } | {
+      parentId: GridRowId;
+      path: string[];
+      error: Error;
+      fetchParams: GridGetRowsParams;
+    };
+    value: void;
+  };
   rowTreeCreation: {
     group: GridStrategyGroup.RowTree;
     params: GridRowTreeCreationParams;

package/hooks/core/strategyProcessing/useGridStrategyProcessing.js

@@ -15,7 +15,8 @@ var _gridStrategyProcessingApi = require("./gridStrategyProcessingApi");
 var _useGridApiMethod = require("../../utils/useGridApiMethod");
 const GRID_DEFAULT_STRATEGY = exports.GRID_DEFAULT_STRATEGY = 'none';
 const GRID_STRATEGIES_PROCESSORS = {
-  dataSourceRowsUpdate: _gridStrategyProcessingApi.GridStrategyGroup.DataSource,
+  dataSourceRootRowsUpdate: _gridStrategyProcessingApi.GridStrategyGroup.DataSource,
+  dataSourceNestedRowsUpdate: _gridStrategyProcessingApi.GridStrategyGroup.DataSource,
   rowTreeCreation: _gridStrategyProcessingApi.GridStrategyGroup.RowTree,
   filtering: _gridStrategyProcessingApi.GridStrategyGroup.RowTree,
   sorting: _gridStrategyProcessingApi.GridStrategyGroup.RowTree,

package/hooks/core/strategyProcessing/useGridStrategyProcessing.mjs

@@ -8,7 +8,8 @@ import { GridStrategyGroup } from "./gridStrategyProcessingApi.mjs";
 import { useGridApiMethod } from "../../utils/useGridApiMethod.mjs";
 export const GRID_DEFAULT_STRATEGY = 'none';
 const GRID_STRATEGIES_PROCESSORS = {
-  dataSourceRowsUpdate: GridStrategyGroup.DataSource,
+  dataSourceRootRowsUpdate: GridStrategyGroup.DataSource,
+  dataSourceNestedRowsUpdate: GridStrategyGroup.DataSource,
   rowTreeCreation: GridStrategyGroup.RowTree,
   filtering: GridStrategyGroup.RowTree,
   sorting: GridStrategyGroup.RowTree,

package/hooks/core/useGridVirtualizer.d.mts

@@ -9,28 +9,28 @@ export declare function useGridVirtualizer(): {
     updateDimensions: (firstUpdate?: boolean) => void;
     debouncedUpdateDimensions: (((firstUpdate?: boolean) => void) & import("@mui/x-internals/throttle").Cancelable) | undefined;
     rowsMeta: {
-      getRowHeight: (rowId: import("@mui/x-virtualizer/models").RowId) => any;
+      getRowHeight: (rowId: import("@mui/x-virtualizer").RowId) => any;
       setLastMeasuredRowIndex: (index: number) => void;
-      storeRowHeightMeasurement: (id: import("@mui/x-virtualizer/models").RowId, height: number) => void;
+      storeRowHeightMeasurement: (id: import("@mui/x-virtualizer").RowId, height: number) => void;
       hydrateRowsMeta: () => void;
-      observeRowHeight: (element: Element, rowId: import("@mui/x-virtualizer/models").RowId) => () => void | undefined;
-      rowHasAutoHeight: (id: import("@mui/x-virtualizer/models").RowId) => any;
-      getRowHeightEntry: (rowId: import("@mui/x-virtualizer/models").RowId) => any;
+      observeRowHeight: (element: Element, rowId: import("@mui/x-virtualizer").RowId) => () => void | undefined;
+      rowHasAutoHeight: (id: import("@mui/x-virtualizer").RowId) => any;
+      getRowHeightEntry: (rowId: import("@mui/x-virtualizer").RowId) => any;
       getLastMeasuredRowIndex: () => number;
       resetRowHeights: () => void;
     };
   } & {
-    getCellColSpanInfo: (rowId: import("@mui/x-virtualizer/models").RowId, columnIndex: import("@mui/x-internals/types").integer) => import("@mui/x-virtualizer/models").CellColSpanInfo;
-    calculateColSpan: (rowId: import("@mui/x-virtualizer/models").RowId, minFirstColumn: import("@mui/x-internals/types").integer, maxLastColumn: import("@mui/x-internals/types").integer, columns: import("@mui/x-virtualizer/models").ColumnWithWidth[]) => void;
-    getHiddenCellsOrigin: () => Record<import("@mui/x-virtualizer/models").RowId, Record<number, number>>;
+    getCellColSpanInfo: (rowId: import("@mui/x-virtualizer").RowId, columnIndex: import("@mui/x-internals/types").integer) => import("@mui/x-virtualizer").CellColSpanInfo;
+    calculateColSpan: (rowId: import("@mui/x-virtualizer").RowId, minFirstColumn: import("@mui/x-internals/types").integer, maxLastColumn: import("@mui/x-internals/types").integer, columns: import("@mui/x-virtualizer").ColumnWithWidth[]) => void;
+    getHiddenCellsOrigin: () => Record<import("@mui/x-virtualizer").RowId, Record<number, number>>;
     getters: any;
     setPanels: React.Dispatch<React.SetStateAction<Readonly<Map<any, React.ReactNode>>>>;
     forceUpdateRenderContext: () => void;
     scheduleUpdateRenderContext: () => void;
   } & {
     resetColSpan: () => void;
-    getCellColSpanInfo: (rowId: import("@mui/x-virtualizer/models").RowId, columnIndex: import("@mui/x-internals/types").integer) => import("@mui/x-virtualizer/models").CellColSpanInfo | undefined;
-    calculateColSpan: (rowId: import("@mui/x-virtualizer/models").RowId, minFirstColumn: import("@mui/x-internals/types").integer, maxLastColumn: import("@mui/x-internals/types").integer, columns: import("@mui/x-virtualizer/models").ColumnWithWidth[]) => void;
+    getCellColSpanInfo: (rowId: import("@mui/x-virtualizer").RowId, columnIndex: import("@mui/x-internals/types").integer) => import("@mui/x-virtualizer").CellColSpanInfo | undefined;
+    calculateColSpan: (rowId: import("@mui/x-virtualizer").RowId, minFirstColumn: import("@mui/x-internals/types").integer, maxLastColumn: import("@mui/x-internals/types").integer, columns: import("@mui/x-virtualizer").ColumnWithWidth[]) => void;
   } & {
     getHiddenCellsOrigin: () => Record<number, Record<number, number>>;
   } & {

package/hooks/core/useGridVirtualizer.d.ts

@@ -9,28 +9,28 @@ export declare function useGridVirtualizer(): {
     updateDimensions: (firstUpdate?: boolean) => void;
     debouncedUpdateDimensions: (((firstUpdate?: boolean) => void) & import("@mui/x-internals/throttle").Cancelable) | undefined;
     rowsMeta: {
-      getRowHeight: (rowId: import("@mui/x-virtualizer/models").RowId) => any;
+      getRowHeight: (rowId: import("@mui/x-virtualizer").RowId) => any;
       setLastMeasuredRowIndex: (index: number) => void;
-      storeRowHeightMeasurement: (id: import("@mui/x-virtualizer/models").RowId, height: number) => void;
+      storeRowHeightMeasurement: (id: import("@mui/x-virtualizer").RowId, height: number) => void;
       hydrateRowsMeta: () => void;
-      observeRowHeight: (element: Element, rowId: import("@mui/x-virtualizer/models").RowId) => () => void | undefined;
-      rowHasAutoHeight: (id: import("@mui/x-virtualizer/models").RowId) => any;
-      getRowHeightEntry: (rowId: import("@mui/x-virtualizer/models").RowId) => any;
+      observeRowHeight: (element: Element, rowId: import("@mui/x-virtualizer").RowId) => () => void | undefined;
+      rowHasAutoHeight: (id: import("@mui/x-virtualizer").RowId) => any;
+      getRowHeightEntry: (rowId: import("@mui/x-virtualizer").RowId) => any;
       getLastMeasuredRowIndex: () => number;
       resetRowHeights: () => void;
     };
   } & {
-    getCellColSpanInfo: (rowId: import("@mui/x-virtualizer/models").RowId, columnIndex: import("@mui/x-internals/types").integer) => import("@mui/x-virtualizer/models").CellColSpanInfo;
-    calculateColSpan: (rowId: import("@mui/x-virtualizer/models").RowId, minFirstColumn: import("@mui/x-internals/types").integer, maxLastColumn: import("@mui/x-internals/types").integer, columns: import("@mui/x-virtualizer/models").ColumnWithWidth[]) => void;
-    getHiddenCellsOrigin: () => Record<import("@mui/x-virtualizer/models").RowId, Record<number, number>>;
+    getCellColSpanInfo: (rowId: import("@mui/x-virtualizer").RowId, columnIndex: import("@mui/x-internals/types").integer) => import("@mui/x-virtualizer").CellColSpanInfo;
+    calculateColSpan: (rowId: import("@mui/x-virtualizer").RowId, minFirstColumn: import("@mui/x-internals/types").integer, maxLastColumn: import("@mui/x-internals/types").integer, columns: import("@mui/x-virtualizer").ColumnWithWidth[]) => void;
+    getHiddenCellsOrigin: () => Record<import("@mui/x-virtualizer").RowId, Record<number, number>>;
     getters: any;
     setPanels: React.Dispatch<React.SetStateAction<Readonly<Map<any, React.ReactNode>>>>;
     forceUpdateRenderContext: () => void;
     scheduleUpdateRenderContext: () => void;
   } & {
     resetColSpan: () => void;
-    getCellColSpanInfo: (rowId: import("@mui/x-virtualizer/models").RowId, columnIndex: import("@mui/x-internals/types").integer) => import("@mui/x-virtualizer/models").CellColSpanInfo | undefined;
-    calculateColSpan: (rowId: import("@mui/x-virtualizer/models").RowId, minFirstColumn: import("@mui/x-internals/types").integer, maxLastColumn: import("@mui/x-internals/types").integer, columns: import("@mui/x-virtualizer/models").ColumnWithWidth[]) => void;
+    getCellColSpanInfo: (rowId: import("@mui/x-virtualizer").RowId, columnIndex: import("@mui/x-internals/types").integer) => import("@mui/x-virtualizer").CellColSpanInfo | undefined;
+    calculateColSpan: (rowId: import("@mui/x-virtualizer").RowId, minFirstColumn: import("@mui/x-internals/types").integer, maxLastColumn: import("@mui/x-internals/types").integer, columns: import("@mui/x-virtualizer").ColumnWithWidth[]) => void;
   } & {
     getHiddenCellsOrigin: () => Record<number, Record<number, number>>;
   } & {

package/hooks/features/dataSource/models.d.mts

@@ -41,7 +41,7 @@ export interface GridDataSourceApiBase {
 }
 export interface GridDataSourceBaseOptions {
   cacheOptions?: GridDataSourceCacheDefaultConfig;
-  fetchRowChildren?: (parents: GridRowId[], options?: GridDataSourceFetchRowChildrenOptions) => void;
+  fetchRowChildren?: (parents: GridRowId[], fetchParams: GridGetRowsParams[], showChildrenLoading?: boolean) => void;
   clearDataSourceState?: () => void;
   handleEditRow?: (params: GridUpdateRowParams, updatedRow: GridRowModel) => void;
 }

package/hooks/features/dataSource/models.d.ts

@@ -41,7 +41,7 @@ export interface GridDataSourceApiBase {
 }
 export interface GridDataSourceBaseOptions {
   cacheOptions?: GridDataSourceCacheDefaultConfig;
-  fetchRowChildren?: (parents: GridRowId[], options?: GridDataSourceFetchRowChildrenOptions) => void;
+  fetchRowChildren?: (parents: GridRowId[], fetchParams: GridGetRowsParams[], showChildrenLoading?: boolean) => void;
   clearDataSourceState?: () => void;
   handleEditRow?: (params: GridUpdateRowParams, updatedRow: GridRowModel) => void;
 }

package/hooks/features/dataSource/useGridDataSourceBase.d.mts

@@ -14,8 +14,8 @@ export declare const useGridDataSourceBase: <Api extends GridPrivateApiCommunity
   debouncedFetchRows: ((parentId?: GridRowId, params?: import("./models.mjs").GridDataSourceFetchRowsParams<import("@mui/x-data-grid").GridGetRowsParams>) => Promise<void>) & import("@mui/utils/debounce").Cancelable;
   strategyProcessor: {
     strategyName: DataSourceRowsUpdateStrategy;
-    group: "dataSourceRowsUpdate";
-    processor: GridStrategyProcessor<"dataSourceRowsUpdate">;
+    group: "dataSourceRootRowsUpdate";
+    processor: GridStrategyProcessor<"dataSourceRootRowsUpdate">;
   };
   setStrategyAvailability: () => void;
   startPolling: () => void;

package/hooks/features/dataSource/useGridDataSourceBase.d.ts

@@ -14,8 +14,8 @@ export declare const useGridDataSourceBase: <Api extends GridPrivateApiCommunity
   debouncedFetchRows: ((parentId?: GridRowId, params?: import("./models.js").GridDataSourceFetchRowsParams<import("@mui/x-data-grid").GridGetRowsParams>) => Promise<void>) & import("@mui/utils/debounce").Cancelable;
   strategyProcessor: {
     strategyName: DataSourceRowsUpdateStrategy;
-    group: "dataSourceRowsUpdate";
-    processor: GridStrategyProcessor<"dataSourceRowsUpdate">;
+    group: "dataSourceRootRowsUpdate";
+    processor: GridStrategyProcessor<"dataSourceRootRowsUpdate">;
   };
   setStrategyAvailability: () => void;
   startPolling: () => void;

package/hooks/features/dataSource/useGridDataSourceBase.js

@@ -25,7 +25,7 @@ var _gridDataSourceSelector = require("./gridDataSourceSelector");
 var _utils2 = require("./utils");
 var _cache = require("./cache");
 var _gridDataSourceError = require("./gridDataSourceError");
-const _excluded = ["skipCache", "keepChildrenExpanded"];
+const _excluded = ["skipCache", "keepChildrenExpanded", "showChildrenLoading"];
 const noopCache = {
   clear: () => {},
   get: () => undefined,
@@ -64,22 +64,26 @@ const useGridDataSourceBase = (apiRef, props, options = {}) => {
     if (!getRows) {
       return;
     }
-    if (parentId && parentId !== _gridRowsUtils.GRID_ROOT_GROUP_ID && props.signature !== 'DataGrid') {
-      options.fetchRowChildren?.([parentId]);
-      return;
-    }
-    options.clearDataSourceState?.();
     const _ref = params || {},
       {
         skipCache,
-        keepChildrenExpanded
+        keepChildrenExpanded,
+        showChildrenLoading
       } = _ref,
       getRowsParams = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
     const fetchParams = (0, _extends2.default)({}, (0, _gridDataSourceSelector.gridGetRowsParamsSelector)(apiRef), apiRef.current.unstable_applyPipeProcessors('getRowsParams', {}), getRowsParams);
+    if (parentId && parentId !== _gridRowsUtils.GRID_ROOT_GROUP_ID && props.signature !== 'DataGrid') {
+      options.fetchRowChildren?.([parentId], [fetchParams], showChildrenLoading);
+      return;
+    }
+    options.clearDataSourceState?.();
     const cacheKeys = cacheChunkManager.getCacheKeys(fetchParams);
     const responses = cacheKeys.map(cacheKey => cache.get(cacheKey));
     if (!skipCache && responses.every(response => response !== undefined)) {
-      apiRef.current.applyStrategyProcessor('dataSourceRowsUpdate', {
+      // Bump the request id so any cache-miss request still in flight is treated as
+      // stale and won't override the cached data we're about to apply.
+      lastRequestId.current += 1;
+      apiRef.current.applyStrategyProcessor('dataSourceRootRowsUpdate', {
         response: _utils2.CacheChunkManager.mergeResponses(responses),
         fetchParams,
         options: {
@@ -87,6 +91,9 @@ const useGridDataSourceBase = (apiRef, props, options = {}) => {
           keepChildrenExpanded
         }
       });
+      if (standardRowsUpdateStrategyActive) {
+        apiRef.current.setLoading(false);
+      }
       return;
     }
 
@@ -101,7 +108,7 @@ const useGridDataSourceBase = (apiRef, props, options = {}) => {
       const cacheResponses = cacheChunkManager.splitResponse(fetchParams, getRowsResponse);
       cacheResponses.forEach((response, key) => cache.set(key, response));
       if (lastRequestId.current === requestId) {
-        apiRef.current.applyStrategyProcessor('dataSourceRowsUpdate', {
+        apiRef.current.applyStrategyProcessor('dataSourceRootRowsUpdate', {
           response: getRowsResponse,
           fetchParams,
           options: {
@@ -112,7 +119,7 @@ const useGridDataSourceBase = (apiRef, props, options = {}) => {
       }
     } catch (originalError) {
       if (lastRequestId.current === requestId) {
-        apiRef.current.applyStrategyProcessor('dataSourceRowsUpdate', {
+        apiRef.current.applyStrategyProcessor('dataSourceRootRowsUpdate', {
           error: originalError,
           fetchParams,
           options: {
@@ -159,9 +166,7 @@ const useGridDataSourceBase = (apiRef, props, options = {}) => {
         return acc;
       }, []);
       if (expandedGroupIds.length > 0) {
-        fetchRowChildrenOption(expandedGroupIds, {
-          showChildrenLoading: false
-        });
+        fetchRowChildrenOption(expandedGroupIds, [], false);
       }
     };
     const fetchParams = (0, _extends2.default)({}, (0, _gridDataSourceSelector.gridGetRowsParamsSelector)(apiRef), apiRef.current.unstable_applyPipeProcessors('getRowsParams', {}));
@@ -179,7 +184,7 @@ const useGridDataSourceBase = (apiRef, props, options = {}) => {
       }
       const cacheResponses = cacheChunkManager.splitResponse(fetchParams, response);
       cacheResponses.forEach((cacheResponse, key) => cache.set(key, cacheResponse));
-      apiRef.current.applyStrategyProcessor('dataSourceRowsUpdate', {
+      apiRef.current.applyStrategyProcessor('dataSourceRootRowsUpdate', {
         response,
         fetchParams,
         options: {}
@@ -260,10 +265,17 @@ const useGridDataSourceBase = (apiRef, props, options = {}) => {
   };
   const debouncedFetchRows = React.useMemo(() => (0, _debounce.default)(fetchRows, 0), [fetchRows]);
   const handleFetchRowsOnParamsChange = React.useCallback(() => {
+    // Clear the rows first and immediately mark the grid as loading so the overlay
+    // selector never observes the intermediate `rows=[] && loading=false` state that
+    // would otherwise pick `noRowsOverlay`. Order matters: `setRows([])` rebuilds
+    // `state.rows` from `props.loading`, so the `setLoading(true)` call must come after
+    // it to survive the rebuild. This handler is only wired up when a standard strategy
+    // is active via the `runIf` guards on the returned `events` object.
     apiRef.current.setRows([]);
+    apiRef.current.setLoading(true);
     stopPolling();
     debouncedFetchRows();
-  }, [stopPolling, debouncedFetchRows, apiRef]);
+  }, [apiRef, stopPolling, debouncedFetchRows]);
   const isFirstRender = React.useRef(true);
   React.useEffect(() => {
     if (isFirstRender.current) {
@@ -290,7 +302,7 @@ const useGridDataSourceBase = (apiRef, props, options = {}) => {
   React.useEffect(() => {
     // Return early if the proper strategy isn't set yet
     // Context: https://github.com/mui/mui-x/issues/19650
-    if (currentStrategy !== _utils2.DataSourceRowsUpdateStrategy.Default && currentStrategy !== _utils2.DataSourceRowsUpdateStrategy.LazyLoading && currentStrategy !== _utils2.DataSourceRowsUpdateStrategy.GroupedData) {
+    if (currentStrategy !== _utils2.DataSourceRowsUpdateStrategy.Default && currentStrategy !== _utils2.DataSourceRowsUpdateStrategy.LazyLoading && currentStrategy !== _utils2.DataSourceRowsUpdateStrategy.GroupedData && currentStrategy !== _utils2.DataSourceRowsUpdateStrategy.LazyLoadedGroupedData) {
       return undefined;
     }
     if (props.dataSource) {
@@ -311,7 +323,7 @@ const useGridDataSourceBase = (apiRef, props, options = {}) => {
     debouncedFetchRows,
     strategyProcessor: {
       strategyName: _utils2.DataSourceRowsUpdateStrategy.Default,
-      group: 'dataSourceRowsUpdate',
+      group: 'dataSourceRootRowsUpdate',
       processor: handleDataUpdate
     },
     setStrategyAvailability,

package/hooks/features/dataSource/useGridDataSourceBase.mjs

@@ -2,7 +2,7 @@
 
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["skipCache", "keepChildrenExpanded"];
+const _excluded = ["skipCache", "keepChildrenExpanded", "showChildrenLoading"];
 import * as React from 'react';
 import useLazyRef from '@mui/utils/useLazyRef';
 import useEventCallback from '@mui/utils/useEventCallback';
@@ -57,22 +57,26 @@ export const useGridDataSourceBase = (apiRef, props, options = {}) => {
     if (!getRows) {
       return;
     }
-    if (parentId && parentId !== GRID_ROOT_GROUP_ID && props.signature !== 'DataGrid') {
-      options.fetchRowChildren?.([parentId]);
-      return;
-    }
-    options.clearDataSourceState?.();
     const _ref = params || {},
       {
         skipCache,
-        keepChildrenExpanded
+        keepChildrenExpanded,
+        showChildrenLoading
       } = _ref,
       getRowsParams = _objectWithoutPropertiesLoose(_ref, _excluded);
     const fetchParams = _extends({}, gridGetRowsParamsSelector(apiRef), apiRef.current.unstable_applyPipeProcessors('getRowsParams', {}), getRowsParams);
+    if (parentId && parentId !== GRID_ROOT_GROUP_ID && props.signature !== 'DataGrid') {
+      options.fetchRowChildren?.([parentId], [fetchParams], showChildrenLoading);
+      return;
+    }
+    options.clearDataSourceState?.();
     const cacheKeys = cacheChunkManager.getCacheKeys(fetchParams);
     const responses = cacheKeys.map(cacheKey => cache.get(cacheKey));
     if (!skipCache && responses.every(response => response !== undefined)) {
-      apiRef.current.applyStrategyProcessor('dataSourceRowsUpdate', {
+      // Bump the request id so any cache-miss request still in flight is treated as
+      // stale and won't override the cached data we're about to apply.
+      lastRequestId.current += 1;
+      apiRef.current.applyStrategyProcessor('dataSourceRootRowsUpdate', {
         response: CacheChunkManager.mergeResponses(responses),
         fetchParams,
         options: {
@@ -80,6 +84,9 @@ export const useGridDataSourceBase = (apiRef, props, options = {}) => {
           keepChildrenExpanded
         }
       });
+      if (standardRowsUpdateStrategyActive) {
+        apiRef.current.setLoading(false);
+      }
       return;
     }
 
@@ -94,7 +101,7 @@ export const useGridDataSourceBase = (apiRef, props, options = {}) => {
       const cacheResponses = cacheChunkManager.splitResponse(fetchParams, getRowsResponse);
       cacheResponses.forEach((response, key) => cache.set(key, response));
       if (lastRequestId.current === requestId) {
-        apiRef.current.applyStrategyProcessor('dataSourceRowsUpdate', {
+        apiRef.current.applyStrategyProcessor('dataSourceRootRowsUpdate', {
           response: getRowsResponse,
           fetchParams,
           options: {
@@ -105,7 +112,7 @@ export const useGridDataSourceBase = (apiRef, props, options = {}) => {
       }
     } catch (originalError) {
       if (lastRequestId.current === requestId) {
-        apiRef.current.applyStrategyProcessor('dataSourceRowsUpdate', {
+        apiRef.current.applyStrategyProcessor('dataSourceRootRowsUpdate', {
           error: originalError,
           fetchParams,
           options: {
@@ -152,9 +159,7 @@ export const useGridDataSourceBase = (apiRef, props, options = {}) => {
         return acc;
       }, []);
       if (expandedGroupIds.length > 0) {
-        fetchRowChildrenOption(expandedGroupIds, {
-          showChildrenLoading: false
-        });
+        fetchRowChildrenOption(expandedGroupIds, [], false);
       }
     };
     const fetchParams = _extends({}, gridGetRowsParamsSelector(apiRef), apiRef.current.unstable_applyPipeProcessors('getRowsParams', {}));
@@ -172,7 +177,7 @@ export const useGridDataSourceBase = (apiRef, props, options = {}) => {
       }
       const cacheResponses = cacheChunkManager.splitResponse(fetchParams, response);
       cacheResponses.forEach((cacheResponse, key) => cache.set(key, cacheResponse));
-      apiRef.current.applyStrategyProcessor('dataSourceRowsUpdate', {
+      apiRef.current.applyStrategyProcessor('dataSourceRootRowsUpdate', {
         response,
         fetchParams,
         options: {}
@@ -253,10 +258,17 @@ export const useGridDataSourceBase = (apiRef, props, options = {}) => {
   };
   const debouncedFetchRows = React.useMemo(() => debounce(fetchRows, 0), [fetchRows]);
   const handleFetchRowsOnParamsChange = React.useCallback(() => {
+    // Clear the rows first and immediately mark the grid as loading so the overlay
+    // selector never observes the intermediate `rows=[] && loading=false` state that
+    // would otherwise pick `noRowsOverlay`. Order matters: `setRows([])` rebuilds
+    // `state.rows` from `props.loading`, so the `setLoading(true)` call must come after
+    // it to survive the rebuild. This handler is only wired up when a standard strategy
+    // is active via the `runIf` guards on the returned `events` object.
     apiRef.current.setRows([]);
+    apiRef.current.setLoading(true);
     stopPolling();
     debouncedFetchRows();
-  }, [stopPolling, debouncedFetchRows, apiRef]);
+  }, [apiRef, stopPolling, debouncedFetchRows]);
   const isFirstRender = React.useRef(true);
   React.useEffect(() => {
     if (isFirstRender.current) {
@@ -283,7 +295,7 @@ export const useGridDataSourceBase = (apiRef, props, options = {}) => {
   React.useEffect(() => {
     // Return early if the proper strategy isn't set yet
     // Context: https://github.com/mui/mui-x/issues/19650
-    if (currentStrategy !== DataSourceRowsUpdateStrategy.Default && currentStrategy !== DataSourceRowsUpdateStrategy.LazyLoading && currentStrategy !== DataSourceRowsUpdateStrategy.GroupedData) {
+    if (currentStrategy !== DataSourceRowsUpdateStrategy.Default && currentStrategy !== DataSourceRowsUpdateStrategy.LazyLoading && currentStrategy !== DataSourceRowsUpdateStrategy.GroupedData && currentStrategy !== DataSourceRowsUpdateStrategy.LazyLoadedGroupedData) {
       return undefined;
     }
     if (props.dataSource) {
@@ -304,7 +316,7 @@ export const useGridDataSourceBase = (apiRef, props, options = {}) => {
     debouncedFetchRows,
     strategyProcessor: {
       strategyName: DataSourceRowsUpdateStrategy.Default,
-      group: 'dataSourceRowsUpdate',
+      group: 'dataSourceRootRowsUpdate',
       processor: handleDataUpdate
     },
     setStrategyAvailability,

package/hooks/features/dataSource/utils.d.mts

@@ -3,6 +3,7 @@ export declare enum DataSourceRowsUpdateStrategy {
   Default = "set-flat-rows",
   LazyLoading = "replace-row-range",
   GroupedData = "set-grouped-rows",
+  LazyLoadedGroupedData = "replace-grouped-row-range",
 }
 /**
  * Provides better cache hit rate by:

package/hooks/features/dataSource/utils.d.ts

@@ -3,6 +3,7 @@ export declare enum DataSourceRowsUpdateStrategy {
   Default = "set-flat-rows",
   LazyLoading = "replace-row-range",
   GroupedData = "set-grouped-rows",
+  LazyLoadedGroupedData = "replace-grouped-row-range",
 }
 /**
  * Provides better cache hit rate by:

package/hooks/features/dataSource/utils.js

@@ -10,6 +10,7 @@ let DataSourceRowsUpdateStrategy = exports.DataSourceRowsUpdateStrategy = /*#__P
   DataSourceRowsUpdateStrategy["Default"] = "set-flat-rows";
   DataSourceRowsUpdateStrategy["LazyLoading"] = "replace-row-range";
   DataSourceRowsUpdateStrategy["GroupedData"] = "set-grouped-rows";
+  DataSourceRowsUpdateStrategy["LazyLoadedGroupedData"] = "replace-grouped-row-range";
   return DataSourceRowsUpdateStrategy;
 }({});
 /**

package/hooks/features/dataSource/utils.mjs

@@ -3,6 +3,7 @@ export let DataSourceRowsUpdateStrategy = /*#__PURE__*/function (DataSourceRowsU
   DataSourceRowsUpdateStrategy["Default"] = "set-flat-rows";
   DataSourceRowsUpdateStrategy["LazyLoading"] = "replace-row-range";
   DataSourceRowsUpdateStrategy["GroupedData"] = "set-grouped-rows";
+  DataSourceRowsUpdateStrategy["LazyLoadedGroupedData"] = "replace-grouped-row-range";
   return DataSourceRowsUpdateStrategy;
 }({});
 

package/hooks/features/virtualization/gridVirtualizationSelectors.d.mts

@@ -42,7 +42,7 @@ export declare const gridVirtualizationLayoutModeSelector: (args_0: import("reac
  */
 export declare const gridRenderContextSelector: (args_0: import("react").RefObject<{
   state: GridStateCommunity;
-} | null>) => import("@mui/x-virtualizer/models").RenderContext;
+} | null>) => import("@mui/x-virtualizer").RenderContext;
 /**
  * Get the render context, with only columns filled in.
  * This is cached, so it can be used to only re-render when the column interval changes.

package/hooks/features/virtualization/gridVirtualizationSelectors.d.ts

@@ -42,7 +42,7 @@ export declare const gridVirtualizationLayoutModeSelector: (args_0: import("reac
  */
 export declare const gridRenderContextSelector: (args_0: import("react").RefObject<{
   state: GridStateCommunity;
-} | null>) => import("@mui/x-virtualizer/models").RenderContext;
+} | null>) => import("@mui/x-virtualizer").RenderContext;
 /**
  * Get the render context, with only columns filled in.
  * This is cached, so it can be used to only re-render when the column interval changes.

package/index.js

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

package/index.mjs

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

package/models/gridDataSource.d.mts

@@ -27,6 +27,12 @@ export interface GridGetRowsOptions {
    * @default true
    */
   keepChildrenExpanded?: boolean;
+  /**
+   * If `false`, the loading indicator for children will not be shown during the fetch.
+   * Useful for background revalidation where loading indicators should be suppressed.
+   * @default true
+   */
+  showChildrenLoading?: boolean;
 }
 export interface GridUpdateRowParams {
   rowId: GridRowId;

package/models/gridDataSource.d.ts

@@ -27,6 +27,12 @@ export interface GridGetRowsOptions {
    * @default true
    */
   keepChildrenExpanded?: boolean;
+  /**
+   * If `false`, the loading indicator for children will not be shown during the fetch.
+   * Useful for background revalidation where loading indicators should be suppressed.
+   * @default true
+   */
+  showChildrenLoading?: boolean;
 }
 export interface GridUpdateRowParams {
   rowId: GridRowId;

package/models/gridRows.d.mts

@@ -129,7 +129,6 @@ 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;
 }

package/models/gridRows.d.ts

@@ -129,7 +129,6 @@ 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;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid",
-  "version": "9.3.0",
+  "version": "9.4.0",
   "author": "MUI Team",
   "description": "The Community plan edition of the MUI X Data Grid components.",
   "license": "MIT",
@@ -37,12 +37,12 @@
     "directory": "packages/x-data-grid"
   },
   "dependencies": {
-    "@babel/runtime": "^7.29.2",
+    "@babel/runtime": "^7.29.7",
     "@mui/utils": "9.0.1",
     "clsx": "^2.1.1",
     "prop-types": "^15.8.1",
     "use-sync-external-store": "^1.6.0",
-    "@mui/x-virtualizer": "9.0.0-alpha.7",
+    "@mui/x-virtualizer": "9.0.0-alpha.8",
     "@mui/x-internals": "^9.1.0"
   },
   "peerDependencies": {