@mui/x-data-grid 9.5.0 → 9.6.0

package/components/toolbarV8/Toolbar.mjs

@@ -195,7 +195,7 @@ const Toolbar = forwardRef(function Toolbar(props, ref) {
   });
 });
 if (process.env.NODE_ENV !== "production") Toolbar.displayName = "Toolbar";
-process.env.NODE_ENV !== "production" ? Toolbar.propTypes = {
+process.env.NODE_ENV !== "production" ? Toolbar.propTypes /* remove-proptypes */ = {
   // ----------------------------- Warning --------------------------------
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "pnpm proptypes"  |

package/components/toolbarV8/ToolbarButton.js

@@ -93,7 +93,7 @@ const ToolbarButton = exports.ToolbarButton = (0, _forwardRef.forwardRef)(functi
   });
 });
 if (process.env.NODE_ENV !== "production") ToolbarButton.displayName = "ToolbarButton";
-process.env.NODE_ENV !== "production" ? ToolbarButton.propTypes = {
+process.env.NODE_ENV !== "production" ? ToolbarButton.propTypes /* remove-proptypes */ = {
   // ----------------------------- Warning --------------------------------
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "pnpm proptypes"  |

package/components/toolbarV8/ToolbarButton.mjs

@@ -86,7 +86,7 @@ const ToolbarButton = forwardRef(function ToolbarButton(props, ref) {
   });
 });
 if (process.env.NODE_ENV !== "production") ToolbarButton.displayName = "ToolbarButton";
