@mui/x-data-grid-premium 8.0.0-alpha.9 → 8.0.0-beta.0

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

@@ -0,0 +1,106 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.addColumnGroupingHeaders = void 0;
+exports.addSerializedRowToWorksheet = addSerializedRowToWorksheet;
+exports.createValueOptionsSheetIfNeeded = createValueOptionsSheetIfNeeded;
+exports.getExcelJs = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _interopRequireWildcard2 = _interopRequireDefault(require("@babel/runtime/helpers/interopRequireWildcard"));
+const getExcelJs = async () => {
+  const excelJsModule = await Promise.resolve().then(() => (0, _interopRequireWildcard2.default)(require('exceljs')));
+  return excelJsModule.default ?? excelJsModule;
+};
+exports.getExcelJs = getExcelJs;
+const addColumnGroupingHeaders = (worksheet, columns, columnGroupPaths, columnGroupDetails) => {
+  const maxDepth = Math.max(...columns.map(({
+    key
+  }) => columnGroupPaths[key]?.length ?? 0));
+  if (maxDepth === 0) {
+    return;
+  }
+  for (let rowIndex = 0; rowIndex < maxDepth; rowIndex += 1) {
+    const row = columns.map(({
+      key
+    }) => {
+      const groupingPath = columnGroupPaths[key];
+      if (groupingPath.length <= rowIndex) {
+        return {
+          groupId: null,
+          parents: groupingPath
+        };
+      }
+      return (0, _extends2.default)({}, columnGroupDetails[groupingPath[rowIndex]], {
+        parents: groupingPath.slice(0, rowIndex)
+      });
+    });
+    const newRow = worksheet.addRow(row.map(group => group.groupId === null ? null : group?.headerName ?? group.groupId));
+
+    // use `rowCount`, since worksheet can have additional rows added in `exceljsPreProcess`
+    const lastRowIndex = newRow.worksheet.rowCount;
+    let leftIndex = 0;
+    let rightIndex = 1;
+    while (rightIndex < columns.length) {
+      const {
+        groupId: leftGroupId,
+        parents: leftParents
+      } = row[leftIndex];
+      const {
+        groupId: rightGroupId,
+        parents: rightParents
+      } = row[rightIndex];
+      const areInSameGroup = leftGroupId === rightGroupId && leftParents.length === rightParents.length && leftParents.every((leftParent, index) => rightParents[index] === leftParent);
+      if (areInSameGroup) {
+        rightIndex += 1;
+      } else {
+        if (rightIndex - leftIndex > 1) {
+          worksheet.mergeCells(lastRowIndex, leftIndex + 1, lastRowIndex, rightIndex);
+        }
+        leftIndex = rightIndex;
+        rightIndex += 1;
+      }
+    }
+    if (rightIndex - leftIndex > 1) {
+      worksheet.mergeCells(lastRowIndex, leftIndex + 1, lastRowIndex, rightIndex);
+    }
+  }
+};
+exports.addColumnGroupingHeaders = addColumnGroupingHeaders;
+function addSerializedRowToWorksheet(serializedRow, worksheet) {
+  const {
+    row,
+    dataValidation,
+    outlineLevel,
+    mergedCells
+  } = serializedRow;
+  const newRow = worksheet.addRow(row);
+  Object.keys(dataValidation).forEach(field => {
+    newRow.getCell(field).dataValidation = (0, _extends2.default)({}, dataValidation[field]);
+  });
+  if (outlineLevel) {
+    newRow.outlineLevel = outlineLevel;
+  }
+
+  // use `rowCount`, since worksheet can have additional rows added in `exceljsPreProcess`
+  const lastRowIndex = newRow.worksheet.rowCount;
+  mergedCells.forEach(mergedCell => {
+    worksheet.mergeCells(lastRowIndex, mergedCell.leftIndex, lastRowIndex, mergedCell.rightIndex);
+  });
+}
+async function createValueOptionsSheetIfNeeded(valueOptionsData, sheetName, workbook) {
+  if (Object.keys(valueOptionsData).length === 0) {
+    return;
+  }
+  const valueOptionsWorksheet = workbook.addWorksheet(sheetName);
+  valueOptionsWorksheet.columns = Object.keys(valueOptionsData).map(key => ({
+    key
+  }));
+  Object.entries(valueOptionsData).forEach(([field, {
+    values
+  }]) => {
+    valueOptionsWorksheet.getColumn(field).values = values;
+  });
+}

