@mui/x-data-grid-pro 6.18.1 → 7.0.0-alpha.1

package/hooks/features/columnResize/useGridColumnResize.js

@@ -144,13 +144,16 @@ function extractColumnWidths(apiRef, options, columns) {
     if (options.includeHeaders) {
       const header = findGridHeader(apiRef.current, column.field);
       if (header) {
+        var _iconContainer$client, _menuContainer$client;
         const title = header.querySelector(`.${gridClasses.columnHeaderTitle}`);
         const content = header.querySelector(`.${gridClasses.columnHeaderTitleContainerContent}`);
+        const iconContainer = header.querySelector(`.${gridClasses.iconButtonContainer}`);
+        const menuContainer = header.querySelector(`.${gridClasses.menuIcon}`);
         const element = title != null ? title : content;
         const style = window.getComputedStyle(header, null);
         const paddingWidth = parseInt(style.paddingLeft, 10) + parseInt(style.paddingRight, 10);
         const contentWidth = element.scrollWidth + 1;
-        const width = paddingWidth + contentWidth;
+        const width = contentWidth + paddingWidth + ((_iconContainer$client = iconContainer == null ? void 0 : iconContainer.clientWidth) != null ? _iconContainer$client : 0) + ((_menuContainer$client = menuContainer == null ? void 0 : menuContainer.clientWidth) != null ? _menuContainer$client : 0);
         filteredWidths.push(width);
       }
     }

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid-pro v6.18.1
+ * @mui/x-data-grid-pro v7.0.0-alpha.1
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/legacy/DataGridPro/DataGridPro.js

@@ -145,16 +145,6 @@ DataGridProRaw.propTypes = {
    * If defined, the grid will ignore the `hide` property in [[GridColDef]].
    */
   columnVisibilityModel: PropTypes.object,
-  /**
-   * Overridable components.
-   * @deprecated Use the `slots` prop instead.
-   */
-  components: PropTypes.object,
-  /**
-   * Overridable components props dynamically passed to the component at rendering.
-   * @deprecated Use the `slotProps` prop instead.
-   */
-  componentsProps: PropTypes.object,
   /**
    * If above 0, the row children will be expanded up to this depth.
    * If equal to -1, all the row children will be expanded.

package/legacy/DataGridPro/useDataGridProProps.js

@@ -1,9 +1,8 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { useThemeProps } from '@mui/material/styles';
 import { GRID_DEFAULT_LOCALE_TEXT, DATA_GRID_PROPS_DEFAULT_VALUES } from '@mui/x-data-grid';
-import { computeSlots, uncapitalizeObjectKeys, useProps } from '@mui/x-data-grid/internals';
+import { computeSlots, useProps } from '@mui/x-data-grid/internals';
 import { DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS } from '../constants/dataGridProDefaultSlotsComponents';
 
 /**
@@ -26,33 +25,26 @@ export var DATA_GRID_PRO_PROPS_DEFAULT_VALUES = _extends({}, DATA_GRID_PROPS_DEF
   },
   unstable_headerFilters: false
 });
-var defaultSlots = uncapitalizeObjectKeys(DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS);
+var defaultSlots = DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS;
 export var useDataGridProProps = function useDataGridProProps(inProps) {
-  var _useProps = useProps(useThemeProps({
-      props: inProps,
-      name: 'MuiDataGrid'
-    })),
-    _useProps2 = _slicedToArray(_useProps, 3),
-    components = _useProps2[0],
-    componentsProps = _useProps2[1],
-    themedProps = _useProps2[2];
+  var themedProps = useProps(useThemeProps({
+    props: inProps,
+    name: 'MuiDataGrid'
+  }));
   var localeText = React.useMemo(function () {
     return _extends({}, GRID_DEFAULT_LOCALE_TEXT, themedProps.localeText);
   }, [themedProps.localeText]);
   var slots = React.useMemo(function () {
     return computeSlots({
       defaultSlots: defaultSlots,
-      slots: themedProps.slots,
-      components: components
+      slots: themedProps.slots
     });
-  }, [components, themedProps.slots]);
+  }, [themedProps.slots]);
   return React.useMemo(function () {
-    var _themedProps$slotProp;
     return _extends({}, DATA_GRID_PRO_PROPS_DEFAULT_VALUES, themedProps, {
       localeText: localeText,
       slots: slots,
-      slotProps: (_themedProps$slotProp = themedProps.slotProps) != null ? _themedProps$slotProp : componentsProps,
       signature: 'DataGridPro'
     });
-  }, [themedProps, localeText, slots, componentsProps]);
+  }, [themedProps, localeText, slots]);
 };

package/legacy/components/headerFiltering/GridHeaderFilterCell.js

@@ -224,7 +224,6 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterCell.propTypes = {
   colIndex: PropTypes.number.isRequired,
   filterOperators: PropTypes.arrayOf(PropTypes.shape({
     getApplyFilterFn: PropTypes.func.isRequired,
-    getApplyFilterFnV7: PropTypes.func,
     getValueAsString: PropTypes.func,
     headerLabel: PropTypes.string,
     InputComponent: PropTypes.elementType,

package/legacy/components/headerFiltering/GridHeaderFilterMenu.js

@@ -75,7 +75,6 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterMenu.propTypes = {
   open: PropTypes.bool.isRequired,
   operators: PropTypes.arrayOf(PropTypes.shape({
     getApplyFilterFn: PropTypes.func.isRequired,
-    getApplyFilterFnV7: PropTypes.func,
     getValueAsString: PropTypes.func,
     headerLabel: PropTypes.string,
     InputComponent: PropTypes.elementType,

package/legacy/components/headerFiltering/GridHeaderFilterMenuContainer.js

@@ -81,7 +81,6 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterMenuContainer.propTypes
   }).isRequired,
   operators: PropTypes.arrayOf(PropTypes.shape({
     getApplyFilterFn: PropTypes.func.isRequired,
-    getApplyFilterFnV7: PropTypes.func,
     getValueAsString: PropTypes.func,
     headerLabel: PropTypes.string,
     InputComponent: PropTypes.elementType,

package/legacy/constants/dataGridProDefaultSlotsComponents.js

@@ -6,8 +6,8 @@ import { GridHeaderFilterMenu } from '../components/headerFiltering/GridHeaderFi
 import { GridHeaderFilterCell } from '../components/headerFiltering/GridHeaderFilterCell';
 import materialSlots from '../material';
 export var DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS = _extends({}, DATA_GRID_DEFAULT_SLOTS_COMPONENTS, materialSlots, {
-  ColumnMenu: GridProColumnMenu,
-  ColumnHeaders: GridColumnHeaders,
-  HeaderFilterCell: GridHeaderFilterCell,
-  HeaderFilterMenu: GridHeaderFilterMenu
+  columnMenu: GridProColumnMenu,
+  columnHeaders: GridColumnHeaders,
+  headerFilterCell: GridHeaderFilterCell,
+  headerFilterMenu: GridHeaderFilterMenu
 });

package/legacy/hooks/features/columnResize/useGridColumnResize.js

@@ -153,13 +153,16 @@ function extractColumnWidths(apiRef, options, columns) {
     if (options.includeHeaders) {
       var header = findGridHeader(apiRef.current, column.field);
       if (header) {
+        var _iconContainer$client, _menuContainer$client;
         var title = header.querySelector(".".concat(gridClasses.columnHeaderTitle));
         var content = header.querySelector(".".concat(gridClasses.columnHeaderTitleContainerContent));
+        var iconContainer = header.querySelector(".".concat(gridClasses.iconButtonContainer));
+        var menuContainer = header.querySelector(".".concat(gridClasses.menuIcon));
         var element = title != null ? title : content;
         var style = window.getComputedStyle(header, null);
         var paddingWidth = parseInt(style.paddingLeft, 10) + parseInt(style.paddingRight, 10);
         var contentWidth = element.scrollWidth + 1;
-        var width = paddingWidth + contentWidth;
+        var width = contentWidth + paddingWidth + ((_iconContainer$client = iconContainer == null ? void 0 : iconContainer.clientWidth) != null ? _iconContainer$client : 0) + ((_menuContainer$client = menuContainer == null ? void 0 : menuContainer.clientWidth) != null ? _menuContainer$client : 0);
         filteredWidths.push(width);
       }
     }

package/legacy/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid-pro v6.18.1
+ * @mui/x-data-grid-pro v7.0.0-alpha.1
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/legacy/material/index.js

@@ -1,8 +1,8 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import { GridPushPinRightIcon, GridPushPinLeftIcon } from './icons';
 var iconSlots = {
-  ColumnMenuPinRightIcon: GridPushPinRightIcon,
-  ColumnMenuPinLeftIcon: GridPushPinLeftIcon
+  columnMenuPinRightIcon: GridPushPinRightIcon,
+  columnMenuPinLeftIcon: GridPushPinLeftIcon
 };
 var materialSlots = _extends({}, iconSlots);
 export default materialSlots;

package/legacy/utils/releaseInfo.js

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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 declare const materialSlots: {
-    ColumnMenuPinLeftIcon: import("react").JSXElementConstructor<any>;
-    ColumnMenuPinRightIcon: import("react").JSXElementConstructor<any>;
+    columnMenuPinLeftIcon: import("react").JSXElementConstructor<any>;
+    columnMenuPinRightIcon: import("react").JSXElementConstructor<any>;
 };
 export default materialSlots;

package/material/index.js

@@ -1,8 +1,8 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import { GridPushPinRightIcon, GridPushPinLeftIcon } from './icons';
 const iconSlots = {
-  ColumnMenuPinRightIcon: GridPushPinRightIcon,
-  ColumnMenuPinLeftIcon: GridPushPinLeftIcon
+  columnMenuPinRightIcon: GridPushPinRightIcon,
+  columnMenuPinLeftIcon: GridPushPinLeftIcon
 };
 const materialSlots = _extends({}, iconSlots);
 export default materialSlots;

package/models/dataGridProProps.d.ts

@@ -6,7 +6,7 @@ import type { GridPinnedRowsProp } from '../hooks/features/rowPinning';
 import { GridApiPro } from './gridApiPro';
 import { GridGroupingColDefOverride, GridGroupingColDefOverrideParams } from './gridGroupingColDefOverride';
 import { GridInitialStatePro } from './gridStatePro';
-import { GridProSlotsComponent, UncapitalizedGridProSlotsComponent } from './gridProSlotsComponent';
+import { GridProSlotsComponent } from './gridProSlotsComponent';
 import type { GridProSlotProps } from './gridProSlotProps';
 import { GridAutosizeOptions } from '../hooks';
 export interface GridExperimentalProFeatures extends GridExperimentalFeatures {
@@ -18,13 +18,8 @@ export interface GridExperimentalProFeatures extends GridExperimentalFeatures {
 interface DataGridProPropsWithComplexDefaultValueBeforeProcessing extends Omit<DataGridPropsWithComplexDefaultValueBeforeProcessing, 'components'> {
     /**
      * Overridable components.
-     * @deprecated Use the `slots` prop instead.
      */
-    components?: Partial<GridProSlotsComponent>;
-    /**
-     * Overridable components.
-     */
-    slots?: Partial<UncapitalizedGridProSlotsComponent>;
+    slots?: Partial<GridProSlotsComponent>;
 }
 /**
  * The props users can give to the `DataGridProProps` component.
@@ -32,7 +27,7 @@ interface DataGridProPropsWithComplexDefaultValueBeforeProcessing extends Omit<D
 export interface DataGridProProps<R extends GridValidRowModel = any> extends Omit<Partial<DataGridProPropsWithDefaultValue> & DataGridProPropsWithComplexDefaultValueBeforeProcessing & DataGridProPropsWithoutDefaultValue<R>, DataGridProForcedPropsKey> {
 }
 interface DataGridProPropsWithComplexDefaultValueAfterProcessing extends Omit<DataGridPropsWithComplexDefaultValueAfterProcessing, 'slots'> {
-    slots: UncapitalizedGridProSlotsComponent;
+    slots: GridProSlotsComponent;
 }
 /**
  * The props of the `DataGridPro` component after the pre-processing phase.
@@ -227,10 +222,5 @@ export interface DataGridProPropsWithoutDefaultValue<R extends GridValidRowModel
      * Overridable components props dynamically passed to the component at rendering.
      */
     slotProps?: GridProSlotProps;
-    /**
-     * Overridable components props dynamically passed to the component at rendering.
-     * @deprecated Use the `slotProps` prop instead.
-     */
-    componentsProps?: GridProSlotProps;
 }
 export {};

