@mui/x-data-grid-premium 6.0.0-beta.4 → 6.0.0

package/legacy/hooks/features/export/useGridExcelExport.js

@@ -1,10 +1,12 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+var _excluded = ["worker", "exceljsPostProcess", "exceljsPreProcess", "columnsStyles", "includeHeaders", "getRowsToExport", "valueOptionsSheetName"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import * as React from 'react';
-import { useGridApiMethod, useGridLogger } from '@mui/x-data-grid';
+import { useGridApiMethod, useGridLogger, useGridApiOptionHandler } from '@mui/x-data-grid';
 import { useGridRegisterPipeProcessor, exportAs, getColumnsToExport, defaultGetRowsToExport } from '@mui/x-data-grid/internals';
-import { buildExcel } from './serializer/excelSerializer';
+import { buildExcel, getDataForValueOptionsSheet, serializeColumns, serializeRow } from './serializer/excelSerializer';
 import { GridExcelExportMenuItem } from '../../../components';
 
 /**
@@ -15,7 +17,7 @@ import { GridExcelExportMenuItem } from '../../../components';
  * @requires useGridParamsApi (method)
  */
 import { jsx as _jsx } from "react/jsx-runtime";
-export var useGridExcelExport = function useGridExcelExport(apiRef) {
+export var useGridExcelExport = function useGridExcelExport(apiRef, props) {
   var logger = useGridLogger(apiRef, 'useGridExcelExport');
   var getDataAsExcel = React.useCallback(function () {
     var _options$getRowsToExp, _options$includeHeade, _options$includeColum;
@@ -40,43 +42,129 @@ export var useGridExcelExport = function useGridExcelExport(apiRef) {
       exceljsPostProcess: options == null ? void 0 : options.exceljsPostProcess
     }, apiRef.current);
   }, [logger, apiRef]);
-  var exportDataAsExcel = React.useCallback( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(options) {
-      var workbook, content, blob;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              logger.debug("Export data as excel");
-              _context.next = 3;
-              return getDataAsExcel(options);
-            case 3:
-              workbook = _context.sent;
-              if (!(workbook === null)) {
-                _context.next = 6;
-                break;
-              }
-              return _context.abrupt("return");
-            case 6:
-              _context.next = 8;
-              return workbook.xlsx.writeBuffer();
-            case 8:
-              content = _context.sent;
-              blob = new Blob([content], {
+  var exportDataAsExcel = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var options,
+      workerFn,
+      exceljsPostProcess,
+      exceljsPreProcess,
+      columnsStyles,
+      includeHeaders,
+      _options$getRowsToExp2,
+      getRowsToExport,
+      _options$valueOptions,
+      valueOptionsSheetName,
+      cloneableOptions,
+      sendExcelToUser,
+      workbook,
+      content,
+      worker,
+      exportedRowIds,
+      exportedColumns,
+      valueOptionsData,
+      serializedColumns,
+      serializedRows,
+      columnGroupPaths,
+      message,
+      _args2 = arguments;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            options = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+            workerFn = options.worker, exceljsPostProcess = options.exceljsPostProcess, exceljsPreProcess = options.exceljsPreProcess, columnsStyles = options.columnsStyles, includeHeaders = options.includeHeaders, _options$getRowsToExp2 = options.getRowsToExport, getRowsToExport = _options$getRowsToExp2 === void 0 ? defaultGetRowsToExport : _options$getRowsToExp2, _options$valueOptions = options.valueOptionsSheetName, valueOptionsSheetName = _options$valueOptions === void 0 ? 'Options' : _options$valueOptions, cloneableOptions = _objectWithoutProperties(options, _excluded);
+            sendExcelToUser = function sendExcelToUser(buffer) {
+              var blob = new Blob([buffer], {
                 type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
               });
               exportAs(blob, 'xlsx', options == null ? void 0 : options.fileName);
-            case 11:
-            case "end":
-              return _context.stop();
-          }
+            };
+            if (workerFn) {
+              _context2.next = 16;
+              break;
+            }
+            apiRef.current.publishEvent('excelExportStateChange', 'pending');
+            _context2.next = 7;
+            return getDataAsExcel(options);
+          case 7:
+            workbook = _context2.sent;
+            if (!(workbook === null)) {
+              _context2.next = 10;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 10:
+            _context2.next = 12;
+            return workbook.xlsx.writeBuffer();
+          case 12:
+            content = _context2.sent;
+            apiRef.current.publishEvent('excelExportStateChange', 'finished');
+            sendExcelToUser(content);
+            return _context2.abrupt("return");
+          case 16:
+            if (exceljsPostProcess && process.env.NODE_ENV !== 'production') {
+              console.warn(["MUI: The exceljsPostProcess option is not supported when a web worker is used.", 'As alternative, pass the callback to the same option in setupExcelExportWebWorker.'].join('\n'));
+            }
+            if (exceljsPreProcess && process.env.NODE_ENV !== 'production') {
+              console.warn(["MUI: The exceljsPreProcess option is not supported when a web worker is used.", 'As alternative, pass the callback to the same option in setupExcelExportWebWorker.'].join('\n'));
+            }
+            worker = workerFn();
+            apiRef.current.publishEvent('excelExportStateChange', 'pending');
+            worker.onmessage = /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(event) {
+                return _regeneratorRuntime.wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        sendExcelToUser(event.data);
+                        apiRef.current.publishEvent('excelExportStateChange', 'finished');
+                        worker.terminate();
+                      case 3:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee);
+              }));
+              return function (_x) {
+                return _ref2.apply(this, arguments);
+              };
+            }();
+            exportedRowIds = getRowsToExport({
+              apiRef: apiRef
+            });
+            exportedColumns = getColumnsToExport({
+              apiRef: apiRef,
+              options: options
+            });
+            _context2.next = 25;
+            return getDataForValueOptionsSheet(exportedColumns, valueOptionsSheetName, apiRef.current);
+          case 25:
+            valueOptionsData = _context2.sent;
+            serializedColumns = serializeColumns(exportedColumns, options.columnsStyles || {});
+            serializedRows = exportedRowIds.map(function (id) {
+              return serializeRow(id, exportedColumns, apiRef.current, valueOptionsData);
+            });
+            columnGroupPaths = exportedColumns.reduce(function (acc, column) {
+              acc[column.field] = apiRef.current.unstable_getColumnGroupPath(column.field);
+              return acc;
+            }, {});
+            message = {
+              serializedColumns: serializedColumns,
+              serializedRows: serializedRows,
+              valueOptionsData: valueOptionsData,
+              columnGroupPaths: columnGroupPaths,
+              columnGroupDetails: apiRef.current.unstable_getAllGroupDetails(),
+              options: cloneableOptions,
+              valueOptionsSheetName: valueOptionsSheetName
+            };
+            worker.postMessage(message);
+          case 31:
+          case "end":
+            return _context2.stop();
         }
-      }, _callee);
-    }));
-    return function (_x) {
-      return _ref.apply(this, arguments);
-    };
-  }(), [logger, getDataAsExcel]);
+      }
+    }, _callee2);
+  })), [apiRef, getDataAsExcel]);
   var excelExportApi = {
     getDataAsExcel: getDataAsExcel,
     exportDataAsExcel: exportDataAsExcel
@@ -99,4 +187,5 @@ export var useGridExcelExport = function useGridExcelExport(apiRef) {
     }]);
   }, []);
   useGridRegisterPipeProcessor(apiRef, 'exportMenu', addExportMenuButtons);
