@mui/x-data-grid-premium 6.18.2 → 6.18.4

package/CHANGELOG.md

@@ -3,6 +3,105 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 6.18.4
+
+_Dec 8, 2023_
+
+We'd like to offer a big thanks to the 6 contributors who made this release possible. Here are some highlights ✨:
+
+- 📚 Add [Pickers FAQ page](https://mui.com/x/react-date-pickers/faq/)
+- 🌍 Improve Danish (da-DK) locale on Data Grid
+- 🐞 Bugfixes
+
+### Data Grid
+
+#### `@mui/x-data-grid@6.18.4`
+
+- [DataGrid] Fix cell slot style override (#11215) @oliviertassinari
+- [l10n] Improve Danish (da-DK) locale (#11346) @goibon
+
+#### `@mui/x-data-grid-pro@6.18.4` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-data-grid@6.18.4`.
+
+#### `@mui/x-data-grid-premium@6.18.4` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
+
+Same changes as in `@mui/x-data-grid-pro@6.18.4`.
+
+### Date Pickers
+
+#### `@mui/x-date-pickers@6.18.4`
+
+- [pickers] Fix `MultiSectionDigitalClock` issues (#11308) @LukasTy
+
+#### `@mui/x-date-pickers-pro@6.18.4` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-date-pickers@6.18.4`.
+
+### Docs
+
+- [docs] Fix typo (#11323) @cadam11
+- [docs] Add FAQ page (#11347) @noraleonte
+
+## 6.18.3
+
+_Dec 4, 2023_
+
+We'd like to offer a big thanks to the 10 contributors who made this release possible. Here are some highlights ✨:
+
+- 📈 Fix a lot of Charts package issues
+- 🌍 Improve Bulgarian (bg-BG) locale on Data Grid
+- 🐞 Bugfixes
+- 📚 Documentation improvements
+
+### Data Grid
+
+#### `@mui/x-data-grid@6.18.3`
+
+- [DataGrid] Fix cell editing adding a leading "v" on paste (#11166) @prasad5795
+- [DataGrid] Fix handling of event target in portal (#11209) @cherniavskii
+- [DataGrid] Fix `onFilterModelChange` being fired with stale field value (#11244) @gitstart
+- [l10n] Improve Bulgarian (bg-BG) locale (#10856) (#11206) @Kristiqn95
+
+#### `@mui/x-data-grid-pro@6.18.3` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-data-grid@6.18.3`.
+
+#### `@mui/x-data-grid-premium@6.18.3` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
+
+Same changes as in `@mui/x-data-grid-pro@6.18.3`, plus:
+
+- [DataGridPremium] Fix aggregated column ignoring column definition changes (#11176) @cherniavskii
+- [DataGridPremium] Fix custom filter operators not working on aggregated column (#11201) @cherniavskii
+
+### Date Pickers
+
+#### `@mui/x-date-pickers@6.18.3`
+
+- [pickers] Correctly format `MultiSectionDigitalClock` number sections (#11297) @LukasTy
+- [pickers] Expand field placeholder methods flexibility by providing `format` parameter (#11254) @LukasTy
+
+#### `@mui/x-date-pickers-pro@6.18.3` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-date-pickers@6.18.3`.
+
+### Charts / `@mui/x-charts@6.18.3`
+
+- [charts] Adjusted `defaultizeValueFormatter` util to accept an optional `series.valueFormatter` value (#11213) @michelengelen
+- [charts] Apply `labelStyle` and `tickLabelStyle` props on `<ChartsYAxis />` (#11180) @akamfoad
+- [charts] Fix TS config (#11259) @alexfauquette
+- [charts] Fix error with empty dataset (#11063) @alexfauquette
+- [charts] Fix export strategy (#11235) @alexfauquette
+
+### Docs
+
+- [docs] Add LTS section to support page (#11300) @joserodolfofreitas
+- [docs] Add end v6 blogpost to whats new page (#11299) @joserodolfofreitas
+- [docs] Document charts composition (#10710) @alexfauquette
+- [docs] Fix version links (#11167) @LukasTy
+- [docs] Improve Data Grid togglable columns example (#11241) @MBilalShafi
+- [docs] Split charts overview and getting started in distinct pages (#10910) @alexfauquette
+
 ## 6.18.2
 
 _Nov 23, 2023_
@@ -288,7 +387,7 @@ Same changes as in `@mui/x-date-pickers@6.16.3`, plus:
 
 - [charts] Add reference links to area + bar chart components (#10652) @michelengelen
 - [charts] Add reference links to line chart + sparkline components (#10650) @michelengelen
-- [charts] Add reference links to pie + scatter chart components  (#10653) @michelengelen
+- [charts] Add reference links to pie + scatter chart components (#10653) @michelengelen
 - [charts] Render only when `width` and `height` are resolved (#10714) @alexfauquette
 - [charts] Support animation on `BarChart` (#9926) @alexfauquette
 - [charts] Use new text component to avoid tick label overflow on x-axis (#10648) @alexfauquette
@@ -364,6 +463,7 @@ It adds line break support and avoids overlapping text in the legend.
 This comes with some breaking changes.
 
 - The DOM structure is modified. An intermediary `<tspan />` element has been added. This can impact how your style is applied.
+
   ```diff
   - <text>The label</text>
   + <text><tspan>The label</tspan></text>

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

@@ -1,10 +1,16 @@
 import * as React from 'react';
-import { GridColDef } from '@mui/x-data-grid-pro';
+import { GridColDef, GridFilterOperator } from '@mui/x-data-grid-pro';
 import { GridBaseColDef } from '@mui/x-data-grid-pro/internals';
 import { GridApiPremium } from '../../../models/gridApiPremium';
 import { GridAggregationRule } from './gridAggregationInterfaces';
+declare const AGGREGATION_WRAPPABLE_PROPERTIES: readonly ["valueGetter", "valueFormatter", "renderCell", "renderHeader", "filterOperators"];
+type WrappableColumnProperty = (typeof AGGREGATION_WRAPPABLE_PROPERTIES)[number];
 interface GridColDefWithAggregationWrappers extends GridBaseColDef {
-    aggregationWrappedColumn: GridBaseColDef;
+    aggregationWrappedProperties: {
+        name: WrappableColumnProperty;
+        originalValue: GridBaseColDef[WrappableColumnProperty];
+        wrappedValue: GridBaseColDef[WrappableColumnProperty];
+    }[];
 }
 /**
  * Add a wrapper around each wrappable property of the column to customize the behavior of the aggregation cells.
@@ -19,5 +25,48 @@ export declare const wrapColumnWithAggregationValue: ({ column, apiRef, aggregat
  */
 export declare const unwrapColumnFromAggregation: ({ column, }: {
     column: GridColDef | GridColDefWithAggregationWrappers;
-}) => GridBaseColDef<import("@mui/x-data-grid-pro").GridValidRowModel, any, any>;
+}) => GridBaseColDef<any, any, any> | {
+    field: string;
+    headerName?: string | undefined;
+    description?: string | undefined;
+    width?: number | undefined;
+    flex?: number | undefined;
+    minWidth?: number | undefined;
+    maxWidth?: number | undefined;
+    hideable?: boolean | undefined;
+    sortable?: boolean | undefined;
+    sortingOrder?: import("@mui/x-data-grid-pro").GridSortDirection[] | undefined;
+    resizable?: boolean | undefined;
+    editable?: boolean | undefined;
+    groupable?: boolean | undefined;
+    pinnable?: boolean | undefined;
+    sortComparator?: import("@mui/x-data-grid-pro").GridComparatorFn<any> | undefined;
+    type?: import("@mui/x-data-grid-pro").GridColType | undefined;
+    align?: import("@mui/x-data-grid-pro").GridAlignment | undefined;
+    valueGetter?: ((params: import("@mui/x-data-grid-pro").GridValueGetterParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, import("@mui/x-data-grid-pro").GridTreeNodeWithRender>) => any) | undefined;
+    valueSetter?: ((params: import("@mui/x-data-grid-pro").GridValueSetterParams<import("@mui/x-data-grid-pro").GridValidRowModel, any>) => import("@mui/x-data-grid-pro").GridValidRowModel) | undefined;
+    valueFormatter?: ((params: import("@mui/x-data-grid-pro").GridValueFormatterParams<any>) => any) | undefined;
+    valueParser?: ((value: any, params?: import("@mui/x-data-grid-pro").GridCellParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, any, import("@mui/x-data-grid-pro").GridTreeNode> | undefined) => any) | undefined;
+    cellClassName?: import("@mui/x-data-grid-pro").GridCellClassNamePropType<import("@mui/x-data-grid-pro").GridValidRowModel, any> | undefined;
+    renderCell?: ((params: import("@mui/x-data-grid-pro").GridRenderCellParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, any, import("@mui/x-data-grid-pro").GridTreeNodeWithRender>) => React.ReactNode) | undefined;
+    renderEditCell?: ((params: import("@mui/x-data-grid-pro").GridRenderEditCellParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, any, import("@mui/x-data-grid-pro").GridTreeNodeWithRender>) => React.ReactNode) | undefined;
+    preProcessEditCellProps?: ((params: import("@mui/x-data-grid-pro").GridPreProcessEditCellProps<any, any>) => import("@mui/x-data-grid-pro").GridEditCellProps<any> | Promise<import("@mui/x-data-grid-pro").GridEditCellProps<any>>) | undefined;
+    headerClassName?: import("@mui/x-data-grid-pro").GridColumnHeaderClassNamePropType | undefined;
+    renderHeader?: ((params: import("@mui/x-data-grid-pro").GridColumnHeaderParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, any>) => React.ReactNode) | undefined;
+    headerAlign?: import("@mui/x-data-grid-pro").GridAlignment | undefined;
+    hideSortIcons?: boolean | undefined;
+    disableColumnMenu?: boolean | undefined;
+    filterable?: boolean | undefined;
+    filterOperators?: GridFilterOperator<import("@mui/x-data-grid-pro").GridValidRowModel, any, any>[] | undefined;
+    getApplyQuickFilterFn?: import("@mui/x-data-grid/models/colDef/gridColDef").GetApplyQuickFilterFnLegacy<import("@mui/x-data-grid-pro").GridValidRowModel, any, any> | undefined;
+    getApplyQuickFilterFnV7?: import("@mui/x-data-grid/models/colDef/gridColDef").GetApplyQuickFilterFnV7<import("@mui/x-data-grid-pro").GridValidRowModel, any> | undefined;
+    disableReorder?: boolean | undefined;
+    disableExport?: boolean | undefined;
+    colSpan?: number | ((params: import("@mui/x-data-grid-pro").GridCellParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, any, import("@mui/x-data-grid-pro").GridTreeNode>) => number | undefined) | undefined;
+    renderHeaderFilter?: ((params: import("@mui/x-data-grid-pro").GridHeaderFilterCellProps) => React.ReactNode) | undefined;
+    aggregable?: boolean | undefined;
+    availableAggregationFunctions?: string[] | undefined;
+    groupingValueGetter?: ((params: import("../../..").GridGroupingValueGetterParams<import("@mui/x-data-grid-pro").GridValidRowModel, any>) => import("@mui/x-data-grid-pro").GridKeyValue | null | undefined) | undefined;
+    pastedValueParser?: ((value: string, params: import("@mui/x-data-grid-pro").GridCellParams<import("@mui/x-data-grid-pro").GridValidRowModel, any, any, import("@mui/x-data-grid-pro").GridTreeNode>) => any) | undefined;
+};
 export {};

package/hooks/features/aggregation/wrapColumnWithAggregation.js

@@ -1,6 +1,8 @@
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
+const _excluded = ["aggregationWrappedProperties"];
 import * as React from 'react';
-import { tagInternalFilter } from '@mui/x-data-grid-pro/internals';
+import { isInternalFilter, tagInternalFilter } from '@mui/x-data-grid-pro/internals';
 import { gridAggregationLookupSelector } from './gridAggregationSelectors';
 import { GridFooterCell } from '../../../components/GridFooterCell';
 import { GridAggregationHeader } from '../../../components/GridAggregationHeader';
@@ -88,7 +90,7 @@ const getWrappedFilterOperators = ({
 }) => filterOperators.map(operator => {
   const baseGetApplyFilterFn = operator.getApplyFilterFn;
   const baseGetApplyFilterFnV7 = operator.getApplyFilterFnV7;
-  const getApplyFilterFn = tagInternalFilter((filterItem, colDef) => {
+  let getApplyFilterFn = (filterItem, colDef) => {
     const filterFn = baseGetApplyFilterFn(filterItem, colDef);
     if (!filterFn) {
       return null;
@@ -99,19 +101,28 @@ const getWrappedFilterOperators = ({
       }
       return filterFn(params);
     };
-  });
-  const getApplyFilterFnV7 = baseGetApplyFilterFnV7 === undefined ? undefined : tagInternalFilter((filterItem, colDef) => {
-    const filterFn = baseGetApplyFilterFnV7(filterItem, colDef);
-    if (!filterFn) {
-      return null;
-    }
-    return (value, row, column, api) => {
-      if (getCellAggregationResult(apiRef.current.getRowId(row), column.field) != null) {
-        return true;
+  };
+  if (isInternalFilter(baseGetApplyFilterFn)) {
+    getApplyFilterFn = tagInternalFilter(getApplyFilterFn);
+  }
+  let getApplyFilterFnV7;
+  if (baseGetApplyFilterFnV7 !== undefined) {
+    getApplyFilterFnV7 = tagInternalFilter((filterItem, colDef) => {
+      const filterFn = baseGetApplyFilterFnV7(filterItem, colDef);
+      if (!filterFn) {
+        return null;
       }
-      return filterFn(value, row, column, api);
-    };
-  });
+      return (value, row, column, api) => {
+        if (getCellAggregationResult(apiRef.current.getRowId(row), column.field) != null) {
+          return true;
+        }
+        return filterFn(value, row, column, api);
+      };
+    });
+    if (isInternalFilter(baseGetApplyFilterFnV7)) {
+      getApplyFilterFnV7 = tagInternalFilter(getApplyFilterFnV7);
+    }
+  }
   return _extends({}, operator, {
     getApplyFilterFn,
     getApplyFilterFnV7
@@ -167,7 +178,7 @@ export const wrapColumnWithAggregationValue = ({
   };
   let didWrapSomeProperty = false;
   const wrappedColumn = _extends({}, column, {
-    aggregationWrappedColumn: column
+    aggregationWrappedProperties: []
   });
   const wrapColumnProperty = (property, wrapper) => {
     const originalValue = column[property];
@@ -181,6 +192,11 @@ export const wrapColumnWithAggregationValue = ({
     if (wrappedProperty !== originalValue) {
       didWrapSomeProperty = true;
       wrappedColumn[property] = wrappedProperty;
+      wrappedColumn.aggregationWrappedProperties.push({
+        name: property,
+        originalValue,
+        wrappedValue: wrappedProperty
+      });
     }
   };
   wrapColumnProperty('valueGetter', getAggregationValueWrappedValueGetter);
@@ -200,6 +216,24 @@ export const wrapColumnWithAggregationValue = ({
 export const unwrapColumnFromAggregation = ({
   column
 }) => {
-  var _aggregationWrappedCo;
-  return (_aggregationWrappedCo = column.aggregationWrappedColumn) != null ? _aggregationWrappedCo : column;
+  if (!column.aggregationWrappedProperties) {
+    return column;
+  }
+  const _ref = column,
+    {
+      aggregationWrappedProperties
+    } = _ref,
+    unwrappedColumn = _objectWithoutPropertiesLoose(_ref, _excluded);
+  aggregationWrappedProperties.forEach(({
+    name,
+    originalValue,
+    wrappedValue
+  }) => {
+    // The value changed since we wrapped it
+    if (wrappedValue !== unwrappedColumn[name]) {
+      return;
+    }
+    unwrappedColumn[name] = originalValue;
+  });
+  return unwrappedColumn;
 };

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid-premium v6.18.2
+ * @mui/x-data-grid-premium v6.18.4
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/legacy/hooks/features/aggregation/wrapColumnWithAggregation.js

@@ -1,6 +1,8 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _extends from "@babel/runtime/helpers/esm/extends";
+var _excluded = ["aggregationWrappedProperties"];
 import * as React from 'react';
-import { tagInternalFilter } from '@mui/x-data-grid-pro/internals';
+import { isInternalFilter, tagInternalFilter } from '@mui/x-data-grid-pro/internals';
 import { gridAggregationLookupSelector } from './gridAggregationSelectors';
 import { GridFooterCell } from '../../../components/GridFooterCell';
 import { GridAggregationHeader } from '../../../components/GridAggregationHeader';
@@ -85,7 +87,7 @@ var getWrappedFilterOperators = function getWrappedFilterOperators(_ref4) {
   return filterOperators.map(function (operator) {
     var baseGetApplyFilterFn = operator.getApplyFilterFn;
     var baseGetApplyFilterFnV7 = operator.getApplyFilterFnV7;
-    var getApplyFilterFn = tagInternalFilter(function (filterItem, colDef) {
+    var getApplyFilterFn = function getApplyFilterFn(filterItem, colDef) {
       var filterFn = baseGetApplyFilterFn(filterItem, colDef);
       if (!filterFn) {
         return null;
@@ -96,19 +98,28 @@ var getWrappedFilterOperators = function getWrappedFilterOperators(_ref4) {
         }
         return filterFn(params);
       };
-    });
-    var getApplyFilterFnV7 = baseGetApplyFilterFnV7 === undefined ? undefined : tagInternalFilter(function (filterItem, colDef) {
-      var filterFn = baseGetApplyFilterFnV7(filterItem, colDef);
-      if (!filterFn) {
-        return null;
-      }
-      return function (value, row, column, api) {
-        if (getCellAggregationResult(apiRef.current.getRowId(row), column.field) != null) {
-          return true;
+    };
+    if (isInternalFilter(baseGetApplyFilterFn)) {
+      getApplyFilterFn = tagInternalFilter(getApplyFilterFn);
+    }
+    var getApplyFilterFnV7;
+    if (baseGetApplyFilterFnV7 !== undefined) {
+      getApplyFilterFnV7 = tagInternalFilter(function (filterItem, colDef) {
+        var filterFn = baseGetApplyFilterFnV7(filterItem, colDef);
+        if (!filterFn) {
+          return null;
         }
-        return filterFn(value, row, column, api);
-      };
-    });
+        return function (value, row, column, api) {
+          if (getCellAggregationResult(apiRef.current.getRowId(row), column.field) != null) {
+            return true;
+          }
+          return filterFn(value, row, column, api);
+        };
+      });
+      if (isInternalFilter(baseGetApplyFilterFnV7)) {
+        getApplyFilterFnV7 = tagInternalFilter(getApplyFilterFnV7);
+      }
+    }
     return _extends({}, operator, {
       getApplyFilterFn: getApplyFilterFn,
       getApplyFilterFnV7: getApplyFilterFnV7
@@ -163,7 +174,7 @@ export var wrapColumnWithAggregationValue = function wrapColumnWithAggregationVa
   };
   var didWrapSomeProperty = false;
   var wrappedColumn = _extends({}, column, {
-    aggregationWrappedColumn: column
+    aggregationWrappedProperties: []
   });
   var wrapColumnProperty = function wrapColumnProperty(property, wrapper) {
     var originalValue = column[property];
@@ -177,6 +188,11 @@ export var wrapColumnWithAggregationValue = function wrapColumnWithAggregationVa
     if (wrappedProperty !== originalValue) {
       didWrapSomeProperty = true;
       wrappedColumn[property] = wrappedProperty;
+      wrappedColumn.aggregationWrappedProperties.push({
+        name: property,
+        originalValue: originalValue,
+        wrappedValue: wrappedProperty
+      });
     }
   };
   wrapColumnProperty('valueGetter', getAggregationValueWrappedValueGetter);
@@ -194,7 +210,22 @@ export var wrapColumnWithAggregationValue = function wrapColumnWithAggregationVa
  * Remove the aggregation wrappers around the wrappable properties of the column.
  */
 export var unwrapColumnFromAggregation = function unwrapColumnFromAggregation(_ref7) {
-  var _aggregationWrappedCo;
   var column = _ref7.column;
-  return (_aggregationWrappedCo = column.aggregationWrappedColumn) != null ? _aggregationWrappedCo : column;
+  if (!column.aggregationWrappedProperties) {
+    return column;
+  }
+  var _ref8 = column,
+    aggregationWrappedProperties = _ref8.aggregationWrappedProperties,
+    unwrappedColumn = _objectWithoutProperties(_ref8, _excluded);
+  aggregationWrappedProperties.forEach(function (_ref9) {
+    var name = _ref9.name,
+      originalValue = _ref9.originalValue,
+      wrappedValue = _ref9.wrappedValue;
+    // The value changed since we wrapped it
+    if (wrappedValue !== unwrappedColumn[name]) {
+      return;
+    }
+    unwrappedColumn[name] = originalValue;
+  });
+  return unwrappedColumn;
 };

package/legacy/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid-premium v6.18.2
+ * @mui/x-data-grid-premium v6.18.4
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/legacy/utils/releaseInfo.js

@@ -1,6 +1,6 @@
 import { ponyfillGlobal } from '@mui/utils';
 export var getReleaseInfo = function getReleaseInfo() {
-  var releaseInfo = "MTcwMDY5MDQwMDAwMA==";
+  var releaseInfo = "MTcwMTk5MDAwMDAwMA==";
   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/modern/hooks/features/aggregation/wrapColumnWithAggregation.js

@@ -1,6 +1,8 @@
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
+const _excluded = ["aggregationWrappedProperties"];
 import * as React from 'react';
-import { tagInternalFilter } from '@mui/x-data-grid-pro/internals';
+import { isInternalFilter, tagInternalFilter } from '@mui/x-data-grid-pro/internals';
 import { gridAggregationLookupSelector } from './gridAggregationSelectors';
 import { GridFooterCell } from '../../../components/GridFooterCell';
 import { GridAggregationHeader } from '../../../components/GridAggregationHeader';
@@ -86,7 +88,7 @@ const getWrappedFilterOperators = ({
 }) => filterOperators.map(operator => {
   const baseGetApplyFilterFn = operator.getApplyFilterFn;
   const baseGetApplyFilterFnV7 = operator.getApplyFilterFnV7;
-  const getApplyFilterFn = tagInternalFilter((filterItem, colDef) => {
+  let getApplyFilterFn = (filterItem, colDef) => {
     const filterFn = baseGetApplyFilterFn(filterItem, colDef);
     if (!filterFn) {
       return null;
@@ -97,19 +99,28 @@ const getWrappedFilterOperators = ({
       }
       return filterFn(params);
     };
-  });
-  const getApplyFilterFnV7 = baseGetApplyFilterFnV7 === undefined ? undefined : tagInternalFilter((filterItem, colDef) => {
-    const filterFn = baseGetApplyFilterFnV7(filterItem, colDef);
-    if (!filterFn) {
-      return null;
-    }
-    return (value, row, column, api) => {
-      if (getCellAggregationResult(apiRef.current.getRowId(row), column.field) != null) {
-        return true;
+  };
+  if (isInternalFilter(baseGetApplyFilterFn)) {
+    getApplyFilterFn = tagInternalFilter(getApplyFilterFn);
+  }
+  let getApplyFilterFnV7;
+  if (baseGetApplyFilterFnV7 !== undefined) {
+    getApplyFilterFnV7 = tagInternalFilter((filterItem, colDef) => {
+      const filterFn = baseGetApplyFilterFnV7(filterItem, colDef);
+      if (!filterFn) {
+        return null;
       }
-      return filterFn(value, row, column, api);
-    };
-  });
+      return (value, row, column, api) => {
+        if (getCellAggregationResult(apiRef.current.getRowId(row), column.field) != null) {
+          return true;
+        }
+        return filterFn(value, row, column, api);
+      };
+    });
+    if (isInternalFilter(baseGetApplyFilterFnV7)) {
+      getApplyFilterFnV7 = tagInternalFilter(getApplyFilterFnV7);
+    }
+  }
   return _extends({}, operator, {
     getApplyFilterFn,
     getApplyFilterFnV7
@@ -164,7 +175,7 @@ export const wrapColumnWithAggregationValue = ({
   };
   let didWrapSomeProperty = false;
   const wrappedColumn = _extends({}, column, {
-    aggregationWrappedColumn: column
+    aggregationWrappedProperties: []
   });
   const wrapColumnProperty = (property, wrapper) => {
     const originalValue = column[property];
@@ -178,6 +189,11 @@ export const wrapColumnWithAggregationValue = ({
     if (wrappedProperty !== originalValue) {
       didWrapSomeProperty = true;
       wrappedColumn[property] = wrappedProperty;
+      wrappedColumn.aggregationWrappedProperties.push({
+        name: property,
+        originalValue,
+        wrappedValue: wrappedProperty
+      });
     }
   };
   wrapColumnProperty('valueGetter', getAggregationValueWrappedValueGetter);
@@ -197,5 +213,24 @@ export const wrapColumnWithAggregationValue = ({
 export const unwrapColumnFromAggregation = ({
   column
 }) => {
-  return column.aggregationWrappedColumn ?? column;
+  if (!column.aggregationWrappedProperties) {
+    return column;
+  }
+  const _ref = column,
+    {
+      aggregationWrappedProperties
+    } = _ref,
+    unwrappedColumn = _objectWithoutPropertiesLoose(_ref, _excluded);
+  aggregationWrappedProperties.forEach(({
+    name,
+    originalValue,
+    wrappedValue
+  }) => {
+    // The value changed since we wrapped it
+    if (wrappedValue !== unwrappedColumn[name]) {
+      return;
+    }
+    unwrappedColumn[name] = originalValue;
+  });
+  return unwrappedColumn;
 };

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid-premium v6.18.2
+ * @mui/x-data-grid-premium v6.18.4
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/modern/utils/releaseInfo.js

@@ -1,6 +1,6 @@
 import { ponyfillGlobal } from '@mui/utils';
 export const getReleaseInfo = () => {
-  const releaseInfo = "MTcwMDY5MDQwMDAwMA==";
+  const releaseInfo = "MTcwMTk5MDAwMDAwMA==";
   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/node/hooks/features/aggregation/wrapColumnWithAggregation.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.wrapColumnWithAggregationValue = exports.unwrapColumnFromAggregation = void 0;
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var React = _interopRequireWildcard(require("react"));
 var _internals = require("@mui/x-data-grid-pro/internals");
@@ -12,6 +13,7 @@ var _gridAggregationSelectors = require("./gridAggregationSelectors");
 var _GridFooterCell = require("../../../components/GridFooterCell");
 var _GridAggregationHeader = require("../../../components/GridAggregationHeader");
 var _jsxRuntime = require("react/jsx-runtime");
+const _excluded = ["aggregationWrappedProperties"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const AGGREGATION_WRAPPABLE_PROPERTIES = ['valueGetter', 'valueFormatter', 'renderCell', 'renderHeader', 'filterOperators'];
@@ -95,7 +97,7 @@ const getWrappedFilterOperators = ({
 }) => filterOperators.map(operator => {
   const baseGetApplyFilterFn = operator.getApplyFilterFn;
   const baseGetApplyFilterFnV7 = operator.getApplyFilterFnV7;
-  const getApplyFilterFn = (0, _internals.tagInternalFilter)((filterItem, colDef) => {
+  let getApplyFilterFn = (filterItem, colDef) => {
     const filterFn = baseGetApplyFilterFn(filterItem, colDef);
     if (!filterFn) {
       return null;
@@ -106,19 +108,28 @@ const getWrappedFilterOperators = ({
       }
       return filterFn(params);
     };
-  });
-  const getApplyFilterFnV7 = baseGetApplyFilterFnV7 === undefined ? undefined : (0, _internals.tagInternalFilter)((filterItem, colDef) => {
-    const filterFn = baseGetApplyFilterFnV7(filterItem, colDef);
-    if (!filterFn) {
-      return null;
-    }
-    return (value, row, column, api) => {
-      if (getCellAggregationResult(apiRef.current.getRowId(row), column.field) != null) {
-        return true;
+  };
+  if ((0, _internals.isInternalFilter)(baseGetApplyFilterFn)) {
+    getApplyFilterFn = (0, _internals.tagInternalFilter)(getApplyFilterFn);
+  }
+  let getApplyFilterFnV7;
+  if (baseGetApplyFilterFnV7 !== undefined) {
+    getApplyFilterFnV7 = (0, _internals.tagInternalFilter)((filterItem, colDef) => {
+      const filterFn = baseGetApplyFilterFnV7(filterItem, colDef);
+      if (!filterFn) {
+        return null;
       }
-      return filterFn(value, row, column, api);
-    };
-  });
+      return (value, row, column, api) => {
+        if (getCellAggregationResult(apiRef.current.getRowId(row), column.field) != null) {
+          return true;
+        }
+        return filterFn(value, row, column, api);
+      };
+    });
+    if ((0, _internals.isInternalFilter)(baseGetApplyFilterFnV7)) {
+      getApplyFilterFnV7 = (0, _internals.tagInternalFilter)(getApplyFilterFnV7);
+    }
+  }
   return (0, _extends2.default)({}, operator, {
     getApplyFilterFn,
     getApplyFilterFnV7
@@ -173,7 +184,7 @@ const wrapColumnWithAggregationValue = ({
   };
   let didWrapSomeProperty = false;
   const wrappedColumn = (0, _extends2.default)({}, column, {
-    aggregationWrappedColumn: column
+    aggregationWrappedProperties: []
   });
   const wrapColumnProperty = (property, wrapper) => {
     const originalValue = column[property];
@@ -187,6 +198,11 @@ const wrapColumnWithAggregationValue = ({
     if (wrappedProperty !== originalValue) {
       didWrapSomeProperty = true;
       wrappedColumn[property] = wrappedProperty;
+      wrappedColumn.aggregationWrappedProperties.push({
+        name: property,
+        originalValue,
+        wrappedValue: wrappedProperty
+      });
     }
   };
   wrapColumnProperty('valueGetter', getAggregationValueWrappedValueGetter);
@@ -207,6 +223,25 @@ exports.wrapColumnWithAggregationValue = wrapColumnWithAggregationValue;
 const unwrapColumnFromAggregation = ({
   column
 }) => {
-  return column.aggregationWrappedColumn ?? column;
+  if (!column.aggregationWrappedProperties) {
+    return column;
+  }
+  const _ref = column,
+    {
+      aggregationWrappedProperties
+    } = _ref,
+    unwrappedColumn = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
+  aggregationWrappedProperties.forEach(({
+    name,
+    originalValue,
+    wrappedValue
+  }) => {
+    // The value changed since we wrapped it
+    if (wrappedValue !== unwrappedColumn[name]) {
+      return;
+    }
+    unwrappedColumn[name] = originalValue;
+  });
+  return unwrappedColumn;
 };
 exports.unwrapColumnFromAggregation = unwrapColumnFromAggregation;

package/node/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid-premium v6.18.2
+ * @mui/x-data-grid-premium v6.18.4
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/node/utils/releaseInfo.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getReleaseInfo = void 0;
 var _utils = require("@mui/utils");
 const getReleaseInfo = () => {
-  const releaseInfo = "MTcwMDY5MDQwMDAwMA==";
+  const releaseInfo = "MTcwMTk5MDAwMDAwMA==";
   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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid-premium",
-  "version": "6.18.2",
+  "version": "6.18.4",
   "description": "The Premium plan edition of the data grid component (MUI X).",
   "author": "MUI Team",
   "main": "./node/index.js",
@@ -33,8 +33,8 @@
   "dependencies": {
     "@babel/runtime": "^7.23.2",
     "@mui/utils": "^5.14.16",
-    "@mui/x-data-grid": "6.18.2",
-    "@mui/x-data-grid-pro": "6.18.2",
+    "@mui/x-data-grid": "6.18.4",
+    "@mui/x-data-grid-pro": "6.18.4",
     "@mui/x-license-pro": "6.10.2",
     "@types/format-util": "^1.0.3",
     "clsx": "^2.0.0",

package/utils/releaseInfo.js

@@ -1,6 +1,6 @@
 import { ponyfillGlobal } from '@mui/utils';
 export const getReleaseInfo = () => {
-  const releaseInfo = "MTcwMDY5MDQwMDAwMA==";
+  const releaseInfo = "MTcwMTk5MDAwMDAwMA==";
   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