@mui/x-data-grid-pro 8.0.0-alpha.7 → 8.0.0-alpha.8

package/CHANGELOG.md

@@ -5,6 +5,121 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 8.0.0-alpha.8
+
+_Jan 16, 2025_
+
+We'd like to offer a big thanks to the 11 contributors who made this release possible. Here are some highlights ✨:
+
+- 🍬 Improved design for Data Grid [Header filters](https://next.mui.com/x/react-data-grid/filtering/header-filters/)
+
+  <img width="100%" alt="Data Grid Header filters" src="https://github.com/user-attachments/assets/74a50cd9-7a55-41fc-a2b8-f8a0d5b9120e" />
+
+- 🔄 Data Grid [Scroll restoration](https://next.mui.com/x/react-data-grid/scrolling/#scroll-restoration)
+- 📊 Charts support server-side rendering under [some conditions](https://next.mui.com/x/react-charts/getting-started/#server-side-rendering)
+- 🐞 Bugfixes
+
+Special thanks go out to the community contributors who have helped make this release possible:
+@lauri865.
+Following are all team members who have contributed to this release:
+@arminmeh, @romgrk, @samuelsycamore, @alexfauquette, @cherniavskii, @flaviendelangle, @JCQuintas, @KenanYusuf, @LukasTy, @michelengelen.
+
+<!--/ HIGHLIGHT_ABOVE_SEPARATOR /-->
+
+### Data Grid
+
+#### Breaking changes
+
+- The clear button in header filter cells has been moved to the header filter menu. Use `slotProps={{ headerFilterCell: { showClearIcon: true } }}` to restore the clear button in the cell.
+
+#### `@mui/x-data-grid@8.0.0-alpha.8`
+
+- [DataGrid] Improve scrollbar deadzone with overlay scrollbars (#15961) @lauri865
+- [DataGrid] Header filter design improvements (#15991) @KenanYusuf
+- [DataGrid] Scroll restoration (#15623) @lauri865
+- [DataGrid] Fix row, cell and header memoizations (#15666) @lauri865
+
+#### `@mui/x-data-grid-pro@8.0.0-alpha.8` [![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@8.0.0-alpha.8`, plus:
+
+- [DataGridPro] Add test for column pinning with disabled column virtualization (#16176) @cherniavskii
+- [DataGridPro] Fix width of right-pinned column group during resize (#16199) @cherniavskii
+
+#### `@mui/x-data-grid-premium@8.0.0-alpha.8` [![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@8.0.0-alpha.8`.
+
+### Date and Time Pickers
+
+#### Breaking changes
+
+- The field is now editable if rendered inside a mobile Picker — [Learn more](https://next.mui.com/x/migration/migration-pickers-v7/#field-editing-on-mobile-pickers)
+- The `useMultiInputDateRangeField`, `useMultiInputTimeRangeField`, and `useMultiInputDateTimeRangeField` hooks have been removed in favor of the new `useMultiInputRangeField` hook — [Learn more](https://next.mui.com/x/migration/migration-pickers-v7/#usemultiinputdaterangefield)
+- The component passed to the `field` slot no longer receives the `value`, `onChange`, `timezone`, `format`, `disabled`, `formatDensity`, `enableAccessibleFieldDOMStructure`, `selectedSections` and `onSelectedSectionsChange` props — [Learn more](https://next.mui.com/x/migration/migration-pickers-v7/#slot-field)
+
+#### `@mui/x-date-pickers@8.0.0-alpha.8`
+
+- [pickers] Let the field components handle their opening UI, and allow field editing on mobile pickers (#15671) @flaviendelangle
+- [pickers] Remove code duplication for the multi input range fields (#15505) @flaviendelangle
+- [pickers] Rename `onRangePositionChange` into `setRangePosition` in `usePickerRangePositionContext` (#16189) @flaviendelangle
+- [pickers] Use context to pass props from the picker to the field (#16042) @flaviendelangle
+
+#### `@mui/x-date-pickers-pro@8.0.0-alpha.8` [![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@8.0.0-alpha.8`.
+
+### Charts
+
+#### Breaking changes
+
+- Charts tooltip markers now have different styles for each chart type. The tooltip and legend marks are now the same.
+- Duplicate axis id's across `x` and `y` axis now log a warning in dev mode. Axis ids should be unique to prevent internal issues.
+
+#### `@mui/x-charts@8.0.0-alpha.8`
+
+- [charts] Fix flaky charts tests (#16180) @JCQuintas
+- [charts] Handle case where gradient stop `offset` could be `Infinite` (#16131) @JCQuintas
+- [charts] Make `useChartGradientId` public (#16106) @JCQuintas
+- [charts] Move z-axis to plugin (#16130) @alexfauquette
+- [charts] Plot data at first render if `skipAnimation` is set to `true` (#16166) @alexfauquette
+- [charts] Replace tooltip mark with style (#16117) @JCQuintas
+- [charts] Support `rtl` for gradient legend (#16115) @JCQuintas
+- [charts] Use plugin system for series and axes (#15865) @alexfauquette
+
+#### `@mui/x-charts-pro@8.0.0-alpha.8` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-charts@8.0.0-alpha.8`.
+
+### Tree View
+
+#### `@mui/x-tree-view@8.0.0-alpha.8`
+
+No changes since `@mui/x-tree-view-pro@v8.0.0-alpha.7`.
+
+#### `@mui/x-tree-view-pro@8.0.0-alpha.8` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-tree-view@8.0.0-alpha.8`.
+
+### Docs
+
+- [docs] Add example for custom legend (#16169) @alexfauquette
+- [docs] Add full custom field creation example (#15194) @flaviendelangle
+- [docs] Copyedit the Data Grid cell selection page (#16099) @samuelsycamore
+- [docs] Fix demo rendering issue on Codesandbox (#16118) @arminmeh
+- [docs] Remove broken links (#16167) @alexfauquette
+- [docs] Split the Data Grid editing page (#14931) @MBilalShafi
+- [docs] Fix wrong props warnings (#16119) @JCQuintas
+
+### Core
+
+- [core] Type all references as `RefObject` (#16124) @arminmeh
+- [code-infra] Refactor `react` and `react-dom` definitions to simplify dep resolving (#16160) @LukasTy
+- [code-infra] Stop renovate from updating `date-fns-v2` (#16158) @LukasTy
+- [infra] Improve cherry-pick action target list (#16184) @michelengelen
+- [test] Fix flaky column pinning unit test (#16202) @cherniavskii
+- [test] Fix flaky screenshot (#16182) @cherniavskii
+
 ## 8.0.0-alpha.7
 
 _Jan 9, 2025_

package/DataGridPro/DataGridPro.js

@@ -39,18 +39,16 @@ const DataGridProRaw = (0, _forwardRef.forwardRef)(function DataGridPro(inProps,
     privateApiRef: privateApiRef,
     configuration: configuration,
     props: props,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_xDataGrid.GridRoot, (0, _extends2.default)({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_xDataGrid.GridRoot, (0, _extends2.default)({
       className: props.className,
       style: props.style,
       sx: props.sx
     }, props.slotProps?.root, {
       ref: ref,
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_xDataGrid.GridHeader, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_xDataGrid.GridBody, {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_xLicense.Watermark, {
-          packageName: "x-data-grid-pro",
-          releaseInfo: releaseInfo
-        })
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_xDataGrid.GridFooterPlaceholder, {})]
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_xLicense.Watermark, {
+        packageName: "x-data-grid-pro",
+        releaseInfo: releaseInfo
+      })
     }))
   });
 });

package/DataGridPro/useDataGridProComponent.js

@@ -53,6 +53,7 @@ const useDataGridProComponent = (inputApiRef, props) => {
   (0, _internals.useGridInitializeState)(_useGridColumnPinning.columnPinningStateInitializer, apiRef, props);
   (0, _internals.useGridInitializeState)(_internals.columnsStateInitializer, apiRef, props);
   (0, _internals.useGridInitializeState)(_useGridRowPinning.rowPinningStateInitializer, apiRef, props);
+  (0, _internals.useGridInitializeState)(_internals.paginationStateInitializer, apiRef, props);
   (0, _internals.useGridInitializeState)(_internals.rowsStateInitializer, apiRef, props);
   (0, _internals.useGridInitializeState)(_internals.editingStateInitializer, apiRef, props);
   (0, _internals.useGridInitializeState)(_internals.focusStateInitializer, apiRef, props);
@@ -63,7 +64,6 @@ const useDataGridProComponent = (inputApiRef, props) => {
   (0, _internals.useGridInitializeState)(_internals.densityStateInitializer, apiRef, props);
   (0, _internals.useGridInitializeState)(_useGridColumnReorder.columnReorderStateInitializer, apiRef, props);
   (0, _internals.useGridInitializeState)(_internals.columnResizeStateInitializer, apiRef, props);
-  (0, _internals.useGridInitializeState)(_internals.paginationStateInitializer, apiRef, props);
   (0, _internals.useGridInitializeState)(_internals.rowsMetaStateInitializer, apiRef, props);
   (0, _internals.useGridInitializeState)(_internals.columnMenuStateInitializer, apiRef, props);
   (0, _internals.useGridInitializeState)(_internals.columnGroupsStateInitializer, apiRef, props);

package/components/headerFiltering/GridHeaderFilterCell.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { GridFilterItem, GridFilterOperator, GridColDef, GridPinnedColumnPosition } from '@mui/x-data-grid';
-import { GridStateColDef } from '@mui/x-data-grid/internals';
+import { GridFilterItem, GridFilterOperator, GridColDef } from '@mui/x-data-grid';
+import { PinnedColumnPosition, GridStateColDef } from '@mui/x-data-grid/internals';
 export interface GridRenderHeaderFilterProps extends GridHeaderFilterCellProps {
     inputRef: React.RefObject<unknown>;
 }
@@ -12,15 +12,15 @@ export interface GridHeaderFilterCellProps extends Pick<GridStateColDef, 'header
     tabIndex: 0 | -1;
     width: number;
     colDef: GridColDef;
-    headerFilterMenuRef: React.MutableRefObject<HTMLButtonElement | null>;
+    headerFilterMenuRef: React.RefObject<HTMLButtonElement | null>;
     item: GridFilterItem;
     showClearIcon?: boolean;
     InputComponentProps: GridFilterOperator['InputComponentProps'];
-    pinnedPosition?: GridPinnedColumnPosition;
+    pinnedPosition?: PinnedColumnPosition;
+    pinnedOffset?: number;
     style?: React.CSSProperties;
-    indexInSection: number;
-    sectionLength: number;
-    gridHasFiller: boolean;
+    showLeftBorder: boolean;
+    showRightBorder: boolean;
 }
 declare const Memoized: React.ForwardRefExoticComponent<GridHeaderFilterCellProps> | React.ForwardRefExoticComponent<GridHeaderFilterCellProps & React.RefAttributes<HTMLDivElement>>;
 export { Memoized as GridHeaderFilterCell };

package/components/headerFiltering/GridHeaderFilterCell.js

@@ -11,16 +11,55 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _clsx = _interopRequireDefault(require("clsx"));
+var _styles = require("@mui/material/styles");
 var _utils = require("@mui/utils");
 var _fastMemo = require("@mui/x-internals/fastMemo");
 var _xDataGrid = require("@mui/x-data-grid");
 var _internals = require("@mui/x-data-grid/internals");
+var _RtlProvider = require("@mui/system/RtlProvider");
 var _forwardRef = require("@mui/x-internals/forwardRef");
+var _InputBase = require("@mui/material/InputBase");
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
 var _GridHeaderFilterMenuContainer = require("./GridHeaderFilterMenuContainer");
 var _GridHeaderFilterClearButton = require("./GridHeaderFilterClearButton");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["colIndex", "height", "hasFocus", "width", "headerClassName", "colDef", "item", "headerFilterMenuRef", "InputComponentProps", "showClearIcon", "pinnedPosition", "style", "indexInSection", "sectionLength", "gridHasFiller"];
+const _excluded = ["colIndex", "height", "hasFocus", "width", "headerClassName", "colDef", "item", "headerFilterMenuRef", "InputComponentProps", "showClearIcon", "pinnedPosition", "pinnedOffset", "style", "showLeftBorder", "showRightBorder"];
+const StyledInputComponent = (0, _styles.styled)(_xDataGrid.GridFilterInputValue, {
+  name: 'MuiDataGrid',
+  slot: 'ColumnHeaderFilterInput'
+})(({
+  theme
+}) => ({
+  flex: 1,
+  marginRight: theme.spacing(0.5),
+  marginBottom: theme.spacing(-0.25),
+  '& input[type="number"], & input[type="date"], & input[type="datetime-local"]': {
+    '&[value=""]:not(:focus)': {
+      color: 'transparent'
+    }
+  },
+  [`& .${_InputBase.inputBaseClasses.input}`]: {
+    fontSize: '14px'
+  },
+  [`.${_xDataGrid.gridClasses['root--densityCompact']} & .${_InputBase.inputBaseClasses.input}`]: {
+    paddingTop: theme.spacing(0.5),
+    paddingBottom: theme.spacing(0.5),
+    height: 23
+  }
+}));
+const OperatorLabel = (0, _styles.styled)('span', {
+  name: 'MuiDataGrid',
+  slot: 'ColumnHeaderFilterOperatorLabel'
+})(({
+  theme
+}) => ({
+  flex: 1,
+  marginRight: theme.spacing(0.5),
+  color: theme.palette.text.secondary,
+  whiteSpace: 'nowrap',
+  textOverflow: 'ellipsis',
+  overflow: 'hidden'
+}));
 const useUtilityClasses = ownerState => {
   const {
     colDef,
@@ -30,16 +69,13 @@ const useUtilityClasses = ownerState => {
     pinnedPosition
   } = ownerState;
   const slots = {
-    root: ['columnHeader', colDef.headerAlign === 'left' && 'columnHeader--alignLeft', colDef.headerAlign === 'center' && 'columnHeader--alignCenter', colDef.headerAlign === 'right' && 'columnHeader--alignRight', 'withBorderColor', showRightBorder && 'columnHeader--withRightBorder', showLeftBorder && 'columnHeader--withLeftBorder', pinnedPosition === 'left' && 'columnHeader--pinnedLeft', pinnedPosition === 'right' && 'columnHeader--pinnedRight']
+    root: ['columnHeader', 'columnHeader--filter', colDef.headerAlign === 'left' && 'columnHeader--alignLeft', colDef.headerAlign === 'center' && 'columnHeader--alignCenter', colDef.headerAlign === 'right' && 'columnHeader--alignRight', 'withBorderColor', showRightBorder && 'columnHeader--withRightBorder', showLeftBorder && 'columnHeader--withLeftBorder', pinnedPosition === _internals.PinnedColumnPosition.LEFT && 'columnHeader--pinnedLeft', pinnedPosition === _internals.PinnedColumnPosition.RIGHT && 'columnHeader--pinnedRight'],
+    input: ['columnHeaderFilterInput'],
+    operatorLabel: ['columnHeaderFilterOperatorLabel']
   };
   return (0, _utils.unstable_composeClasses)(slots, _xDataGrid.getDataGridUtilityClass, classes);
 };
-const emptyFieldSx = {
-  [`& input[value=""]:not(:focus)`]: {
-    color: 'transparent'
-  }
-};
-const defaultInputComponents = {
+const DEFAULT_INPUT_COMPONENTS = {
   string: _xDataGrid.GridFilterInputValue,
   number: _xDataGrid.GridFilterInputValue,
   date: _xDataGrid.GridFilterInputDate,
@@ -60,15 +96,16 @@ const GridHeaderFilterCell = (0, _forwardRef.forwardRef)((props, ref) => {
       item,
       headerFilterMenuRef,
       InputComponentProps,
-      showClearIcon = true,
+      showClearIcon = false,
       pinnedPosition,
+      pinnedOffset,
       style: styleProp,
-      indexInSection,
-      sectionLength,
-      gridHasFiller
+      showLeftBorder,
+      showRightBorder
     } = props,
     other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   const apiRef = (0, _internals.useGridPrivateApiContext)();
+  const isRtl = (0, _RtlProvider.useRtl)();
   const columnFields = (0, _xDataGrid.useGridSelector)(apiRef, _xDataGrid.gridVisibleColumnFieldsSelector);
   const rootProps = (0, _useGridRootProps.useGridRootProps)();
   const cellRef = React.useRef(null);
@@ -97,7 +134,7 @@ const GridHeaderFilterCell = (0, _forwardRef.forwardRef)((props, ref) => {
     return filterModelItem ? !filterableColumnsLookup[filterModelItem.field] : false;
   }, [colDef.field, filterModel, filterableColumnsLookup]);
   const currentOperator = React.useMemo(() => filterOperators.find(operator => operator.value === item.operator) ?? filterOperators[0], [item.operator, filterOperators]);
-  const InputComponent = colDef.filterable || isFilterReadOnly ? currentOperator.InputComponent ?? defaultInputComponents[colDef.type] : null;
+  const InputComponent = colDef.filterable || isFilterReadOnly ? currentOperator.InputComponent ?? DEFAULT_INPUT_COMPONENTS[colDef.type] : null;
   const clearFilterItem = React.useCallback(() => {
     apiRef.current.deleteFilterItem(item);
   }, [apiRef, item]);
@@ -183,8 +220,6 @@ const GridHeaderFilterCell = (0, _forwardRef.forwardRef)((props, ref) => {
     onMouseDown: publish('headerFilterMouseDown', onMouseDown),
     onBlur: publish('headerFilterBlur')
   }), [onMouseDown, onKeyDown, publish]);
-  const showLeftBorder = (0, _internals.shouldCellShowLeftBorder)(pinnedPosition, indexInSection);
-  const showRightBorder = (0, _internals.shouldCellShowRightBorder)(pinnedPosition, indexInSection, sectionLength, rootProps.showCellVerticalBorder, gridHasFiller);
   const ownerState = (0, _extends2.default)({}, rootProps, {
     pinnedPosition,
     colDef,
@@ -192,23 +227,45 @@ const GridHeaderFilterCell = (0, _forwardRef.forwardRef)((props, ref) => {
     showRightBorder
   });
   const classes = useUtilityClasses(ownerState);
+  const label = currentOperator.headerLabel ?? apiRef.current.getLocaleText(`headerFilterOperator${(0, _utils.unstable_capitalize)(item.operator)}`);
   const isNoInputOperator = currentOperator.requiresFilterValue === false;
   const isApplied = item?.value !== undefined || isNoInputOperator;
-  const label = currentOperator.headerLabel ?? apiRef.current.getLocaleText(`headerFilterOperator${(0, _utils.unstable_capitalize)(item.operator)}`);
   const isFilterActive = isApplied || hasFocus;
+  const headerFilterMenu = /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridHeaderFilterMenuContainer.GridHeaderFilterMenuContainer, {
+    operators: filterOperators,
+    item: item,
+    field: colDef.field,
+    disabled: isFilterReadOnly,
+    applyFilterChanges: apiRef.current.upsertFilterItem,
+    headerFilterMenuRef: headerFilterMenuRef,
+    buttonRef: buttonRef,
+    showClearItem: !showClearIcon && isApplied,
+    clearFilterItem: clearFilterItem
+  });
+  const clearButton = showClearIcon && isApplied ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridHeaderFilterClearButton.GridHeaderFilterClearButton, {
+    onClick: clearFilterItem,
+    disabled: isFilterReadOnly
+  }) : null;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", (0, _extends2.default)({
     className: (0, _clsx.default)(classes.root, headerClassName),
-    style: (0, _extends2.default)({
+    style: (0, _internals.attachPinnedStyle)((0, _extends2.default)({
       height,
       width
-    }, styleProp),
+    }, styleProp), isRtl, pinnedPosition, pinnedOffset),
     role: "columnheader",
     "aria-colindex": colIndex + 1,
     "aria-label": headerFilterComponent == null ? colDef.headerName ?? colDef.field : undefined
   }, other, mouseEventsHandlers, {
     ref: handleRef,
-    children: [headerFilterComponent, InputComponent && headerFilterComponent === undefined ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(React.Fragment, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(InputComponent, (0, _extends2.default)({
+    children: [headerFilterComponent, headerFilterComponent === undefined ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(React.Fragment, {
+      children: [isNoInputOperator ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(React.Fragment, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(OperatorLabel, {
+          className: classes.operatorLabel,
+          children: label
+        }), clearButton, headerFilterMenu]
+      }) : null, InputComponent && !isNoInputOperator ? /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledInputComponent, (0, _extends2.default)({
+        as: InputComponent,
+        className: classes.input,
         apiRef: apiRef,
         item: item,
         inputRef: inputRef,
@@ -231,25 +288,15 @@ const GridHeaderFilterCell = (0, _forwardRef.forwardRef)((props, ref) => {
         label: (0, _utils.unstable_capitalize)(label),
         placeholder: "",
         isFilterActive: isFilterActive,
-        clearButton: showClearIcon && isApplied ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridHeaderFilterClearButton.GridHeaderFilterClearButton, {
-          onClick: clearFilterItem,
-          disabled: isFilterReadOnly
-        }) : null,
+        variant: "outlined",
+        size: "small",
         disabled: isFilterReadOnly || isNoInputOperator,
         tabIndex: -1,
-        InputLabelProps: null,
-        sx: colDef.type === 'date' || colDef.type === 'dateTime' || colDef.type === 'number' ? emptyFieldSx : undefined
+        headerFilterMenu: headerFilterMenu,
+        clearButton: clearButton
       }, isNoInputOperator ? {
         value: ''
-      } : {}, currentOperator?.InputComponentProps, InputComponentProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridHeaderFilterMenuContainer.GridHeaderFilterMenuContainer, {
-        operators: filterOperators,
-        item: item,
-        field: colDef.field,
-        disabled: isFilterReadOnly,
-        applyFilterChanges: apiRef.current.upsertFilterItem,
-        headerFilterMenuRef: headerFilterMenuRef,
-        buttonRef: buttonRef
-      })]
+      } : {}, currentOperator?.InputComponentProps, InputComponentProps)) : null]
     }) : null]
   }));
 });
@@ -260,7 +307,6 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterCell.propTypes = {
   // ----------------------------------------------------------------------
   colDef: _propTypes.default.object.isRequired,
   colIndex: _propTypes.default.number.isRequired,
-  gridHasFiller: _propTypes.default.bool.isRequired,
   hasFocus: _propTypes.default.bool,
   /**
    * Class name added to the column header cell.
@@ -270,7 +316,6 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterCell.propTypes = {
     current: _propTypes.default.object
   }).isRequired,
   height: _propTypes.default.number.isRequired,
-  indexInSection: _propTypes.default.number.isRequired,
   InputComponentProps: _propTypes.default.object,
   item: _propTypes.default.shape({
     field: _propTypes.default.string.isRequired,
@@ -278,9 +323,11 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterCell.propTypes = {
     operator: _propTypes.default.string.isRequired,
     value: _propTypes.default.any
   }).isRequired,
-  pinnedPosition: _propTypes.default.oneOf(['left', 'right']),
-  sectionLength: _propTypes.default.number.isRequired,
+  pinnedOffset: _propTypes.default.number,
+  pinnedPosition: _propTypes.default.oneOf([0, 1, 2, 3]),
   showClearIcon: _propTypes.default.bool,
+  showLeftBorder: _propTypes.default.bool.isRequired,
+  showRightBorder: _propTypes.default.bool.isRequired,
   sortIndex: _propTypes.default.number,
   style: _propTypes.default.object,
   tabIndex: _propTypes.default.oneOf([-1, 0]).isRequired,

package/components/headerFiltering/GridHeaderFilterClearButton.js

@@ -10,19 +10,13 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var React = _interopRequireWildcard(require("react"));
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
 var _jsxRuntime = require("react/jsx-runtime");
-// FIXME(v8:romgrk): Make parametric
-
-const style = {
-  padding: '2px'
-};
 function GridHeaderFilterClearButton(props) {
   const rootProps = (0, _useGridRootProps.useGridRootProps)();
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.baseIconButton, (0, _extends2.default)({
     tabIndex: -1,
     "aria-label": "Clear filter",
-    size: "small",
-    style: style
-  }, props, rootProps.slotProps?.baseIconButton, {
+    size: "small"
+  }, rootProps.slotProps?.baseIconButton, props, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.columnMenuClearIcon, {
       fontSize: "inherit"
     })

package/components/headerFiltering/GridHeaderFilterMenu.d.ts

@@ -9,8 +9,10 @@ interface GridHeaderFilterMenuProps {
     id: string;
     labelledBy: string;
     target: HTMLElement | null;
+    showClearItem: boolean;
+    clearFilterItem: () => void;
 }
-declare function GridHeaderFilterMenu({ open, field, target, applyFilterChanges, operators, item, id, labelledBy, }: GridHeaderFilterMenuProps): React.JSX.Element | null;
+declare function GridHeaderFilterMenu({ open, field, target, applyFilterChanges, operators, item, id, labelledBy, showClearItem, clearFilterItem, }: GridHeaderFilterMenuProps): React.JSX.Element | null;
 declare namespace GridHeaderFilterMenu {
     var propTypes: any;
 }

package/components/headerFiltering/GridHeaderFilterMenu.js

@@ -20,7 +20,9 @@ function GridHeaderFilterMenu({
   operators,
   item,
   id,
-  labelledBy
+  labelledBy,
+  showClearItem,
+  clearFilterItem
 }) {
   const apiRef = (0, _xDataGrid.useGridApiContext)();
   const rootProps = (0, _xDataGrid.useGridRootProps)();
@@ -43,24 +45,36 @@ function GridHeaderFilterMenu({
     open: open,
     target: target,
     onClose: hideMenu,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.baseMenuList, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(rootProps.slots.baseMenuList, {
       "aria-labelledby": labelledBy,
       id: id,
       onKeyDown: handleListKeyDown,
-      children: operators.map((op, i) => {
+      children: [showClearItem && [/*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.baseMenuItem, {
+        iconStart: /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.columnMenuClearIcon, {
+          fontSize: "small"
+        }),
+        onClick: () => {
+          clearFilterItem();
+          hideMenu();
+        },
+        children: apiRef.current.getLocaleText('headerFilterClear')
+      }, "filter-menu-clear-filter"), /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.baseDivider, {}, "filter-menu-divider")], operators.map(op => {
+        const selected = op.value === item.operator;
         const label = op?.headerLabel ?? apiRef.current.getLocaleText(`headerFilterOperator${(0, _utils.unstable_capitalize)(op.value)}`);
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.baseMenuItem, {
+          iconStart: selected ? /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.menuItemCheckIcon, {
+            fontSize: "small"
+          }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {}),
           onClick: () => {
             applyFilterChanges((0, _extends2.default)({}, item, {
               operator: op.value
             }));
             hideMenu();
           },
-          autoFocus: i === 0 ? open : false,
-          selected: op.value === item.operator,
+          autoFocus: selected ? open : false,
           children: label
         }, `${field}-${op.value}`);
-      })
+      })]
     })
   });
 }
@@ -70,6 +84,7 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterMenu.propTypes = {
   // | To update them edit the TypeScript types and run "pnpm proptypes"  |
   // ----------------------------------------------------------------------
   applyFilterChanges: _propTypes.default.func.isRequired,
+  clearFilterItem: _propTypes.default.func.isRequired,
   field: _propTypes.default.string.isRequired,
   id: _propTypes.default.string.isRequired,
   item: _propTypes.default.shape({
@@ -90,5 +105,6 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterMenu.propTypes = {
     requiresFilterValue: _propTypes.default.bool,
     value: _propTypes.default.string.isRequired
   })).isRequired,
+  showClearItem: _propTypes.default.bool.isRequired,
   target: _utils.HTMLElementType
 } : void 0;

package/components/headerFiltering/GridHeaderFilterMenuContainer.d.ts

@@ -5,9 +5,11 @@ declare function GridHeaderFilterMenuContainer(props: {
     field: GridColDef['field'];
     item: GridFilterItem;
     applyFilterChanges: (item: GridFilterItem) => void;
-    headerFilterMenuRef: React.MutableRefObject<HTMLButtonElement | null>;
+    headerFilterMenuRef: React.RefObject<HTMLButtonElement | null>;
     buttonRef: React.Ref<HTMLButtonElement>;
     disabled?: boolean;
+    showClearItem?: boolean;
+    clearFilterItem?: () => void;
 }): React.JSX.Element | null;
 declare namespace GridHeaderFilterMenuContainer {
     var propTypes: any;

package/components/headerFiltering/GridHeaderFilterMenuContainer.js

@@ -15,12 +15,7 @@ var _utils = require("@mui/utils");
 var _internals = require("@mui/x-data-grid/internals");
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["operators", "item", "field", "buttonRef", "headerFilterMenuRef", "disabled"];
-const style = {
-  width: 22,
-  height: 22,
-  margin: 'auto 0 10px 5px'
-};
+const _excluded = ["operators", "item", "field", "buttonRef", "headerFilterMenuRef", "disabled", "showClearItem", "clearFilterItem"];
 function GridHeaderFilterMenuContainer(props) {
   const {
       operators,
@@ -28,7 +23,9 @@ function GridHeaderFilterMenuContainer(props) {
       field,
       buttonRef,
       headerFilterMenuRef,
-      disabled = false
+      disabled = false,
+      showClearItem,
+      clearFilterItem
     } = props,
     others = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   const buttonId = (0, _utils.unstable_useId)();
@@ -58,11 +55,15 @@ function GridHeaderFilterMenuContainer(props) {
       tabIndex: -1,
       size: "small",
       onClick: handleClick,
-      style: style,
       disabled: disabled
     }, rootProps.slotProps?.baseIconButton, {
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.openFilterButtonIcon, {
-        fontSize: "small"
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.baseBadge, {
+        color: "primary",
+        variant: "dot",
+        badgeContent: showClearItem ? 1 : 0,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.openFilterButtonIcon, {
+          fontSize: "inherit"
+        })
       })
     })), /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.headerFilterMenu, (0, _extends2.default)({
       field: field,
@@ -71,7 +72,9 @@ function GridHeaderFilterMenuContainer(props) {
       target: headerFilterMenuRef.current,
       operators: operators,
       labelledBy: buttonId,
-      id: menuId
+      id: menuId,
+      clearFilterItem: clearFilterItem,
+      showClearItem: showClearItem
     }, others))]
   });
 }
@@ -82,6 +85,7 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterMenuContainer.propTypes
   // ----------------------------------------------------------------------
   applyFilterChanges: _propTypes.default.func.isRequired,
   buttonRef: _utils.refType,
+  clearFilterItem: _propTypes.default.func,
   disabled: _propTypes.default.bool,
   field: _propTypes.default.string.isRequired,
   headerFilterMenuRef: _propTypes.default.shape({
@@ -102,5 +106,6 @@ process.env.NODE_ENV !== "production" ? GridHeaderFilterMenuContainer.propTypes
     label: _propTypes.default.string,
     requiresFilterValue: _propTypes.default.bool,
     value: _propTypes.default.string.isRequired
-  })).isRequired
+  })).isRequired,
+  showClearItem: _propTypes.default.bool
 } : void 0;

package/esm/DataGridPro/DataGridPro.js

@@ -4,7 +4,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useLicenseVerifier, Watermark } from '@mui/x-license';
-import { GridBody, GridFooterPlaceholder, GridHeader, GridRoot, GridContextProvider } from '@mui/x-data-grid';
+import { GridRoot, GridContextProvider } from '@mui/x-data-grid';
 import { validateProps } from '@mui/x-data-grid/internals';
 import { forwardRef } from '@mui/x-internals/forwardRef';
 import { useDataGridProComponent } from "./useDataGridProComponent.js";
@@ -13,7 +13,7 @@ import { getReleaseInfo } from "../utils/releaseInfo.js";
 import { propValidatorsDataGridPro } from "../internals/propValidation.js";
 import { useGridAriaAttributes } from "../hooks/utils/useGridAriaAttributes.js";
 import { useGridRowAriaAttributes } from "../hooks/features/rows/useGridRowAriaAttributes.js";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 const configuration = {
   hooks: {
     useGridAriaAttributes,
@@ -32,18 +32,16 @@ const DataGridProRaw = forwardRef(function DataGridPro(inProps, ref) {
     privateApiRef: privateApiRef,
     configuration: configuration,
     props: props,
-    children: /*#__PURE__*/_jsxs(GridRoot, _extends({
+    children: /*#__PURE__*/_jsx(GridRoot, _extends({
       className: props.className,
       style: props.style,
       sx: props.sx
     }, props.slotProps?.root, {
       ref: ref,
-      children: [/*#__PURE__*/_jsx(GridHeader, {}), /*#__PURE__*/_jsx(GridBody, {
-        children: /*#__PURE__*/_jsx(Watermark, {
-          packageName: "x-data-grid-pro",
-          releaseInfo: releaseInfo
-        })
-      }), /*#__PURE__*/_jsx(GridFooterPlaceholder, {})]
+      children: /*#__PURE__*/_jsx(Watermark, {
+        packageName: "x-data-grid-pro",
+        releaseInfo: releaseInfo
+      })
     }))
   });
 });