+  useGridApiOptionHandler(apiRef, 'excelExportStateChange', props.onExcelExportStateChange);
 };

package/legacy/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid-premium v6.0.0-beta.4
+ * @mui/x-data-grid-premium v6.0.0
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the
@@ -23,5 +23,6 @@ export * from './DataGridPremium';
 export * from './hooks';
 export * from './models';
 export * from './components';
+export { GridColumnHeaders } from '@mui/x-data-grid-pro';
 export { useGridApiContext, useGridApiRef, useGridRootProps } from './typeOverloads/reexports';
 export { GridColumnMenu, GRID_COLUMN_MENU_COMPONENTS, GRID_COLUMN_MENU_COMPONENTS_PROPS } from './components/reexports';

package/legacy/material/index.js

@@ -0,0 +1,9 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import { GridWorkspacesIcon, GridGroupWorkIcon, GridFunctionsIcon } from './icons';
+var iconsSlots = {
+  ColumnMenuUngroupIcon: GridWorkspacesIcon,
+  ColumnMenuGroupIcon: GridGroupWorkIcon,
+  ColumnMenuAggregationIcon: GridFunctionsIcon
+};
+var materialSlots = _extends({}, iconsSlots);
+export default materialSlots;

package/legacy/utils/releaseInfo.js