package/models/gridProIconSlotsComponent.d.ts

@@ -4,10 +4,10 @@ export interface GridProIconSlotsComponent {
      * Icon displayed in column menu for left pinning
      * @default GridPushPinLeftIcon
      */
-    ColumnMenuPinLeftIcon: React.JSXElementConstructor<any>;
+    columnMenuPinLeftIcon: React.JSXElementConstructor<any>;
     /**
      * Icon displayed in column menu for right pinning
      * @default GridPushPinRightIcon
      */
-    ColumnMenuPinRightIcon: React.JSXElementConstructor<any>;
+    columnMenuPinRightIcon: React.JSXElementConstructor<any>;
 }

package/models/gridProSlotsComponent.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="react" />
 import { GridSlotsComponent } from '@mui/x-data-grid';
-import { UncapitalizeObjectKeys } from '@mui/x-data-grid/internals';
 import { GridProIconSlotsComponent } from './gridProIconSlotsComponent';
 /**
  * Grid components React prop interface containing all the overridable components
@@ -11,12 +10,10 @@ export interface GridProSlotsComponent extends GridSlotsComponent, GridProIconSl
      * Component responsible for showing menu adornment in Header filter row
      * @default GridHeaderFilterCell
      */
-    HeaderFilterCell: React.JSXElementConstructor<any>;
+    headerFilterCell: React.JSXElementConstructor<any>;
     /**
      * Component responsible for showing menu in Header filter row
      * @default GridHeaderFilterMenu
      */
