@mui/x-data-grid-premium 8.13.0 → 8.14.0

package/hooks/features/pivoting/useGridPivoting.js

@@ -32,7 +32,7 @@ const pivotingStateInitializer = (state, props, apiRef) => {
       current: undefined
     }
   };
-  if (!(0, _utils.isPivotingAvailable)(props)) {
+  if (props.disablePivoting) {
     return (0, _extends2.default)({}, state, {
       pivoting: {
         active: false,
@@ -58,11 +58,12 @@ const pivotingStateInitializer = (state, props, apiRef) => {
 exports.pivotingStateInitializer = pivotingStateInitializer;
 const useGridPivoting = (apiRef, props, originalColumnsProp, originalRowsProp) => {
   const isPivotActive = (0, _internals.useGridSelector)(apiRef, _gridPivotingSelectors.gridPivotActiveSelector);
+  const isLoading = props.loading ?? (0, _xDataGridPro.gridRowsLoadingSelector)(apiRef);
   const {
     exportedStateRef,
     nonPivotDataRef
   } = apiRef.current.caches.pivoting;
-  const isPivotingAvailable = (0, _utils.isPivotingAvailable)(props);
+  const isPivotingAvailable = !props.disablePivoting;
   apiRef.current.registerControlState({
     stateId: 'pivotModel',
     propModel: props.pivotModel,
@@ -88,16 +89,19 @@ const useGridPivoting = (apiRef, props, originalColumnsProp, originalRowsProp) =
     if (!exportedStateRef.current) {
       exportedStateRef.current = apiRef.current.exportState();
     }
-    const rowIds = (0, _xDataGridPro.gridDataRowIdsSelector)(apiRef);
-    const rowsLookup = (0, _xDataGridPro.gridRowsLookupSelector)(apiRef);
-    const rows = rowIds.map(id => rowsLookup[id]);
+    let rows = [];
+    if (!props.dataSource) {
+      const rowIds = (0, _xDataGridPro.gridDataRowIdsSelector)(apiRef);
+      const rowsLookup = (0, _xDataGridPro.gridRowsLookupSelector)(apiRef);
+      rows = rowIds.map(id => rowsLookup[id]);
+    }
     const initialColumns = (0, _utils.getInitialColumns)(originalColumnsProp, props.getPivotDerivedColumns, apiRef.current.getLocaleText);
     return {
       rows,
       columns: initialColumns,
       originalRowsProp
     };
-  }, [apiRef, props.getPivotDerivedColumns, originalColumnsProp, originalRowsProp, exportedStateRef]);
+  }, [apiRef, props.getPivotDerivedColumns, originalColumnsProp, originalRowsProp, exportedStateRef, props.dataSource]);
   const computePivotingState = React.useCallback(({
     active,
     model: pivotModel
@@ -110,32 +114,39 @@ const useGridPivoting = (apiRef, props, originalColumnsProp, originalRowsProp) =
         rows: [],
         columns: new Map()
       };
-      return {
-        initialColumns: columns,
-        // TODO: fix getPivotedData called twice in controlled mode
-        propsOverrides: (0, _utils.getPivotedData)({
+      let propsOverrides = (0, _utils.getPivotForcedProps)(pivotModel, columns, props.groupingColDef);
+
+      // without data source, add more props overrides based on the data
+      if (!isLoading && !props.dataSource) {
+        propsOverrides = (0, _extends2.default)({}, propsOverrides, (0, _utils.createPivotPropsFromRows)({
           rows,
           columns,
           pivotModel,
-          apiRef: apiRef,
           pivotingColDef: props.pivotingColDef,
-          groupingColDef: props.groupingColDef
-        })
+          apiRef
+        }));
+      }
+      return {
+        initialColumns: columns,
+        propsOverrides
       };
     }
-    return undefined;
-  }, [apiRef, props.pivotingColDef, props.groupingColDef, nonPivotDataRef]);
+    return {};
+  }, [apiRef, isLoading, props.dataSource, props.pivotingColDef, props.groupingColDef, nonPivotDataRef]);
   (0, _useOnMount.default)(() => {
     if (!isPivotingAvailable || !isPivotActive) {
       return undefined;
     }
     nonPivotDataRef.current = getInitialData();
-    const isLoading = (0, _xDataGridPro.gridRowsLoadingSelector)(apiRef) ?? false;
-    if (isLoading) {
-      return undefined;
-    }
     apiRef.current.setState(state => {
-      const pivotingState = (0, _extends2.default)({}, state.pivoting, computePivotingState(state.pivoting));
+      const {
+        initialColumns,
+        propsOverrides
+      } = computePivotingState(state.pivoting);
+      const pivotingState = (0, _extends2.default)({}, state.pivoting, {
+        initialColumns: initialColumns || state.pivoting.initialColumns,
+        propsOverrides: (0, _extends2.default)({}, state.pivoting.propsOverrides, propsOverrides)
+      });
       return (0, _extends2.default)({}, state, {
         pivoting: pivotingState
       });
@@ -165,9 +176,15 @@ const useGridPivoting = (apiRef, props, originalColumnsProp, originalRowsProp) =
       if (state.pivoting?.model === newPivotModel) {
         return state;
       }
-      const newPivotingState = (0, _extends2.default)({}, state.pivoting, computePivotingState((0, _extends2.default)({}, state.pivoting, {
+      const {
+        initialColumns,
+        propsOverrides
+      } = computePivotingState((0, _extends2.default)({}, state.pivoting, {
         model: newPivotModel
-      })), {
+      }));
+      const newPivotingState = (0, _extends2.default)({}, state.pivoting, {
+        initialColumns: initialColumns || state.pivoting.initialColumns,
+        propsOverrides: (0, _extends2.default)({}, state.pivoting.propsOverrides, propsOverrides),
         model: newPivotModel
       });
       return (0, _extends2.default)({}, state, {
@@ -207,7 +224,7 @@ const useGridPivoting = (apiRef, props, originalColumnsProp, originalRowsProp) =
           const aggFunc = isSameSection ? prev.values.find(item => item.field === field)?.aggFunc : (0, _gridAggregationUtils.getAvailableAggregationFunctions)({
             aggregationFunctions: props.aggregationFunctions,
             colDef: initialColumns.get(field),
-            isDataSource: false
+            isDataSource: !!props.dataSource
           })[0];
           newSectionArray.splice(toIndex, 0, {
             field,
@@ -236,7 +253,7 @@ const useGridPivoting = (apiRef, props, originalColumnsProp, originalRowsProp) =
       }
       return newModel;
     });
-  }, [apiRef, props.aggregationFunctions]);
+  }, [apiRef, props.aggregationFunctions, props.dataSource]);
   const setPivotActive = React.useCallback(callback => {
     if (!isPivotingAvailable) {
       return;
@@ -249,9 +266,15 @@ const useGridPivoting = (apiRef, props, originalColumnsProp, originalRowsProp) =
       if (newPivotMode) {
         nonPivotDataRef.current = getInitialData();
       }
-      const newPivotingState = (0, _extends2.default)({}, state.pivoting, computePivotingState((0, _extends2.default)({}, state.pivoting, {
+      const {
+        initialColumns,
+        propsOverrides
+      } = computePivotingState((0, _extends2.default)({}, state.pivoting, {
         active: newPivotMode
-      })), {
+      }));
+      const newPivotingState = (0, _extends2.default)({}, state.pivoting, {
+        initialColumns: initialColumns || state.pivoting.initialColumns,
+        propsOverrides: (0, _extends2.default)({}, state.pivoting.propsOverrides, propsOverrides),
         active: newPivotMode
       });
       const newState = (0, _extends2.default)({}, state, {
@@ -295,15 +318,19 @@ const useGridPivoting = (apiRef, props, originalColumnsProp, originalRowsProp) =
       nonPivotDataRef.current.columns = (0, _utils.getInitialColumns)(columns, props.getPivotDerivedColumns, apiRef.current.getLocaleText);
     }
     apiRef.current.setState(state => {
+      const {
+        propsOverrides
+      } = computePivotingState(state.pivoting);
       return (0, _extends2.default)({}, state, {
-        pivoting: (0, _extends2.default)({}, state.pivoting, computePivotingState(state.pivoting), {
-          initialColumns: nonPivotDataRef.current?.columns
+        pivoting: (0, _extends2.default)({}, state.pivoting, {
+          initialColumns: nonPivotDataRef.current?.columns,
+          propsOverrides: (0, _extends2.default)({}, state.pivoting.propsOverrides, propsOverrides)
         })
       });
     });
   }, [isPivotingAvailable, apiRef, props.getPivotDerivedColumns, computePivotingState, nonPivotDataRef]);
   const updateNonPivotRows = React.useCallback((rows, keepPreviousRows = true) => {
-    if (!nonPivotDataRef.current || !isPivotingAvailable || !rows || rows.length === 0) {
+    if (!nonPivotDataRef.current || props.dataSource || !isPivotingAvailable || !rows || rows.length === 0) {
       return;
     }
     if (keepPreviousRows) {
@@ -325,18 +352,42 @@ const useGridPivoting = (apiRef, props, originalColumnsProp, originalRowsProp) =
       nonPivotDataRef.current.rows = rows;
     }
     apiRef.current.setState(state => {
+      const {
+        initialColumns,
+        propsOverrides
+      } = computePivotingState(state.pivoting);
       return (0, _extends2.default)({}, state, {
-        pivoting: (0, _extends2.default)({}, state.pivoting, computePivotingState(state.pivoting))
+        pivoting: (0, _extends2.default)({}, state.pivoting, {
+          initialColumns: initialColumns || state.pivoting.initialColumns,
+          propsOverrides: (0, _extends2.default)({}, state.pivoting.propsOverrides, propsOverrides)
+        })
       });
     });
-  }, [apiRef, computePivotingState, isPivotingAvailable, nonPivotDataRef]);
+  }, [apiRef, computePivotingState, isPivotingAvailable, nonPivotDataRef, props.dataSource]);
   const addPivotingPanel = React.useCallback((initialValue, value) => {
     if (isPivotingAvailable && value === _sidebar.GridSidebarValue.Pivot) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_pivotPanel.GridPivotPanel, {});
     }
     return initialValue;
   }, [isPivotingAvailable]);
+  const addGetRowsParams = React.useCallback(params => {
+    if (!isPivotingAvailable || !isPivotActive) {
+      return params;
+    }
+    const pivotModel = (0, _gridPivotingSelectors.gridPivotModelSelector)(apiRef);
+    const visibleColumns = pivotModel.columns.filter(column => !column.hidden);
+    const visibleRows = pivotModel.rows.filter(row => !row.hidden);
+    const visibleValues = pivotModel.values.filter(value => !value.hidden);
+    return (0, _extends2.default)({}, params, {
+      pivotModel: {
+        columns: visibleColumns,
+        rows: visibleRows,
+        values: visibleValues
+      }
+    });
+  }, [apiRef, isPivotingAvailable, isPivotActive]);
   (0, _internals.useGridRegisterPipeProcessor)(apiRef, 'sidebar', addPivotingPanel);
+  (0, _internals.useGridRegisterPipeProcessor)(apiRef, 'getRowsParams', addGetRowsParams);
   (0, _internals.useGridApiMethod)(apiRef, {
     setPivotModel,
     setPivotActive,

package/hooks/features/pivoting/utils.d.ts

@@ -2,22 +2,20 @@ import { GridColDef, GridRowModel, GridLocaleTextApi } from '@mui/x-data-grid-pr
 import type { RefObject } from '@mui/x-internals/types';
 import type { DataGridPremiumProcessedProps } from "../../../models/dataGridPremiumProps.js";
 import type { GridApiPremium } from "../../../models/gridApiPremium.js";
-import type { GridPivotingPropsOverrides, GridPivotModel } from "./gridPivotingInterfaces.js";
-export declare const isPivotingAvailable: (props: Pick<DataGridPremiumProcessedProps, "disablePivoting">) => boolean;
-export declare const defaultGetPivotDerivedColumns: DataGridPremiumProcessedProps['getPivotDerivedColumns'];
+import type { GridPivotingStaticPropsOverrides, GridPivotingDynamicPropsOverrides, GridPivotModel } from "./gridPivotingInterfaces.js";
+export declare const defaultGetPivotDerivedColumns: NonNullable<DataGridPremiumProcessedProps['getPivotDerivedColumns']>;
 export declare const getInitialColumns: (originalColumns: DataGridPremiumProcessedProps["columns"], getPivotDerivedColumns: DataGridPremiumProcessedProps["getPivotDerivedColumns"], getLocaleText: GridLocaleTextApi["getLocaleText"]) => Map<string, GridColDef>;
-export declare const getPivotedData: ({
+export declare const getPivotForcedProps: (pivotModel: GridPivotModel, columns: Map<string, GridColDef>, groupingColDef: DataGridPremiumProcessedProps["groupingColDef"]) => GridPivotingStaticPropsOverrides;
+export declare const createPivotPropsFromRows: ({
   rows,
   columns,
   pivotModel,
-  apiRef,
   pivotingColDef,
-  groupingColDef
+  apiRef
 }: {
   rows: GridRowModel[];
   columns: Map<string, GridColDef>;
   pivotModel: GridPivotModel;
-  apiRef: RefObject<GridApiPremium>;
   pivotingColDef: DataGridPremiumProcessedProps["pivotingColDef"];
-  groupingColDef: DataGridPremiumProcessedProps["groupingColDef"];
-}) => GridPivotingPropsOverrides;
+  apiRef: RefObject<GridApiPremium>;
+}) => GridPivotingDynamicPropsOverrides;

package/hooks/features/pivoting/utils.js

@@ -4,17 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isPivotingAvailable = exports.getPivotedData = exports.getInitialColumns = exports.defaultGetPivotDerivedColumns = void 0;
+exports.getPivotForcedProps = exports.getInitialColumns = exports.defaultGetPivotDerivedColumns = exports.createPivotPropsFromRows = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _xDataGridPro = require("@mui/x-data-grid-pro");
 var _internals = require("@mui/x-data-grid-pro/internals");
 var _columnGroups = require("../../../constants/columnGroups");
 var _rowGrouping = require("../rowGrouping");
 var _gridAggregationUtils = require("../aggregation/gridAggregationUtils");
-const isPivotingAvailable = props => {
-  return !props.disablePivoting;
-};
-exports.isPivotingAvailable = isPivotingAvailable;
 const defaultGetPivotDerivedColumns = (column, getLocaleText) => {
   if (column.type === 'date') {
     const field = column.field;
@@ -49,11 +45,17 @@ const getInitialColumns = (originalColumns, getPivotDerivedColumns, getLocaleTex
   return initialColumns;
 };
 exports.getInitialColumns = getInitialColumns;
-function sortColumnGroups(columnGroups, pivotModelColumns, depth = 0) {
+const sortColumnGroups = (columnGroups, pivotModelColumns, depth = 0) => {
   if (depth > pivotModelColumns.length - 1) {
     return;
   }
   const sort = pivotModelColumns[depth].sort;
+  if (columnGroups.length < 2) {
+    if (columnGroups[0]?.children) {
+      sortColumnGroups(columnGroups[0].children, pivotModelColumns, depth + 1);
+    }
+    return;
+  }
   columnGroups.sort((a, b) => {
     if ((0, _xDataGridPro.isLeaf)(a) || (0, _xDataGridPro.isLeaf)(b)) {
       return 0;
@@ -69,20 +71,47 @@ function sortColumnGroups(columnGroups, pivotModelColumns, depth = 0) {
     }
     return (sort === 'asc' ? 1 : -1) * (0, _xDataGridPro.gridStringOrNumberComparator)(a.rawHeaderName, b.rawHeaderName, {}, {});
   });
-}
-const getPivotedData = ({
+};
+const getPivotForcedProps = (pivotModel, columns, groupingColDef) => {
+  const visibleRows = pivotModel.rows.filter(row => !row.hidden);
+  const visibleColumns = pivotModel.columns.filter(column => !column.hidden);
+  const visibleValues = pivotModel.values.filter(value => !value.hidden);
+  const columnVisibilityModel = {};
+  for (const column of columns.values()) {
+    columnVisibilityModel[column.field] = false;
+  }
+  if (visibleColumns.length === 0) {
+    visibleValues.forEach(value => {
+      delete columnVisibilityModel[value.field];
+    });
+  }
+  const groupingColDefOverrides = params => (0, _extends2.default)({}, typeof groupingColDef === 'function' ? groupingColDef(params) : groupingColDef || {}, {
+    filterable: false,
+    aggregable: false,
+    hideable: false
+  });
+  return {
+    columnVisibilityModel,
+    rowGroupingModel: visibleRows.map(row => row.field),
+    getAggregationPosition: _gridAggregationUtils.defaultGetAggregationPosition,
+    groupingColDef: groupingColDefOverrides,
+    headerFilters: false,
+    disableAggregation: false,
+    disableRowGrouping: false
+  };
+};
+exports.getPivotForcedProps = getPivotForcedProps;
+const createPivotPropsFromRows = ({
   rows,
   columns,
   pivotModel,
-  apiRef,
   pivotingColDef,
-  groupingColDef
+  apiRef
 }) => {
   const visibleColumns = pivotModel.columns.filter(column => !column.hidden);
   const visibleRows = pivotModel.rows.filter(row => !row.hidden);
   const visibleValues = pivotModel.values.filter(value => !value.hidden);
   let pivotColumns = [];
-  const columnVisibilityModel = {};
   const pivotColumnsIncludedInPivotValues = [];
   const initialColumns = new Map();
   for (const column of columns.values()) {
@@ -106,7 +135,6 @@ const getPivotedData = ({
       } else {
         pivotColumns.push(columnToAdd);
       }
-      columnVisibilityModel[column.field] = false;
     }
   }
   pivotColumns = pivotColumns.concat(pivotColumnsIncludedInPivotValues);
@@ -134,7 +162,6 @@ const getPivotedData = ({
     newRows = rows;
     visibleValues.forEach(pivotValue => {
       aggregationModel[pivotValue.field] = pivotValue.aggFunc;
-      delete columnVisibilityModel[pivotValue.field];
     });
   } else {
     for (let i = 0; i < rows.length; i += 1) {
@@ -260,23 +287,11 @@ const getPivotedData = ({
     }
   }
   createColumns(columnGroupingModel);
-  const groupingColDefOverrides = params => (0, _extends2.default)({}, typeof groupingColDef === 'function' ? groupingColDef(params) : groupingColDef || {}, {
-    filterable: false,
-    aggregable: false,
-    hideable: false
-  });
   return {
     rows: visibleRows.length > 0 ? newRows : [],
     columns: pivotColumns,
-    rowGroupingModel: visibleRows.map(row => row.field),
-    aggregationModel,
-    getAggregationPosition: _gridAggregationUtils.defaultGetAggregationPosition,
-    columnVisibilityModel,
     columnGroupingModel,
-    groupingColDef: groupingColDefOverrides,
-    headerFilters: false,
-    disableAggregation: false,
-    disableRowGrouping: false
+    aggregationModel
   };
 };
-exports.getPivotedData = getPivotedData;
+exports.createPivotPropsFromRows = createPivotPropsFromRows;

package/hooks/features/rowGrouping/createGroupingColDef.js

@@ -91,7 +91,7 @@ function getGroupingCriteriaProperties(groupedByColDef, rowGroupingColumnMode, r
     valueFormatter = (value, row, column, apiRef) => {
       const rowId = (0, _xDataGridPro.gridRowIdSelector)(apiRef, row);
       const rowNode = (0, _xDataGridPro.gridRowNodeSelector)(apiRef, rowId);
-      if (rowNode.type === 'group') {
+      if (rowNode?.type === 'group') {
         const originalColDef = columnsLookup[rowNode.groupingField];
         if (originalColDef.type === 'singleSelect') {
           // the default valueFormatter of a singleSelect colDef won't work with the grouping column values

package/hooks/features/rowGrouping/useGridDataSourceRowGroupingPreProcessors.js

@@ -20,7 +20,9 @@ const useGridDataSourceRowGroupingPreProcessors = (apiRef, props) => {
     if (!getChildrenCount) {
       throw new Error('MUI X: No `getChildrenCount` method provided with the dataSource.');
     }
+    const pivotingActive = (0, _internals.gridPivotActiveSelector)(apiRef);
     const sanitizedRowGroupingModel = (0, _gridRowGroupingSelector.gridRowGroupingSanitizedModelSelector)(apiRef);
+    const maxDepth = pivotingActive ? sanitizedRowGroupingModel.length - 1 : undefined;
     const columnsLookup = (0, _xDataGridPro.gridColumnLookupSelector)(apiRef);
     const groupingRules = (0, _gridRowGroupingUtils.getGroupingRules)({
       sanitizedRowGroupingModel,
@@ -45,7 +47,8 @@ const useGridDataSourceRowGroupingPreProcessors = (apiRef, props) => {
         nodes: params.updates.rows.map(getRowTreeBuilderNode),
         defaultGroupingExpansionDepth: props.defaultGroupingExpansionDepth,
         isGroupExpandedByDefault: props.isGroupExpandedByDefault,
-        groupingName: _internals.RowGroupingStrategy.DataSource
+        groupingName: _internals.RowGroupingStrategy.DataSource,
+        maxDepth
       });
     }
     return (0, _internals.updateRowTree)({
@@ -59,7 +62,8 @@ const useGridDataSourceRowGroupingPreProcessors = (apiRef, props) => {
       previousTreeDepth: params.previousTreeDepths,
       defaultGroupingExpansionDepth: props.defaultGroupingExpansionDepth,
       isGroupExpandedByDefault: props.isGroupExpandedByDefault,
-      groupingName: _internals.RowGroupingStrategy.DataSource
+      groupingName: _internals.RowGroupingStrategy.DataSource,
+      maxDepth
     });
   }, [apiRef, props.dataSource, props.defaultGroupingExpansionDepth, props.isGroupExpandedByDefault]);
   const filterRows = React.useCallback(() => {

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

@@ -8,4 +8,4 @@ export declare const rowGroupingStateInitializer: GridStateInitializer<Pick<Data
  * @requires useGridRows (state, method) - can be after, async only
  * @requires useGridParamsApi (method) - can be after, async only
  */
-export declare const useGridRowGrouping: (apiRef: RefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "initialState" | "rowGroupingModel" | "onRowGroupingModelChange" | "defaultGroupingExpansionDepth" | "isGroupExpandedByDefault" | "rowGroupingColumnMode" | "disableRowGrouping" | "slotProps" | "slots" | "dataSource" | "treeData">) => void;
+export declare const useGridRowGrouping: (apiRef: RefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "initialState" | "rowGroupingModel" | "onRowGroupingModelChange" | "isGroupExpandedByDefault" | "rowGroupingColumnMode" | "disableRowGrouping" | "slotProps" | "slots" | "dataSource" | "treeData">) => void;

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid-premium v8.13.0
+ * @mui/x-data-grid-premium v8.14.0
  *
  * @license SEE LICENSE IN LICENSE
  * This source code is licensed under the SEE LICENSE IN LICENSE license found in the

package/models/dataGridPremiumProps.d.ts

@@ -8,7 +8,7 @@ import { GridPremiumSlotProps } from "./gridPremiumSlotProps.js";
 import { GridInitialStatePremium } from "./gridStatePremium.js";
 import { GridApiPremium } from "./gridApiPremium.js";
 import { GridCellSelectionModel } from "../hooks/features/cellSelection/index.js";
-import type { GridPivotingColDefOverrides, GridPivotModel } from "../hooks/features/pivoting/gridPivotingInterfaces.js";
+import type { GridPivotingColDefOverrides, PivotingColDefCallback, GridPivotModel } from "../hooks/features/pivoting/gridPivotingInterfaces.js";
 import { GridDataSourcePremium as GridDataSource, GridGetRowsParamsPremium as GridGetRowsParams } from "../hooks/features/dataSource/models.js";
 import { Conversation, PromptResponse, PromptSuggestion } from "../hooks/features/aiAssistant/gridAiAssistantInterfaces.js";
 export interface GridExperimentalPremiumFeatures extends GridExperimentalProFeatures {
@@ -91,15 +91,6 @@ export interface DataGridPremiumPropsWithDefaultValue<R extends GridValidRowMode
    * @default false
    */
   disablePivoting: boolean;
-  /**
-   * Allows to generate derived columns from actual columns that will be used for pivoting.
-   * Useful e.g. for date columns to generate year, quarter, month, etc.
-   * @param {GridColDef} column The column to generate derived columns for.
-   * @param {GridLocaleTextApi['getLocaleText']} getLocaleText The function to get the locale text.
-   * @returns {GridColDef[] | undefined} The derived columns.
-   * @default {defaultGetPivotDerivedColumns} Creates year and quarter columns for date columns.
-   */
-  getPivotDerivedColumns: ((column: GridColDef, getLocaleText: GridLocaleTextApi['getLocaleText']) => GridColDef[] | undefined) | null;
   /**
    * If `true`, the AI Assistant is enabled.
    * @default false
@@ -226,14 +217,24 @@ export interface DataGridPremiumPropsWithoutDefaultValue<R extends GridValidRowM
    * @deprecated Use the `sidebarOpen` and `sidebarClose` events or corresponding event handlers `onSidebarOpen()` and `onSidebarClose()` instead.
    */
   onPivotPanelOpenChange?: (pivotPanelOpen: boolean) => void;
+  /**
+   * Allows to generate derived columns from actual columns that will be used for pivoting.
+   * Useful e.g. for date columns to generate year, quarter, month, etc.
+   * @param {GridColDef} column The column to generate derived columns for.
+   * @param {GridLocaleTextApi['getLocaleText']} getLocaleText The function to get the locale text.
+   * @returns {GridColDef[] | undefined} The derived columns.
+   * @default {defaultGetPivotDerivedColumns | undefined} Creates year and quarter columns for date columns if not in server side mode.
+   */
+  getPivotDerivedColumns?: ((column: GridColDef, getLocaleText: GridLocaleTextApi['getLocaleText']) => GridColDef[] | undefined) | null;
   /**
    * The column definition overrides for the columns generated by the pivoting feature.
-   * @param {string} originalColumnField The field of the original column.
-   * @param {string[]} columnGroupPath The path of the column groups the column belongs to.
-   * @returns {Partial<GridPivotingColDefOverrides> | undefined | void} The column definition overrides.
+   * Pass either a partial column definition to apply the same overrides to all pivot columns, or a callback to apply different overrides to each pivot column.
+   * For server-side pivoting, only the `PivotingColDefCallback` signature is supported, and the prop is required.
+   * @type {Partial<GridPivotingColDefOverrides> | PivotingColDefCallback}
    * @default undefined
+   * @throws {Error} If `undefined` and `dataSource` is provided.
    */
-  pivotingColDef?: Partial<GridPivotingColDefOverrides> | ((originalColumnField: GridColDef['field'], columnGroupPath: string[]) => Partial<GridPivotingColDefOverrides> | undefined);
+  pivotingColDef?: Partial<GridPivotingColDefOverrides> | PivotingColDefCallback;
   /**
    * The conversations with the AI Assistant.
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid-premium",
-  "version": "8.13.0",
+  "version": "8.14.0",
   "author": "MUI Team",
   "description": "The Premium plan edition of the MUI X Data Grid Components.",
   "license": "SEE LICENSE IN LICENSE",
@@ -34,15 +34,14 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.28.4",
-    "@mui/utils": "^7.3.2",
-    "@types/format-util": "^1.0.4",
+    "@mui/utils": "^7.3.3",
     "clsx": "^2.1.1",
     "exceljs": "^4.4.0",
     "prop-types": "^15.8.1",
-    "@mui/x-data-grid": "8.13.0",
-    "@mui/x-internals": "8.12.0",
-    "@mui/x-license": "8.12.0",
-    "@mui/x-data-grid-pro": "8.13.0"
+    "@mui/x-data-grid": "8.14.0",
+    "@mui/x-data-grid-pro": "8.14.0",
+    "@mui/x-internals": "8.14.0",
+    "@mui/x-license": "8.14.0"
   },
   "peerDependencies": {
     "@emotion/react": "^11.9.0",