@mui/x-data-grid-pro 5.6.1 → 5.9.0

package/hooks/features/detailPanel/useGridDetailPanel.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { GridEvents, useGridSelector, useGridApiEventHandler, useGridApiMethod } from '@mui/x-data-grid';
-import { useGridRegisterPreProcessor } from '@mui/x-data-grid/internals';
+import { useGridRegisterPipeProcessor } from '@mui/x-data-grid/internals';
 import { GRID_DETAIL_PANEL_TOGGLE_FIELD } from './gridDetailPanelToggleColDef';
 import { gridDetailPanelExpandedRowIdsSelector, gridDetailPanelExpandedRowsContentCacheSelector, gridDetailPanelExpandedRowsHeightCacheSelector } from './gridDetailPanelSelector';
 export const detailPanelStateInitializer = (state, props) => {
@@ -35,11 +35,19 @@ export const useGridDetailPanel = (apiRef, props) => {
     apiRef.current.toggleDetailPanel(params.id);
   }, [apiRef, contentCache, props.getDetailPanelContent]);
   const handleCellKeyDown = React.useCallback((params, event) => {
-    if (!event.ctrlKey || event.key !== 'Enter' || props.getDetailPanelContent == null) {
+    if (props.getDetailPanelContent == null) {
       return;
     }
 
-    apiRef.current.toggleDetailPanel(params.id);
+    if ((event.ctrlKey || event.metaKey) && event.key === 'Enter') {
+      // TODO v6: only support Space on the detail toggle
+      apiRef.current.toggleDetailPanel(params.id);
+      return;
+    }
+
+    if (params.field === GRID_DETAIL_PANEL_TOGGLE_FIELD && event.key === ' ') {
+      apiRef.current.toggleDetailPanel(params.id);
+    }
   }, [apiRef, props.getDetailPanelContent]);
   useGridApiEventHandler(apiRef, GridEvents.cellClick, handleCellClick);
   useGridApiEventHandler(apiRef, GridEvents.cellKeyDown, handleCellKeyDown);
@@ -58,7 +66,7 @@ export const useGridDetailPanel = (apiRef, props) => {
 
     });
   }, [apiRef, expandedRowIds]);
-  useGridRegisterPreProcessor(apiRef, 'rowHeight', addDetailHeight);
+  useGridRegisterPipeProcessor(apiRef, 'rowHeight', addDetailHeight);
   apiRef.current.unstable_updateControlState({
     stateId: 'detailPanels',
     propModel: props.detailPanelExpandedRowIds,

package/hooks/features/detailPanel/useGridDetailPanelCache.js

@@ -39,7 +39,7 @@ export const useGridDetailPanelCache = (apiRef, props) => {
     });
     apiRef.current.forceUpdate();
   }, [apiRef, props.getDetailPanelContent, props.getDetailPanelHeight]);