-    HeaderFilterMenu: React.JSXElementConstructor<any> | null;
-}
-export interface UncapitalizedGridProSlotsComponent extends UncapitalizeObjectKeys<GridProSlotsComponent> {
+    headerFilterMenu: React.JSXElementConstructor<any> | null;
 }

package/modern/DataGridPro/DataGridPro.js

@@ -145,16 +145,6 @@ DataGridProRaw.propTypes = {
    * If defined, the grid will ignore the `hide` property in [[GridColDef]].
    */
   columnVisibilityModel: PropTypes.object,
-  /**
-   * Overridable components.
-   * @deprecated Use the `slots` prop instead.
-   */
-  components: PropTypes.object,
-  /**
-   * Overridable components props dynamically passed to the component at rendering.
-   * @deprecated Use the `slotProps` prop instead.
-   */
-  componentsProps: PropTypes.object,
   /**
    * If above 0, the row children will be expanded up to this depth.
    * If equal to -1, all the row children will be expanded.

package/modern/DataGridPro/useDataGridProProps.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { useThemeProps } from '@mui/material/styles';
 import { GRID_DEFAULT_LOCALE_TEXT, DATA_GRID_PROPS_DEFAULT_VALUES } from '@mui/x-data-grid';
-import { computeSlots, uncapitalizeObjectKeys, useProps } from '@mui/x-data-grid/internals';
+import { computeSlots, useProps } from '@mui/x-data-grid/internals';
 import { DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS } from '../constants/dataGridProDefaultSlotsComponents';
 
 /**
@@ -23,22 +23,20 @@ export const DATA_GRID_PRO_PROPS_DEFAULT_VALUES = _extends({}, DATA_GRID_PROPS_D
   getDetailPanelHeight: () => 500,
   unstable_headerFilters: false
 });
-const defaultSlots = uncapitalizeObjectKeys(DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS);
+const defaultSlots = DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS;
 export const useDataGridProProps = inProps => {
-  const [components, componentsProps, themedProps] = useProps(useThemeProps({
+  const themedProps = useProps(useThemeProps({
     props: inProps,
     name: 'MuiDataGrid'
   }));
   const localeText = React.useMemo(() => _extends({}, GRID_DEFAULT_LOCALE_TEXT, themedProps.localeText), [themedProps.localeText]);
   const slots = React.useMemo(() => computeSlots({
     defaultSlots,
-    slots: themedProps.slots,
-    components
-  }), [components, themedProps.slots]);
+    slots: themedProps.slots
+  }), [themedProps.slots]);
   return React.useMemo(() => _extends({}, DATA_GRID_PRO_PROPS_DEFAULT_VALUES, themedProps, {
     localeText,
     slots,
-    slotProps: themedProps.slotProps ?? componentsProps,
     signature: 'DataGridPro'
-  }), [themedProps, localeText, slots, componentsProps]);
+  }), [themedProps, localeText, slots]);
 };

package/modern/components/headerFiltering/GridHeaderFilterCell.js

@@ -216,7 +216,6 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterCell.propTypes = {
   colIndex: PropTypes.number.isRequired,
   filterOperators: PropTypes.arrayOf(PropTypes.shape({
     getApplyFilterFn: PropTypes.func.isRequired,
-    getApplyFilterFnV7: PropTypes.func,
     getValueAsString: PropTypes.func,
     headerLabel: PropTypes.string,
     InputComponent: PropTypes.elementType,

package/modern/components/headerFiltering/GridHeaderFilterMenu.js

@@ -75,7 +75,6 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterMenu.propTypes = {
   open: PropTypes.bool.isRequired,
   operators: PropTypes.arrayOf(PropTypes.shape({
     getApplyFilterFn: PropTypes.func.isRequired,
-    getApplyFilterFnV7: PropTypes.func,
     getValueAsString: PropTypes.func,
     headerLabel: PropTypes.string,
     InputComponent: PropTypes.elementType,

package/modern/components/headerFiltering/GridHeaderFilterMenuContainer.js

@@ -82,7 +82,6 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterMenuContainer.propTypes
   }).isRequired,
   operators: PropTypes.arrayOf(PropTypes.shape({
     getApplyFilterFn: PropTypes.func.isRequired,
-    getApplyFilterFnV7: PropTypes.func,
     getValueAsString: PropTypes.func,
     headerLabel: PropTypes.string,
     InputComponent: PropTypes.elementType,

package/modern/constants/dataGridProDefaultSlotsComponents.js

@@ -6,8 +6,8 @@ import { GridHeaderFilterMenu } from '../components/headerFiltering/GridHeaderFi
 import { GridHeaderFilterCell } from '../components/headerFiltering/GridHeaderFilterCell';
 import materialSlots from '../material';
 export const DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS = _extends({}, DATA_GRID_DEFAULT_SLOTS_COMPONENTS, materialSlots, {
-  ColumnMenu: GridProColumnMenu,
-  ColumnHeaders: GridColumnHeaders,
-  HeaderFilterCell: GridHeaderFilterCell,
-  HeaderFilterMenu: GridHeaderFilterMenu
+  columnMenu: GridProColumnMenu,
+  columnHeaders: GridColumnHeaders,
+  headerFilterCell: GridHeaderFilterCell,
+  headerFilterMenu: GridHeaderFilterMenu
 });

package/modern/hooks/features/columnResize/useGridColumnResize.js

@@ -145,11 +145,13 @@ function extractColumnWidths(apiRef, options, columns) {
       if (header) {
         const title = header.querySelector(`.${gridClasses.columnHeaderTitle}`);
         const content = header.querySelector(`.${gridClasses.columnHeaderTitleContainerContent}`);
+        const iconContainer = header.querySelector(`.${gridClasses.iconButtonContainer}`);
+        const menuContainer = header.querySelector(`.${gridClasses.menuIcon}`);
         const element = title ?? content;
         const style = window.getComputedStyle(header, null);
         const paddingWidth = parseInt(style.paddingLeft, 10) + parseInt(style.paddingRight, 10);
         const contentWidth = element.scrollWidth + 1;
-        const width = paddingWidth + contentWidth;
+        const width = contentWidth + paddingWidth + (iconContainer?.clientWidth ?? 0) + (menuContainer?.clientWidth ?? 0);
         filteredWidths.push(width);
       }
     }

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid-pro v6.18.1
+ * @mui/x-data-grid-pro v7.0.0-alpha.1
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/modern/material/index.js

@@ -1,8 +1,8 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import { GridPushPinRightIcon, GridPushPinLeftIcon } from './icons';
 const iconSlots = {
-  ColumnMenuPinRightIcon: GridPushPinRightIcon,
-  ColumnMenuPinLeftIcon: GridPushPinLeftIcon
+  columnMenuPinRightIcon: GridPushPinRightIcon,
+  columnMenuPinLeftIcon: GridPushPinLeftIcon
 };
 const materialSlots = _extends({}, iconSlots);
 export default materialSlots;

package/modern/utils/releaseInfo.js

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

@@ -153,16 +153,6 @@ DataGridProRaw.propTypes = {
    * If defined, the grid will ignore the `hide` property in [[GridColDef]].
    */
   columnVisibilityModel: _propTypes.default.object,
-  /**
-   * Overridable components.
-   * @deprecated Use the `slots` prop instead.
-   */
-  components: _propTypes.default.object,
-  /**
-   * Overridable components props dynamically passed to the component at rendering.
-   * @deprecated Use the `slotProps` prop instead.
-   */
-  componentsProps: _propTypes.default.object,
   /**
    * If above 0, the row children will be expanded up to this depth.
    * If equal to -1, all the row children will be expanded.

package/node/DataGridPro/useDataGridProProps.js

@@ -31,23 +31,21 @@ const DATA_GRID_PRO_PROPS_DEFAULT_VALUES = exports.DATA_GRID_PRO_PROPS_DEFAULT_V
   getDetailPanelHeight: () => 500,
   unstable_headerFilters: false
 });
-const defaultSlots = (0, _internals.uncapitalizeObjectKeys)(_dataGridProDefaultSlotsComponents.DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS);
+const defaultSlots = _dataGridProDefaultSlotsComponents.DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS;
 const useDataGridProProps = inProps => {
-  const [components, componentsProps, themedProps] = (0, _internals.useProps)((0, _styles.useThemeProps)({
+  const themedProps = (0, _internals.useProps)((0, _styles.useThemeProps)({
     props: inProps,
     name: 'MuiDataGrid'
   }));
   const localeText = React.useMemo(() => (0, _extends2.default)({}, _xDataGrid.GRID_DEFAULT_LOCALE_TEXT, themedProps.localeText), [themedProps.localeText]);
   const slots = React.useMemo(() => (0, _internals.computeSlots)({
     defaultSlots,
-    slots: themedProps.slots,
-    components
-  }), [components, themedProps.slots]);
+    slots: themedProps.slots
+  }), [themedProps.slots]);
   return React.useMemo(() => (0, _extends2.default)({}, DATA_GRID_PRO_PROPS_DEFAULT_VALUES, themedProps, {
     localeText,
     slots,
-    slotProps: themedProps.slotProps ?? componentsProps,
     signature: 'DataGridPro'
-  }), [themedProps, localeText, slots, componentsProps]);
+  }), [themedProps, localeText, slots]);
 };
 exports.useDataGridProProps = useDataGridProProps;

package/node/components/headerFiltering/GridHeaderFilterCell.js

@@ -224,7 +224,6 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterCell.propTypes = {
   colIndex: _propTypes.default.number.isRequired,
   filterOperators: _propTypes.default.arrayOf(_propTypes.default.shape({
     getApplyFilterFn: _propTypes.default.func.isRequired,
-    getApplyFilterFnV7: _propTypes.default.func,
     getValueAsString: _propTypes.default.func,
     headerLabel: _propTypes.default.string,
     InputComponent: _propTypes.default.elementType,

package/node/components/headerFiltering/GridHeaderFilterMenu.js

@@ -84,7 +84,6 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterMenu.propTypes = {
   open: _propTypes.default.bool.isRequired,
   operators: _propTypes.default.arrayOf(_propTypes.default.shape({
     getApplyFilterFn: _propTypes.default.func.isRequired,
-    getApplyFilterFnV7: _propTypes.default.func,
     getValueAsString: _propTypes.default.func,
     headerLabel: _propTypes.default.string,
     InputComponent: _propTypes.default.elementType,

package/node/components/headerFiltering/GridHeaderFilterMenuContainer.js

@@ -90,7 +90,6 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterMenuContainer.propTypes
   }).isRequired,
   operators: _propTypes.default.arrayOf(_propTypes.default.shape({
     getApplyFilterFn: _propTypes.default.func.isRequired,
-    getApplyFilterFnV7: _propTypes.default.func,
     getValueAsString: _propTypes.default.func,
     headerLabel: _propTypes.default.string,
     InputComponent: _propTypes.default.elementType,

package/node/constants/dataGridProDefaultSlotsComponents.js

@@ -13,8 +13,8 @@ var _GridHeaderFilterMenu = require("../components/headerFiltering/GridHeaderFil
 var _GridHeaderFilterCell = require("../components/headerFiltering/GridHeaderFilterCell");
 var _material = _interopRequireDefault(require("../material"));
 const DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS = exports.DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS = (0, _extends2.default)({}, _internals.DATA_GRID_DEFAULT_SLOTS_COMPONENTS, _material.default, {
-  ColumnMenu: _GridProColumnMenu.GridProColumnMenu,
-  ColumnHeaders: _GridColumnHeaders.GridColumnHeaders,
-  HeaderFilterCell: _GridHeaderFilterCell.GridHeaderFilterCell,
-  HeaderFilterMenu: _GridHeaderFilterMenu.GridHeaderFilterMenu
+  columnMenu: _GridProColumnMenu.GridProColumnMenu,
+  columnHeaders: _GridColumnHeaders.GridColumnHeaders,
+  headerFilterCell: _GridHeaderFilterCell.GridHeaderFilterCell,
+  headerFilterMenu: _GridHeaderFilterMenu.GridHeaderFilterMenu
 });

package/node/hooks/features/columnResize/useGridColumnResize.js

@@ -154,11 +154,13 @@ function extractColumnWidths(apiRef, options, columns) {
       if (header) {
         const title = header.querySelector(`.${_xDataGrid.gridClasses.columnHeaderTitle}`);
         const content = header.querySelector(`.${_xDataGrid.gridClasses.columnHeaderTitleContainerContent}`);
+        const iconContainer = header.querySelector(`.${_xDataGrid.gridClasses.iconButtonContainer}`);
+        const menuContainer = header.querySelector(`.${_xDataGrid.gridClasses.menuIcon}`);
         const element = title ?? content;
         const style = window.getComputedStyle(header, null);
         const paddingWidth = parseInt(style.paddingLeft, 10) + parseInt(style.paddingRight, 10);
         const contentWidth = element.scrollWidth + 1;
-        const width = paddingWidth + contentWidth;
+        const width = contentWidth + paddingWidth + (iconContainer?.clientWidth ?? 0) + (menuContainer?.clientWidth ?? 0);
         filteredWidths.push(width);
       }
     }

package/node/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid-pro v6.18.1
+ * @mui/x-data-grid-pro v7.0.0-alpha.1
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/node/material/index.js

@@ -8,8 +8,8 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _icons = require("./icons");
 const iconSlots = {
-  ColumnMenuPinRightIcon: _icons.GridPushPinRightIcon,
-  ColumnMenuPinLeftIcon: _icons.GridPushPinLeftIcon
+  columnMenuPinRightIcon: _icons.GridPushPinRightIcon,
+  columnMenuPinLeftIcon: _icons.GridPushPinLeftIcon
 };
 const materialSlots = (0, _extends2.default)({}, iconSlots);
 var _default = exports.default = materialSlots;

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 = "MTY5OTQ4NDQwMDAwMA==";
+  const releaseInfo = "MTcwMDE3MjAwMDAwMA==";
   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-pro",
-  "version": "6.18.1",
+  "version": "7.0.0-alpha.1",
   "description": "The Pro plan edition of the data grid component (MUI X).",
   "author": "MUI Team",
   "main": "./node/index.js",
@@ -33,9 +33,9 @@
   "dependencies": {
     "@babel/runtime": "^7.23.2",
     "@mui/utils": "^5.14.16",
-    "@mui/x-data-grid": "6.18.1",
-    "@mui/x-license-pro": "6.10.2",
-    "@types/format-util": "^1.0.3",
+    "@mui/x-data-grid": "7.0.0-alpha.1",
+    "@mui/x-license-pro": "7.0.0-alpha.1",
+    "@types/format-util": "^1.0.4",
     "clsx": "^2.0.0",
     "prop-types": "^15.8.1",
     "reselect": "^4.1.8"

package/utils/releaseInfo.js

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