@mui/x-data-grid 9.13.0 → 9.15.0

package/hooks/features/export/useGridPrintExport.mjs

@@ -1,7 +1,7 @@
 'use client';
 
 import _formatErrorMessage from "@mui/x-internals/formatErrorMessage";
-import _extends from "@babel/runtime/helpers/esm/extends";
+import _extends from "@babel/runtime/helpers/extends";
 import * as React from 'react';
 import ownerDocument from '@mui/utils/ownerDocument';
 import { loadStyleSheets } from '@mui/x-internals/export';
@@ -91,7 +91,7 @@ export const useGridPrintExport = (apiRef, props) => {
     }, []);
     apiRef.current.setRows(newRows);
   }, [apiRef]);
-  const handlePrintWindowLoad = React.useCallback((printWindow, options) => {
+  const handlePrintWindowLoad = React.useCallback(async (printWindow, options) => {
     const normalizeOptions = _extends({
       copyStyles: true,
       hideToolbar: false,
@@ -100,7 +100,7 @@ export const useGridPrintExport = (apiRef, props) => {
     }, options);
     const printDoc = printWindow.contentDocument;
     if (!printDoc) {
-      return;
+      return false;
     }
     const gridRootElement = apiRef.current.rootElementRef.current;
     const gridClone = gridRootElement.cloneNode(true);
@@ -129,6 +129,8 @@ export const useGridPrintExport = (apiRef, props) => {
       gridFooterElement.remove();
     }
     gridClone.style.height = 'auto';
+    gridClone.style.minHeight = '0';
+    gridClone.style.maxHeight = 'none';
     // The height above does not include grid border width, so we need to exclude it
     gridClone.style.boxSizing = 'content-box';
     if (!normalizeOptions.hideFooter && gridFooterElement) {
@@ -159,16 +161,23 @@ export const useGridPrintExport = (apiRef, props) => {
     if (normalizeOptions.copyStyles) {
       const rootCandidate = gridRootElement.getRootNode();
       const root = rootCandidate.constructor.name === 'ShadowRoot' ? rootCandidate : doc.current;
-      stylesheetLoadPromises = loadStyleSheets(printDoc, root);
+      stylesheetLoadPromises = loadStyleSheets(printDoc, root, {
+        onStylesheetError: normalizeOptions.onStylesheetError
+      });
+    }
+
+    // wait for remote stylesheets to load
+    const loaded = await Promise.all(stylesheetLoadPromises);
+    if (loaded.includes(false)) {
+      // `onStylesheetError` cancelled the print
+      return false;
     }
 
     // Trigger print
     if (process.env.NODE_ENV !== 'test' && !DEBUG_MODE) {
-      // wait for remote stylesheets to load
-      Promise.all(stylesheetLoadPromises).then(() => {
-        printWindow.contentWindow.print();
-      });
+      printWindow.contentWindow.print();
     }
+    return true;
   }, [apiRef, doc]);
   const handlePrintWindowAfterPrint = React.useCallback(printWindow => {
     // Remove the print iframe
@@ -221,21 +230,36 @@ export const useGridPrintExport = (apiRef, props) => {
     const printWindow = buildPrintWindow(options?.fileName);
     if (process.env.NODE_ENV === 'test') {
       doc.current.body.appendChild(printWindow);
-      // In test env, run the all pipeline without waiting for loading
-      handlePrintWindowLoad(printWindow, options);
-      handlePrintWindowAfterPrint(printWindow);
+      // In test env, run the all pipeline without waiting for the iframe to load or the print dialog
+      try {
+        await handlePrintWindowLoad(printWindow, options);
+      } finally {
+        handlePrintWindowAfterPrint(printWindow);
+      }
     } else {
-      printWindow.onload = () => {
-        handlePrintWindowLoad(printWindow, options);
-        const mediaQueryList = printWindow.contentWindow.matchMedia('print');
-        mediaQueryList.addEventListener('change', mql => {
-          const isAfterPrint = mql.matches === false;
-          if (isAfterPrint) {
+      await new Promise((resolve, reject) => {
+        printWindow.onload = () => {
+          const mediaQueryList = printWindow.contentWindow.matchMedia('print');
+          mediaQueryList.addEventListener('change', mql => {
+            const isAfterPrint = mql.matches === false;
+            if (isAfterPrint) {
+              handlePrintWindowAfterPrint(printWindow);
+            }
+          });
+          handlePrintWindowLoad(printWindow, options).then(printed => {
+            if (!printed) {
+              // The print dialog never opens, so restore the grid here
+              handlePrintWindowAfterPrint(printWindow);
+            }
+            resolve();
+          }, error => {
+            // The print dialog never opens, so restore the grid here
             handlePrintWindowAfterPrint(printWindow);
-          }
-        });
-      };
-      doc.current.body.appendChild(printWindow);
+            reject(error);
+          });
+        };
+        doc.current.body.appendChild(printWindow);
+      });
     }
   }, [props, logger, apiRef, handlePrintWindowLoad, handlePrintWindowAfterPrint, updateGridColumnsForPrint, updateGridRowsForPrint]);
   const printExportApi = {

package/hooks/features/filter/gridFilterUtils.js

@@ -137,7 +137,7 @@ const sanitizeFilterModel = (model, disableMultipleColumnsFiltering, apiRef) =>
   let items;
   if (hasSeveralItems && disableMultipleColumnsFiltering) {
     if (process.env.NODE_ENV !== 'production') {
-      (0, _warning.warnOnce)(['MUI X: The `filterModel` can only contain a single item when the `disableMultipleColumnsFiltering` prop is set to `true`.', 'If you are using the community version of the Data Grid, this prop is always `true`.'], 'error');
+      (0, _warning.errorOnce)(['MUI X: The `filterModel` can only contain a single item when the `disableMultipleColumnsFiltering` prop is set to `true`.', 'If you are using the community version of the Data Grid, this prop is always `true`.'].join('\n'));
     }
     items = [model.items[0]];
   } else {
@@ -146,10 +146,10 @@ const sanitizeFilterModel = (model, disableMultipleColumnsFiltering, apiRef) =>
   const hasItemsWithoutIds = hasSeveralItems && items.some(item => item.id == null);
   const hasItemWithoutOperator = items.some(item => item.operator == null);
   if (hasItemsWithoutIds && process.env.NODE_ENV !== 'production') {
-    (0, _warning.warnOnce)('MUI X: The `id` field is required on `filterModel.items` when you use multiple filters.', 'error');
+    (0, _warning.errorOnce)('MUI X: The `id` field is required on `filterModel.items` when you use multiple filters.');
   }
   if (hasItemWithoutOperator && process.env.NODE_ENV !== 'production') {
-    (0, _warning.warnOnce)('MUI X: The `operator` field is required on `filterModel.items`, one or more of your filtering item has no `operator` provided.', 'error');
+    (0, _warning.errorOnce)('MUI X: The `operator` field is required on `filterModel.items`, one or more of your filtering item has no `operator` provided.');
   }
   if (hasItemWithoutOperator || hasItemsWithoutIds) {
     return (0, _extends2.default)({}, model, {

package/hooks/features/filter/gridFilterUtils.mjs

@@ -1,6 +1,6 @@
 import _formatErrorMessage from "@mui/x-internals/formatErrorMessage";
-import _extends from "@babel/runtime/helpers/esm/extends";
-import { warnOnce } from '@mui/x-internals/warning';
+import _extends from "@babel/runtime/helpers/extends";
+import { errorOnce } from '@mui/x-internals/warning';
 import { GridLogicOperator } from "../../../models/index.mjs";
 import { getDefaultGridFilterModel } from "./gridFilterState.mjs";
 import { getPublicApiRef } from "../../../utils/getPublicApiRef.mjs";
@@ -123,7 +123,7 @@ export const sanitizeFilterModel = (model, disableMultipleColumnsFiltering, apiR
   let items;
   if (hasSeveralItems && disableMultipleColumnsFiltering) {
     if (process.env.NODE_ENV !== 'production') {
-      warnOnce(['MUI X: The `filterModel` can only contain a single item when the `disableMultipleColumnsFiltering` prop is set to `true`.', 'If you are using the community version of the Data Grid, this prop is always `true`.'], 'error');
+      errorOnce(['MUI X: The `filterModel` can only contain a single item when the `disableMultipleColumnsFiltering` prop is set to `true`.', 'If you are using the community version of the Data Grid, this prop is always `true`.'].join('\n'));
     }
     items = [model.items[0]];
   } else {
@@ -132,10 +132,10 @@ export const sanitizeFilterModel = (model, disableMultipleColumnsFiltering, apiR
   const hasItemsWithoutIds = hasSeveralItems && items.some(item => item.id == null);
   const hasItemWithoutOperator = items.some(item => item.operator == null);
   if (hasItemsWithoutIds && process.env.NODE_ENV !== 'production') {
-    warnOnce('MUI X: The `id` field is required on `filterModel.items` when you use multiple filters.', 'error');
+    errorOnce('MUI X: The `id` field is required on `filterModel.items` when you use multiple filters.');
   }
   if (hasItemWithoutOperator && process.env.NODE_ENV !== 'production') {
-    warnOnce('MUI X: The `operator` field is required on `filterModel.items`, one or more of your filtering item has no `operator` provided.', 'error');
+    errorOnce('MUI X: The `operator` field is required on `filterModel.items`, one or more of your filtering item has no `operator` provided.');
   }
   if (hasItemWithoutOperator || hasItemsWithoutIds) {
     return _extends({}, model, {

package/hooks/features/filter/useGridFilter.js

@@ -11,6 +11,7 @@ var React = _interopRequireWildcard(require("react"));
 var _lruMemoize = require("@mui/x-internals/lruMemoize");
 var _useEnhancedEffect = _interopRequireDefault(require("@mui/utils/useEnhancedEffect"));
 var _isDeepEqual = require("@mui/x-internals/isDeepEqual");
+var _useOnFirstRender = require("@base-ui/utils/useOnFirstRender");
 var _useLazyRef = require("../../utils/useLazyRef");
 var _useGridEvent = require("../../utils/useGridEvent");
 var _useGridApiMethod = require("../../utils/useGridApiMethod");
@@ -19,7 +20,6 @@ var _gridColumnsSelector = require("../columns/gridColumnsSelector");
 var _gridPreferencePanelsValue = require("../preferencesPanel/gridPreferencePanelsValue");
 var _gridFilterState = require("./gridFilterState");
 var _gridFilterSelector = require("./gridFilterSelector");
-var _useFirstRender = require("../../utils/useFirstRender");
 var _rows = require("../rows");
 var _pipeProcessing = require("../../core/pipeProcessing");
 var _strategyProcessing = require("../../core/strategyProcessing");
@@ -311,7 +311,7 @@ const useGridFilter = (apiRef, props, configuration) => {
   /**
    * 1ST RENDER
    */
-  (0, _useFirstRender.useFirstRender)(() => {
+  (0, _useOnFirstRender.useOnFirstRender)(() => {
     if (props.signature === 'DataGrid') {
       updateFilteredRows();
     }

package/hooks/features/filter/useGridFilter.mjs

@@ -1,8 +1,9 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
+import _extends from "@babel/runtime/helpers/extends";
 import * as React from 'react';
 import { lruMemoize } from '@mui/x-internals/lruMemoize';
 import useEnhancedEffect from '@mui/utils/useEnhancedEffect';
 import { isDeepEqual } from '@mui/x-internals/isDeepEqual';
+import { useOnFirstRender } from '@base-ui/utils/useOnFirstRender';
 import { useLazyRef } from "../../utils/useLazyRef.mjs";
 import { useGridEvent } from "../../utils/useGridEvent.mjs";
 import { useGridApiMethod } from "../../utils/useGridApiMethod.mjs";
@@ -11,7 +12,6 @@ import { gridColumnLookupSelector } from "../columns/gridColumnsSelector.mjs";
 import { GridPreferencePanelsValue } from "../preferencesPanel/gridPreferencePanelsValue.mjs";
 import { defaultGridFilterLookup, getDefaultGridFilterModel } from "./gridFilterState.mjs";
 import { gridFilterModelSelector } from "./gridFilterSelector.mjs";
-import { useFirstRender } from "../../utils/useFirstRender.mjs";
 import { gridRowsLookupSelector } from "../rows/index.mjs";
 import { useGridRegisterPipeProcessor } from "../../core/pipeProcessing/index.mjs";
 import { GRID_DEFAULT_STRATEGY, useGridRegisterStrategyProcessor } from "../../core/strategyProcessing/index.mjs";
@@ -302,7 +302,7 @@ export const useGridFilter = (apiRef, props, configuration) => {
   /**
    * 1ST RENDER
    */
-  useFirstRender(() => {
+  useOnFirstRender(() => {
     if (props.signature === 'DataGrid') {
       updateFilteredRows();
     }

package/hooks/features/focus/useGridFocus.mjs

@@ -1,6 +1,6 @@
 'use client';
 
-import _extends from "@babel/runtime/helpers/esm/extends";
+import _extends from "@babel/runtime/helpers/extends";
 import * as React from 'react';
 import debounce from '@mui/utils/debounce';
 import useEventCallback from '@mui/utils/useEventCallback';

package/hooks/features/headerFiltering/useGridHeaderFiltering.mjs

@@ -1,6 +1,6 @@
 'use client';
 
-import _extends from "@babel/runtime/helpers/esm/extends";
+import _extends from "@babel/runtime/helpers/extends";
 import * as React from 'react';
 import { useGridApiMethod } from "../../utils/useGridApiMethod.mjs";
 import { useGridLogger } from "../../utils/index.mjs";

package/hooks/features/listView/useGridListView.d.mts

@@ -3,8 +3,8 @@ import type { GridListViewColDef } from "../../../models/colDef/gridColDef.mjs";
 import type { GridStateInitializer } from "../../utils/useGridInitializeState.mjs";
 import type { GridPrivateApiCommunity } from "../../../models/api/gridApiCommunity.mjs";
 import type { DataGridProcessedProps } from "../../../models/props/DataGridProps.mjs";
-export type GridListViewState = (GridListViewColDef & {
+export type GridListViewState = GridListViewColDef & {
   computedWidth: number;
-}) | undefined;
+} | undefined;
 export declare const listViewStateInitializer: GridStateInitializer<Pick<DataGridProcessedProps, 'listViewColumn'>>;
 export declare function useGridListView(apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, 'listView' | 'listViewColumn'>): void;

package/hooks/features/listView/useGridListView.d.ts

@@ -3,8 +3,8 @@ import type { GridListViewColDef } from "../../../models/colDef/gridColDef.js";
 import type { GridStateInitializer } from "../../utils/useGridInitializeState.js";
 import type { GridPrivateApiCommunity } from "../../../models/api/gridApiCommunity.js";
 import type { DataGridProcessedProps } from "../../../models/props/DataGridProps.js";
-export type GridListViewState = (GridListViewColDef & {
+export type GridListViewState = GridListViewColDef & {
   computedWidth: number;
-}) | undefined;
+} | undefined;
 export declare const listViewStateInitializer: GridStateInitializer<Pick<DataGridProcessedProps, 'listViewColumn'>>;
 export declare function useGridListView(apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, 'listView' | 'listViewColumn'>): void;

package/hooks/features/listView/useGridListView.js

@@ -63,7 +63,7 @@ function useGridListView(apiRef, props) {
   }, [apiRef, props.listViewColumn]);
   React.useEffect(() => {
     if (process.env.NODE_ENV !== 'production' && props.listView && !props.listViewColumn) {
-      (0, _warning.warnOnce)(['MUI X: The `listViewColumn` prop must be set if `listView` is enabled.', 'To fix, pass a column definition to the `listViewColumn` prop, e.g. `{ field: "example", renderCell: (params) => <div>{params.row.id}</div> }`.', 'For more details, see https://mui.com/x/react-data-grid/list-view/']);
+      (0, _warning.warnOnce)(['MUI X: The `listViewColumn` prop must be set if `listView` is enabled.', 'To fix, pass a column definition to the `listViewColumn` prop, e.g. `{ field: "example", renderCell: (params) => <div>{params.row.id}</div> }`.', 'For more details, see https://mui.com/x/react-data-grid/list-view/'].join('\n'));
     }
   }, [props.listView, props.listViewColumn]);
 }

package/hooks/features/listView/useGridListView.mjs

@@ -1,6 +1,6 @@
 'use client';
 
-import _extends from "@babel/runtime/helpers/esm/extends";
+import _extends from "@babel/runtime/helpers/extends";
 import * as React from 'react';
 import useEnhancedEffect from '@mui/utils/useEnhancedEffect';
 import { warnOnce } from '@mui/x-internals/warning';
@@ -54,7 +54,7 @@ export function useGridListView(apiRef, props) {
   }, [apiRef, props.listViewColumn]);
   React.useEffect(() => {
     if (process.env.NODE_ENV !== 'production' && props.listView && !props.listViewColumn) {
-      warnOnce(['MUI X: The `listViewColumn` prop must be set if `listView` is enabled.', 'To fix, pass a column definition to the `listViewColumn` prop, e.g. `{ field: "example", renderCell: (params) => <div>{params.row.id}</div> }`.', 'For more details, see https://mui.com/x/react-data-grid/list-view/']);
+      warnOnce(['MUI X: The `listViewColumn` prop must be set if `listView` is enabled.', 'To fix, pass a column definition to the `listViewColumn` prop, e.g. `{ field: "example", renderCell: (params) => <div>{params.row.id}</div> }`.', 'For more details, see https://mui.com/x/react-data-grid/list-view/'].join('\n'));
     }
   }, [props.listView, props.listViewColumn]);
 }

package/hooks/features/pagination/useGridPagination.mjs

@@ -1,4 +1,4 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
+import _extends from "@babel/runtime/helpers/extends";
 import { throwIfPageSizeExceedsTheLimit, getDefaultGridPaginationModel } from "./gridPaginationUtils.mjs";
 import { useGridPaginationModel } from "./useGridPaginationModel.mjs";
 import { useGridRowCount } from "./useGridRowCount.mjs";

package/hooks/features/pagination/useGridPaginationMeta.mjs

@@ -1,6 +1,6 @@
 'use client';
 
-import _extends from "@babel/runtime/helpers/esm/extends";
+import _extends from "@babel/runtime/helpers/extends";
 import * as React from 'react';
 import { useGridLogger, useGridApiMethod } from "../../utils/index.mjs";
 import { useGridRegisterPipeProcessor } from "../../core/pipeProcessing/index.mjs";

package/hooks/features/pagination/useGridPaginationModel.mjs

@@ -1,6 +1,6 @@
 'use client';
 
-import _extends from "@babel/runtime/helpers/esm/extends";
+import _extends from "@babel/runtime/helpers/extends";
 import * as React from 'react';
 import debounce from '@mui/utils/debounce';
 import { isDeepEqual } from '@mui/x-internals/isDeepEqual';

package/hooks/features/pagination/useGridRowCount.js

@@ -10,7 +10,7 @@ exports.useGridRowCount = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var React = _interopRequireWildcard(require("react"));
 var _useLazyRef = _interopRequireDefault(require("@mui/utils/useLazyRef"));
-var _store = require("@mui/x-internals/store");
+var _useStoreEffect = require("@mui/x-internals/useStoreEffect");
 var _filter = require("../filter");
 var _utils = require("../../utils");
 var _pipeProcessing = require("../../core/pipeProcessing");
@@ -120,7 +120,7 @@ const useGridRowCount = (apiRef, props) => {
       apiRef.current.setRowCount(props.rowCount);
     }
   }, [apiRef, props.paginationMode, props.rowCount]);
-  (0, _store.useStoreEffect)(
+  (0, _useStoreEffect.useStoreEffect)(
   // typings not supported currently, but methods work
   apiRef.current.store, () => {
     const isLastPage = (0, _gridPaginationSelector.gridPaginationMetaSelector)(apiRef).hasNextPage === false;

package/hooks/features/pagination/useGridRowCount.mjs

@@ -1,9 +1,9 @@
 'use client';
 
-import _extends from "@babel/runtime/helpers/esm/extends";
+import _extends from "@babel/runtime/helpers/extends";
 import * as React from 'react';
 import useLazyRef from '@mui/utils/useLazyRef';
-import { useStoreEffect } from '@mui/x-internals/store';
+import { useStoreEffect } from '@mui/x-internals/useStoreEffect';
 import { gridFilteredTopLevelRowCountSelector } from "../filter/index.mjs";
 import { useGridLogger, useGridApiMethod, useGridEvent } from "../../utils/index.mjs";
 import { useGridRegisterPipeProcessor } from "../../core/pipeProcessing/index.mjs";

package/hooks/features/preferencesPanel/gridPreferencePanelsValue.d.mts

@@ -1,6 +1,6 @@
 declare enum GridPreferencePanelsValue {
   filters = "filters",
   columns = "columns",
-  aiAssistant = "aiAssistant",
+  aiAssistant = "aiAssistant"
 }
 export { GridPreferencePanelsValue };

package/hooks/features/preferencesPanel/gridPreferencePanelsValue.d.ts

@@ -1,6 +1,6 @@
 declare enum GridPreferencePanelsValue {
   filters = "filters",
   columns = "columns",
-  aiAssistant = "aiAssistant",
+  aiAssistant = "aiAssistant"
 }
 export { GridPreferencePanelsValue };

package/hooks/features/preferencesPanel/useGridPreferencesPanel.mjs

@@ -1,4 +1,4 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
+import _extends from "@babel/runtime/helpers/extends";
 import * as React from 'react';
 import { useGridApiMethod } from "../../utils/useGridApiMethod.mjs";
 import { useGridLogger } from "../../utils/useGridLogger.mjs";

package/hooks/features/rowSelection/useGridRowSelection.d.mts

@@ -9,4 +9,4 @@ export declare const rowSelectionStateInitializer: GridStateInitializer<Pick<Dat
  * @requires useGridFocus (state) - can be after
  * @requires useGridKeyboardNavigation (`cellKeyDown` event must first be consumed by it)
  */
-export declare const useGridRowSelection: (apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, 'checkboxSelection' | 'rowSelectionModel' | 'onRowSelectionModelChange' | 'disableMultipleRowSelection' | 'disableRowSelectionOnClick' | 'disableRowSelectionExcludeModel' | 'isRowSelectable' | 'checkboxSelectionVisibleOnly' | 'pagination' | 'paginationMode' | 'filterMode' | 'classes' | 'keepNonExistentRowsSelected' | 'rowSelection' | 'rowSelectionPropagation' | 'signature'>) => void;
+export declare const useGridRowSelection: (apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, 'checkboxSelection' | 'rowSelectionModel' | 'onRowSelectionModelChange' | 'disableMultipleRowSelection' | 'disableRowSelectionOnClick' | 'disableRowSelectionExcludeModel' | 'isRowSelectable' | 'checkboxSelectionVisibleOnly' | 'pagination' | 'paginationMode' | 'filterMode' | 'classes' | 'keepNonExistentRowsSelected' | 'rowSelection' | 'rowSelectionPropagation' | 'dataSource' | 'signature'>) => void;

package/hooks/features/rowSelection/useGridRowSelection.d.ts

@@ -9,4 +9,4 @@ export declare const rowSelectionStateInitializer: GridStateInitializer<Pick<Dat
  * @requires useGridFocus (state) - can be after
  * @requires useGridKeyboardNavigation (`cellKeyDown` event must first be consumed by it)
  */
-export declare const useGridRowSelection: (apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, 'checkboxSelection' | 'rowSelectionModel' | 'onRowSelectionModelChange' | 'disableMultipleRowSelection' | 'disableRowSelectionOnClick' | 'disableRowSelectionExcludeModel' | 'isRowSelectable' | 'checkboxSelectionVisibleOnly' | 'pagination' | 'paginationMode' | 'filterMode' | 'classes' | 'keepNonExistentRowsSelected' | 'rowSelection' | 'rowSelectionPropagation' | 'signature'>) => void;
+export declare const useGridRowSelection: (apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, 'checkboxSelection' | 'rowSelectionModel' | 'onRowSelectionModelChange' | 'disableMultipleRowSelection' | 'disableRowSelectionOnClick' | 'disableRowSelectionExcludeModel' | 'isRowSelectable' | 'checkboxSelectionVisibleOnly' | 'pagination' | 'paginationMode' | 'filterMode' | 'classes' | 'keepNonExistentRowsSelected' | 'rowSelection' | 'rowSelectionPropagation' | 'dataSource' | 'signature'>) => void;

package/hooks/features/rowSelection/useGridRowSelection.js

@@ -17,6 +17,7 @@ var _useGridApiMethod = require("../../utils/useGridApiMethod");
 var _useGridLogger = require("../../utils/useGridLogger");
 var _useGridSelector = require("../../utils/useGridSelector");
 var _gridRowsSelector = require("../rows/gridRowsSelector");
+var _gridRowsUtils = require("../rows/gridRowsUtils");
 var _gridRowSelectionSelector = require("./gridRowSelectionSelector");
 var _gridFocusStateSelector = require("../focus/gridFocusStateSelector");
 var _gridFilterSelector = require("../filter/gridFilterSelector");
@@ -127,6 +128,10 @@ You need to upgrade to DataGridPro or DataGridPremium component to unlock multip
     if (props.rowSelection === false) {
       return false;
     }
+    const rowNode = (0, _gridRowsSelector.gridRowNodeSelector)(apiRef, id);
+    if (rowNode?.type === 'footer' || rowNode?.type === 'pinnedRow' || rowNode?.type === 'skeletonRow') {
+      return false;
+    }
 
     // If `keepNonExistentRowsSelected` is true, we might run in a case where row selectability is checked for a row that does not exist.
     // Since that row was previously selected (otherwise it would not be checked at this point), we return true.
@@ -136,10 +141,6 @@ You need to upgrade to DataGridPro or DataGridPremium component to unlock multip
     if (propIsRowSelectable && !propIsRowSelectable(apiRef.current.getRowParams(id))) {
       return false;
     }
-    const rowNode = (0, _gridRowsSelector.gridRowNodeSelector)(apiRef, id);
-    if (rowNode?.type === 'footer' || rowNode?.type === 'pinnedRow') {
-      return false;
-    }
     return true;
   }, [apiRef, props.rowSelection, props.keepNonExistentRowsSelected, propIsRowSelectable]);
   const getSelectedRows = React.useCallback(() => (0, _gridRowSelectionSelector.gridRowSelectionIdsSelector)(apiRef), [apiRef]);
@@ -315,6 +316,7 @@ You need to upgrade to DataGridPro or DataGridPremium component to unlock multip
    * EVENTS
    */
   const isFirstRender = React.useRef(true);
+  const previousRowsLookupRef = React.useRef(null);
   const removeOutdatedSelection = React.useCallback(() => {
     if (isFirstRender.current) {
       return;
@@ -323,6 +325,11 @@ You need to upgrade to DataGridPro or DataGridPremium component to unlock multip
     const rowsLookup = (0, _gridRowsSelector.gridRowsLookupSelector)(apiRef);
     const rowTree = (0, _gridRowsSelector.gridRowTreeSelector)(apiRef);
     const filteredRowsLookup = (0, _gridFilterSelector.gridFilteredRowsLookupSelector)(apiRef);
+    const previousRowsLookup = previousRowsLookupRef.current;
+    previousRowsLookupRef.current = rowsLookup;
+    // Read the depth at call time. The event that runs this callback can fire in the same
+    // tick as the state update that changes the depth, before the render-scope value updates.
+    const isNested = (0, _gridRowsSelector.gridRowMaximumTreeDepthSelector)(apiRef) > 1;
     const isNonExistent = id => {
       if (props.filterMode === 'server') {
         return !rowsLookup[id];
@@ -350,6 +357,32 @@ You need to upgrade to DataGridPro or DataGridPremium component to unlock multip
       return node.children.some(childId => isOrHasSelectableDescendant(childId));
     };
     let hasChanged = false;
+
+    // Rows can load after their parent was selected (server-side lazy loading).
+    // They arrive unselected, so the parent re-derivation below would drop the parent.
+    // With `rowSelectionPropagation.descendants`, the rows that appeared since the last run
+    // inherit the selection state of their closest previously known ancestor instead.
+    if (isNested && props.rowSelectionPropagation?.descendants && currentSelection.type === 'include' && currentSelection.ids.size > 0 && previousRowsLookup !== null && previousRowsLookup !== rowsLookup) {
+      const isNewRow = id => rowsLookup[id] !== undefined && previousRowsLookup[id] === undefined;
+      const inheritsSelection = id => {
+        const parentId = rowTree[id]?.parent;
+        if (parentId == null || parentId === _gridRowsUtils.GRID_ROOT_GROUP_ID) {
+          return false;
+        }
+        if (selectionManager.has(parentId)) {
+          return true;
+        }
+        // A row that appeared together with its parent reads the state further up the chain.
+        return isNewRow(parentId) ? inheritsSelection(parentId) : false;
+      };
+      const dataRowIds = (0, _gridRowsSelector.gridDataRowIdsSelector)(apiRef);
+      for (const id of dataRowIds) {
+        if (isNewRow(id) && filteredRowsLookup[id] !== false && inheritsSelection(id) && apiRef.current.isRowSelectable(id)) {
+          selectionManager.select(id);
+          hasChanged = true;
+        }
+      }
+    }
     for (const id of currentSelection.ids) {
       if (isNonExistent(id)) {
         if (props.keepNonExistentRowsSelected) {
@@ -382,9 +415,10 @@ You need to upgrade to DataGridPro or DataGridPremium component to unlock multip
     // For nested data, on row tree updation (filtering, adding rows, etc.) when the selection is
     // not empty, we need to re-run scanning of the tree to propagate the selection changes
     // Example: A parent whose de-selected children are filtered out should now be selected
-    const shouldReapplyPropagation = isNestedData && props.rowSelectionPropagation?.parents && (newSelectionModel.ids.size > 0 ||
-    // In case of exclude selection, newSelectionModel.ids.size === 0 means all rows are selected
-    newSelectionModel.type === 'exclude');
+    // With a data source, an `exclude` model is left alone: the grid only knows the loaded
+    // subset of the rows, so rewriting the model into an `include` of the known rows would
+    // drop the "rows that load later are selected too" semantics of the select-all state.
+    const shouldReapplyPropagation = isNested && props.rowSelectionPropagation?.parents && (newSelectionModel.type === 'exclude' ? props.dataSource === undefined : newSelectionModel.ids.size > 0);
     if (hasChanged || shouldReapplyPropagation) {
       if (shouldReapplyPropagation) {
         if (newSelectionModel.type === 'exclude') {
@@ -398,13 +432,20 @@ You need to upgrade to DataGridPro or DataGridPremium component to unlock multip
           }
           apiRef.current.selectRows(selectedRowIds, true, true);
         } else {
-          apiRef.current.selectRows(Array.from(newSelectionModel.ids), true, true);
+          // `getPropagatedRowSelectionModel` reads the sibling selection state from the model
+          // built above, so the rows selected during this run count for the parent derivation.
+          // `selectRows` would read the state from before this run instead.
+          const propagatedModel = apiRef.current.getPropagatedRowSelectionModel(newSelectionModel);
+          const isSelectionValid = propagatedModel.ids.size < 2 || canHaveMultipleSelection;
+          if (isSelectionValid && (propagatedModel.type !== currentSelection.type || propagatedModel.ids.size !== currentSelection.ids.size || !Array.from(propagatedModel.ids).every(id => currentSelection.ids.has(id)))) {
+            apiRef.current.setRowSelectionModel(propagatedModel, 'multipleRowsSelection');
+          }
         }
       } else {
         apiRef.current.setRowSelectionModel(newSelectionModel, 'multipleRowsSelection');
       }
     }
-  }, [apiRef, isNestedData, props.rowSelectionPropagation?.parents, props.keepNonExistentRowsSelected, props.filterMode, getRowsToBeSelected]);
+  }, [apiRef, props.rowSelectionPropagation?.parents, props.rowSelectionPropagation?.descendants, props.keepNonExistentRowsSelected, props.filterMode, props.dataSource, canHaveMultipleSelection, getRowsToBeSelected]);
   const handleSingleRowSelection = React.useCallback((id, event) => {
     const hasCtrlKey = event.metaKey || event.ctrlKey;