-  useGridApiEventHandler(apiRef, GridEvents.visibleRowsSet, updateCaches);
+  useGridApiEventHandler(apiRef, GridEvents.sortedRowsSet, updateCaches);
   const isFirstRender = React.useRef(true);
 
   if (isFirstRender.current) {

package/hooks/features/detailPanel/useGridDetailPanelPreProcessors.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useGridRegisterPreProcessor } from '@mui/x-data-grid/internals';
+import { useGridRegisterPipeProcessor } from '@mui/x-data-grid/internals';
 import { GRID_DETAIL_PANEL_TOGGLE_FIELD, GRID_DETAIL_PANEL_TOGGLE_COL_DEF } from './gridDetailPanelToggleColDef';
 export const useGridDetailPanelPreProcessors = (apiRef, props) => {
   const addToggleColumn = React.useCallback(columnsState => {
@@ -24,5 +24,5 @@ export const useGridDetailPanelPreProcessors = (apiRef, props) => {
     columnsState.lookup[GRID_DETAIL_PANEL_TOGGLE_FIELD] = GRID_DETAIL_PANEL_TOGGLE_COL_DEF;
     return columnsState;
   }, [props.getDetailPanelContent]);
-  useGridRegisterPreProcessor(apiRef, 'hydrateColumns', addToggleColumn);
+  useGridRegisterPipeProcessor(apiRef, 'hydrateColumns', addToggleColumn);
 };

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

@@ -1,6 +1,12 @@
 export declare type GridRowGroupingModel = string[];
 export interface GridRowGroupingState {
     model: GridRowGroupingModel;
+    /**
+     * 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.
+     * TODO: Move outside of the state
+     */
+    unstable_sanitizedModelOnLastRowTreeCreation: GridRowGroupingModel;
 }
 export interface GridRowGroupingInitialState {
     model?: GridRowGroupingModel;

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

@@ -1,10 +1,12 @@
+import * as React from 'react';
 import { GridRowTreeConfig, GridFilterState } from '@mui/x-data-grid';
 import { GridAggregatedFilterItemApplier } from '@mui/x-data-grid/internals';
 import { DataGridProProcessedProps } from '../../../models/dataGridProProps';
 import { GridRowGroupingModel } from './gridRowGroupingInterfaces';
 import { GridStatePro } from '../../../models/gridStatePro';
+import { GridApiPro } from '../../../models/gridApiPro';
 export declare const GRID_ROW_GROUPING_SINGLE_GROUPING_FIELD = "__row_group_by_columns_group__";
-export declare const GROUPING_COLUMNS_FEATURE_NAME = "grouping-columns";
+export declare const ROW_GROUPING_STRATEGY = "grouping-columns";
 export declare const getRowGroupingFieldFromGroupingCriteria: (groupingCriteria: string | null) => string;
 export declare const getRowGroupingCriteriaFromGroupingField: (groupingColDefField: string) => string | null;
 export declare const isGroupingColumn: (field: string) => boolean;
@@ -19,6 +21,7 @@ interface FilterRowTreeFromTreeDataParams {
  * - It is passing the filter
  */
 export declare const filterRowTreeFromGroupingColumns: (params: FilterRowTreeFromTreeDataParams) => Omit<GridFilterState, 'filterModel'>;
-export declare const getColDefOverrides: (groupingColDefProp: DataGridProProcessedProps['groupingColDef'], fields: string[]) => import("../../..").GridGroupingColDefOverride | null | undefined;
+export declare const getColDefOverrides: (groupingColDefProp: DataGridProProcessedProps['groupingColDef'], fields: string[]) => import("../../..").GridGroupingColDefOverride<any> | null | undefined;
 export declare const mergeStateWithRowGroupingModel: (rowGroupingModel: GridRowGroupingModel) => (state: GridStatePro) => GridStatePro;
+export declare const setStrategyAvailability: (apiRef: React.MutableRefObject<GridApiPro>, disableRowGrouping: boolean) => void;
 export {};

package/hooks/features/rowGrouping/gridRowGroupingUtils.js

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import { gridRowGroupingSanitizedModelSelector } from './gridRowGroupingSelector';
 export const GRID_ROW_GROUPING_SINGLE_GROUPING_FIELD = '__row_group_by_columns_group__';
-export const GROUPING_COLUMNS_FEATURE_NAME = 'grouping-columns';
+export const ROW_GROUPING_STRATEGY = 'grouping-columns';
 export const getRowGroupingFieldFromGroupingCriteria = groupingCriteria => {
   if (groupingCriteria === null) {
     return GRID_ROW_GROUPING_SINGLE_GROUPING_FIELD;
@@ -110,7 +111,7 @@ export const filterRowTreeFromGroupingColumns = params => {
 export const getColDefOverrides = (groupingColDefProp, fields) => {
   if (typeof groupingColDefProp === 'function') {
     return groupingColDefProp({
-      groupingName: GROUPING_COLUMNS_FEATURE_NAME,
+      groupingName: ROW_GROUPING_STRATEGY,
       fields
     });
   }
@@ -121,4 +122,18 @@ export const mergeStateWithRowGroupingModel = rowGroupingModel => state => _exte
   rowGrouping: _extends({}, state.rowGrouping, {
     model: rowGroupingModel
   })
-});
+});
+export const setStrategyAvailability = (apiRef, disableRowGrouping) => {
+  let isAvailable;
+
+  if (disableRowGrouping) {
+    isAvailable = () => false;
+  } else {
+    isAvailable = () => {
+      const rowGroupingSanitizedModel = gridRowGroupingSanitizedModelSelector(apiRef);
+      return rowGroupingSanitizedModel.length > 0;
+    };
+  }
+
+  apiRef.current.unstable_setStrategyAvailability('rowTree', ROW_GROUPING_STRATEGY, isAvailable);
+};

package/hooks/features/rowGrouping/useGridRowGrouping.js

@@ -1,12 +1,10 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import Divider from '@mui/material/Divider';
-import { GridEvents, gridRowIdsSelector, gridRowTreeSelector, useGridApiEventHandler, useGridApiMethod, gridColumnLookupSelector, gridFilteredDescendantCountLookupSelector, useFirstRender } from '@mui/x-data-grid';
-import { useGridRegisterPreProcessor, useGridRegisterSortingMethod, useGridRegisterFilteringMethod, isDeepEqual } from '@mui/x-data-grid/internals';
-import { buildRowTree } from '../../../utils/tree/buildRowTree';
-import { gridRowGroupingModelSelector, gridRowGroupingSanitizedModelSelector } from './gridRowGroupingSelector';
-import { filterRowTreeFromGroupingColumns, getRowGroupingFieldFromGroupingCriteria, GROUPING_COLUMNS_FEATURE_NAME, isGroupingColumn, mergeStateWithRowGroupingModel } from './gridRowGroupingUtils';
-import { sortRowTree } from '../../../utils/tree/sortRowTree';
+import { GridEvents, useGridApiEventHandler, useGridApiMethod, gridFilteredDescendantCountLookupSelector } from '@mui/x-data-grid';
+import { useGridRegisterPipeProcessor, isDeepEqual } from '@mui/x-data-grid/internals';
+import { gridRowGroupingModelSelector, gridRowGroupingSanitizedModelSelector, gridRowGroupingStateSelector } from './gridRowGroupingSelector';
+import { getRowGroupingFieldFromGroupingCriteria, ROW_GROUPING_STRATEGY, isGroupingColumn, mergeStateWithRowGroupingModel, setStrategyAvailability } from './gridRowGroupingUtils';
 import { GridRowGroupableColumnMenuItems } from '../../../components/GridRowGroupableColumnMenuItems';
 import { GridRowGroupingColumnMenuItems } from '../../../components/GridRowGroupingColumnMenuItems';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -15,7 +13,8 @@ export const rowGroupingStateInitializer = (state, props) => {
 
   return _extends({}, state, {
     rowGrouping: {
-      model: (_ref = (_props$rowGroupingMod = props.rowGroupingModel) != null ? _props$rowGroupingMod : (_props$initialState = props.initialState) == null ? void 0 : (_props$initialState$r = _props$initialState.rowGrouping) == null ? void 0 : _props$initialState$r.model) != null ? _ref : []
+      model: (_ref = (_props$rowGroupingMod = props.rowGroupingModel) != null ? _props$rowGroupingMod : (_props$initialState = props.initialState) == null ? void 0 : (_props$initialState$r = _props$initialState.rowGrouping) == null ? void 0 : _props$initialState$r.model) != null ? _ref : [],
+      unstable_sanitizedModelOnLastRowTreeCreation: []
     }
   });
 };
@@ -35,158 +34,6 @@ export const useGridRowGrouping = (apiRef, props) => {
     stateSelector: gridRowGroupingModelSelector,
     changeEvent: GridEvents.rowGroupingModelChange
   });
-  /**
-   * ROW GROUPING
-   */
-  // Tracks the model on the last pre-processing to check if we need to re-build the grouping columns when the grid upserts a column.
-
-  const sanitizedModelOnLastRowPreProcessing = React.useRef([]);
-  const updateRowGrouping = React.useCallback(() => {
-    const groupRows = params => {
-      const rowGroupingModel = gridRowGroupingSanitizedModelSelector(apiRef);
-      const columnsLookup = gridColumnLookupSelector(apiRef);
-      sanitizedModelOnLastRowPreProcessing.current = rowGroupingModel;
-
-      if (props.disableRowGrouping || rowGroupingModel.length === 0) {
-        return null;
-      }
-
-      const distinctValues = Object.fromEntries(rowGroupingModel.map(groupingField => [groupingField, {
-        lookup: {},
-        list: []
-      }]));
-
-      const getCellGroupingCriteria = ({
-        row,
-        id,
-        colDef
-      }) => {
-        let key;
-
-        if (colDef.groupingValueGetter) {
-          const groupingValueGetterParams = {
-            colDef,
-            field: colDef.field,
-            value: row[colDef.field],
-            id,
-            row,
-            rowNode: {
-              isAutoGenerated: false,
-              id
-            }
-          };
-          key = colDef.groupingValueGetter(groupingValueGetterParams);
-        } else {
-          key = row[colDef.field];
-        }
-
-        return {
-          key,
-          field: colDef.field
-        };
-      };
-
-      params.ids.forEach(rowId => {
-        const row = params.idRowsLookup[rowId];
-        rowGroupingModel.forEach(groupingCriteria => {
-          const {
-            key
-          } = getCellGroupingCriteria({
-            row,
-            id: rowId,
-            colDef: columnsLookup[groupingCriteria]
-          });
-          const groupingFieldsDistinctKeys = distinctValues[groupingCriteria];
-
-          if (key != null && !groupingFieldsDistinctKeys.lookup[key.toString()]) {
-            groupingFieldsDistinctKeys.lookup[key.toString()] = true;
-            groupingFieldsDistinctKeys.list.push(key);
-          }
-        });
-      });
-      const rows = params.ids.map(rowId => {
-        const row = params.idRowsLookup[rowId];
-        const parentPath = rowGroupingModel.map(groupingField => getCellGroupingCriteria({
-          row,
-          id: rowId,
-          colDef: columnsLookup[groupingField]
-        })).filter(cell => cell.key != null);
-        const leafGroupingCriteria = {
-          key: rowId.toString(),
-          field: null
-        };
-        return {
-          path: [...parentPath, leafGroupingCriteria],
-          id: rowId
-        };
-      });
-      return buildRowTree(_extends({}, params, {
-        rows,
-        defaultGroupingExpansionDepth: props.defaultGroupingExpansionDepth,
-        isGroupExpandedByDefault: props.isGroupExpandedByDefault,
-        groupingName: GROUPING_COLUMNS_FEATURE_NAME
-      }));
-    };
-
-    return apiRef.current.unstable_registerRowGroupsBuilder('rowGrouping', groupRows);
-  }, [apiRef, props.defaultGroupingExpansionDepth, props.isGroupExpandedByDefault, props.disableRowGrouping]);
-  useFirstRender(() => {
-    updateRowGrouping();
-  });
-  const isFirstRender = React.useRef(true);
-  React.useEffect(() => {
-    if (isFirstRender.current) {
-      isFirstRender.current = false;
-      return () => {};
-    }
-
-    return updateRowGrouping();
-  }, [updateRowGrouping]);
-  /**
-   * PRE-PROCESSING
-   */
-
-  const addColumnMenuButtons = React.useCallback((initialValue, columns) => {
-    if (props.disableRowGrouping) {
-      return initialValue;
-    }
-
-    let menuItems;
-
-    if (isGroupingColumn(columns.field)) {
-      menuItems = /*#__PURE__*/_jsx(GridRowGroupingColumnMenuItems, {});
-    } else if (columns.groupable) {
-      menuItems = /*#__PURE__*/_jsx(GridRowGroupableColumnMenuItems, {});
-    } else {
-      menuItems = null;
-    }
-
-    if (menuItems == null) {
-      return initialValue;
-    }
-
-    return [...initialValue, /*#__PURE__*/_jsx(Divider, {}), menuItems];
-  }, [props.disableRowGrouping]);
-  const filteringMethod = React.useCallback(params => {
-    const rowTree = gridRowTreeSelector(apiRef);
-    return filterRowTreeFromGroupingColumns({
-      rowTree,
-      isRowMatchingFilters: params.isRowMatchingFilters
-    });
-  }, [apiRef]);
-  const sortingMethod = React.useCallback(params => {
-    const rowTree = gridRowTreeSelector(apiRef);
-    const rowIds = gridRowIdsSelector(apiRef);
-    return sortRowTree({
-      rowTree,
-      rowIds,
-      sortRowList: params.sortRowList,
-      disableChildrenSorting: false
-    });
-  }, [apiRef]);
-  useGridRegisterPreProcessor(apiRef, 'columnMenu', addColumnMenuButtons);
-  useGridRegisterFilteringMethod(apiRef, GROUPING_COLUMNS_FEATURE_NAME, filteringMethod);
-  useGridRegisterSortingMethod(apiRef, GROUPING_COLUMNS_FEATURE_NAME, sortingMethod);
   /**
    * API METHODS
    */
@@ -196,10 +43,10 @@ export const useGridRowGrouping = (apiRef, props) => {
 
     if (currentModel !== model) {
       apiRef.current.setState(mergeStateWithRowGroupingModel(model));
-      updateRowGrouping();
+      setStrategyAvailability(apiRef, props.disableRowGrouping);
       apiRef.current.forceUpdate();
     }
-  }, [apiRef, updateRowGrouping]);
+  }, [apiRef, props.disableRowGrouping]);
   const addRowGroupingCriteria = React.useCallback((field, groupingIndex) => {
     const currentModel = gridRowGroupingModelSelector(apiRef);
 
@@ -243,6 +90,27 @@ export const useGridRowGrouping = (apiRef, props) => {
    * PRE-PROCESSING
    */
 
+  const addColumnMenuButtons = React.useCallback((initialValue, columns) => {
+    if (props.disableRowGrouping) {
+      return initialValue;
+    }
+
+    let menuItems;
+
+    if (isGroupingColumn(columns.field)) {
+      menuItems = /*#__PURE__*/_jsx(GridRowGroupingColumnMenuItems, {});
+    } else if (columns.groupable) {
+      menuItems = /*#__PURE__*/_jsx(GridRowGroupableColumnMenuItems, {});
+    } else {
+      menuItems = null;
+    }
+
+    if (menuItems == null) {
+      return initialValue;
+    }
+
+    return [...initialValue, /*#__PURE__*/_jsx(Divider, {}), menuItems];
+  }, [props.disableRowGrouping]);
   const stateExportPreProcessing = React.useCallback(prevState => {
     if (props.disableRowGrouping) {
       return prevState;
@@ -275,8 +143,9 @@ export const useGridRowGrouping = (apiRef, props) => {
 
     return params;
   }, [apiRef, props.disableRowGrouping]);
-  useGridRegisterPreProcessor(apiRef, 'exportState', stateExportPreProcessing);
-  useGridRegisterPreProcessor(apiRef, 'restoreState', stateRestorePreProcessing);
+  useGridRegisterPipeProcessor(apiRef, 'columnMenu', addColumnMenuButtons);
+  useGridRegisterPipeProcessor(apiRef, 'exportState', stateExportPreProcessing);
+  useGridRegisterPipeProcessor(apiRef, 'restoreState', stateRestorePreProcessing);
   /**
    * EVENTS
    */
@@ -301,15 +170,23 @@ export const useGridRowGrouping = (apiRef, props) => {
   }, [apiRef, props.rowGroupingColumnMode]);
   const checkGroupingColumnsModelDiff = React.useCallback(() => {
     const rowGroupingModel = gridRowGroupingSanitizedModelSelector(apiRef);
-    const lastGroupingColumnsModelApplied = sanitizedModelOnLastRowPreProcessing.current;
+    const lastGroupingColumnsModelApplied = gridRowGroupingStateSelector(apiRef.current.state).unstable_sanitizedModelOnLastRowTreeCreation;
 
     if (!isDeepEqual(lastGroupingColumnsModelApplied, rowGroupingModel)) {
-      sanitizedModelOnLastRowPreProcessing.current = rowGroupingModel; // Refresh the column pre-processing
+      apiRef.current.setState(state => _extends({}, state, {
+        rowGrouping: _extends({}, state.rowGrouping, {
+          unstable_sanitizedModelOnLastRowTreeCreation: rowGroupingModel
+        })
+      }));
+      apiRef.current.unstable_requestPipeProcessorsApplication('hydrateColumns');
+      setStrategyAvailability(apiRef, props.disableRowGrouping); // Refresh the row tree creation strategy processing
+      // TODO: Add a clean way to re-run a strategy processing without publishing a private event
 
-      apiRef.current.updateColumns([]);
-      updateRowGrouping();
+      if (apiRef.current.unstable_getActiveStrategy('rowTree') === ROW_GROUPING_STRATEGY) {
+        apiRef.current.publishEvent(GridEvents.activeStrategyProcessorChange, 'rowTreeCreation');
+      }
     }
-  }, [apiRef, updateRowGrouping]);
+  }, [apiRef, props.disableRowGrouping]);
   useGridApiEventHandler(apiRef, GridEvents.cellKeyDown, handleCellKeyDown);
   useGridApiEventHandler(apiRef, GridEvents.columnsChange, checkGroupingColumnsModelDiff);
   useGridApiEventHandler(apiRef, GridEvents.rowGroupingModelChange, checkGroupingColumnsModelDiff);

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

@@ -1,4 +1,4 @@
 import * as React from 'react';
 import { DataGridProProcessedProps } from '../../../models/dataGridProProps';
 import { GridApiPro } from '../../../models/gridApiPro';
-export declare const useGridRowGroupingPreProcessors: (apiRef: React.MutableRefObject<GridApiPro>, props: Pick<DataGridProProcessedProps, 'disableRowGrouping' | 'groupingColDef' | 'rowGroupingColumnMode'>) => void;
+export declare const useGridRowGroupingPreProcessors: (apiRef: React.MutableRefObject<GridApiPro>, props: Pick<DataGridProProcessedProps, 'disableRowGrouping' | 'groupingColDef' | 'rowGroupingColumnMode' | 'defaultGroupingExpansionDepth' | 'isGroupExpandedByDefault'>) => void;

package/hooks/features/rowGrouping/useGridRowGroupingPreProcessors.js

@@ -1,8 +1,12 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
-import { useGridRegisterPreProcessor } from '@mui/x-data-grid/internals';
-import { gridRowGroupingModelSelector } from './gridRowGroupingSelector';
+import { gridColumnLookupSelector, gridRowIdsSelector, gridRowTreeSelector, useFirstRender } from '@mui/x-data-grid';
+import { useGridRegisterPipeProcessor, useGridRegisterStrategyProcessor } from '@mui/x-data-grid/internals';
+import { gridRowGroupingModelSelector, gridRowGroupingSanitizedModelSelector } from './gridRowGroupingSelector';
 import { createGroupingColDefForAllGroupingCriteria, createGroupingColDefForOneGroupingCriteria } from './createGroupingColDef';
-import { getColDefOverrides, isGroupingColumn } from './gridRowGroupingUtils';
+import { filterRowTreeFromGroupingColumns, getColDefOverrides, ROW_GROUPING_STRATEGY, isGroupingColumn, setStrategyAvailability } from './gridRowGroupingUtils';
+import { buildRowTree } from '../../../utils/tree/buildRowTree';
+import { sortRowTree } from '../../../utils/tree/sortRowTree';
 export const useGridRowGroupingPreProcessors = (apiRef, props) => {
   const getGroupingColDefs = React.useCallback(columnsState => {
     if (props.disableRowGrouping) {
@@ -72,5 +76,128 @@ export const useGridRowGroupingPreProcessors = (apiRef, props) => {
     columnsState.lookup = newColumnsLookup;
     return columnsState;
   }, [getGroupingColDefs]);
-  useGridRegisterPreProcessor(apiRef, 'hydrateColumns', updateGroupingColumn);
+  const createRowTree = React.useCallback(params => {
+    const rowGroupingModel = gridRowGroupingSanitizedModelSelector(apiRef);
+    const columnsLookup = gridColumnLookupSelector(apiRef);
+    apiRef.current.setState(state => _extends({}, state, {
+      rowGrouping: _extends({}, state.rowGrouping, {
+        unstable_sanitizedModelOnLastRowTreeCreation: rowGroupingModel
+      })
+    }));
+    const distinctValues = Object.fromEntries(rowGroupingModel.map(groupingField => [groupingField, {
+      lookup: {},
+      list: []
+    }]));
+
+    const getCellGroupingCriteria = ({
+      row,
+      id,
+      colDef
+    }) => {
+      let key;
+
+      if (colDef.groupingValueGetter) {
+        const groupingValueGetterParams = {
+          colDef,
+          field: colDef.field,
+          value: row[colDef.field],
+          id,
+          row,
+          rowNode: {
+            isAutoGenerated: false,
+            id
+          }
+        };
+        key = colDef.groupingValueGetter(groupingValueGetterParams);
+      } else {
+        key = row[colDef.field];
+      }
+
+      return {
+        key,
+        field: colDef.field
+      };
+    };
+
+    params.ids.forEach(rowId => {
+      const row = params.idRowsLookup[rowId];
+      rowGroupingModel.forEach(groupingCriteria => {
+        const {
+          key
+        } = getCellGroupingCriteria({
+          row,
+          id: rowId,
+          colDef: columnsLookup[groupingCriteria]
+        });
+        const groupingFieldsDistinctKeys = distinctValues[groupingCriteria];
+
+        if (key != null && !groupingFieldsDistinctKeys.lookup[key.toString()]) {
+          groupingFieldsDistinctKeys.lookup[key.toString()] = true;
+          groupingFieldsDistinctKeys.list.push(key);
+        }
+      });
+    });
+    const rows = params.ids.map(rowId => {
+      const row = params.idRowsLookup[rowId];
+      const parentPath = rowGroupingModel.map(groupingField => getCellGroupingCriteria({
+        row,
+        id: rowId,
+        colDef: columnsLookup[groupingField]
+      })).filter(cell => cell.key != null);
+      const leafGroupingCriteria = {
+        key: rowId.toString(),
+        field: null
+      };
+      return {
+        path: [...parentPath, leafGroupingCriteria],
+        id: rowId
+      };
+    });
+    return buildRowTree(_extends({}, params, {
+      rows,
+      defaultGroupingExpansionDepth: props.defaultGroupingExpansionDepth,
+      isGroupExpandedByDefault: props.isGroupExpandedByDefault,
+      groupingName: ROW_GROUPING_STRATEGY
+    }));
+  }, [apiRef, props.defaultGroupingExpansionDepth, props.isGroupExpandedByDefault]);
+  const filterRows = React.useCallback(params => {
+    const rowTree = gridRowTreeSelector(apiRef);
+    return filterRowTreeFromGroupingColumns({
+      rowTree,
+      isRowMatchingFilters: params.isRowMatchingFilters
+    });
+  }, [apiRef]);
+  const sortRows = React.useCallback(params => {
+    const rowTree = gridRowTreeSelector(apiRef);
+    const rowIds = gridRowIdsSelector(apiRef);
+    return sortRowTree({
+      rowTree,
+      rowIds,
+      sortRowList: params.sortRowList,
+      disableChildrenSorting: false
+    });
+  }, [apiRef]);
+  useGridRegisterPipeProcessor(apiRef, 'hydrateColumns', updateGroupingColumn);
+  useGridRegisterStrategyProcessor(apiRef, ROW_GROUPING_STRATEGY, 'rowTreeCreation', createRowTree);
+  useGridRegisterStrategyProcessor(apiRef, ROW_GROUPING_STRATEGY, 'filtering', filterRows);
+  useGridRegisterStrategyProcessor(apiRef, ROW_GROUPING_STRATEGY, 'sorting', sortRows);
+  /**
+   * 1ST RENDER
+   */
+
+  useFirstRender(() => {
+    setStrategyAvailability(apiRef, props.disableRowGrouping);
+  });
+  /**
+   * EFFECTS
+   */
+
+  const isFirstRender = React.useRef(true);
+  React.useEffect(() => {
+    if (!isFirstRender.current) {
+      setStrategyAvailability(apiRef, props.disableRowGrouping);
+    } else {
+      isFirstRender.current = false;
+    }
+  }, [apiRef, props.disableRowGrouping]);
 };

package/hooks/features/treeData/gridTreeDataUtils.d.ts

@@ -5,6 +5,7 @@ interface FilterRowTreeFromTreeDataParams {
     disableChildrenFiltering: boolean;
     isRowMatchingFilters: GridAggregatedFilterItemApplier | null;
 }
+export declare const TREE_DATA_STRATEGY = "tree-data";
 /**
  * A node is visible if one of the following criteria is met:
  * - One of its children is passing the filter

package/hooks/features/treeData/gridTreeDataUtils.js

@@ -1,8 +1,10 @@
+export const TREE_DATA_STRATEGY = 'tree-data';
 /**
  * A node is visible if one of the following criteria is met:
  * - One of its children is passing the filter
  * - It is passing the filter
  */
+
 export const filterRowTreeFromTreeData = params => {
   const {
     rowTree,

package/hooks/features/treeData/useGridTreeData.d.ts

@@ -1,10 +1,6 @@
 import * as React from 'react';
 import { GridApiPro } from '../../../models/gridApiPro';
-import { DataGridProProcessedProps } from '../../../models/dataGridProProps';
-export declare const TREE_DATA_GROUPING_NAME = "tree-data";
 /**
  * Only available in DataGridPro
- * @requires useGridPreProcessing (method)
- * @requires useGridRowGroupsPreProcessing (method)
  */
-export declare const useGridTreeData: (apiRef: React.MutableRefObject<GridApiPro>, props: Pick<DataGridProProcessedProps, 'treeData' | 'getTreeDataPath' | 'groupingColDef' | 'defaultGroupingExpansionDepth' | 'isGroupExpandedByDefault' | 'disableChildrenFiltering' | 'disableChildrenSorting'>) => void;
+export declare const useGridTreeData: (apiRef: React.MutableRefObject<GridApiPro>) => void;