@mui/x-data-grid-premium 8.0.0-alpha.1 → 8.0.0-alpha.11

package/esm/hooks/features/cellSelection/useGridCellSelection.js

@@ -2,8 +2,8 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import ownerDocument from '@mui/utils/ownerDocument';
 import useEventCallback from '@mui/utils/useEventCallback';
-import { getTotalHeaderHeight, getVisibleRows, isNavigationKey, serializeCellValue, useGridRegisterPipeProcessor, useGridVisibleRows } from '@mui/x-data-grid-pro/internals';
-import { useGridApiEventHandler, useGridApiMethod, GRID_ACTIONS_COLUMN_TYPE, GRID_CHECKBOX_SELECTION_COL_DEF, GRID_DETAIL_PANEL_TOGGLE_FIELD, gridRowsDataRowIdToIdLookupSelector, gridClasses, gridFocusCellSelector, GRID_REORDER_COL_DEF, useGridSelector, gridSortedRowIdsSelector, gridDimensionsSelector } from '@mui/x-data-grid-pro';
+import { getTotalHeaderHeight, getVisibleRows, isNavigationKey, serializeCellValue, useGridRegisterPipeProcessor } from '@mui/x-data-grid-pro/internals';
+import { useGridApiEventHandler, useGridApiMethod, GRID_ACTIONS_COLUMN_TYPE, GRID_CHECKBOX_SELECTION_COL_DEF, GRID_DETAIL_PANEL_TOGGLE_FIELD, gridClasses, gridFocusCellSelector, GRID_REORDER_COL_DEF, gridSortedRowIdsSelector, gridDimensionsSelector } from '@mui/x-data-grid-pro';
 import { gridCellSelectionStateSelector } from "./gridCellSelectionSelector.js";
 export const cellSelectionStateInitializer = (state, props) => _extends({}, state, {
   cellSelection: _extends({}, props.cellSelectionModel ?? props.initialState?.cellSelection)
@@ -16,13 +16,10 @@ const AUTO_SCROLL_SPEED = 20; // The speed to scroll once the mouse enters the s
 
 export const useGridCellSelection = (apiRef, props) => {
   const hasRootReference = apiRef.current.rootElementRef.current !== null;
-  const visibleRows = useGridVisibleRows(apiRef, props);
-  const cellWithVirtualFocus = React.useRef();
-  const lastMouseDownCell = React.useRef();
+  const cellWithVirtualFocus = React.useRef(null);
+  const lastMouseDownCell = React.useRef(null);
   const mousePosition = React.useRef(null);
-  const autoScrollRAF = React.useRef();
-  const sortedRowIds = useGridSelector(apiRef, gridSortedRowIdsSelector);
-  const dimensions = useGridSelector(apiRef, gridDimensionsSelector);
+  const autoScrollRAF = React.useRef(null);
   const totalHeaderHeight = getTotalHeaderHeight(apiRef, props);
   const ignoreValueFormatterProp = props.ignoreValueFormatterDuringExport;
   const ignoreValueFormatter = (typeof ignoreValueFormatterProp === 'object' ? ignoreValueFormatterProp?.clipboardExport : ignoreValueFormatterProp) || false;
@@ -76,6 +73,7 @@ export const useGridCellSelection = (apiRef, props) => {
       finalEndColumnIndex = startColumnIndex;
     }
     const visibleColumns = apiRef.current.getVisibleColumns();
+    const visibleRows = getVisibleRows(apiRef);
     const rowsInRange = visibleRows.rows.slice(finalStartRowIndex, finalEndRowIndex + 1);
     const columnsInRange = visibleColumns.slice(finalStartColumnIndex, finalEndColumnIndex + 1);
     const newModel = keepOtherSelected ? _extends({}, apiRef.current.getCellSelectionModel()) : {};
@@ -88,10 +86,9 @@ export const useGridCellSelection = (apiRef, props) => {
       }, {});
     });
     apiRef.current.setCellSelectionModel(newModel);