@@ -1,6 +1,6 @@
 import { ponyfillGlobal } from '@mui/utils';
 export var getReleaseInfo = function getReleaseInfo() {
-  var releaseInfo = "MTY3NjQ5ODQwMDAwMA==";
+  var releaseInfo = "MTY3Nzc5ODAwMDAwMA==";
   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/material/index.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+declare const materialSlots: {
+    ColumnMenuUngroupIcon: import("react").JSXElementConstructor<any>;
+    ColumnMenuGroupIcon: import("react").JSXElementConstructor<any>;
+    ColumnMenuAggregationIcon: import("react").JSXElementConstructor<any>;
+};
+export default materialSlots;

package/material/index.js

@@ -0,0 +1,9 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import { GridWorkspacesIcon, GridGroupWorkIcon, GridFunctionsIcon } from './icons';
+const iconsSlots = {
+  ColumnMenuUngroupIcon: GridWorkspacesIcon,
+  ColumnMenuGroupIcon: GridGroupWorkIcon,
+  ColumnMenuAggregationIcon: GridFunctionsIcon
+};
+const materialSlots = _extends({}, iconsSlots);
+export default materialSlots;

package/material/package.json

@@ -0,0 +1,6 @@
+{
+  "sideEffects": false,
+  "module": "./index.js",
+  "main": "../node/material/index.js",
+  "types": "./index.d.ts"
+}

package/models/dataGridPremiumProps.d.ts

@@ -3,7 +3,7 @@ import { GridCallbackDetails, GridValidRowModel, GridGroupNode } from '@mui/x-da
 import { GridExperimentalProFeatures, DataGridProPropsWithDefaultValue, DataGridProPropsWithoutDefaultValue, DataGridPropsWithComplexDefaultValueAfterProcessing, DataGridPropsWithComplexDefaultValueBeforeProcessing } from '@mui/x-data-grid-pro/internals';
 import type { GridRowGroupingModel } from '../hooks/features/rowGrouping';
 import type { GridAggregationModel, GridAggregationFunction, GridAggregationPosition } from '../hooks/features/aggregation';
-import { GridPremiumSlotsComponent } from './gridPremiumSlotsComponent';
+import { GridPremiumSlotsComponent, UncapitalizedGridPremiumSlotsComponent } from './gridPremiumSlotsComponent';
 import { GridInitialStatePremium } from './gridStatePremium';
 import { GridApiPremium } from './gridApiPremium';
 import { GridCellSelectionModel } from '../hooks/features/cellSelection';
@@ -12,8 +12,13 @@ export interface GridExperimentalPremiumFeatures extends GridExperimentalProFeat
 export interface DataGridPremiumPropsWithComplexDefaultValueBeforeProcessing extends Pick<DataGridPropsWithComplexDefaultValueBeforeProcessing, 'localeText'> {
     /**
      * Overrideable components.
+     * @deprecated Use the `slots` prop instead.
      */
     components?: Partial<GridPremiumSlotsComponent>;
+    /**
+     * Overrideable components.
+     */
+    slots?: Partial<UncapitalizedGridPremiumSlotsComponent>;
 }
 /**
  * The props users can give to the `DataGridPremiumProps` component.
@@ -26,12 +31,12 @@ export interface DataGridPremiumProps<R extends GridValidRowModel = any> extends
     experimentalFeatures?: Partial<GridExperimentalPremiumFeatures>;
 }
 export interface DataGridPremiumPropsWithComplexDefaultValueAfterProcessing extends Pick<DataGridPropsWithComplexDefaultValueAfterProcessing, 'localeText'> {
-    components: GridPremiumSlotsComponent;
+    slots: UncapitalizedGridPremiumSlotsComponent;
 }
 /**
  * The props of the `DataGridPremium` component after the pre-processing phase.
  */
-export interface DataGridPremiumProcessedProps extends DataGridPremiumPropsWithDefaultValue, DataGridPremiumPropsWithComplexDefaultValueAfterProcessing, DataGridPremiumPropsWithoutDefaultValue {
+export interface DataGridPremiumProcessedProps extends DataGridPremiumPropsWithDefaultValue, DataGridPremiumPropsWithComplexDefaultValueAfterProcessing, Omit<DataGridPremiumPropsWithoutDefaultValue, 'componentsProps'> {
 }
 export type DataGridPremiumForcedPropsKey = 'signature';
 /**
@@ -122,4 +127,9 @@ export interface DataGridPremiumPropsWithoutDefaultValue<R extends GridValidRowM
      * @param {GridCallbackDetails} details Additional details for this callback.
      */
     unstable_onCellSelectionModelChange?: (cellSelectionModel: GridCellSelectionModel, details: GridCallbackDetails) => void;
+    /**
+     * Callback fired when the state of the Excel export changes.
+     * @param {string} inProgress Indicates if the task is in progress.
+     */
+    onExcelExportStateChange?: (inProgress: 'pending' | 'finished') => void;
 }

package/models/gridPremiumSlotsComponent.d.ts

@@ -1,4 +1,5 @@
-import { GridProSlotsComponent } from '@mui/x-data-grid-pro';
+import { GridProSlotsComponent, UncapitalizedGridProSlotsComponent } from '@mui/x-data-grid-pro';
+import { UncapitalizeObjectKeys } from '@mui/x-data-grid-pro/internals';
 import { GridPremiumIconSlotsComponent } from './gridPremiumIconSlotsComponent';
 /**
  * Grid components React prop interface containing all the overridable components
@@ -6,3 +7,5 @@ import { GridPremiumIconSlotsComponent } from './gridPremiumIconSlotsComponent';
  */
 export interface GridPremiumSlotsComponent extends GridProSlotsComponent, GridPremiumIconSlotsComponent {
 }
+export interface UncapitalizedGridPremiumSlotsComponent extends UncapitalizedGridProSlotsComponent, UncapitalizeObjectKeys<GridPremiumIconSlotsComponent> {
+}

package/modern/DataGridPremium/DataGridPremium.js

@@ -2,8 +2,8 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useLicenseVerifier, Watermark } from '@mui/x-license-pro';
 import { chainPropTypes } from '@mui/utils';