-process.env.NODE_ENV !== "production" ? ToolbarButton.propTypes = {
+process.env.NODE_ENV !== "production" ? ToolbarButton.propTypes /* remove-proptypes */ = {
   // ----------------------------- Warning --------------------------------
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "pnpm proptypes"  |

package/components/virtualization/GridVirtualScrollbar.js

@@ -11,6 +11,7 @@ var React = _interopRequireWildcard(require("react"));
 var _styles = require("@mui/material/styles");
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
 var _forwardRef = require("@mui/x-internals/forwardRef");
+var _platform = require("@mui/x-internals/platform");
 var _useGridPrivateApiContext = require("../../hooks/utils/useGridPrivateApiContext");
 var _hooks = require("../../hooks");
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
@@ -42,7 +43,13 @@ const Scrollbar = (0, _styles.styled)('div', {
   '&:hover': {
     zIndex: 70
   },
-  '--size': scrollbarSizeCssExpression
+  '--size': scrollbarSizeCssExpression,
+  // [iOS-scrollbar-swap]
+  // On iOS, native scrollbars of the `GridVirtualScroller` are shown instead,
+  // so hide these to avoid a duplicate thumb.
+  [_platform.iOSMediaQuery]: {
+    display: 'none'
+  }
 });
 const ScrollbarVertical = (0, _styles.styled)(Scrollbar, {
   slot: 'internal'

package/components/virtualization/GridVirtualScrollbar.mjs

@@ -4,6 +4,7 @@ import * as React from 'react';
 import { styled } from '@mui/material/styles';
 import composeClasses from '@mui/utils/composeClasses';
 import { forwardRef } from '@mui/x-internals/forwardRef';
+import { iOSMediaQuery } from '@mui/x-internals/platform';
 import { useGridPrivateApiContext } from "../../hooks/utils/useGridPrivateApiContext.mjs";
 import { gridDimensionsSelector, useGridSelector } from "../../hooks/index.mjs";
 import { useGridRootProps } from "../../hooks/utils/useGridRootProps.mjs";
@@ -35,7 +36,13 @@ const Scrollbar = styled('div', {
   '&:hover': {
     zIndex: 70
   },
-  '--size': scrollbarSizeCssExpression
+  '--size': scrollbarSizeCssExpression,
+  // [iOS-scrollbar-swap]
+  // On iOS, native scrollbars of the `GridVirtualScroller` are shown instead,
+  // so hide these to avoid a duplicate thumb.
+  [iOSMediaQuery]: {
+    display: 'none'
+  }
 });
 const ScrollbarVertical = styled(Scrollbar, {
   slot: 'internal'

package/components/virtualization/GridVirtualScroller.js

@@ -10,6 +10,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var React = _interopRequireWildcard(require("react"));
 var _styles = require("@mui/material/styles");
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
+var _platform = require("@mui/x-internals/platform");
 var _clsx = _interopRequireDefault(require("clsx"));
 var _xVirtualizer = require("@mui/x-virtualizer");
 var _gridDimensionsSelectors = require("../../hooks/features/dimensions/gridDimensionsSelectors");
@@ -66,6 +67,17 @@ const Scroller = (0, _styles.styled)('div', {
   '&::-webkit-scrollbar': {
     display: 'none' /* Safari and Chrome */
   },
+  // [iOS-scrollbar-swap]
+  // On iOS, virtual scrollbars do not show a thumb unless the user scrolls the element directly:
+  // https://github.com/mui/mui-x/issues/22386
+  // So keep this scroller's own native scrollbars and hide the ones in `GridVirtualScrollbar`
+  // instead to avoid a duplicate thumb.
+  [_platform.iOSMediaQuery]: {
+    scrollbarWidth: 'auto',
+    '&::-webkit-scrollbar': {
+      display: 'block'
+    }
+  },
   '@media print': {
     overflow: 'hidden'
   },

package/components/virtualization/GridVirtualScroller.mjs

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { styled } from '@mui/material/styles';
 import composeClasses from '@mui/utils/composeClasses';
+import { iOSMediaQuery } from '@mui/x-internals/platform';
 import clsx from 'clsx';
 import { LayoutDataGrid, Virtualization } from '@mui/x-virtualizer';
 import { gridHasBottomFillerSelector, gridHasScrollXSelector, gridHasScrollYSelector } from "../../hooks/features/dimensions/gridDimensionsSelectors.mjs";
@@ -58,6 +59,17 @@ const Scroller = styled('div', {
   '&::-webkit-scrollbar': {
     display: 'none' /* Safari and Chrome */
   },
+  // [iOS-scrollbar-swap]
+  // On iOS, virtual scrollbars do not show a thumb unless the user scrolls the element directly:
+  // https://github.com/mui/mui-x/issues/22386
+  // So keep this scroller's own native scrollbars and hide the ones in `GridVirtualScrollbar`
+  // instead to avoid a duplicate thumb.
+  [iOSMediaQuery]: {
+    scrollbarWidth: 'auto',
+    '&::-webkit-scrollbar': {
+      display: 'block'
+    }
+  },
   '@media print': {
     overflow: 'hidden'
   },

package/hooks/utils/useGridSelector.js

@@ -74,7 +74,7 @@ function useGridSelector(apiRef, selector, args = undefined, equals = defaultCom
       }
     }
   },
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+  // eslint-disable-next-line react-hooks/exhaustive-deps, react-hooks/use-memo
   EMPTY);
 
   // Why subscribe in an effect instead of during render: a component can render without

package/hooks/utils/useGridSelector.mjs

@@ -66,7 +66,7 @@ export function useGridSelector(apiRef, selector, args = undefined, equals = def
       }
     }
   },
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+  // eslint-disable-next-line react-hooks/exhaustive-deps, react-hooks/use-memo
   EMPTY);
 
   // Why subscribe in an effect instead of during render: a component can render without

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v9.5.0
+ * @mui/x-data-grid v9.6.0
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/index.mjs

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v9.5.0
+ * @mui/x-data-grid v9.6.0
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/material/index.js

@@ -87,7 +87,7 @@ const _excluded = ["id", "label", "labelId", "material", "disabled", "multiple",
   _excluded21 = ["slotProps"],
   _excluded22 = ["slotProps", "material"],
   _excluded23 = ["material"],
-  _excluded24 = ["ref", "open", "children", "className", "clickAwayTouchEvent", "clickAwayMouseEvent", "flip", "focusTrap", "onExited", "onClickAway", "onDidShow", "onDidHide", "id", "target", "transition", "placement", "material"],
+  _excluded24 = ["open", "children", "className", "clickAwayTouchEvent", "clickAwayMouseEvent", "flip", "focusTrap", "onExited", "onClickAway", "onDidShow", "onDidHide", "id", "target", "transition", "placement", "material"],
   _excluded25 = ["native"],
   _excluded26 = ["children", "value", "active"],
   _excluded27 = ["items", "value", "material"];
@@ -645,7 +645,7 @@ const transformOrigin = {
   'bottom-start': 'top left',
   'bottom-end': 'top right'
 };
-function BasePopper(props) {
+const BasePopper = (0, _forwardRef.forwardRef)(function BasePopper(props, ref) {
   const {
       open,
       children,
@@ -720,9 +720,11 @@ function BasePopper(props) {
     placement: placement,
     modifiers: modifiers
   }, other, material, {
+    ref: ref,
     children: content
   }));
-}
+});
+if (process.env.NODE_ENV !== "production") BasePopper.displayName = "BasePopper";
 function wrappers(props, content) {
   return focusTrapWrapper(props, clickAwayWrapper(props, content));
 }

package/material/index.mjs

@@ -25,7 +25,7 @@ const _excluded = ["id", "label", "labelId", "material", "disabled", "multiple",
   _excluded21 = ["slotProps"],
   _excluded22 = ["slotProps", "material"],
   _excluded23 = ["material"],
-  _excluded24 = ["ref", "open", "children", "className", "clickAwayTouchEvent", "clickAwayMouseEvent", "flip", "focusTrap", "onExited", "onClickAway", "onDidShow", "onDidHide", "id", "target", "transition", "placement", "material"],
+  _excluded24 = ["open", "children", "className", "clickAwayTouchEvent", "clickAwayMouseEvent", "flip", "focusTrap", "onExited", "onClickAway", "onDidShow", "onDidHide", "id", "target", "transition", "placement", "material"],
   _excluded25 = ["native"],
   _excluded26 = ["children", "value", "active"],
   _excluded27 = ["items", "value", "material"];
@@ -632,7 +632,7 @@ const transformOrigin = {
   'bottom-start': 'top left',
   'bottom-end': 'top right'
 };
-function BasePopper(props) {
+const BasePopper = forwardRef(function BasePopper(props, ref) {
   const {
       open,
       children,
@@ -707,9 +707,11 @@ function BasePopper(props) {
     placement: placement,
     modifiers: modifiers
   }, other, material, {
+    ref: ref,
     children: content
   }));
-}
+});
+if (process.env.NODE_ENV !== "production") BasePopper.displayName = "BasePopper";
 function wrappers(props, content) {
   return focusTrapWrapper(props, clickAwayWrapper(props, content));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid",
-  "version": "9.5.0",
+  "version": "9.6.0",
   "author": "MUI Team",
   "description": "The Community plan edition of the MUI X Data Grid components.",
   "license": "MIT",
@@ -38,12 +38,12 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.29.7",
-    "@mui/utils": "9.0.1",
+    "@mui/utils": "^9.0.1",
     "clsx": "^2.1.1",
     "prop-types": "^15.8.1",
     "use-sync-external-store": "^1.6.0",
-    "@mui/x-internals": "^9.1.0",
-    "@mui/x-virtualizer": "9.0.0-alpha.8"
+    "@mui/x-internals": "^9.6.0",
+    "@mui/x-virtualizer": "9.0.0-alpha.10"
   },
   "peerDependencies": {
     "@emotion/react": "^11.9.0",
@@ -264,6 +264,9 @@
       }
     }
   },
+  "imports": {
+    "#formatErrorMessage": "@mui/x-internals/formatErrorMessage"
+  },
   "main": "./index.js",
   "types": "./index.d.ts"
 }