-  }, [apiRef, visibleRows.rows]);
+  }, [apiRef]);
   const getSelectedCellsAsArray = React.useCallback(() => {
     const selectionModel = apiRef.current.getCellSelectionModel();
-    const idToIdLookup = gridRowsDataRowIdToIdLookupSelector(apiRef);
     const currentVisibleRows = getVisibleRows(apiRef, props);
     const sortedEntries = currentVisibleRows.rows.reduce((result, row) => {
       if (row.id in selectionModel) {
@@ -103,7 +100,7 @@ export const useGridCellSelection = (apiRef, props) => {
       selectedCells.push(...Object.entries(fields).reduce((selectedFields, [field, isSelected]) => {
         if (isSelected) {
           selectedFields.push({
-            id: idToIdLookup[id],
+            id,
             field
           });
         }
@@ -187,6 +184,7 @@ export const useGridCellSelection = (apiRef, props) => {
       if (!mousePosition.current || !apiRef.current.virtualScrollerRef?.current) {
         return;
       }
+      const dimensions = gridDimensionsSelector(apiRef.current.state);
       const {
         x: mouseX,
         y: mouseY
@@ -229,7 +227,7 @@ export const useGridCellSelection = (apiRef, props) => {
       autoScrollRAF.current = requestAnimationFrame(autoScroll);
     }
     autoScroll();
-  }, [apiRef, dimensions, totalHeaderHeight]);
+  }, [apiRef, totalHeaderHeight]);
   const handleCellMouseOver = React.useCallback((params, event) => {
     if (!lastMouseDownCell.current) {
       return;
@@ -246,6 +244,7 @@ export const useGridCellSelection = (apiRef, props) => {
     if (!virtualScrollerRect) {
       return;
     }
+    const dimensions = gridDimensionsSelector(apiRef.current.state);
     const {
       x,
       y
@@ -271,7 +270,7 @@ export const useGridCellSelection = (apiRef, props) => {
       // Mouse has left the sensitivity area while auto scroll is on
       stopAutoScroll();
     }
-  }, [apiRef, startAutoScroll, stopAutoScroll, totalHeaderHeight, dimensions]);
+  }, [apiRef, startAutoScroll, stopAutoScroll, totalHeaderHeight]);
   const handleCellClick = useEventCallback((params, event) => {
     const {
       id,
@@ -331,6 +330,7 @@ export const useGridCellSelection = (apiRef, props) => {
     } else if (event.key === 'ArrowLeft') {
       endColumnIndex -= 1;
     }
+    const visibleRows = getVisibleRows(apiRef);
     if (endRowIndex < 0 || endRowIndex >= visibleRows.rows.length) {
       return;
     }
@@ -383,6 +383,7 @@ export const useGridCellSelection = (apiRef, props) => {
     id,
     field
   }) => {
+    const visibleRows = getVisibleRows(apiRef);
     if (!visibleRows.range || !apiRef.current.isCellSelected(id, field)) {
       return classes;
     }
@@ -431,7 +432,7 @@ export const useGridCellSelection = (apiRef, props) => {
       newClasses.push(gridClasses['cell--rangeRight']);
     }
     return newClasses;
-  }, [apiRef, visibleRows.range, visibleRows.rows]);
+  }, [apiRef]);
   const canUpdateFocus = React.useCallback((initialValue, {
     event,
     cell
@@ -452,6 +453,7 @@ export const useGridCellSelection = (apiRef, props) => {
     if (apiRef.current.getSelectedCellsAsArray().length <= 1) {
       return value;
     }
+    const sortedRowIds = gridSortedRowIdsSelector(apiRef.current.state);
     const cellSelectionModel = apiRef.current.getCellSelectionModel();
     const unsortedSelectedRowIds = Object.keys(cellSelectionModel);
     const sortedSelectedRowIds = sortedRowIds.filter(id => unsortedSelectedRowIds.includes(`${id}`));
@@ -477,7 +479,7 @@ export const useGridCellSelection = (apiRef, props) => {
       return acc === '' ? rowString : [acc, rowString].join('\r\n');
     }, '');
     return copyData;
-  }, [apiRef, ignoreValueFormatter, clipboardCopyCellDelimiter, sortedRowIds]);
+  }, [apiRef, ignoreValueFormatter, clipboardCopyCellDelimiter]);
   useGridRegisterPipeProcessor(apiRef, 'isCellSelected', checkIfCellIsSelected);
   useGridRegisterPipeProcessor(apiRef, 'cellClassName', addClassesToCells);
   useGridRegisterPipeProcessor(apiRef, 'canUpdateFocus', canUpdateFocus);

package/esm/hooks/features/clipboard/useGridClipboardImport.js

@@ -121,7 +121,7 @@ class CellValueUpdater {
           if (onProcessRowUpdateError) {
             onProcessRowUpdateError(errorThrown);
           } else if (process.env.NODE_ENV !== 'production') {
-            warnOnce(['MUI X: A call to `processRowUpdate` threw an error which was not handled because `onProcessRowUpdateError` is missing.', 'To handle the error pass a callback to the `onProcessRowUpdateError` prop, for example `<DataGrid onProcessRowUpdateError={(error) => ...} />`.', 'For more detail, see https://mui.com/x/react-data-grid/editing/#server-side-persistence.'], 'error');
+            warnOnce(['MUI X: A call to `processRowUpdate` threw an error which was not handled because `onProcessRowUpdateError` is missing.', 'To handle the error pass a callback to the `onProcessRowUpdateError` prop, for example `<DataGrid onProcessRowUpdateError={(error) => ...} />`.', 'For more detail, see https://mui.com/x/react-data-grid/editing/persistence/.'], 'error');
           }
         };
         try {

package/esm/hooks/features/dataSource/cache.js

@@ -0,0 +1,3 @@
+export function getKeyPremium(params) {
+  return JSON.stringify([params.filterModel, params.sortModel, params.groupKeys, params.groupFields, params.start, params.end, params.aggregationModel]);
+}

package/esm/hooks/features/dataSource/models.js

@@ -0,0 +1 @@
+export {};

package/esm/hooks/features/dataSource/useGridDataSourcePremium.js

@@ -0,0 +1,53 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import * as React from 'react';
+import { useGridApiEventHandler as addEventHandler, useGridApiMethod, GRID_ROOT_GROUP_ID } from '@mui/x-data-grid-pro';
+import { useGridDataSourceBase, useGridRegisterStrategyProcessor, useGridRegisterPipeProcessor } from '@mui/x-data-grid-pro/internals';
+import { getKeyPremium } from "./cache.js";
+const options = {
+  cacheOptions: {
+    getKey: getKeyPremium
+  }
+};
+export const useGridDataSourcePremium = (apiRef, props) => {
+  const {
+    api,
+    strategyProcessor,
+    events
+  } = useGridDataSourceBase(apiRef, props, options);
+  const aggregateRowRef = React.useRef({});
+  const processDataSourceRows = React.useCallback(({
+    params,
+    response
+  }, applyRowHydration) => {
+    if (response.aggregateRow) {
+      aggregateRowRef.current = response.aggregateRow;
+    }
+    if (Object.keys(params.aggregationModel || {}).length > 0) {
+      if (applyRowHydration) {
+        apiRef.current.requestPipeProcessorsApplication('hydrateRows');
+      }
+      apiRef.current.applyAggregation();
+    }
+    return {
+      params,
+      response
+    };
+  }, [apiRef]);
+  const resolveGroupAggregation = React.useCallback((groupId, field) => {
+    if (groupId === GRID_ROOT_GROUP_ID) {
+      return props.unstable_dataSource?.getAggregatedValue?.(aggregateRowRef.current, field);
+    }
+    const row = apiRef.current.getRow(groupId);
+    return props.unstable_dataSource?.getAggregatedValue?.(row, field);
+  }, [apiRef, props.unstable_dataSource]);
+  const privateApi = _extends({}, api.private, {
+    resolveGroupAggregation
+  });
+  useGridApiMethod(apiRef, api.public, 'public');
+  useGridApiMethod(apiRef, privateApi, 'private');
+  useGridRegisterStrategyProcessor(apiRef, strategyProcessor.strategyName, strategyProcessor.group, strategyProcessor.processor);
+  useGridRegisterPipeProcessor(apiRef, 'processDataSourceRows', processDataSourceRows);
+  Object.entries(events).forEach(([event, handler]) => {
+    addEventHandler(apiRef, event, handler);
+  });
+};

package/esm/hooks/features/rowGrouping/createGroupingColDef.js

@@ -32,7 +32,9 @@ const GROUPING_COL_DEF_FORCED_PROPERTIES_DATA_SOURCE = _extends({}, GROUPING_COL
  * TODO: Make this index comparator depth invariant, the logic should not be inverted when sorting in the "desc" direction (but the current return format of `sortComparator` does not support this behavior).
  */
 const groupingFieldIndexComparator = (v1, v2, cellParams1, cellParams2) => {
-  const model = gridRowGroupingSanitizedModelSelector(cellParams1.api.state, cellParams1.api.instanceId);
+  const model = gridRowGroupingSanitizedModelSelector({
+    current: cellParams1.api
+  });
   const groupingField1 = cellParams1.rowNode.groupingField ?? null;
   const groupingField2 = cellParams2.rowNode.groupingField ?? null;
   if (groupingField1 === groupingField2) {
@@ -63,10 +65,12 @@ const getLeafProperties = leafColDef => ({
     return groupingFieldIndexComparator(v1, v2, cellParams1, cellParams2);
   }
 });
+const groupedByColValueFormatter = groupedByColDef => (value, row, _, apiRef) => groupedByColDef.valueFormatter(value, row, groupedByColDef, apiRef);
 const getGroupingCriteriaProperties = (groupedByColDef, applyHeaderName) => {
   const properties = {
     sortable: groupedByColDef.sortable,
     filterable: groupedByColDef.filterable,
+    valueFormatter: groupedByColDef.valueFormatter ? groupedByColValueFormatter(groupedByColDef) : undefined,
     valueOptions: isSingleSelectColDef(groupedByColDef) ? groupedByColDef.valueOptions : undefined,
     sortComparator: (v1, v2, cellParams1, cellParams2) => {
       // We only want to sort the groups of the current grouping criteria

package/esm/hooks/features/rowGrouping/gridRowGroupingUtils.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import { passFilterLogic, GRID_ROW_GROUPING_SINGLE_GROUPING_FIELD, getRowGroupingCriteriaFromGroupingField, isGroupingColumn } from '@mui/x-data-grid-pro/internals';
+import { passFilterLogic, GRID_ROW_GROUPING_SINGLE_GROUPING_FIELD, getRowGroupingCriteriaFromGroupingField, isGroupingColumn, GridStrategyGroup } from '@mui/x-data-grid-pro/internals';
 import { gridRowGroupingSanitizedModelSelector } from "./gridRowGroupingSelector.js";
 export { GRID_ROW_GROUPING_SINGLE_GROUPING_FIELD, getRowGroupingCriteriaFromGroupingField, isGroupingColumn };
 export let RowGroupingStrategy = /*#__PURE__*/function (RowGroupingStrategy) {
@@ -75,7 +75,9 @@ export const filterRowTreeFromGroupingColumns = params => {
         isPassingFiltering = 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;
     }
@@ -124,7 +126,7 @@ export const setStrategyAvailability = (privateApiRef, disableRowGrouping, dataS
     };
   }
   const strategy = dataSource ? RowGroupingStrategy.DataSource : RowGroupingStrategy.Default;
-  privateApiRef.current.setStrategyAvailability('rowTree', strategy, isAvailable);
+  privateApiRef.current.setStrategyAvailability(GridStrategyGroup.RowTree, strategy, isAvailable);
 };
 export const getCellGroupingCriteria = ({
   row,

package/esm/hooks/features/rowGrouping/useGridRowGrouping.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { useGridApiEventHandler, useGridApiMethod, gridColumnLookupSelector } from '@mui/x-data-grid-pro';
-import { useGridRegisterPipeProcessor } from '@mui/x-data-grid-pro/internals';
+import { useGridRegisterPipeProcessor, GridStrategyGroup } from '@mui/x-data-grid-pro/internals';
 import { gridRowGroupingModelSelector, gridRowGroupingSanitizedModelSelector } from "./gridRowGroupingSelector.js";
 import { getRowGroupingFieldFromGroupingCriteria, RowGroupingStrategy, isGroupingColumn, mergeStateWithRowGroupingModel, setStrategyAvailability, getGroupingRules, areGroupingRulesEqual } from "./gridRowGroupingUtils.js";
 export const rowGroupingStateInitializer = (state, props, apiRef) => {
@@ -162,7 +162,7 @@ export const useGridRowGrouping = (apiRef, props) => {
 
       // Refresh the row tree creation strategy processing
       // TODO: Add a clean way to re-run a strategy processing without publishing a private event
-      if (apiRef.current.getActiveStrategy('rowTree') === RowGroupingStrategy.Default) {
+      if (apiRef.current.getActiveStrategy(GridStrategyGroup.RowTree) === RowGroupingStrategy.Default) {
         apiRef.current.publishEvent('activeStrategyProcessorChange', 'rowTreeCreation');
       }
     }

package/esm/hooks/features/rowGrouping/useGridRowGroupingPreProcessors.js

@@ -48,10 +48,13 @@ export const useGridRowGroupingPreProcessors = (apiRef, props) => {
     const groupingColDefs = getGroupingColDefs(columnsState);
     let newColumnFields = [];
     const newColumnsLookup = {};
+    const prevGroupingfields = [];
 
     // We only keep the non-grouping columns
     columnsState.orderedFields.forEach(field => {
-      if (!isGroupingColumn(field)) {
+      if (isGroupingColumn(field)) {
+        prevGroupingfields.push(field);
+      } else {
         newColumnFields.push(field);
         newColumnsLookup[field] = columnsState.lookup[field];
       }
@@ -66,9 +69,11 @@ export const useGridRowGroupingPreProcessors = (apiRef, props) => {
       }
       newColumnsLookup[groupingColDef.field] = groupingColDef;
     });
-    const startIndex = newColumnFields[0] === GRID_CHECKBOX_SELECTION_FIELD ? 1 : 0;
-    newColumnFields = [...newColumnFields.slice(0, startIndex), ...groupingColDefs.map(colDef => colDef.field), ...newColumnFields.slice(startIndex)];
-    columnsState.orderedFields = newColumnFields;
+    if (prevGroupingfields.length !== groupingColDefs.length) {
+      const startIndex = newColumnFields[0] === GRID_CHECKBOX_SELECTION_FIELD ? 1 : 0;
+      newColumnFields = [...newColumnFields.slice(0, startIndex), ...groupingColDefs.map(colDef => colDef.field), ...newColumnFields.slice(startIndex)];
+      columnsState.orderedFields = newColumnFields;
+    }
     columnsState.lookup = newColumnsLookup;
     return columnsState;
   }, [getGroupingColDefs]);

package/esm/hooks/utils/useGridAriaAttributes.js

@@ -2,13 +2,11 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import { useGridAriaAttributes as useGridAriaAttributesPro, useGridSelector } from '@mui/x-data-grid-pro/internals';
 import { gridRowGroupingSanitizedModelSelector } from "../features/rowGrouping/gridRowGroupingSelector.js";
 import { useGridPrivateApiContext } from "./useGridPrivateApiContext.js";
-import { useGridRootProps } from "./useGridRootProps.js";
 export const useGridAriaAttributes = () => {
-  const rootProps = useGridRootProps();
   const ariaAttributesPro = useGridAriaAttributesPro();
   const apiRef = useGridPrivateApiContext();
   const gridRowGroupingModel = useGridSelector(apiRef, gridRowGroupingSanitizedModelSelector);
-  const ariaAttributesPremium = rootProps.experimentalFeatures?.ariaV8 && gridRowGroupingModel.length > 0 ? {
+  const ariaAttributesPremium = gridRowGroupingModel.length > 0 ? {
     role: 'treegrid'
   } : {};
   return _extends({}, ariaAttributesPro, ariaAttributesPremium);

package/esm/hooks/utils/useKeepGroupedColumnsHidden.js

@@ -25,9 +25,9 @@ export const useKeepGroupedColumnsHidden = props => {
   const initialProps = React.useRef(props);
   const rowGroupingModel = React.useRef(props.rowGroupingModel ?? props.initialState?.rowGrouping?.model);
   React.useEffect(() => {
-    props.apiRef.current.subscribeEvent('rowGroupingModelChange', newModel => {
+    props.apiRef.current?.subscribeEvent('rowGroupingModelChange', newModel => {
       const columnVisibilityModel = updateColumnVisibilityModel(gridColumnVisibilityModelSelector(props.apiRef), newModel, rowGroupingModel.current);
-      props.apiRef.current.setColumnVisibilityModel(columnVisibilityModel);
+      props.apiRef.current?.setColumnVisibilityModel(columnVisibilityModel);
       rowGroupingModel.current = newModel;
     });
   }, [props.apiRef]);

package/esm/utils/releaseInfo.js

@@ -1,6 +1,6 @@
 import { ponyfillGlobal } from '@mui/utils';
 export const getReleaseInfo = () => {
-  const releaseInfo = "MTczMjIzMDAwMDAwMA==";
+  const releaseInfo = "MTczODg4MjgwMDAwMA==";
   if (process.env.NODE_ENV !== 'production') {
     // A simple hack to set the value in the test environment (has no build step).
     // eslint-disable-next-line no-useless-concat

package/hooks/features/aggregation/createAggregationLookup.d.ts

@@ -1,10 +1,11 @@
-import * as React from 'react';
-import { GridApiPremium } from '../../../models/gridApiPremium';
+import { RefObject } from '@mui/x-internals/types';
+import { GridPrivateApiPremium } from '../../../models/gridApiPremium';
 import { DataGridPremiumProcessedProps } from '../../../models/dataGridPremiumProps';
-import { GridAggregationFunction, GridAggregationLookup } from './gridAggregationInterfaces';
-export declare const createAggregationLookup: ({ apiRef, aggregationFunctions, aggregationRowsScope, getAggregationPosition, }: {
-    apiRef: React.MutableRefObject<GridApiPremium>;
-    aggregationFunctions: Record<string, GridAggregationFunction>;
+import { GridAggregationFunction, GridAggregationFunctionDataSource, GridAggregationLookup } from './gridAggregationInterfaces';
+export declare const createAggregationLookup: ({ apiRef, aggregationFunctions, aggregationRowsScope, getAggregationPosition, isDataSource, }: {
+    apiRef: RefObject<GridPrivateApiPremium>;
+    aggregationFunctions: Record<string, GridAggregationFunction> | Record<string, GridAggregationFunctionDataSource>;
     aggregationRowsScope: DataGridPremiumProcessedProps["aggregationRowsScope"];
     getAggregationPosition: DataGridPremiumProcessedProps["getAggregationPosition"];
+    isDataSource: boolean;
 }) => GridAggregationLookup;

package/hooks/features/aggregation/createAggregationLookup.js

@@ -7,18 +7,13 @@ exports.createAggregationLookup = void 0;
 var _xDataGridPro = require("@mui/x-data-grid-pro");
 var _gridAggregationUtils = require("./gridAggregationUtils");
 var _gridAggregationSelectors = require("./gridAggregationSelectors");
-const getAggregationCellValue = ({
-  apiRef,
-  groupId,
-  field,
-  aggregationFunction,
-  aggregationRowsScope
-}) => {
-  const filteredRowsLookup = (0, _xDataGridPro.gridFilteredRowsLookupSelector)(apiRef);
+const getGroupAggregatedValue = (groupId, apiRef, aggregationRowsScope, aggregatedFields, aggregationRules, position) => {
+  const groupAggregationLookup = {};
+  const aggregatedValues = [];
   const rowIds = apiRef.current.getRowGroupChildren({
     groupId
   });
-  const values = [];
+  const filteredRowsLookup = (0, _xDataGridPro.gridFilteredRowsLookupSelector)(apiRef);
   rowIds.forEach(rowId => {
     if (aggregationRowsScope === 'filtered' && filteredRowsLookup[rowId] === false) {
       return;
@@ -35,42 +30,53 @@ const getAggregationCellValue = ({
     if (rowNode.type === 'group') {
       return;
     }
-    if (typeof aggregationFunction.getCellValue === 'function') {
-      const row = apiRef.current.getRow(rowId);
-      values.push(aggregationFunction.getCellValue({
-        row
-      }));
-    } else {
-      values.push(apiRef.current.getCellValue(rowId, field));
+    const row = apiRef.current.getRow(rowId);
+    for (let j = 0; j < aggregatedFields.length; j += 1) {
+      const aggregatedField = aggregatedFields[j];
+      const columnAggregationRules = aggregationRules[aggregatedField];
+      const aggregationFunction = columnAggregationRules.aggregationFunction;
+      const field = aggregatedField;
+      if (aggregatedValues[j] === undefined) {
+        aggregatedValues[j] = {
+          aggregatedField,
+          values: []
+        };
+      }
+      if (typeof aggregationFunction.getCellValue === 'function') {
+        aggregatedValues[j].values.push(aggregationFunction.getCellValue({
+          row
+        }));
+      } else {
+        const colDef = apiRef.current.getColumn(field);
+        aggregatedValues[j].values.push(apiRef.current.getRowValue(row, colDef));
+      }
     }
   });
-  return aggregationFunction.apply({
-    values,
-    groupId,
-    field // Added per user request in https://github.com/mui/mui-x/issues/6995#issuecomment-1327423455
-  });
+  for (let i = 0; i < aggregatedValues.length; i += 1) {
+    const {
+      aggregatedField,
+      values
+    } = aggregatedValues[i];
+    const aggregationFunction = aggregationRules[aggregatedField].aggregationFunction;
+    const value = aggregationFunction.apply({
+      values,
+      groupId,
+      field: aggregatedField // Added per user request in https://github.com/mui/mui-x/issues/6995#issuecomment-1327423455
+    });
+    groupAggregationLookup[aggregatedField] = {
+      position,
+      value
+    };
+  }
+  return groupAggregationLookup;
 };
-const getGroupAggregatedValue = ({
-  groupId,
-  apiRef,
-  aggregationRowsScope,
-  aggregatedFields,
-  aggregationRules,
-  position
-}) => {
+const getGroupAggregatedValueDataSource = (groupId, apiRef, aggregatedFields, position) => {
   const groupAggregationLookup = {};
   for (let j = 0; j < aggregatedFields.length; j += 1) {
     const aggregatedField = aggregatedFields[j];
-    const columnAggregationRules = aggregationRules[aggregatedField];
     groupAggregationLookup[aggregatedField] = {
       position,
-      value: getAggregationCellValue({
-        apiRef,
-        groupId,
-        field: aggregatedField,
-        aggregationFunction: columnAggregationRules.aggregationFunction,
-        aggregationRowsScope
-      })
+      value: apiRef.current.resolveGroupAggregation(groupId, aggregatedField)
     };
   }
   return groupAggregationLookup;
@@ -79,13 +85,10 @@ const createAggregationLookup = ({
   apiRef,
   aggregationFunctions,
   aggregationRowsScope,
-  getAggregationPosition
+  getAggregationPosition,
+  isDataSource
 }) => {
-  const aggregationRules = (0, _gridAggregationUtils.getAggregationRules)({
-    columnsLookup: (0, _xDataGridPro.gridColumnLookupSelector)(apiRef),
-    aggregationModel: (0, _gridAggregationSelectors.gridAggregationModelSelector)(apiRef),
-    aggregationFunctions
-  });
+  const aggregationRules = (0, _gridAggregationUtils.getAggregationRules)((0, _xDataGridPro.gridColumnLookupSelector)(apiRef), (0, _gridAggregationSelectors.gridAggregationModelSelector)(apiRef), aggregationFunctions, isDataSource);
   const aggregatedFields = Object.keys(aggregationRules);
   if (aggregatedFields.length === 0) {
     return {};
@@ -100,18 +103,12 @@ const createAggregationLookup = ({
         createGroupAggregationLookup(childNode);
       }
     }
-    const hasAggregableChildren = groupNode.children.length;
-    if (hasAggregableChildren) {
-      const position = getAggregationPosition(groupNode);
-      if (position != null) {
-        aggregationLookup[groupNode.id] = getGroupAggregatedValue({
-          groupId: groupNode.id,
-          apiRef,
-          aggregatedFields,
-          aggregationRowsScope,
-          aggregationRules,
-          position
-        });
+    const position = getAggregationPosition(groupNode);
+    if (position !== null) {
+      if (isDataSource) {
+        aggregationLookup[groupNode.id] = getGroupAggregatedValueDataSource(groupNode.id, apiRef, aggregatedFields, position);
+      } else if (groupNode.children.length) {
+        aggregationLookup[groupNode.id] = getGroupAggregatedValue(groupNode.id, apiRef, aggregationRowsScope, aggregatedFields, aggregationRules, position);
       }
     }
   };

package/hooks/features/aggregation/gridAggregationInterfaces.d.ts

@@ -17,6 +17,12 @@ export interface GridAggregationApi {
      */
     setAggregationModel: (model: GridAggregationModel) => void;
 }
+export interface GridAggregationPrivateApi {
+    /**
+     * Applies the aggregation to the rows.
+     */
+    applyAggregation: () => void;
+}
 export interface GridAggregationGetCellValueParams {
     /**
      * The row model of the row that the current cell belongs to.
@@ -38,7 +44,7 @@ export interface GridAggregationFunction<V = any, AV = V> {
     apply: (params: GridAggregationParams<V>) => AV | null | undefined;
     /**
      * Label of the aggregation function.
-     * Will be used to add a label on the footer of the grouping column when this aggregation function is the only one being used.
+     * Used for adding a label to the footer of the grouping column when this aggregation function is the only one being used.
      * @default apiRef.current.getLocaleText('aggregationFunctionLabel{capitalize(name)})
      */
     label?: string;
@@ -48,12 +54,12 @@ export interface GridAggregationFunction<V = any, AV = V> {
      */
     columnTypes?: string[];
     /**
-     * Function that allows to apply a formatter to the aggregated value.
-     * If not defined, the grid will use the formatter of the column.
+     * Function for applying a formatter to the aggregated value.
+     * If not defined, the grid uses the formatter of the column.
      */
     valueFormatter?: GridValueFormatter;
     /**
-     * Indicates if the aggregated value have the same unit as the cells used to generate it.
+     * Indicates if the aggregated value has the same unit as the cells used to generate it.
      * It can be used to apply a custom cell renderer only if the aggregated value has the same unit.
      * @default true
      */
@@ -67,6 +73,13 @@ export interface GridAggregationFunction<V = any, AV = V> {
      */
     getCellValue?: (params: GridAggregationGetCellValueParams) => V;
 }
+/**
+ * Grid aggregation function data source definition interface.
+ * @demos
+ *   - [Server-side aggregation](/x/react-data-grid/server-side-data/aggregation/)
+ */
+export interface GridAggregationFunctionDataSource extends Omit<GridAggregationFunction, 'apply' | 'getCellValue'> {
+}
 export interface GridAggregationParams<V = any> {
     values: (V | undefined)[];
     groupId: GridRowId;
@@ -102,7 +115,7 @@ export interface GridAggregationHeaderMeta {
 }
 export interface GridAggregationRule {
     aggregationFunctionName: string;
-    aggregationFunction: GridAggregationFunction;
+    aggregationFunction: GridAggregationFunction | GridAggregationFunctionDataSource;
 }
 /**
  * Object containing all the aggregation rules that must be applied to the current columns.

package/hooks/features/aggregation/gridAggregationSelectors.d.ts

@@ -5,9 +5,9 @@ export declare const gridAggregationStateSelector: (state: GridStatePremium) =>
  * If a column is not in the model, it is not aggregated.
  * @category Aggregation
  */
-export declare const gridAggregationModelSelector: import("@mui/x-data-grid").OutputSelector<GridStatePremium, import("./gridAggregationInterfaces").GridAggregationModel>;
+export declare const gridAggregationModelSelector: import("@mui/x-data-grid").OutputSelector<GridStatePremium, import("./gridAggregationInterfaces").GridAggregationState, import("./gridAggregationInterfaces").GridAggregationModel>;
 /**
  * Get the aggregation results as a lookup.
  * @category Aggregation
  */
-export declare const gridAggregationLookupSelector: import("@mui/x-data-grid").OutputSelector<GridStatePremium, import("./gridAggregationInterfaces").GridAggregationLookup>;
+export declare const gridAggregationLookupSelector: import("@mui/x-data-grid").OutputSelector<GridStatePremium, import("./gridAggregationInterfaces").GridAggregationState, import("./gridAggregationInterfaces").GridAggregationLookup>;

package/hooks/features/aggregation/gridAggregationUtils.d.ts

@@ -1,27 +1,26 @@
-import * as React from 'react';
+import { RefObject } from '@mui/x-internals/types';
 import { GridColDef, GridRowId } from '@mui/x-data-grid-pro';
 import { GridColumnRawLookup, GridHydrateRowsValue } from '@mui/x-data-grid-pro/internals';
-import { GridAggregationFunction, GridAggregationModel, GridAggregationRule, GridAggregationRules } from './gridAggregationInterfaces';
+import { GridAggregationFunction, GridAggregationFunctionDataSource, GridAggregationModel, GridAggregationRule, GridAggregationRules } from './gridAggregationInterfaces';
 import { GridStatePremium } from '../../../models/gridStatePremium';
 import { DataGridPremiumProcessedProps } from '../../../models/dataGridPremiumProps';
 import { GridApiPremium, GridPrivateApiPremium } from '../../../models/gridApiPremium';
 export declare const GRID_AGGREGATION_ROOT_FOOTER_ROW_ID = "auto-generated-group-footer-root";
 export declare const getAggregationFooterRowIdFromGroupId: (groupId: GridRowId | null) => string;
-export declare const canColumnHaveAggregationFunction: ({ colDef, aggregationFunctionName, aggregationFunction, }: {
+type AggregationFunction = GridAggregationFunction | GridAggregationFunctionDataSource | undefined;
+export declare const canColumnHaveAggregationFunction: ({ colDef, aggregationFunctionName, aggregationFunction, isDataSource, }: {
     colDef: GridColDef | undefined;
     aggregationFunctionName: string;
-    aggregationFunction: GridAggregationFunction | undefined;
+    aggregationFunction: AggregationFunction;
+    isDataSource: boolean;
 }) => boolean;
-export declare const getAvailableAggregationFunctions: ({ aggregationFunctions, colDef, }: {
-    aggregationFunctions: Record<string, GridAggregationFunction>;
+export declare const getAvailableAggregationFunctions: ({ aggregationFunctions, colDef, isDataSource, }: {
+    aggregationFunctions: Record<string, GridAggregationFunction> | Record<string, GridAggregationFunctionDataSource>;
     colDef: GridColDef;
+    isDataSource: boolean;
 }) => string[];
 export declare const mergeStateWithAggregationModel: (aggregationModel: GridAggregationModel) => (state: GridStatePremium) => GridStatePremium;
-export declare const getAggregationRules: ({ columnsLookup, aggregationModel, aggregationFunctions, }: {
-    columnsLookup: GridColumnRawLookup;
-    aggregationModel: GridAggregationModel;
-    aggregationFunctions: Record<string, GridAggregationFunction>;
-}) => GridAggregationRules;
+export declare const getAggregationRules: (columnsLookup: GridColumnRawLookup, aggregationModel: GridAggregationModel, aggregationFunctions: Record<string, GridAggregationFunction> | Record<string, GridAggregationFunctionDataSource>, isDataSource: boolean) => GridAggregationRules;
 interface AddFooterRowsParams {
     groupingParams: GridHydrateRowsValue;
     getAggregationPosition: DataGridPremiumProcessedProps['getAggregationPosition'];
@@ -29,7 +28,7 @@ interface AddFooterRowsParams {
      * If `true`, there are some aggregation rules to apply
      */
     hasAggregationRule: boolean;
-    apiRef: React.MutableRefObject<GridPrivateApiPremium>;
+    apiRef: RefObject<GridPrivateApiPremium>;
 }
 /**
  * Add a footer for each group that has at least one column with an aggregated value.
@@ -40,7 +39,7 @@ export declare const addFooterRows: ({ groupingParams, apiRef, getAggregationPos
  */
 export declare const areAggregationRulesEqual: (previousValue: GridAggregationRules | undefined, newValue: GridAggregationRules) => boolean;
 export declare const getAggregationFunctionLabel: ({ apiRef, aggregationRule, }: {
-    apiRef: React.MutableRefObject<GridApiPremium>;
+    apiRef: RefObject<GridApiPremium>;
     aggregationRule: GridAggregationRule;
 }) => string;
 export {};