-import { GridBody, GridFooterPlaceholder, GridHeader, GridRoot, GridContextProvider } from '@mui/x-data-grid-pro';
-import { DataGridProVirtualScroller, DataGridProColumnHeaders } from '@mui/x-data-grid-pro/internals';
+import { GridBody, GridFooterPlaceholder, GridHeader, GridRoot, GridContextProvider, useGridSelector, gridPinnedColumnsSelector } from '@mui/x-data-grid-pro';
+import { DataGridProVirtualScroller } from '@mui/x-data-grid-pro/internals';
 import { useDataGridPremiumComponent } from './useDataGridPremiumComponent';
 import { useDataGridPremiumProps } from './useDataGridPremiumProps';
 import { getReleaseInfo } from '../utils/releaseInfo';
@@ -14,6 +14,7 @@ const DataGridPremiumRaw = /*#__PURE__*/React.forwardRef(function DataGridPremiu
   const props = useDataGridPremiumProps(inProps);
   const privateApiRef = useDataGridPremiumComponent(props.apiRef, props);
   useLicenseVerifier('x-data-grid-premium', releaseInfo);
+  const pinnedColumns = useGridSelector(privateApiRef, gridPinnedColumnsSelector);
   return /*#__PURE__*/_jsx(GridContextProvider, {
     privateApiRef: privateApiRef,
     props: props,
@@ -23,8 +24,10 @@ const DataGridPremiumRaw = /*#__PURE__*/React.forwardRef(function DataGridPremiu
       sx: props.sx,
       ref: ref,
       children: [/*#__PURE__*/_jsx(GridHeader, {}), /*#__PURE__*/_jsx(GridBody, {
-        ColumnHeadersComponent: DataGridProColumnHeaders,
         VirtualScrollerComponent: DataGridProVirtualScroller,
+        ColumnHeadersProps: {
+          pinnedColumns
+        },
         children: /*#__PURE__*/_jsx(Watermark, {
           packageName: "x-data-grid-premium",
           releaseInfo: releaseInfo
@@ -130,10 +133,12 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
   columnVisibilityModel: PropTypes.object,
   /**
    * Overrideable components.
+   * @deprecated Use the `slots` prop instead.
    */
   components: PropTypes.object,
   /**
    * Overrideable components props dynamically passed to the component at rendering.
+   * @deprecated Use the `slotProps` prop instead.
    */
   componentsProps: PropTypes.object,
   /**
@@ -243,7 +248,6 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
   experimentalFeatures: PropTypes.shape({
     columnGrouping: PropTypes.bool,
     lazyLoading: PropTypes.bool,
-    rowPinning: PropTypes.bool,
     warnIfFocusStateIsNotSynced: PropTypes.bool
   }),
   /**
@@ -552,6 +556,11 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    * @param {GridCallbackDetails} details Additional details for this callback.
    */
   onDetailPanelExpandedRowIdsChange: PropTypes.func,
+  /**
+   * Callback fired when the state of the Excel export changes.
+   * @param {string} inProgress Indicates if the task is in progress.
+   */
+  onExcelExportStateChange: PropTypes.func,
   /**
    * Callback fired when rowCount is set and the next batch of virtualized rows is rendered.
    * @param {GridFetchRowsParams} params With all properties from [[GridFetchRowsParams]].
@@ -825,6 +834,14 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    * @default false
    */
   showColumnVerticalBorder: PropTypes.bool,
+  /**
+   * Overrideable components props dynamically passed to the component at rendering.
+   */
+  slotProps: PropTypes.object,
+  /**
+   * Overrideable components.
+   */
+  slots: PropTypes.object,
   /**
    * Sorting can be processed on the server or client-side.
    * Set it to 'client' if you would like to handle sorting on the client-side.

package/modern/DataGridPremium/useDataGridPremiumComponent.js

@@ -80,7 +80,7 @@ export const useDataGridPremiumComponent = (inputApiRef, props) => {
   useGridColumnMenu(privateApiRef);
   useGridCsvExport(privateApiRef);
   useGridPrintExport(privateApiRef, props);
-  useGridExcelExport(privateApiRef);
+  useGridExcelExport(privateApiRef, props);
   useGridClipboard(privateApiRef);
   useGridDimensions(privateApiRef, props);
   useGridEvents(privateApiRef, props);

package/modern/DataGridPremium/useDataGridPremiumProps.js

@@ -1,7 +1,10 @@
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
+const _excluded = ["components", "componentsProps"];
 import * as React from 'react';
 import { useThemeProps } from '@mui/material/styles';
 import { DATA_GRID_PRO_PROPS_DEFAULT_VALUES, GRID_DEFAULT_LOCALE_TEXT } from '@mui/x-data-grid-pro';
+import { computeSlots, uncapitalizeObjectKeys } from '@mui/x-data-grid-pro/internals';
 import { GRID_AGGREGATION_FUNCTIONS } from '../hooks/features/aggregation';
 import { DATA_GRID_PREMIUM_DEFAULT_SLOTS_COMPONENTS } from '../constants/dataGridPremiumDefaultSlotsComponents';
 
@@ -17,26 +20,27 @@ export const DATA_GRID_PREMIUM_PROPS_DEFAULT_VALUES = _extends({}, DATA_GRID_PRO
   aggregationRowsScope: 'filtered',
   getAggregationPosition: groupNode => groupNode.depth === -1 ? 'footer' : 'inline'
 });
+const defaultSlots = uncapitalizeObjectKeys(DATA_GRID_PREMIUM_DEFAULT_SLOTS_COMPONENTS);
 export const useDataGridPremiumProps = inProps => {
-  const themedProps = useThemeProps({
-    props: inProps,
-    name: 'MuiDataGrid'
-  });
+  const _useThemeProps = useThemeProps({
+      props: inProps,
+      name: 'MuiDataGrid'
+    }),
+    {
+      components,
+      componentsProps
+    } = _useThemeProps,
+    themedProps = _objectWithoutPropertiesLoose(_useThemeProps, _excluded);
   const localeText = React.useMemo(() => _extends({}, GRID_DEFAULT_LOCALE_TEXT, themedProps.localeText), [themedProps.localeText]);
-  const components = React.useMemo(() => {
-    const overrides = themedProps.components;
-    if (!overrides) {
-      return _extends({}, DATA_GRID_PREMIUM_DEFAULT_SLOTS_COMPONENTS);
-    }
-    const mergedComponents = {};
-    Object.entries(DATA_GRID_PREMIUM_DEFAULT_SLOTS_COMPONENTS).forEach(([key, defaultComponent]) => {
-      mergedComponents[key] = overrides[key] === undefined ? defaultComponent : overrides[key];
-    });
-    return mergedComponents;
-  }, [themedProps.components]);
+  const slots = React.useMemo(() => computeSlots({
+    defaultSlots,
+    components,
+    slots: themedProps.slots
+  }), [components, themedProps.slots]);
   return React.useMemo(() => _extends({}, DATA_GRID_PREMIUM_PROPS_DEFAULT_VALUES, themedProps, {
+    slotProps: themedProps.slotProps ?? componentsProps,
     localeText,
-    components,
+    slots,
     signature: 'DataGridPremium'
-  }), [themedProps, localeText, components]);
+  }), [themedProps, componentsProps, localeText, slots]);
 };

package/modern/components/GridAggregationHeader.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { unstable_composeClasses as composeClasses } from '@mui/utils';
 import Box from '@mui/material/Box';
@@ -56,10 +57,10 @@ function GridAggregationHeader(props) {
   } = props;
   const apiRef = useGridApiContext();
   const rootProps = useGridRootProps();
-  const ownerState = {
+  const ownerState = _extends({}, rootProps, {
     classes: rootProps.classes,
     colDef
-  };
+  });
   const classes = useUtilityClasses(ownerState);
   if (!aggregation) {
     return null;

package/modern/components/GridColumnMenuAggregationItem.js

@@ -58,7 +58,7 @@ function GridColumnMenuAggregationItem(props) {
   return /*#__PURE__*/_jsxs(MenuItem, {
     disableRipple: true,
     children: [/*#__PURE__*/_jsx(ListItemIcon, {
-      children: /*#__PURE__*/_jsx(rootProps.components.ColumnMenuAggregationIcon, {
+      children: /*#__PURE__*/_jsx(rootProps.slots.columnMenuAggregationIcon, {
         fontSize: "small"
       })
     }), /*#__PURE__*/_jsx(ListItemText, {

package/modern/components/GridColumnMenuRowGroupItem.js

@@ -28,7 +28,7 @@ function GridColumnMenuRowGroupItem(props) {
     return /*#__PURE__*/_jsxs(MenuItem, {
       onClick: ungroupColumn,
       children: [/*#__PURE__*/_jsx(ListItemIcon, {
-        children: /*#__PURE__*/_jsx(rootProps.components.ColumnMenuUngroupIcon, {
+        children: /*#__PURE__*/_jsx(rootProps.slots.columnMenuUngroupIcon, {
           fontSize: "small"
         })
       }), /*#__PURE__*/_jsx(ListItemText, {

package/modern/components/GridColumnMenuRowUngroupItem.js

@@ -34,7 +34,7 @@ function GridColumnMenuRowUngroupItem(props) {
     return /*#__PURE__*/_jsxs(MenuItem, {
       onClick: ungroupColumn,
       children: [/*#__PURE__*/_jsx(ListItemIcon, {
-        children: /*#__PURE__*/_jsx(rootProps.components.ColumnMenuUngroupIcon, {
+        children: /*#__PURE__*/_jsx(rootProps.slots.columnMenuUngroupIcon, {
           fontSize: "small"
         })
       }), /*#__PURE__*/_jsx(ListItemText, {
@@ -45,7 +45,7 @@ function GridColumnMenuRowUngroupItem(props) {
   return /*#__PURE__*/_jsxs(MenuItem, {
     onClick: groupColumn,
     children: [/*#__PURE__*/_jsx(ListItemIcon, {
-      children: /*#__PURE__*/_jsx(rootProps.components.ColumnMenuGroupIcon, {
+      children: /*#__PURE__*/_jsx(rootProps.slots.columnMenuGroupIcon, {
         fontSize: "small"
       })
     }), /*#__PURE__*/_jsx(ListItemText, {

package/modern/components/GridExcelExportMenuItem.js

@@ -39,7 +39,8 @@ process.env.NODE_ENV !== "production" ? GridExcelExportMenuItem.propTypes = {
     getRowsToExport: PropTypes.func,
     includeColumnGroupsHeaders: PropTypes.bool,
     includeHeaders: PropTypes.bool,
-    valueOptionsSheetName: PropTypes.string
+    valueOptionsSheetName: PropTypes.string,
+    worker: PropTypes.func
   })
 } : void 0;
 export { GridExcelExportMenuItem };

package/modern/components/GridFooterCell.js

@@ -33,9 +33,7 @@ function GridFooterCell(props) {
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const rootProps = useGridRootProps();
-  const ownerState = {
-    classes: rootProps.classes
-  };
+  const ownerState = rootProps;
   const classes = useUtilityClasses(ownerState);
   return /*#__PURE__*/_jsx(GridFooterCellRoot, _extends({
     ownerState: ownerState,

package/modern/components/GridGroupingCriteriaCell.js

@@ -33,7 +33,7 @@ export function GridGroupingCriteriaCell(props) {
   const classes = useUtilityClasses(ownerState);
   const filteredDescendantCountLookup = useGridSelector(apiRef, gridFilteredDescendantCountLookupSelector);
   const filteredDescendantCount = filteredDescendantCountLookup[rowNode.id] ?? 0;
-  const Icon = rowNode.childrenExpanded ? rootProps.components.GroupingCriteriaCollapseIcon : rootProps.components.GroupingCriteriaExpandIcon;
+  const Icon = rowNode.childrenExpanded ? rootProps.slots.groupingCriteriaCollapseIcon : rootProps.slots.groupingCriteriaExpandIcon;
   const handleKeyDown = event => {
     if (event.key === ' ') {
       // We call event.stopPropagation to avoid unfolding the row and also scrolling to bottom
@@ -68,13 +68,13 @@ export function GridGroupingCriteriaCell(props) {
     },
     children: [/*#__PURE__*/_jsx("div", {
       className: classes.toggle,
-      children: filteredDescendantCount > 0 && /*#__PURE__*/_jsx(rootProps.components.BaseIconButton, _extends({
+      children: filteredDescendantCount > 0 && /*#__PURE__*/_jsx(rootProps.slots.baseIconButton, _extends({
         size: "small",
         onClick: handleClick,
         onKeyDown: handleKeyDown,
         tabIndex: -1,
         "aria-label": rowNode.childrenExpanded ? apiRef.current.getLocaleText('treeDataCollapse') : apiRef.current.getLocaleText('treeDataExpand')
-      }, rootProps.componentsProps?.baseIconButton, {
+      }, rootProps.slotProps?.baseIconButton, {
         children: /*#__PURE__*/_jsx(Icon, {
           fontSize: "inherit"
         })

package/modern/components/index.js

@@ -1,4 +1,4 @@
 export * from './GridExcelExportMenuItem';
-export * from './icons';
+export * from '../material/icons';
 export * from './GridColumnMenuAggregationItem';
 export { GridColumnMenuGroupingItem } from './GridPremiumColumnMenu';

package/modern/constants/dataGridPremiumDefaultSlotsComponents.js

@@ -1,12 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import { DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS } from '@mui/x-data-grid-pro/internals';
-import { GridWorkspacesIcon, GridGroupWorkIcon, GridFunctionsIcon } from '../components';
 import { GridPremiumColumnMenu } from '../components/GridPremiumColumnMenu';
-export const DEFAULT_GRID_PREMIUM_ICON_SLOTS_COMPONENTS = {
-  ColumnMenuUngroupIcon: GridWorkspacesIcon,
-  ColumnMenuGroupIcon: GridGroupWorkIcon,
-  ColumnMenuAggregationIcon: GridFunctionsIcon
-};
-export const DATA_GRID_PREMIUM_DEFAULT_SLOTS_COMPONENTS = _extends({}, DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS, DEFAULT_GRID_PREMIUM_ICON_SLOTS_COMPONENTS, {
+import materialSlots from '../material';
+export const DATA_GRID_PREMIUM_DEFAULT_SLOTS_COMPONENTS = _extends({}, DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS, materialSlots, {
   ColumnMenu: GridPremiumColumnMenu
 });

package/modern/hooks/features/export/index.js

@@ -1 +1,2 @@
-export * from './gridExcelExportInterface';
+export * from './gridExcelExportInterface';
+export { setupExcelExportWebWorker } from './serializer/excelSerializer';