package/hooks/features/export/useGridExcelExport.d.ts

@@ -1,6 +1,6 @@
 import { RefObject } from '@mui/x-internals/types';
-import { GridPrivateApiPremium } from '../../../models/gridApiPremium';
-import { DataGridPremiumProps } from '../../../models/dataGridPremiumProps';
+import { GridPrivateApiPremium } from "../../../models/gridApiPremium.js";
+import { DataGridPremiumProps } from "../../../models/dataGridPremiumProps.js";
 /**
  * @requires useGridColumns (state)
  * @requires useGridFilter (state)
@@ -8,4 +8,4 @@ import { DataGridPremiumProps } from '../../../models/dataGridPremiumProps';
  * @requires useGridSelection (state)
  * @requires useGridParamsApi (method)
  */
-export declare const useGridExcelExport: (apiRef: RefObject<GridPrivateApiPremium>, props: DataGridPremiumProps) => void;
+export declare const useGridExcelExport: (apiRef: RefObject<GridPrivateApiPremium>, props: DataGridPremiumProps) => void;

package/hooks/features/export/useGridExcelExport.js

@@ -96,15 +96,22 @@ const useGridExcelExport = (apiRef, props) => {
     const valueOptionsData = await (0, _excelSerializer.getDataForValueOptionsSheet)(exportedColumns, valueOptionsSheetName, apiRef.current);
     const serializedColumns = (0, _excelSerializer.serializeColumns)(exportedColumns, options.columnsStyles || {});
     apiRef.current.resetColSpan();
-    const serializedRows = exportedRowIds.map(id => (0, _excelSerializer.serializeRowUnsafe)(id, exportedColumns, apiRef, valueOptionsData, {
-      escapeFormulas: options.escapeFormulas ?? true
-    }));
+    const serializedRows = [];
+    for (let i = 0; i < exportedRowIds.length; i += 1) {
+      const id = exportedRowIds[i];
+      const serializedRow = (0, _excelSerializer.serializeRowUnsafe)(id, exportedColumns, apiRef, valueOptionsData, {
+        escapeFormulas: options.escapeFormulas ?? true
+      });
+      serializedRows.push(serializedRow);
+    }
     apiRef.current.resetColSpan();
     const columnGroupPaths = exportedColumns.reduce((acc, column) => {
       acc[column.field] = apiRef.current.getColumnGroupPath(column.field);
       return acc;
     }, {});
     const message = {
+      // workers share the pub-sub channel namespace. Use this property to filter out messages.
+      namespace: 'mui-x-data-grid-export',
       serializedColumns,
       serializedRows,
       valueOptionsData,

package/hooks/features/index.d.ts

@@ -1,5 +1,5 @@
-export * from './aggregation';
-export * from './rowGrouping';
-export * from './export';
-export * from './cellSelection';
-export * from './promptControl';
+export * from "./aggregation/index.js";
+export * from "./rowGrouping/index.js";
+export * from "./export/index.js";
+export * from "./cellSelection/index.js";
+export * from "./promptControl/index.js";

package/hooks/features/promptControl/api.d.ts

@@ -1,2 +1,2 @@
-import { PromptResponse } from './types';
-export declare function gridDefaultPromptResolver(url: string, context: string, query: string): Promise<PromptResponse>;
+import { PromptResponse } from "./types.js";
+export declare function gridDefaultPromptResolver(url: string, context: string, query: string): Promise<PromptResponse>;

package/hooks/features/promptControl/index.d.ts

@@ -1,2 +1,2 @@
-export { gridDefaultPromptResolver as unstable_gridDefaultPromptResolver } from './api';
-export type { PromptResponse as unstable_PromptResponse } from './types';
+export { gridDefaultPromptResolver as unstable_gridDefaultPromptResolver } from "./api.js";
+export type { PromptResponse as unstable_PromptResponse } from './types';

package/hooks/features/promptControl/types.d.ts

@@ -1,25 +1,25 @@
 export type Sort = {
-    column: string;
-    direction: 'asc' | 'desc';
+  column: string;
+  direction: 'asc' | 'desc';
 };
 export type Grouping = {
-    column: string;
+  column: string;
 };
 export type Filter = {
-    operator: string;
-    value: string | number | boolean | string[] | number[];
-    column: string;
+  operator: string;
+  value: string | number | boolean | string[] | number[];
+  column: string;
 };
 export type AggregationFunction = 'avg' | 'sum' | 'min' | 'max' | 'size';
 export type Aggregation = {
-    [column: string]: AggregationFunction;
+  [column: string]: AggregationFunction;
 };
 export type PromptResponse = {
-    select: number;
-    filters: Filter[];
-    filterOperator?: 'and' | 'or';
-    aggregation: Aggregation;
-    sorting: Sort[];
-    grouping: Grouping[];
-    error: string | null;
-};
+  select: number;
+  filters: Filter[];
+  filterOperator?: 'and' | 'or';
+  aggregation: Aggregation;
+  sorting: Sort[];
+  grouping: Grouping[];
+  error: string | null;
+};

package/hooks/features/rowGrouping/createGroupingColDef.d.ts

@@ -1,45 +1,57 @@
 import { RefObject } from '@mui/x-internals/types';
 import { GridColDef, GridGroupingColDefOverride } from '@mui/x-data-grid-pro';
 import { GridColumnRawLookup } from '@mui/x-data-grid-pro/internals';
-import { GridApiPremium } from '../../../models/gridApiPremium';
-import { RowGroupingStrategy } from './gridRowGroupingUtils';
+import { GridApiPremium } from "../../../models/gridApiPremium.js";
+import { RowGroupingStrategy } from "./gridRowGroupingUtils.js";
 interface CreateGroupingColDefMonoCriteriaParams {
-    columnsLookup: GridColumnRawLookup;
-    /**
-     * The field from which we are grouping the rows.
-     */
-    groupingCriteria: string;
-    /**
-     * The col def from which we are grouping the rows.
-     */
-    groupedByColDef: GridColDef;
-    /**
-     * The col def properties the user wants to override.
-     * This value comes `prop.groupingColDef`.
-     */
-    colDefOverride: GridGroupingColDefOverride | null | undefined;
-    strategy?: RowGroupingStrategy;
+  columnsLookup: GridColumnRawLookup;
+  /**
+   * The field from which we are grouping the rows.
+   */
+  groupingCriteria: string;
+  /**
+   * The col def from which we are grouping the rows.
+   */
+  groupedByColDef: GridColDef;
+  /**
+   * The col def properties the user wants to override.
+   * This value comes `prop.groupingColDef`.
+   */
+  colDefOverride: GridGroupingColDefOverride | null | undefined;
+  strategy?: RowGroupingStrategy;
 }
 /**
  * Creates the `GridColDef` for a grouping column that only takes care of a single grouping criteria
  */
-export declare const createGroupingColDefForOneGroupingCriteria: ({ columnsLookup, groupedByColDef, groupingCriteria, colDefOverride, strategy, }: CreateGroupingColDefMonoCriteriaParams) => GridColDef;
+export declare const createGroupingColDefForOneGroupingCriteria: ({
+  columnsLookup,
+  groupedByColDef,
+  groupingCriteria,
+  colDefOverride,
+  strategy
+}: CreateGroupingColDefMonoCriteriaParams) => GridColDef;
 interface CreateGroupingColDefSeveralCriteriaParams {
-    apiRef: RefObject<GridApiPremium>;
-    columnsLookup: GridColumnRawLookup;
-    /**
-     * The fields from which we are grouping the rows.
-     */
-    rowGroupingModel: string[];
-    /**
-     * The col def properties the user wants to override.
-     * This value comes `prop.groupingColDef`.
-     */
-    colDefOverride: GridGroupingColDefOverride | null | undefined;
-    strategy?: RowGroupingStrategy;
+  apiRef: RefObject<GridApiPremium>;
+  columnsLookup: GridColumnRawLookup;
+  /**
+   * The fields from which we are grouping the rows.
+   */
+  rowGroupingModel: string[];
+  /**
+   * The col def properties the user wants to override.
+   * This value comes `prop.groupingColDef`.
+   */
+  colDefOverride: GridGroupingColDefOverride | null | undefined;
+  strategy?: RowGroupingStrategy;
 }
 /**
  * Creates the `GridColDef` for a grouping column that takes care of all the grouping criteria
  */
-export declare const createGroupingColDefForAllGroupingCriteria: ({ apiRef, columnsLookup, rowGroupingModel, colDefOverride, strategy, }: CreateGroupingColDefSeveralCriteriaParams) => GridColDef;
-export {};
+export declare const createGroupingColDefForAllGroupingCriteria: ({
+  apiRef,
+  columnsLookup,
+  rowGroupingModel,
+  colDefOverride,
+  strategy
+}: CreateGroupingColDefSeveralCriteriaParams) => GridColDef;
+export {};

package/hooks/features/rowGrouping/createGroupingColDef.js

@@ -148,8 +148,8 @@ const createGroupingColDefForOneGroupingCriteria = ({
       return '';
     },
     valueGetter: (value, row, column, apiRef) => {
-      const rowId = apiRef.current.getRowId(row);
-      const rowNode = apiRef.current.getRowNode(rowId);
+      const rowId = (0, _xDataGridPro.gridRowIdSelector)(apiRef, row);
+      const rowNode = (0, _xDataGridPro.gridRowNodeSelector)(apiRef, rowId);
       if (!rowNode || rowNode.type === 'footer' || rowNode.type === 'pinnedRow') {
         return undefined;
       }
@@ -241,8 +241,8 @@ const createGroupingColDefForAllGroupingCriteria = ({
       }));
     },
     valueGetter: (value, row) => {
-      const rowId = apiRef.current.getRowId(row);
-      const rowNode = apiRef.current.getRowNode(rowId);
+      const rowId = (0, _xDataGridPro.gridRowIdSelector)(apiRef, row);
+      const rowNode = (0, _xDataGridPro.gridRowNodeSelector)(apiRef, rowId);
       if (!rowNode || rowNode.type === 'footer' || rowNode.type === 'pinnedRow') {
         return undefined;
       }

package/hooks/features/rowGrouping/gridRowGroupingInterfaces.d.ts

@@ -1,44 +1,44 @@
 import { GridColDef, GridValidRowModel } from '@mui/x-data-grid';
 export type GridRowGroupingModel = string[];
 export interface GridRowGroupingState {
-    model: GridRowGroupingModel;
+  model: GridRowGroupingModel;
 }
 export interface GridRowGroupingInitialState {
-    model?: GridRowGroupingModel;
+  model?: GridRowGroupingModel;
 }
 export interface GridRowGroupingInternalCache {
-    /**
-     * Tracks the model on the last pre-processing
-     * Allows to check if we need to re-build the grouping columns when the grid upserts a column.
-     */
-    rulesOnLastRowTreeCreation: GridGroupingRules;
+  /**
+   * Tracks the model on the last pre-processing
+   * Allows to check if we need to re-build the grouping columns when the grid upserts a column.
+   */
+  rulesOnLastRowTreeCreation: GridGroupingRules;
 }
 export interface GridRowGroupingApi {
-    /**
-     * Sets the columns to use as grouping criteria.
-     * @param {GridRowGroupingModel} model The columns to use as grouping criteria.
-     */
-    setRowGroupingModel: (model: GridRowGroupingModel) => void;
-    /**
-     * Adds the field to the row grouping model.
-     * @param {string} groupingCriteriaField The field from which we want to group the rows.
-     * @param {number | undefined} groupingIndex The grouping index at which we want to insert the new grouping criteria. By default, it will be inserted at the end of the model.
-     */
-    addRowGroupingCriteria: (groupingCriteriaField: string, groupingIndex?: number) => void;
-    /**
-     * Remove the field from the row grouping model.
-     * @param {string} groupingCriteriaField The field from which we want to stop grouping the rows.
-     */
-    removeRowGroupingCriteria: (groupingCriteriaField: string) => void;
-    /**
-     * Sets the grouping index of a grouping criteria.
-     * @param {string} groupingCriteriaField The field of the grouping criteria from which we want to change the grouping index.
-     * @param {number} groupingIndex The new grouping index of this grouping criteria.
-     */
-    setRowGroupingCriteriaIndex: (groupingCriteriaField: string, groupingIndex: number) => void;
+  /**
+   * Sets the columns to use as grouping criteria.
+   * @param {GridRowGroupingModel} model The columns to use as grouping criteria.
+   */
+  setRowGroupingModel: (model: GridRowGroupingModel) => void;
+  /**
+   * Adds the field to the row grouping model.
+   * @param {string} groupingCriteriaField The field from which we want to group the rows.
+   * @param {number | undefined} groupingIndex The grouping index at which we want to insert the new grouping criteria. By default, it will be inserted at the end of the model.
+   */
+  addRowGroupingCriteria: (groupingCriteriaField: string, groupingIndex?: number) => void;
+  /**
+   * Remove the field from the row grouping model.
+   * @param {string} groupingCriteriaField The field from which we want to stop grouping the rows.
+   */
+  removeRowGroupingCriteria: (groupingCriteriaField: string) => void;
+  /**
+   * Sets the grouping index of a grouping criteria.
+   * @param {string} groupingCriteriaField The field of the grouping criteria from which we want to change the grouping index.
+   * @param {number} groupingIndex The new grouping index of this grouping criteria.
+   */
+  setRowGroupingCriteriaIndex: (groupingCriteriaField: string, groupingIndex: number) => void;
 }
 export interface GridGroupingRule<R extends GridValidRowModel = GridValidRowModel, V = any> {
-    field: string;
-    groupingValueGetter?: GridColDef<R, V>['groupingValueGetter'];
+  field: string;
+  groupingValueGetter?: GridColDef<R, V>['groupingValueGetter'];
 }
-export type GridGroupingRules<R extends GridValidRowModel = GridValidRowModel> = GridGroupingRule<R>[];
+export type GridGroupingRules<R extends GridValidRowModel = GridValidRowModel> = GridGroupingRule<R>[];

package/hooks/features/rowGrouping/gridRowGroupingSelector.d.ts

@@ -1,3 +1,3 @@
-import { GridStatePremium } from '../../../models/gridStatePremium';
+import { GridStatePremium } from "../../../models/gridStatePremium.js";
 export declare const gridRowGroupingModelSelector: import("@mui/x-data-grid").OutputSelector<GridStatePremium, import("./gridRowGroupingInterfaces").GridRowGroupingState, import("./gridRowGroupingInterfaces").GridRowGroupingModel>;
-export declare const gridRowGroupingSanitizedModelSelector: import("@mui/x-data-grid").OutputSelector<GridStatePremium, import("@mui/x-data-grid").GridColumnLookup, string[]>;
+export declare const gridRowGroupingSanitizedModelSelector: import("@mui/x-data-grid").OutputSelector<GridStatePremium, import("@mui/x-data-grid").GridColumnLookup, string[]>;

package/hooks/features/rowGrouping/gridRowGroupingSelector.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.gridRowGroupingSanitizedModelSelector = exports.gridRowGroupingModelSelector = void 0;
 var _xDataGridPro = require("@mui/x-data-grid-pro");
-var _internals = require("@mui/x-data-grid/internals");
-const gridRowGroupingStateSelector = state => state.rowGrouping;
+var _internals = require("@mui/x-data-grid-pro/internals");
+const gridRowGroupingStateSelector = (0, _internals.createRootSelector)(state => state.rowGrouping);
 const gridRowGroupingModelSelector = exports.gridRowGroupingModelSelector = (0, _internals.createSelector)(gridRowGroupingStateSelector, rowGrouping => rowGrouping.model);
 const gridRowGroupingSanitizedModelSelector = exports.gridRowGroupingSanitizedModelSelector = (0, _internals.createSelectorMemoized)(gridRowGroupingModelSelector, _xDataGridPro.gridColumnLookupSelector, (model, columnsLookup) => model.filter(field => !!columnsLookup[field]));

package/hooks/features/rowGrouping/gridRowGroupingUtils.d.ts

@@ -1,21 +1,21 @@
 import { RefObject } from '@mui/x-internals/types';
 import { GridRowTreeConfig, GridFilterState, GridFilterModel, GridRowModel, GridColDef, GridKeyValue, GridDataSource } from '@mui/x-data-grid-pro';
 import { GridAggregatedFilterItemApplier, GridColumnRawLookup, GRID_ROW_GROUPING_SINGLE_GROUPING_FIELD, getRowGroupingCriteriaFromGroupingField, isGroupingColumn } from '@mui/x-data-grid-pro/internals';
-import { DataGridPremiumProcessedProps } from '../../../models/dataGridPremiumProps';
-import { GridGroupingRule, GridGroupingRules, GridRowGroupingModel } from './gridRowGroupingInterfaces';
-import { GridStatePremium } from '../../../models/gridStatePremium';
-import { GridPrivateApiPremium } from '../../../models/gridApiPremium';
-export { GRID_ROW_GROUPING_SINGLE_GROUPING_FIELD, getRowGroupingCriteriaFromGroupingField, isGroupingColumn, };
+import { DataGridPremiumProcessedProps } from "../../../models/dataGridPremiumProps.js";
+import { GridGroupingRule, GridGroupingRules, GridRowGroupingModel } from "./gridRowGroupingInterfaces.js";
+import { GridStatePremium } from "../../../models/gridStatePremium.js";
+import { GridPrivateApiPremium } from "../../../models/gridApiPremium.js";
+export { GRID_ROW_GROUPING_SINGLE_GROUPING_FIELD, getRowGroupingCriteriaFromGroupingField, isGroupingColumn };
 export declare enum RowGroupingStrategy {
-    Default = "grouping-columns",
-    DataSource = "grouping-columns-data-source"
+  Default = "grouping-columns",
+  DataSource = "grouping-columns-data-source",
 }
 export declare const getRowGroupingFieldFromGroupingCriteria: (groupingCriteria: string | null) => string;
 interface FilterRowTreeFromTreeDataParams {
-    rowTree: GridRowTreeConfig;
-    isRowMatchingFilters: GridAggregatedFilterItemApplier | null;
-    filterModel: GridFilterModel;
-    apiRef: RefObject<GridPrivateApiPremium>;
+  rowTree: GridRowTreeConfig;
+  isRowMatchingFilters: GridAggregatedFilterItemApplier | null;
+  filterModel: GridFilterModel;
+  apiRef: RefObject<GridPrivateApiPremium>;
 }
 /**
  * A leaf is visible if it passed the filter
@@ -27,20 +27,28 @@ export declare const filterRowTreeFromGroupingColumns: (params: FilterRowTreeFro
 export declare const getColDefOverrides: (groupingColDefProp: DataGridPremiumProcessedProps["groupingColDef"], fields: string[], strategy?: RowGroupingStrategy) => import("@mui/x-data-grid-pro").GridGroupingColDefOverride<any> | null | undefined;
 export declare const mergeStateWithRowGroupingModel: (rowGroupingModel: GridRowGroupingModel) => (state: GridStatePremium) => GridStatePremium;
 export declare const setStrategyAvailability: (privateApiRef: RefObject<GridPrivateApiPremium>, disableRowGrouping: boolean, dataSource?: GridDataSource) => void;
-export declare const getCellGroupingCriteria: ({ row, colDef, groupingRule, apiRef, }: {
-    row: GridRowModel;
-    colDef: GridColDef;
-    groupingRule: GridGroupingRule;
-    apiRef: RefObject<GridPrivateApiPremium>;
+export declare const getCellGroupingCriteria: ({
+  row,
+  colDef,
+  groupingRule,
+  apiRef
+}: {
+  row: GridRowModel;
+  colDef: GridColDef;
+  groupingRule: GridGroupingRule;
+  apiRef: RefObject<GridPrivateApiPremium>;
 }) => {
-    key: GridKeyValue | null | undefined;
-    field: string;
+  key: GridKeyValue | null | undefined;
+  field: string;
 };
-export declare const getGroupingRules: ({ sanitizedRowGroupingModel, columnsLookup, }: {
-    sanitizedRowGroupingModel: GridRowGroupingModel;
-    columnsLookup: GridColumnRawLookup;
+export declare const getGroupingRules: ({
+  sanitizedRowGroupingModel,
+  columnsLookup
+}: {
+  sanitizedRowGroupingModel: GridRowGroupingModel;
+  columnsLookup: GridColumnRawLookup;
 }) => GridGroupingRules;
 /**
  * Compares two sets of grouping rules to determine if they are equal or not.
  */
-export declare const areGroupingRulesEqual: (newValue: GridGroupingRules, previousValue: GridGroupingRules) => boolean;
+export declare const areGroupingRulesEqual: (newValue: GridGroupingRules, previousValue: GridGroupingRules) => boolean;

package/hooks/features/rowGrouping/gridRowGroupingUtils.js

@@ -102,7 +102,9 @@ const filterRowTreeFromGroupingColumns = params => {
         isPassingFiltering = (0, _internals.passFilterLogic)(allResults.map(result => result.passingFilterItems), allResults.map(result => result.passingQuickFilterValues), filterModel, params.apiRef, filterCache);
       }
     }
-    filteredRowsLookup[node.id] = isPassingFiltering;
+    if (!isPassingFiltering) {
+      filteredRowsLookup[node.id] = false;
+    }
     if (!isPassingFiltering) {
       return 0;
     }
@@ -167,7 +169,7 @@ const getCellGroupingCriteria = ({
   if (groupingRule.groupingValueGetter) {
     key = groupingRule.groupingValueGetter(row[groupingRule.field], row, colDef, apiRef);
   } else {
-    key = row[groupingRule.field];
+    key = (0, _internals.getRowValue)(row, colDef, apiRef);
   }
   return {
     key,

package/hooks/features/rowGrouping/index.d.ts

@@ -1,3 +1,3 @@
-export * from './gridRowGroupingSelector';
-export * from './gridRowGroupingInterfaces';
-export { GRID_ROW_GROUPING_SINGLE_GROUPING_FIELD, getRowGroupingFieldFromGroupingCriteria, isGroupingColumn, } from './gridRowGroupingUtils';
+export * from "./gridRowGroupingSelector.js";
+export * from "./gridRowGroupingInterfaces.js";
+export { GRID_ROW_GROUPING_SINGLE_GROUPING_FIELD, getRowGroupingFieldFromGroupingCriteria, isGroupingColumn } from "./gridRowGroupingUtils.js";

package/hooks/features/rowGrouping/useGridDataSourceRowGroupingPreProcessors.d.ts

@@ -1,4 +1,4 @@
 import { RefObject } from '@mui/x-internals/types';
-import { DataGridPremiumProcessedProps } from '../../../models/dataGridPremiumProps';
-import { GridPrivateApiPremium } from '../../../models/gridApiPremium';
-export declare const useGridDataSourceRowGroupingPreProcessors: (apiRef: RefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "disableRowGrouping" | "groupingColDef" | "rowGroupingColumnMode" | "defaultGroupingExpansionDepth" | "isGroupExpandedByDefault" | "unstable_dataSource">) => void;
+import { DataGridPremiumProcessedProps } from "../../../models/dataGridPremiumProps.js";
+import { GridPrivateApiPremium } from "../../../models/gridApiPremium.js";
+export declare const useGridDataSourceRowGroupingPreProcessors: (apiRef: RefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "disableRowGrouping" | "groupingColDef" | "rowGroupingColumnMode" | "defaultGroupingExpansionDepth" | "isGroupExpandedByDefault" | "dataSource">) => void;

package/hooks/features/rowGrouping/useGridDataSourceRowGroupingPreProcessors.js

@@ -12,11 +12,11 @@ var _gridRowGroupingUtils = require("./gridRowGroupingUtils");
 var _gridRowGroupingSelector = require("./gridRowGroupingSelector");
 const useGridDataSourceRowGroupingPreProcessors = (apiRef, props) => {
   const createRowTreeForRowGrouping = React.useCallback(params => {
-    const getGroupKey = props.unstable_dataSource?.getGroupKey;
+    const getGroupKey = props.dataSource?.getGroupKey;
     if (!getGroupKey) {
       throw new Error('MUI X: No `getGroupKey` method provided with the dataSource.');
     }
-    const getChildrenCount = props.unstable_dataSource?.getChildrenCount;
+    const getChildrenCount = props.dataSource?.getChildrenCount;
     if (!getChildrenCount) {
       throw new Error('MUI X: No `getChildrenCount` method provided with the dataSource.');
     }
@@ -64,7 +64,7 @@ const useGridDataSourceRowGroupingPreProcessors = (apiRef, props) => {
       isGroupExpandedByDefault: props.isGroupExpandedByDefault,
       groupingName: _gridRowGroupingUtils.RowGroupingStrategy.DataSource
     });
-  }, [apiRef, props.unstable_dataSource, props.defaultGroupingExpansionDepth, props.isGroupExpandedByDefault]);
+  }, [apiRef, props.dataSource, props.defaultGroupingExpansionDepth, props.isGroupExpandedByDefault]);
   const filterRows = React.useCallback(() => {
     const rowTree = (0, _xDataGridPro.gridRowTreeSelector)(apiRef);
     return (0, _internals.skipFiltering)(rowTree);

package/hooks/features/rowGrouping/useGridRowGrouping.d.ts

@@ -1,11 +1,11 @@
 import { RefObject } from '@mui/x-internals/types';
 import { GridStateInitializer } from '@mui/x-data-grid-pro/internals';
-import { GridPrivateApiPremium } from '../../../models/gridApiPremium';
-import { DataGridPremiumProcessedProps } from '../../../models/dataGridPremiumProps';
+import { GridPrivateApiPremium } from "../../../models/gridApiPremium.js";
+import { DataGridPremiumProcessedProps } from "../../../models/dataGridPremiumProps.js";
 export declare const rowGroupingStateInitializer: GridStateInitializer<Pick<DataGridPremiumProcessedProps, 'rowGroupingModel' | 'initialState'>>;
 /**
  * @requires useGridColumns (state, method) - can be after, async only
  * @requires useGridRows (state, method) - can be after, async only
  * @requires useGridParamsApi (method) - can be after, async only
  */
-export declare const useGridRowGrouping: (apiRef: RefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "initialState" | "rowGroupingModel" | "onRowGroupingModelChange" | "defaultGroupingExpansionDepth" | "isGroupExpandedByDefault" | "groupingColDef" | "rowGroupingColumnMode" | "disableRowGrouping" | "slotProps" | "slots" | "unstable_dataSource">) => void;
+export declare const useGridRowGrouping: (apiRef: RefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "initialState" | "rowGroupingModel" | "onRowGroupingModelChange" | "defaultGroupingExpansionDepth" | "isGroupExpandedByDefault" | "groupingColDef" | "rowGroupingColumnMode" | "disableRowGrouping" | "slotProps" | "slots" | "dataSource">) => void;

package/hooks/features/rowGrouping/useGridRowGrouping.js

@@ -46,7 +46,6 @@ const useGridRowGrouping = (apiRef, props) => {
     if (currentModel !== model) {
       apiRef.current.setState((0, _gridRowGroupingUtils.mergeStateWithRowGroupingModel)(model));
       (0, _gridRowGroupingUtils.setStrategyAvailability)(apiRef, props.disableRowGrouping);
-      apiRef.current.forceUpdate();
     }
   }, [apiRef, props.disableRowGrouping]);
   const addRowGroupingCriteria = React.useCallback((field, groupingIndex) => {
@@ -150,13 +149,13 @@ const useGridRowGrouping = (apiRef, props) => {
       if (!isOnGroupingCell) {
         return;
       }
-      if (props.unstable_dataSource && !params.rowNode.childrenExpanded) {
-        apiRef.current.unstable_dataSource.fetchRows(params.id);
+      if (props.dataSource && !params.rowNode.childrenExpanded) {
+        apiRef.current.dataSource.fetchRows(params.id);
         return;
       }
       apiRef.current.setRowChildrenExpansion(params.id, !params.rowNode.childrenExpanded);
     }
-  }, [apiRef, props.rowGroupingColumnMode, props.unstable_dataSource]);
+  }, [apiRef, props.rowGroupingColumnMode, props.dataSource]);
   const checkGroupingColumnsModelDiff = React.useCallback(() => {
     const sanitizedRowGroupingModel = (0, _gridRowGroupingSelector.gridRowGroupingSanitizedModelSelector)(apiRef);
     const rulesOnLastRowTreeCreation = apiRef.current.caches.rowGrouping.rulesOnLastRowTreeCreation || [];
@@ -179,7 +178,7 @@ const useGridRowGrouping = (apiRef, props) => {
   (0, _xDataGridPro.useGridApiEventHandler)(apiRef, 'cellKeyDown', handleCellKeyDown);
   (0, _xDataGridPro.useGridApiEventHandler)(apiRef, 'columnsChange', checkGroupingColumnsModelDiff);
   (0, _xDataGridPro.useGridApiEventHandler)(apiRef, 'rowGroupingModelChange', checkGroupingColumnsModelDiff);
-  (0, _xDataGridPro.useGridApiEventHandler)(apiRef, 'rowGroupingModelChange', () => apiRef.current.unstable_dataSource.fetchRows());
+  (0, _xDataGridPro.useGridApiEventHandler)(apiRef, 'rowGroupingModelChange', () => apiRef.current.dataSource.fetchRows());
 
   /*
    * EFFECTS

package/hooks/features/rowGrouping/useGridRowGroupingPreProcessors.d.ts

@@ -1,4 +1,4 @@
 import { RefObject } from '@mui/x-internals/types';
-import { DataGridPremiumProcessedProps } from '../../../models/dataGridPremiumProps';
-import { GridPrivateApiPremium } from '../../../models/gridApiPremium';
-export declare const useGridRowGroupingPreProcessors: (apiRef: RefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "disableRowGrouping" | "groupingColDef" | "rowGroupingColumnMode" | "defaultGroupingExpansionDepth" | "isGroupExpandedByDefault" | "unstable_dataSource">) => void;
+import { DataGridPremiumProcessedProps } from "../../../models/dataGridPremiumProps.js";
+import { GridPrivateApiPremium } from "../../../models/gridApiPremium.js";
+export declare const useGridRowGroupingPreProcessors: (apiRef: RefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "disableRowGrouping" | "groupingColDef" | "rowGroupingColumnMode" | "defaultGroupingExpansionDepth" | "isGroupExpandedByDefault" | "dataSource">) => void;