@mui/x-data-grid 8.27.0 → 9.0.0-alpha.0

package/CHANGELOG.md

@@ -1,9 +1,261 @@
 # Changelog
 
-> For full v8 changelog, please refer to the [v.8x branch](https://github.com/mui/mui-x/blob/v8.x/CHANGELOG.md).
+## 9.0.0-alpha.0
 
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+_Feb 16, 2026_
+
+We'd like to extend a big thank you to the 21 contributors who made this release possible. Here are some highlights ✨:
+
+- Add support for virtualized items on `<RichTreeViewPro />`:
+
+  ```tsx
+  <RichTreeViewPro items={ITEMS} virtualization itemHeight={48} />
+  ```
+
+- Add Thai (`thTH`) locale on the Data Grid and the Date and Time Pickers (#21116) @siriwatknp
+- Add a new `AdapterDayjsBuddhist` adapter for Date and Time Pickers (#20984) @siriwatknp
+- Add support for virtualization in the rich tree view (#20780) @flaviendelangle
+- Add WebGL renderer to Heatmap (#20756) @bernardobelchior
+
+Special thanks go out to these community members for their valuable contributions:
+@jhe-iqbis
+
+The following team members contributed to this release:
+@alexfauquette, @arminmeh, @bernardobelchior, @brijeshb42, @cherniavskii, @dav-is, @flaviendelangle, @Janpot, @JCQuintas, @mapache-salvaje, @MBilalShafi, @michelengelen, @mj12albert, @noraleonte, @oliviertassinari, @rita-codes, @romgrk, @sai6855, @siriwatknp
+
+### Data Grid
+
+#### `@mui/x-data-grid@9.0.0-alpha.0`
+
+- [DataGrid] Update default `logicOperator` behavior in filtering docs (#21098) @michelengelen
+- [DataGrid] Add `thTH` locale (#21116) @siriwatknp
+- [DataGrid] Fix initial filter value state in CustomMultiValueOperator demo (#21217) @sai6855
+
+#### `@mui/x-data-grid-pro@9.0.0-alpha.0` [![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@9.0.0-alpha.0`, plus:
+
+- [DataGridPro] Cleanup outdated rows on `dataSource` reference update (#21138) @MBilalShafi
+
+#### `@mui/x-data-grid-premium@9.0.0-alpha.0` [![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@9.0.0-alpha.0`.
+
+### Date and Time Pickers
+
+#### `@mui/x-date-pickers@9.0.0-alpha.0`
+
+- [pickers] Add `AdapterDayjsBuddhist` adapter (#20984) @siriwatknp
+- [pickers] Add `thTH` locale (#21116) @siriwatknp
+
+#### `@mui/x-date-pickers-pro@9.0.0-alpha.0` [![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@9.0.0-alpha.0`.
+
+### Charts
+
+#### `@mui/x-charts@9.0.0-alpha.0`
+
+- [charts] Add Legend actions (#20404) @JCQuintas
+- [charts] Add `Chart` suffix to MUI Classes (#21042) @JCQuintas
+- [charts] Add `axesGap` props to put space between axes (#20904) @alexfauquette
+- [charts] Add `cleanIdentifier` function to charts series instance (#20832) @JCQuintas
+- [charts] Add `initialHiddenItems` prop to set initial state (#20894) @JCQuintas
+- [charts] Add `useXAxisCoordinates` and `useYAxisCoordinates` hooks (#20972) @bernardobelchior
+- [charts] Add axis slots and expose axis ticks hooks (#20935) @bernardobelchior
+- [charts] Change `line` legend marker to be a line (#21059) @JCQuintas
+- [charts] Codemod test pattern with function (#21111) @JCQuintas
+- [charts] Control the item tooltip (#20617) @alexfauquette
+- [charts] Enable keyboard navigation in radar chart (#20765) @alexfauquette
+- [charts] Export `CartesianChartSeriesType` and `StackableChartSeriesType` (#21012) @bernardobelchior
+- [charts] Export plugins from premium (#20866) @JCQuintas
+- [charts] Filter hidden series from axis tooltip (#21273) @Copilot
+- [charts] Filter hidden series from axis tooltip (#21273) @Copilot
+- [charts] Fix rename `getSVGPoint` to `getChartPoint` (#21335) @bernardobelchior
+- [charts] Fix cleanup function in useChartInteractionListener to correctly remove event listeners with options (#21218) @sai6855
+- [charts] Fix import rename in codemod (#21112) @JCQuintas
+- [charts] Fix multiple exports of `HighlightScope` (#21270) @bernardobelchior
+- [charts] Fix test inconsistency in charts (#20907) @JCQuintas
+- [charts] Fix tooltip position for stacked line series (#20901) @alexfauquette
+- [charts] Make Highlight scope a generic (#21189) @alexfauquette
+- [charts] Make `LegendItemParams.type` required (#21003) @alexfauquette
+- [charts] Make `seriesId` a string only (#20997) @alexfauquette
+- [charts] Make the `useChartRootRef` support typing parameter (#21023) @alexfauquette
+- [charts] Memoize HeatmapItem to avoid re-render when fading/highlighting (#20865) @bernardobelchior
+- [charts] Move axis id to `data-axis-id` attribute instead of class (#21037) @JCQuintas
+- [charts] Move `cleanIdentifier` and `serializeIdentifier` instance methods to `useChartSeriesConfig` plugin (#21025) @JCQuintas
+- [charts] Move `seriesConfig` to `useChartSeriesConfig` plugin (#21004) @JCQuintas
+- [charts] Move element refs to `useChartElementRef` plugin (#21099) @JCQuintas
+- [charts] Move types related to `seriesConfig` into the `useChartSeriesConfig` plugin folder (#21026) @JCQuintas
+- [charts] Remove `data-has-focused-item` from `ChartsSurface` (#21255) @bernardobelchior
+- [charts] Remove default generic of item identifiers (#21182) @alexfauquette
+- [charts] Remove deprecated `id` from `LegendItemParams` (#21055) @alexfauquette
+- [charts] Remove deprecated `ChartApi` export from `ChartContainer` (#20975) @JCQuintas
+- [charts] Remove deprecated `useAxisTooltip` in favor of `useAxesTooltip` (#20962) @Copilot
+- [charts] Remove deprecated series type helpers and functions (#20998) @alexfauquette
+- [charts] Rename `ChartContainer` to `ChartsContainer` (#21173) @JCQuintas
+- [charts] Rename `getSVGPoint` to `getChartPoint` (#21322) @bernardobelchior
+- [charts] Rename `TickItemType` to `TickItem` (#21008) @bernardobelchior
+- [charts] Replace props `id` by `seriesId` when necessary (#21057) @alexfauquette
+- [charts] Revert `touch-action: pan-y` removal when zoom is disabled (#20852) @bernardobelchior
+- [charts] The `useXxxSeries([])` return empty array (#21001) @alexfauquette
+- [charts] Use `NumberValue` in domain limit function (#21054) @JCQuintas
+
+#### `@mui/x-charts-pro@9.0.0-alpha.0` [![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@9.0.0-alpha.0`, plus:
+
+- [charts-pro] Add border radius to heatmap (#20931) @bernardobelchior
+- [charts-pro] Add keyboard navigation to funnel (#20766) @alexfauquette
+- [charts-pro] Add keyboard navigation to heatmap (#20786) @alexfauquette
+- [charts-pro] Add keyboard navigation to sankey (#20777) @alexfauquette
+- [charts-pro] Fix Heatmap's `onItemClick` not triggering (#21016) @bernardobelchior
+- [charts-pro] Fix crash when two same-direction axes have a zoom preview (#20916) @bernardobelchior
+- [charts-pro] Handle edge case in export image (#21190) @bernardobelchior
+- [charts-pro] Prefer global pointer interaction tracker in Heatmap (#20697) @bernardobelchior
+- [charts-pro] Support composition for Sankey (#20604) @alexfauquette
+- [charts-pro] Update Heatmap identifier (#21124) @alexfauquette
+- [charts-pro] Update default value of `hideLegend` prop in `Heatmap` (#20961) @Copilot
+
+#### `@mui/x-charts-premium@9.0.0-alpha.0` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
+
+Same changes as in `@mui/x-charts-pro@9.0.0-alpha.0`, plus:
+
+- [charts-premium] Add WebGL renderer to Heatmap (#20756) @bernardobelchior
+- [charts-premium] Add `ChartContainerPremium` (#20910) @bernardobelchior
+- [charts-premium] Add `HeatmapPremium` (#20930) @bernardobelchior
+- [charts-premium] Add keyboard navigation to range-bar (#21272) @alexfauquette
+- [charts-premium] Extract `HeatmapSVGPlot` from `HeatmapPlot` component (#21015) @bernardobelchior
+- [charts-premium] Fix `ChartDataProviderPremium` tests (#20868) @bernardobelchior
+- [charts-premium] Fix links in comments for chart containers and data providers (#21105) @bernardobelchior
+
+### Tree View
+
+#### `@mui/x-tree-view@9.0.0-alpha.0`
+
+_No changes._
+
+#### `@mui/x-tree-view-pro@9.0.0-alpha.0` [![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@9.0.0-alpha.0`, plus:
+
+- [RichTreeViewPro] Add support for virtualization (#20780) @flaviendelangle
+
+### Codemod
+
+#### `@mui/x-codemod@9.0.0-alpha.0`
+
+- [codemod] Document and Clean the codemod utils (#21014) @alexfauquette
+
+### Docs
+
+- [docs] Add focus highlight in composition snipets (#20614) @alexfauquette
+- [docs] Add simple candlestick chart demo (#20912) @bernardobelchior
+- [docs] Fix Waterfall Chart documentation badge from Pro to Premium (#20888) @Copilot
+- [docs] Fix broken links on Data Grid Editing sub-pages (#20911) @arminmeh
+- [docs] Fix docs API for HeatmapPremium (#21137) @alexfauquette
+- [docs] Fix horizontal overflow in heatmap docs (#20968) @bernardobelchior
+- [docs] Move Range Bar Chart to existing charts (#21120) @bernardobelchior
+- [docs] Prepare the scheduler doc for the alpha (#21268) @flaviendelangle
+- [docs] Rewording of the heatmap item click (#20987) @alexfauquette
+- [scheduler][docs] Create the Quickstart page (#20913) @flaviendelangle
+- [charts][docs] Revise the Charts CSP doc (#20906) @mapache-salvaje
+- [charts][docs] Revise the Charts Composition doc (#20032) @mapache-salvaje
+- [charts][docs] Revise the Charts Hooks Overview doc (#20921) @mapache-salvaje
+- [charts][docs] Revise the Charts Legend doc (#20821) @mapache-salvaje
+- [charts][docs] Revise the Charts Localization doc (#20800) @mapache-salvaje
+- [charts][docs] Revise the Charts Plugins doc (#20933) @mapache-salvaje
+- [charts][docs] Revise the Charts Stacking doc (#20830) @mapache-salvaje
+- [charts][docs] Revise the Charts Styling doc (#20835) @mapache-salvaje
+- [charts][docs] Revise the Charts Toolbar doc (#20867) @mapache-salvaje
+- [charts][docs] Revise the Charts Tooltip doc (#20869) @mapache-salvaje
+- [charts][docs] Revise the Charts Zoom and Pan doc (#20893) @mapache-salvaje
+- [DataGrid][docs] Add a recipe for handling long text cell (#20754) @siriwatknp
+- [DataGrid][docs] Add high-level competitor comparison to Overview doc (DX-117) (#20870) @mapache-salvaje
+- [DataGrid][docs] Remove Bundling section from quickstart (#21177) @MBilalShafi
+
+### Core
+
+- [code-infra] Add `MUI_TEST_ENV` global (#21187) @Janpot
+- [code-infra] Fix `material-ui/disallow-react-api-in-server-components` (#20909) @JCQuintas
+- [code-infra] Fix `renameImports` codemod not preserving comments (#20977) @JCQuintas
+- [code-infra] Fix the label comparison to use lower case (#20934) @brijeshb42
+- [code-infra] Github action to sync title and label (#20922) @brijeshb42
+- [code-infra] Ignore scheduler demo with random data (#20982) @JCQuintas
+- [code-infra] Improve `codemod` testing setup (#20981) @JCQuintas
+- [code-infra] Only ignore renovate[bot] in changelog generation script (#21185) @bernardobelchior
+- [code-infra] Prepare for v9 (#20860) @JCQuintas
+- [code-infra] Set `rasterizehtml` version in pnpm catalog (#21175) @bernardobelchior
+- [code-infra] Update codeowners (#20886) @JCQuintas
+- [code-infra] V9 preparation (#20928) @JCQuintas
+- [code-infra] eslint rule rename (#21172) @Janpot
+- [code-infra][docs] V9 charts migration doc kickoff (#20973) @JCQuintas
+- [docs-infra] Add Cookie Banner and Analytics Provider (#21228) @dav-is
+- [docs-infra] Fix missing slots section on API page (#20915) @Janpot
+- [docs-infra] Fix two broken links (#20914) @Janpot
+- [docs-infra] Port demo changes (#20971) @Janpot
+- [internal] Add information about codemods to AGENTS.md (#21011) @bernardobelchior
+- [internal] Fix codemod versioning instructions in `AGENTS.md` (#21024) @bernardobelchior
+- [internal] Fix missing generated props in master (#21142) @bernardobelchior
+- [internal] Headless sorting plugin (#21089) @arminmeh
+- [internal] Remove duplicate code (#20896) @oliviertassinari
+
+### Miscellaneous
+
+- Bump next to ^15.5.11 (#21171) @Copilot
+- [core] Fix CI (#21223) @flaviendelangle
+- [PoC] Headless data grid (#20645) @cherniavskii
+
+## v8.27.1
+
+_Feb 13, 2026_
+
+We'd like to extend a big thank you to the 6 contributors who made this release possible. Here are some highlights ✨:
+
+- 📝 CSS bundler support is no longer needed for the Data Grid
+- 🐞 Bugfixes
+
+Special thanks go out to these community members for their valuable contributions:
+@sai6855
+
+The following team members contributed to this release:
+@arminmeh, @cherniavskii, @flaviendelangle, @mj12albert, @MBilalShafi
+
+### Data Grid
+
+#### `@mui/x-data-grid@8.27.1`
+
+- [DataGrid] Hide column menu icon when there are no items (#21303) @MBilalShafi
+- [DataGrid] Migrate styled imports and remove `index.css` (#21176) @MBilalShafi
+- [DataGrid] Optimize `GridRootStyles` overrides resolver (#21251) @sai6855
+
+#### `@mui/x-data-grid-pro@8.27.1` [![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.27.1`, plus:
+
+- [DataGridPro] Fix column pinning issue with `restoreState` (#21305) @MBilalShafi
+- [DataGridPro] Fix lazy loading params for page with one row (#21238) @MBilalShafi
+- [DataGridPro] Properly extract parent path (#21301) @arminmeh
+
+#### `@mui/x-data-grid-premium@8.27.1` [![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.27.1`, plus:
+
+- [DataGridPremium] Fix aggregation display when `initialState` has both `sortModel` and `pinnedColumns` (#21152) @mj12albert
+
+### Tree View
+
+#### `@mui/x-tree-view@8.27.1`
+
+- [tree view] Fix `apiRef.current.setItemExpansion()` (#21095) @flaviendelangle
+
+#### `@mui/x-tree-view-pro@8.27.1` [![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.27.1`.
+
+### Core
+
+- [internal] Add CLI for translation using LLM (#21299) @cherniavskii
 
 ## v8.27.0
 

package/DataGrid/index.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-require("../index.css");
 var _DataGrid = require("./DataGrid");
 Object.keys(_DataGrid).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/components/GridColumnSortButton.js

@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
-var _system = require("@mui/system");
+var _styles = require("@mui/material/styles");
 var _clsx = _interopRequireDefault(require("clsx"));
 var _useGridApiContext = require("../hooks/utils/useGridApiContext");
 var _gridClasses = require("../constants/gridClasses");
@@ -30,7 +30,7 @@ const useUtilityClasses = ownerState => {
   };
   return (0, _composeClasses.default)(slots, _gridClasses.getDataGridUtilityClass, classes);
 };
-const GridColumnSortButtonRoot = (0, _system.styled)(_assert.NotRendered, {
+const GridColumnSortButtonRoot = (0, _styles.styled)(_assert.NotRendered, {
   name: 'MuiDataGrid',
   slot: 'SortButton'
 })({

package/components/GridPagination.js

@@ -34,14 +34,15 @@ function GridPagination() {
     paginationMode,
     loading
   } = rootProps;
-  const disabled = rowCount === -1 && paginationMode === 'server' && loading;
+  const unknownRowCount = rowCount == null || rowCount === -1;
+  const disabled = unknownRowCount && paginationMode === 'server' && loading;
   const lastPage = React.useMemo(() => Math.max(0, pageCount - 1), [pageCount]);
   const computedPage = React.useMemo(() => {
-    if (rowCount === -1) {
+    if (unknownRowCount) {
       return paginationModel.page;
     }
     return paginationModel.page <= lastPage ? paginationModel.page : lastPage;
-  }, [lastPage, paginationModel.page, rowCount]);
+  }, [lastPage, paginationModel.page, unknownRowCount]);
   const handlePageSizeChange = React.useCallback(pageSize => {
     apiRef.current.setPageSize(pageSize);
   }, [apiRef]);
@@ -73,7 +74,7 @@ function GridPagination() {
   const pageSizeOptions = isPageSizeIncludedInPageSizeOptions(paginationModel.pageSize) ? rootProps.pageSizeOptions : [];
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(GridPaginationRoot, (0, _extends2.default)({
     as: rootProps.slots.basePagination,
-    count: rowCount,
+    count: rowCount ?? -1,
     page: computedPage,
     rowsPerPageOptions: pageSizeOptions,
     rowsPerPage: paginationModel.pageSize,

package/components/GridScrollArea.js

@@ -12,7 +12,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var React = _interopRequireWildcard(require("react"));
 var _useEventCallback = _interopRequireDefault(require("@mui/utils/useEventCallback"));
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
-var _system = require("@mui/system");
+var _styles = require("@mui/material/styles");
 var _fastMemo = require("@mui/x-internals/fastMemo");
 var _forwardRef = require("@mui/x-internals/forwardRef");
 var _useGridRootProps = require("../hooks/utils/useGridRootProps");
@@ -39,7 +39,7 @@ const useUtilityClasses = ownerState => {
   };
   return (0, _composeClasses.default)(slots, _constants.getDataGridUtilityClass, classes);
 };
-const GridScrollAreaRawRoot = (0, _system.styled)('div', {
+const GridScrollAreaRawRoot = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
   slot: 'ScrollArea',
   overridesResolver: (props, styles) => [{

package/components/GridScrollShadows.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.GridScrollShadows = GridScrollShadows;
 var React = _interopRequireWildcard(require("react"));
-var _system = require("@mui/system");
+var _styles = require("@mui/material/styles");
 var _RtlProvider = require("@mui/system/RtlProvider");
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
 var _hooks = require("../hooks");
@@ -29,7 +29,7 @@ const useUtilityClasses = ownerState => {
   };
   return (0, _composeClasses.default)(slots, _constants.getDataGridUtilityClass, classes);
 };
-const ScrollShadow = (0, _system.styled)('div', {
+const ScrollShadow = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
   slot: 'ScrollShadow',
   overridesResolver: (props, styles) => [styles.root, styles[props.position]]

package/components/GridSkeletonLoadingOverlay.js

@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var React = _interopRequireWildcard(require("react"));
 var _clsx = _interopRequireDefault(require("clsx"));
-var _system = require("@mui/system");
+var _styles = require("@mui/material/styles");
 var _useForkRef = _interopRequireDefault(require("@mui/utils/useForkRef"));
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
 var _RtlProvider = require("@mui/system/RtlProvider");
@@ -29,7 +29,7 @@ var _rtlFlipSide = require("../utils/rtlFlipSide");
 var _utils = require("../internals/utils");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["skeletonRowsCount", "visibleColumns", "showFirstRowBorder"];
-const SkeletonOverlay = (0, _system.styled)('div', {
+const SkeletonOverlay = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
   slot: 'SkeletonLoadingOverlay'
 })({

package/components/base/GridOverlays.js

@@ -9,7 +9,7 @@ exports.GridOverlayWrapper = GridOverlayWrapper;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _system = require("@mui/system");
+var _styles = require("@mui/material/styles");
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
 var _gridRowsUtils = require("../../hooks/features/rows/gridRowsUtils");
 var _useGridSelector = require("../../hooks/utils/useGridSelector");
@@ -18,7 +18,7 @@ var _useGridApiContext = require("../../hooks/utils/useGridApiContext");
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
 var _gridClasses = require("../../constants/gridClasses");
 var _jsxRuntime = require("react/jsx-runtime");
-const GridOverlayWrapperRoot = (0, _system.styled)('div', {
+const GridOverlayWrapperRoot = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
   slot: 'OverlayWrapper',
   shouldForwardProp: prop => prop !== 'overlayType' && prop !== 'loadingOverlayVariant' && prop !== 'right'
@@ -42,7 +42,7 @@ loadingOverlayVariant !== 'skeleton' ? {
   zIndex: overlayType === 'loadingOverlay' ? 5 // Should be above pinned columns, pinned rows, and detail panel
   : 4 // Should be above pinned columns and detail panel
 } : {});
-const GridOverlayWrapperInner = (0, _system.styled)('div', {
+const GridOverlayWrapperInner = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
   slot: 'OverlayWrapperInner',
   shouldForwardProp: prop => prop !== 'overlayType' && prop !== 'loadingOverlayVariant'

package/components/columnHeaders/GridColumnHeaderItem.js

@@ -17,6 +17,7 @@ var _fastMemo = require("@mui/x-internals/fastMemo");
 var _RtlProvider = require("@mui/system/RtlProvider");
 var _doesSupportPreventScroll = require("../../utils/doesSupportPreventScroll");
 var _useGridPrivateApiContext = require("../../hooks/utils/useGridPrivateApiContext");
+var _getColumnMenuItemKeys = require("../../hooks/features/columnMenu/getColumnMenuItemKeys");
 var _ColumnHeaderMenuIcon = require("./ColumnHeaderMenuIcon");
 var _GridColumnHeaderMenu = require("../menu/columnMenu/GridColumnHeaderMenu");
 var _gridClasses = require("../../constants/gridClasses");
@@ -85,6 +86,30 @@ function GridColumnHeaderItem(props) {
   const columnMenuButtonId = (0, _useId.default)();
   const iconButtonRef = React.useRef(null);
   const [showColumnMenuIcon, setShowColumnMenuIcon] = React.useState(columnMenuOpen);
+  const columnMenuSlotProps = rootProps.slotProps?.columnMenu;
+  const columnMenuComponent = rootProps.slots.columnMenu;
+  const defaultSlots = columnMenuComponent?.defaultSlots;
+  const defaultSlotProps = columnMenuComponent?.defaultSlotProps;
+  const hasKnownDefaultColumnMenu = defaultSlots != null && defaultSlotProps != null;
+  const columnMenuItemKeys = React.useMemo(() => {
+    if (!hasKnownDefaultColumnMenu) {
+      return [];
+    }
+    return (0, _getColumnMenuItemKeys.getColumnMenuItemKeys)({
+      apiRef,
+      colDef,
+      defaultSlots,
+      defaultSlotProps,
+      slots: columnMenuSlotProps?.slots,
+      slotProps: columnMenuSlotProps?.slotProps
+    });
+  }, [apiRef, colDef, defaultSlotProps, defaultSlots, hasKnownDefaultColumnMenu, columnMenuSlotProps?.slotProps, columnMenuSlotProps?.slots]);
+
+  // If we don't have a "known" default column menu (i.e. a custom menu component
+  // without `defaultSlots` / `defaultSlotProps` statics), we treat it as opaque
+  // and assume it has items, so we always show the column menu icon.
+  // Only the built-in/default menu path can hide the icon when there are no items.
+  const hasColumnMenuItems = !hasKnownDefaultColumnMenu || columnMenuItemKeys.length > 0;
   const isDraggable = !rootProps.disableColumnReorder && !disableReorder && !colDef.disableReorder;
   let headerComponent;
   if (colDef.renderHeader) {
@@ -135,10 +160,15 @@ function GridColumnHeaderItem(props) {
       setShowColumnMenuIcon(columnMenuOpen);
     }
   }, [showColumnMenuIcon, columnMenuOpen]);
+  React.useEffect(() => {
+    if (hasKnownDefaultColumnMenu && columnMenuOpen && !hasColumnMenuItems) {
+      apiRef.current.hideColumnMenu();
+    }
+  }, [apiRef, columnMenuOpen, hasColumnMenuItems, hasKnownDefaultColumnMenu]);
   const handleExited = React.useCallback(() => {
     setShowColumnMenuIcon(false);
   }, []);
-  const columnMenuIconButton = !rootProps.disableColumnMenu && !colDef.disableColumnMenu && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ColumnHeaderMenuIcon.ColumnHeaderMenuIcon, {
+  const columnMenuIconButton = !rootProps.disableColumnMenu && !colDef.disableColumnMenu && hasColumnMenuItems && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ColumnHeaderMenuIcon.ColumnHeaderMenuIcon, {
     colDef: colDef,
     columnMenuId: columnMenuId,
     columnMenuButtonId: columnMenuButtonId,

package/components/columnHeaders/GridColumnHeaderTitle.js

@@ -13,7 +13,7 @@ var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _clsx = _interopRequireDefault(require("clsx"));
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
-var _system = require("@mui/system");
+var _styles = require("@mui/material/styles");
 var _forwardRef = require("@mui/x-internals/forwardRef");
 var _domUtils = require("../../utils/domUtils");
 var _gridClasses = require("../../constants/gridClasses");
@@ -29,7 +29,7 @@ const useUtilityClasses = ownerState => {
   };
   return (0, _composeClasses.default)(slots, _gridClasses.getDataGridUtilityClass, classes);
 };
-const GridColumnHeaderTitleRoot = (0, _system.styled)('div', {
+const GridColumnHeaderTitleRoot = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
   slot: 'ColumnHeaderTitle'
 })({

package/components/columnHeaders/GridIconButtonContainer.js

@@ -12,7 +12,7 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 var React = _interopRequireWildcard(require("react"));
 var _clsx = _interopRequireDefault(require("clsx"));
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
-var _system = require("@mui/system");
+var _styles = require("@mui/material/styles");
 var _forwardRef = require("@mui/x-internals/forwardRef");
 var _gridClasses = require("../../constants/gridClasses");
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
@@ -27,7 +27,7 @@ const useUtilityClasses = ownerState => {
   };
   return (0, _composeClasses.default)(slots, _gridClasses.getDataGridUtilityClass, classes);
 };
-const GridIconButtonContainerRoot = (0, _system.styled)('div', {
+const GridIconButtonContainerRoot = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
   slot: 'IconButtonContainer'
 })(() => ({