@mui/x-data-grid-premium 5.14.0 → 5.15.0

package/CHANGELOG.md

@@ -3,6 +3,63 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 5.15.0
+
+_Jul 29, 2022_
+
+We'd like to offer a big thanks to the 6 contributors who made this release possible. Here are some highlights ✨:
+
+- 🎁 Introduce aggregation (#5592) @flaviendelangle
+
+  Premium users can now aggregate data in the grid.
+  Extract information like sum, average, count, and others with a couple of clicks.
+  
+  https://user-images.githubusercontent.com/45398769/181581503-77cc412e-9d9e-4de1-8bc3-c3bccc54cdaa.mp4
+
+  To enable this feature, add `experimentalFeatures={{ aggregation: true }}`.
+  Aggregation functions are customizable and they combine well with row grouping.
+  See the [documentation](https://mui.com/x/react-data-grid/aggregation/) to explore everything it has to offer.
+
+- 🚀 Introduce row pinning (#4863) @cherniavskii
+
+  Pro users can now pin rows on top or bottom of the grid.
+
+  https://user-images.githubusercontent.com/45398769/181581493-56c733a3-6dd5-4546-bf8d-3f2dff72b14a.mp4
+
+  To do so, enable the feature with `experimentalFeatures={{ rowPinning: true }}` and provide the pinned rows data to the `pinnedRows` prop.
+  For more details, see the [documentation](https://mui.com/x/react-data-grid/row-pinning/).
+
+- 🌍 Add simplified Chinese (zh-CN) locale to pickers (#5584) @gamecss
+- 📚 Documentation improvements
+
+### `@mui/x-data-grid@v5.15.0` / `@mui/x-data-grid-pro@v5.15.0` / `@mui/x-data-grid-premium@v5.15.0`
+
+#### Changes
+
+- [DataGrid] Add prop to keep modifications while processing props (#5309) @m4theushw
+- [DataGrid] Fix container width change on React 18 (#5566) @m4theushw
+- [DataGrid] Fix ellipsis style convention (#5587) @oliviertassinari
+- [DataGridPro] Implement row pinning (#4863) @cherniavskii
+- [DataGridPremium] Make aggregation public (#5592) @cherniavskii
+- [l10n] Improve simplified Chinese (zh-CN) locale (#5584) @gamecss
+
+### `@mui/x-date-pickers@v5.0.0-beta.3` / `@mui/x-date-picker-pro@5.0.0-beta.3`
+
+#### Changes
+
+- [l10n] Add simplified Chinese (zh-CN) locale (#5584) @gamecss
+
+### Docs
+
+- [docs] Split docs page about rows (#5195) @flaviendelangle
+- [docs] Add warning clarifications (#5399) @alexfauquette
+- [docs] Correct slot CSS classes for Pro and Premium components (#5452) @alexfauquette
+- [docs] Fix internal link to `valueParser` (#5450) @alexfauquette
+
+### Core
+
+- [core] Upgrade monorepo (#5560) @m4theushw
+
 ## 5.14.0
 
 _Jul 21, 2022_
@@ -306,7 +363,7 @@ _May 31, 2022_
 
 We'd like to offer a big thanks to the 15 contributors who made this release possible. Here are some highlights ✨:
 
-- 🎁 Introduce support for [dynamic row height](https://mui.com/x/react-data-grid/rows/#dynamic-row-height) (#4859) @m4theushw
+- 🎁 Introduce support for [dynamic row height](https://mui.com/x/react-data-grid/row-height/#dynamic-row-height) (#4859) @m4theushw
 
   <img src="https://user-images.githubusercontent.com/42154031/171183167-718d7bcd-ec0f-459e-97fe-0f650abb4a99.gif" width="800">
 
@@ -623,7 +680,7 @@ _Apr 25, 2022_
 
 We'd like to offer a big thanks to the 6 contributors who made this release possible. Here are some highlights ✨:
 
-- 🎁 Introduce [Row reorder](https://mui.com/x/react-data-grid/rows/#row-reorder) (#4034) @DanailH
+- 🎁 Introduce [Row reorder](https://mui.com/x/react-data-grid/row-ordering/) (#4034) @DanailH
 
   <img src="https://user-images.githubusercontent.com/5858539/165091263-23472fbb-a989-44b8-849a-d2185adfe13b.gif" width="800">
 
@@ -887,7 +944,7 @@ We'd like to offer a big thanks to the 8 contributors who made this release poss
   <DataGrid getRowSpacing={() => ({ top: 10, bottom: 10 })} />
   ```
 
-  Check the [documentation](https://mui.com/x/react-data-grid/rows/#row-spacing) for more information.
+  Check the [documentation](https://mui.com/x/react-data-grid/row-height/#row-spacing) for more information.
 
 ### `@mui/x-data-grid@v5.6.1` / `@mui/x-data-grid-pro@v5.6.1`
 
@@ -1141,7 +1198,7 @@ _Jan 28, 2022_
 
 A big thanks to the 9 contributors who made this release possible. Here are some highlights ✨:
 
-- 🚣 Introduce [variable row height](https://mui.com/x/react-data-grid/rows/#variable-row-height) (#438) @DanailH
+- 🚣 Introduce [variable row height](https://mui.com/x/react-data-grid/row-height/#variable-row-height) (#438) @DanailH
 
   Allows for setting a row-specific height.
   By default, all rows have the same height, but now you can set the height on a per-row basis.
@@ -3793,7 +3850,7 @@ Big thanks to the 7 contributors who made this release possible. Here are some h
 - 🎁 Add `onRowsScrollEnd` to support infinite loading (#1199) @DanailH
   This is an XGrid feature. Provides the ability to tap into the `onRowsScrollEnd` which is called when the scroll reaches the bottom of the grid viewport allowing developers to load additional data. It can be used with a combination of `scrollBottomThreshold` to control the area in which the `onRowsScrollEnd` is called.
 
-  See the documentation for [more details](https://mui.com/x/react-data-grid/rows/#infinite-loading).
+  See the documentation for [more details](https://mui.com/x/react-data-grid/row-updates/#infinite-loading).
 
 - 🕹 Provide the ability to sort by multiple columns using Shift+click (#1203) @dtassone
 - 🇵🇱 Added pl-PL locale (#1117) @LarsKumbier

package/DataGridPremium/DataGridPremium.js

@@ -42,6 +42,25 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
   // ----------------------------------------------------------------------
 
+  /**
+   * Aggregation functions available on the grid.
+   * @default GRID_AGGREGATION_FUNCTIONS
+   */
+  aggregationFunctions: PropTypes.object,
+
+  /**
+   * Set the aggregation model of the grid.
+   */
+  aggregationModel: PropTypes.object,
+
+  /**
+   * Rows used to generate the aggregated value.
+   * If `filtered`, the aggregated values will be generated using only the rows currently passing the filtering process.
+   * If `all`, the aggregated values will be generated using all the rows.
+   * @default "filtered"
+   */
+  aggregationRowsScope: PropTypes.oneOf(['all', 'filtered']),
+
   /**
    * The ref object that allows grid manipulation. Can be instantiated with [[useGridApiRef()]].
    */
@@ -156,6 +175,12 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    */
   detailPanelExpandedRowIds: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired),
 
+  /**
+   * If `true`, aggregation is disabled.
+   * @default false
+   */
+  disableAggregation: PropTypes.bool,
+
   /**
    * If `true`, the filtering will only be applied to the top level rows when grouping rows with the `treeData` prop.
    * @default false
@@ -216,6 +241,12 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    */
   disableExtendRowFullWidth: PropTypes.bool,
 
+  /**
+   * If `true`, modification to a cell will not be discarded if the mode is changed from "edit" to "view" while processing props.
+   * @default false
+   */
+  disableIgnoreModificationsIfProcessingProps: PropTypes.bool,
+
   /**
    * If `true`, filtering with multiple columns is disabled.
    * @default false
@@ -273,9 +304,10 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    * For each feature, if the flag is not explicitly set to `true`, the feature will be fully disabled and any property / method call will not have any effect.
    */
   experimentalFeatures: PropTypes.shape({
+    aggregation: PropTypes.bool,
     newEditingApi: PropTypes.bool,
     preventCommitWhileValidating: PropTypes.bool,
-    private_aggregation: PropTypes.bool,
+    rowPinning: PropTypes.bool,
     warnIfFocusStateIsNotSynced: PropTypes.bool
   }),
 
@@ -307,6 +339,14 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
     quickFilterValues: PropTypes.array
   }),
 
+  /**
+   * Determines the position of an aggregated value.
+   * @param {GridRowTreeNodeConfig | null} groupNode The current group (`null` being the top level group).
+   * @returns {GridAggregationPosition | null} Position of the aggregated value (if `null`, the group will not be aggregated).
+   * @default `(groupNode) => groupNode == null ? 'footer' : 'inline'`
+   */
+  getAggregationPosition: PropTypes.func,
+
   /**
    * Function that applies CSS classes dynamically on cells.
    * @param {GridCellParams} params With all properties from [[GridCellParams]].
@@ -486,6 +526,13 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    */
   nonce: PropTypes.string,
 
+  /**
+   * Callback fired when the row grouping model changes.
+   * @param {GridAggregationModel} model The aggregated columns.
+   * @param {GridCallbackDetails} details Additional details for this callback.
+   */
+  onAggregationModelChange: PropTypes.func,
+
   /**
    * Callback fired when any cell is clicked.
    * @param {GridCellParams} params With all properties from [[GridCellParams]].
@@ -868,50 +915,12 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
   }),
 
   /**
-   * Aggregation functions available on the grid.
-   * @default GRID_AGGREGATION_FUNCTIONS
-   * @ignore - do not document.
-   */
-  private_aggregationFunctions: PropTypes.object,
-
-  /**
-   * Set the aggregation model of the grid.
-   * @ignore - do not document.
-   */
-  private_aggregationModel: PropTypes.object,
-
-  /**
-   * Rows used to generate the aggregated value.
-   * If `filtered`, the aggregated values will be generated using only the rows currently passing the filtering process.
-   * If `all`, the aggregated values will be generated using all the rows.
-   * @default "filtered"
-   * @ignore - do not document.
+   * Rows data to pin on top or bottom.
    */
-  private_aggregationRowsScope: PropTypes.oneOf(['all', 'filtered']),
-
-  /**
-   * If `true`, aggregation is disabled.
-   * @default false
-   * @ignore - do not document.
-   */
-  private_disableAggregation: PropTypes.bool,
-
-  /**
-   * Determines the position of an aggregated value.
-   * @param {GridRowTreeNodeConfig | null} groupNode The current group (`null` being the top level group).
-   * @returns {GridAggregationPosition | null} Position of the aggregated value (if `null`, the group will not be aggregated).
-   * @default `(groupNode) => groupNode == null ? 'footer' : 'inline'`
-   * @ignore - do not document.
-   */
-  private_getAggregationPosition: PropTypes.func,
-
-  /**
-   * Callback fired when the row grouping model changes.
-   * @param {GridAggregationModel} model The aggregated columns.
-   * @param {GridCallbackDetails} details Additional details for this callback.
-   * @ignore - do not document.
-   */
-  private_onAggregationModelChange: PropTypes.func,
+  pinnedRows: PropTypes.shape({
+    bottom: PropTypes.array,
+    top: PropTypes.array
+  }),
 
   /**
    * Callback called before updating a row with new values in the row and cell editing.

package/DataGridPremium/useDataGridPremiumComponent.js

@@ -1,4 +1,4 @@
-import { useGridInitialization, useGridInitializeState, useGridClipboard, useGridColumnMenu, useGridColumns, columnsStateInitializer, useGridDensity, useGridCsvExport, useGridPrintExport, useGridFilter, filterStateInitializer, useGridFocus, useGridKeyboardNavigation, useGridPagination, paginationStateInitializer, useGridPreferencesPanel, useGridEditing_new, useGridEditing_old, editingStateInitializer_old, editingStateInitializer_new, useGridRows, useGridRowsPreProcessors, rowsStateInitializer, useGridRowsMeta, useGridParamsApi, useGridSelection, useGridSorting, sortingStateInitializer, useGridScroll, useGridEvents, useGridDimensions, useGridStatePersistence, useGridSelectionPreProcessors, columnMenuStateInitializer, densityStateInitializer, focusStateInitializer, preferencePanelStateInitializer, rowsMetaStateInitializer, selectionStateInitializer, useGridColumnReorder, columnReorderStateInitializer, useGridColumnResize, columnResizeStateInitializer, useGridTreeData, useGridTreeDataPreProcessors, useGridColumnPinning, columnPinningStateInitializer, useGridColumnPinningPreProcessors, useGridDetailPanel, detailPanelStateInitializer, useGridDetailPanelPreProcessors, useGridInfiniteLoader, useGridColumnSpanning, useGridRowReorder, useGridRowReorderPreProcessors } from '@mui/x-data-grid-pro/internals';
+import { useGridInitialization, useGridInitializeState, useGridClipboard, useGridColumnMenu, useGridColumns, columnsStateInitializer, useGridDensity, useGridCsvExport, useGridPrintExport, useGridFilter, filterStateInitializer, useGridFocus, useGridKeyboardNavigation, useGridPagination, paginationStateInitializer, useGridPreferencesPanel, useGridEditing_new, useGridEditing_old, editingStateInitializer_old, editingStateInitializer_new, useGridRows, useGridRowsPreProcessors, rowsStateInitializer, useGridRowsMeta, useGridParamsApi, useGridSelection, useGridSorting, sortingStateInitializer, useGridScroll, useGridEvents, useGridDimensions, useGridStatePersistence, useGridSelectionPreProcessors, columnMenuStateInitializer, densityStateInitializer, focusStateInitializer, preferencePanelStateInitializer, rowsMetaStateInitializer, selectionStateInitializer, useGridColumnReorder, columnReorderStateInitializer, useGridColumnResize, columnResizeStateInitializer, useGridTreeData, useGridTreeDataPreProcessors, useGridColumnPinning, columnPinningStateInitializer, useGridColumnPinningPreProcessors, useGridDetailPanel, detailPanelStateInitializer, useGridDetailPanelPreProcessors, useGridInfiniteLoader, useGridColumnSpanning, useGridRowReorder, useGridRowReorderPreProcessors, useGridRowPinning, useGridRowPinningPreProcessors, rowPinningStateInitializer } from '@mui/x-data-grid-pro/internals';
 // Premium-only features
 import { useGridAggregation, aggregationStateInitializer } from '../hooks/features/aggregation/useGridAggregation';
 import { useGridAggregationPreProcessors } from '../hooks/features/aggregation/useGridAggregationPreProcessors';
@@ -17,6 +17,7 @@ export const useDataGridPremiumComponent = (inputApiRef, props) => {
   useGridRowReorderPreProcessors(apiRef, props);
   useGridRowGroupingPreProcessors(apiRef, props);
   useGridTreeDataPreProcessors(apiRef, props);
+  useGridRowPinningPreProcessors(apiRef);
   useGridAggregationPreProcessors(apiRef, props);
   useGridDetailPanelPreProcessors(apiRef, props); // The column pinning `hydrateColumns` pre-processor must be after every other `hydrateColumns` pre-processors
   // Because it changes the order of the columns.
@@ -33,6 +34,7 @@ export const useDataGridPremiumComponent = (inputApiRef, props) => {
   useGridInitializeState(detailPanelStateInitializer, apiRef, props);
   useGridInitializeState(columnPinningStateInitializer, apiRef, props);
   useGridInitializeState(columnsStateInitializer, apiRef, props);
+  useGridInitializeState(rowPinningStateInitializer, apiRef, props);
   useGridInitializeState(rowsStateInitializer, apiRef, props);
   useGridInitializeState((_props$experimentalFe = props.experimentalFeatures) != null && _props$experimentalFe.newEditingApi ? editingStateInitializer_new : editingStateInitializer_old, apiRef, props);
   useGridInitializeState(focusStateInitializer, apiRef, props);
@@ -51,6 +53,7 @@ export const useDataGridPremiumComponent = (inputApiRef, props) => {
   useGridKeyboardNavigation(apiRef, props);
   useGridSelection(apiRef, props);
   useGridColumnPinning(apiRef, props);
+  useGridRowPinning(apiRef, props);
   useGridColumns(apiRef, props);
   useGridRows(apiRef, props);
   useGridParamsApi(apiRef);

package/DataGridPremium/useDataGridPremiumProps.js

@@ -2,18 +2,18 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { useThemeProps } from '@mui/material/styles';
 import { DATA_GRID_PRO_PROPS_DEFAULT_VALUES, DATA_GRID_DEFAULT_SLOTS_COMPONENTS, GRID_DEFAULT_LOCALE_TEXT } from '@mui/x-data-grid-pro';
-import { PRIVATE_GRID_AGGREGATION_FUNCTIONS } from '../hooks/features/aggregation';
+import { GRID_AGGREGATION_FUNCTIONS } from '../hooks/features/aggregation';
 /**
  * The default values of `DataGridPremiumPropsWithDefaultValue` to inject in the props of DataGridPremium.
  */
 
 export const DATA_GRID_PREMIUM_PROPS_DEFAULT_VALUES = _extends({}, DATA_GRID_PRO_PROPS_DEFAULT_VALUES, {
-  private_disableAggregation: false,
+  disableAggregation: false,
   disableRowGrouping: false,
   rowGroupingColumnMode: 'single',
-  private_aggregationFunctions: PRIVATE_GRID_AGGREGATION_FUNCTIONS,
-  private_aggregationRowsScope: 'filtered',
-  private_getAggregationPosition: groupNode => groupNode == null ? 'footer' : 'inline'
+  aggregationFunctions: GRID_AGGREGATION_FUNCTIONS,
+  aggregationRowsScope: 'filtered',
+  getAggregationPosition: groupNode => groupNode == null ? 'footer' : 'inline'
 });
 export const useDataGridPremiumProps = inProps => {
   const themedProps = useThemeProps({
@@ -38,7 +38,7 @@ export const useDataGridPremiumProps = inProps => {
     var _themedProps$experime;
 
     return _extends({}, DATA_GRID_PREMIUM_PROPS_DEFAULT_VALUES, themedProps, {
-      private_disableAggregation: themedProps.private_disableAggregation || !((_themedProps$experime = themedProps.experimentalFeatures) != null && _themedProps$experime.private_aggregation),
+      disableAggregation: themedProps.disableAggregation || !((_themedProps$experime = themedProps.experimentalFeatures) != null && _themedProps$experime.aggregation),
       localeText,
       components,
       signature: 'DataGridPremium'

package/components/GridAggregationColumnMenuItem.js

@@ -34,13 +34,13 @@ export const GridAggregationColumnMenuItem = props => {
     if (canColumnHaveAggregationFunction({
       column,
       aggregationFunctionName,
-      aggregationFunction: rootProps.private_aggregationFunctions[aggregationFunctionName]
+      aggregationFunction: rootProps.aggregationFunctions[aggregationFunctionName]
     })) {
       return aggregationFunctionName;
     }
 
     return '';
-  }, [rootProps.private_aggregationFunctions, aggregationModel, column]);
+  }, [rootProps.aggregationFunctions, aggregationModel, column]);
 
   const handleAggregationItemChange = event => {
     const newAggregationItem = event.target.value || undefined;
@@ -52,7 +52,7 @@ export const GridAggregationColumnMenuItem = props => {
     const newModel = newAggregationItem == null ? otherColumnItems : _extends({}, otherColumnItems, {
       [column.field]: newAggregationItem
     });
-    apiRef.current.private_setAggregationModel(newModel);
+    apiRef.current.setAggregationModel(newModel);
     apiRef.current.hideColumnMenu();
   };
 
@@ -83,7 +83,7 @@ export const GridAggregationColumnMenuItem = props => {
             apiRef,
             aggregationRule: {
               aggregationFunctionName: aggFunc,
-              aggregationFunction: rootProps.private_aggregationFunctions[aggFunc]
+              aggregationFunction: rootProps.aggregationFunctions[aggFunc]
             }
           })
         }, aggFunc))]

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

@@ -5,6 +5,6 @@ import { GridAggregationFunction, GridAggregationLookup } from './gridAggregatio
 export declare const createAggregationLookup: ({ apiRef, aggregationFunctions, aggregationRowsScope, getAggregationPosition, }: {
     apiRef: React.MutableRefObject<GridApiPremium>;
     aggregationFunctions: Record<string, GridAggregationFunction>;
-    aggregationRowsScope: DataGridPremiumProcessedProps['private_aggregationRowsScope'];
-    getAggregationPosition: DataGridPremiumProcessedProps['private_getAggregationPosition'];
+    aggregationRowsScope: DataGridPremiumProcessedProps['aggregationRowsScope'];
+    getAggregationPosition: DataGridPremiumProcessedProps['getAggregationPosition'];
 }) => GridAggregationLookup;

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

@@ -1,5 +1,5 @@
 import { GridAggregationFunction } from './gridAggregationInterfaces';
-export declare const PRIVATE_GRID_AGGREGATION_FUNCTIONS: {
+export declare const GRID_AGGREGATION_FUNCTIONS: {
     sum: GridAggregationFunction<number, number, number>;
     avg: GridAggregationFunction<number, number, number>;
     min: GridAggregationFunction<number | Date, number | Date, number | Date>;

package/hooks/features/aggregation/gridAggregationFunctions.js

@@ -87,7 +87,7 @@ const sizeAgg = {
   },
   hasCellUnit: false
 };
-export const PRIVATE_GRID_AGGREGATION_FUNCTIONS = {
+export const GRID_AGGREGATION_FUNCTIONS = {
   sum: sumAgg,
   avg: avgAgg,
   min: minAgg,

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

@@ -14,9 +14,8 @@ export interface GridAggregationApi {
     /**
      * Sets the aggregation model to the one given by `model`.
      * @param {GridAggregationModel} model The aggregation model.
-     * @ignore - do not document.
      */
-    private_setAggregationModel: (model: GridAggregationModel) => void;
+    setAggregationModel: (model: GridAggregationModel) => void;
 }
 /**
  * Grid aggregation function definition interface.

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

@@ -1,4 +1,4 @@
 import { GridStatePremium } from '../../../models/gridStatePremium';
-export declare const private_gridAggregationStateSelector: (state: GridStatePremium) => import("./gridAggregationInterfaces").GridAggregationState;
+export declare const gridAggregationStateSelector: (state: GridStatePremium) => import("./gridAggregationInterfaces").GridAggregationState;
 export declare const gridAggregationModelSelector: import("@mui/x-data-grid").OutputSelector<GridStatePremium, import("./gridAggregationInterfaces").GridAggregationModel>;
 export declare const gridAggregationLookupSelector: import("@mui/x-data-grid").OutputSelector<GridStatePremium, import("./gridAggregationInterfaces").GridAggregationLookup>;

package/hooks/features/aggregation/gridAggregationSelectors.js

@@ -1,5 +1,4 @@
 import { createSelector } from '@mui/x-data-grid-pro/internals';
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const private_gridAggregationStateSelector = state => state.private_aggregation;
-export const gridAggregationModelSelector = createSelector(private_gridAggregationStateSelector, aggregationState => aggregationState.model);
-export const gridAggregationLookupSelector = createSelector(private_gridAggregationStateSelector, aggregationState => aggregationState.lookup);
+export const gridAggregationStateSelector = state => state.aggregation;
+export const gridAggregationModelSelector = createSelector(gridAggregationStateSelector, aggregationState => aggregationState.model);
+export const gridAggregationLookupSelector = createSelector(gridAggregationStateSelector, aggregationState => aggregationState.lookup);

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

@@ -5,8 +5,8 @@ import { GridAggregationFunction, GridAggregationModel, GridAggregationRule, Gri
 import { GridStatePremium } from '../../../models/gridStatePremium';
 import { DataGridPremiumProcessedProps } from '../../../models/dataGridPremiumProps';
 import { GridApiPremium } from '../../../models/gridApiPremium';
-export declare const PRIVATE_GRID_AGGREGATION_ROOT_FOOTER_ROW_ID = "auto-generated-group-footer-root";
-export declare const private_getAggregationFooterRowIdFromGroupId: (groupId: GridRowId | null) => string;
+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: ({ column, aggregationFunctionName, aggregationFunction, }: {
     column: GridColDef | undefined;
     aggregationFunctionName: string;
@@ -25,10 +25,11 @@ export declare const getAggregationRules: ({ columnsLookup, aggregationModel, ag
 /**
  * Add a footer for each group that has at least one column with an aggregated value.
  */
-export declare const addFooterRows: ({ groupingParams, aggregationRules, getAggregationPosition, }: {
+export declare const addFooterRows: ({ groupingParams, aggregationRules, getAggregationPosition, apiRef, }: {
     groupingParams: GridRowTreeCreationValue;
     aggregationRules: GridAggregationRules;
-    getAggregationPosition: DataGridPremiumProcessedProps['private_getAggregationPosition'];
+    getAggregationPosition: DataGridPremiumProcessedProps['getAggregationPosition'];
+    apiRef: React.MutableRefObject<GridApiPremium>;
 }) => GridRowTreeCreationValue;
 /**
  * Compares two sets of aggregation rules to determine if they are equal or not.

package/hooks/features/aggregation/gridAggregationUtils.js

@@ -1,11 +1,10 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import { capitalize } from '@mui/material';
-import { isDeepEqual } from '@mui/x-data-grid-pro/internals';
-export const PRIVATE_GRID_AGGREGATION_ROOT_FOOTER_ROW_ID = 'auto-generated-group-footer-root'; // eslint-disable-next-line @typescript-eslint/naming-convention
-
-export const private_getAggregationFooterRowIdFromGroupId = groupId => {
+import { addPinnedRow, isDeepEqual } from '@mui/x-data-grid-pro/internals';
+export const GRID_AGGREGATION_ROOT_FOOTER_ROW_ID = 'auto-generated-group-footer-root';
+export const getAggregationFooterRowIdFromGroupId = groupId => {
   if (groupId == null) {
-    return PRIVATE_GRID_AGGREGATION_ROOT_FOOTER_ROW_ID;
+    return GRID_AGGREGATION_ROOT_FOOTER_ROW_ID;
   }
 
   return `auto-generated-group-footer-${groupId}`;
@@ -15,7 +14,7 @@ export const canColumnHaveAggregationFunction = ({
   aggregationFunctionName,
   aggregationFunction
 }) => {
-  if (!column || !column.private_aggregable) {
+  if (!column || !column.aggregable) {
     return false;
   }
 
@@ -23,8 +22,8 @@ export const canColumnHaveAggregationFunction = ({
     return false;
   }
 
-  if (column.private_availableAggregationFunctions != null) {
-    return column.private_availableAggregationFunctions.includes(aggregationFunctionName);
+  if (column.availableAggregationFunctions != null) {
+    return column.availableAggregationFunctions.includes(aggregationFunctionName);
   }
 
   if (!aggregationFunction.columnTypes) {
@@ -42,7 +41,7 @@ export const getAvailableAggregationFunctions = ({
   aggregationFunction: aggregationFunctions[aggregationFunctionName]
 }));
 export const mergeStateWithAggregationModel = aggregationModel => state => _extends({}, state, {
-  private_aggregation: _extends({}, state.private_aggregation, {
+  aggregation: _extends({}, state.aggregation, {
     model: aggregationModel
   })
 });
@@ -73,7 +72,8 @@ export const getAggregationRules = ({
 export const addFooterRows = ({
   groupingParams,
   aggregationRules,
-  getAggregationPosition
+  getAggregationPosition,
+  apiRef
 }) => {
   if (Object.keys(aggregationRules).length === 0) {
     return groupingParams;
@@ -94,7 +94,7 @@ export const addFooterRows = ({
       return;
     }
 
-    const footerId = private_getAggregationFooterRowIdFromGroupId(groupId);
+    const footerId = getAggregationFooterRowIdFromGroupId(groupId);
     ids.push(footerId);
     idRowsLookup[footerId] = {};
     tree[footerId] = {
@@ -112,9 +112,8 @@ export const addFooterRows = ({
         footerId
       });
     }
-  };
+  }; // If the tree is flat, we don't need to loop through the rows
 
-  addGroupFooter(null); // If the tree is flat, we don't need to loop through the rows
 
   if (groupingParams.treeDepth > 1) {
     groupingParams.ids.forEach(parentId => {
@@ -128,11 +127,23 @@ export const addFooterRows = ({
     });
   }
 
-  return _extends({}, groupingParams, {
-    ids,
+  let newGroupingParams = _extends({}, groupingParams, {
+    tree,
     idRowsLookup,
-    tree
+    ids
   });
+
+  if (getAggregationPosition(null) === 'footer') {
+    newGroupingParams = addPinnedRow({
+      groupingParams: newGroupingParams,
+      rowModel: {},
+      rowId: getAggregationFooterRowIdFromGroupId(null),
+      position: 'bottom',
+      apiRef
+    });
+  }
+
+  return _extends({}, groupingParams, newGroupingParams);
 };
 /**
  * Compares two sets of aggregation rules to determine if they are equal or not.

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

@@ -1,4 +1,4 @@
 export * from './gridAggregationInterfaces';
 export * from './gridAggregationSelectors';
 export * from './gridAggregationFunctions';
-export { PRIVATE_GRID_AGGREGATION_ROOT_FOOTER_ROW_ID, private_getAggregationFooterRowIdFromGroupId, } from './gridAggregationUtils';
+export { GRID_AGGREGATION_ROOT_FOOTER_ROW_ID, getAggregationFooterRowIdFromGroupId, } from './gridAggregationUtils';

package/hooks/features/aggregation/index.js

@@ -1,4 +1,4 @@
 export * from './gridAggregationInterfaces';
 export * from './gridAggregationSelectors';
 export * from './gridAggregationFunctions';
-export { PRIVATE_GRID_AGGREGATION_ROOT_FOOTER_ROW_ID, private_getAggregationFooterRowIdFromGroupId } from './gridAggregationUtils';
+export { GRID_AGGREGATION_ROOT_FOOTER_ROW_ID, getAggregationFooterRowIdFromGroupId } from './gridAggregationUtils';

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

@@ -2,5 +2,5 @@ import * as React from 'react';
 import { GridStateInitializer } from '@mui/x-data-grid-pro/internals';
 import { DataGridPremiumProcessedProps } from '../../../models/dataGridPremiumProps';
 import { GridApiPremium } from '../../../models/gridApiPremium';
-export declare const aggregationStateInitializer: GridStateInitializer<Pick<DataGridPremiumProcessedProps, 'private_aggregationModel' | 'initialState'>, GridApiPremium>;
-export declare const useGridAggregation: (apiRef: React.MutableRefObject<GridApiPremium>, props: Pick<DataGridPremiumProcessedProps, 'private_onAggregationModelChange' | 'initialState' | 'private_aggregationModel' | 'private_getAggregationPosition' | 'private_aggregationFunctions' | 'private_aggregationRowsScope' | 'private_disableAggregation' | 'rowGroupingColumnMode'>) => void;
+export declare const aggregationStateInitializer: GridStateInitializer<Pick<DataGridPremiumProcessedProps, 'aggregationModel' | 'initialState'>, GridApiPremium>;
+export declare const useGridAggregation: (apiRef: React.MutableRefObject<GridApiPremium>, props: Pick<DataGridPremiumProcessedProps, 'onAggregationModelChange' | 'initialState' | 'aggregationModel' | 'getAggregationPosition' | 'aggregationFunctions' | 'aggregationRowsScope' | 'disableAggregation' | 'rowGroupingColumnMode'>) => void;