@mui/x-data-grid 8.0.0-beta.3 → 8.1.0

package/components/columnsPanel/ColumnsPanelTrigger.js

@@ -13,7 +13,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _useId = _interopRequireDefault(require("@mui/utils/useId"));
 var _forwardRef = require("@mui/x-internals/forwardRef");
 var _useForkRef = _interopRequireDefault(require("@mui/utils/useForkRef"));
-var _GridPreferencePanelContext = require("../panel/GridPreferencePanelContext");
+var _GridPanelContext = require("../panel/GridPanelContext");
 var _useGridApiContext = require("../../hooks/utils/useGridApiContext");
 var _hooks = require("../../hooks");
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
@@ -52,7 +52,7 @@ const ColumnsPanelTrigger = exports.ColumnsPanelTrigger = (0, _forwardRef.forwar
   const resolvedClassName = typeof className === 'function' ? className(state) : className;
   const {
     columnsPanelTriggerRef
-  } = (0, _GridPreferencePanelContext.useGridPreferencePanelContext)();
+  } = (0, _GridPanelContext.useGridPanelContext)();
   const handleRef = (0, _useForkRef.default)(ref, columnsPanelTriggerRef);
   const handleClick = event => {
     if (open) {
@@ -73,10 +73,10 @@ const ColumnsPanelTrigger = exports.ColumnsPanelTrigger = (0, _forwardRef.forwar
     'aria-haspopup': 'true',
     'aria-expanded': open ? 'true' : undefined,
     'aria-controls': open ? panelId : undefined,
-    onClick: handleClick,
-    onPointerUp: handlePointerUp,
     className: resolvedClassName
   }, other, {
+    onPointerUp: handlePointerUp,
+    onClick: handleClick,
     ref: handleRef
   }), state);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(React.Fragment, {

package/components/containers/GridFooterContainer.js

@@ -29,8 +29,7 @@ const useUtilityClasses = ownerState => {
 };
 const GridFooterContainerRoot = (0, _system.styled)('div', {
   name: 'MuiDataGrid',
-  slot: 'FooterContainer',
-  overridesResolver: (props, styles) => styles.footerContainer
+  slot: 'FooterContainer'
 })({
   display: 'flex',
   justifyContent: 'space-between',

package/components/containers/GridOverlay.js

@@ -40,6 +40,8 @@ const GridOverlayRoot = (0, _system.styled)('div', {
   alignSelf: 'center',
   alignItems: 'center',
   justifyContent: 'center',
+  textAlign: 'center',
+  textWrap: 'balance',
   backgroundColor: _cssVariables.vars.colors.background.backdrop
 });
 const GridOverlay = exports.GridOverlay = (0, _forwardRef.forwardRef)(function GridOverlay(props, ref) {

package/components/containers/GridRoot.d.ts

@@ -6,6 +6,7 @@ export interface GridRootProps extends React.HTMLAttributes<HTMLDivElement> {
    * The system prop that allows defining system overrides as well as additional CSS styles.
    */
   sx?: SxProps<Theme>;
+  sidePanel?: React.ReactNode;
 }
 declare const MemoizedGridRoot: React.ForwardRefExoticComponent<GridRootProps> | React.ForwardRefExoticComponent<GridRootProps & React.RefAttributes<HTMLDivElement>>;
 export { MemoizedGridRoot as GridRoot };

package/components/containers/GridRoot.js

@@ -25,7 +25,7 @@ var _useIsSSR = require("../../hooks/utils/useIsSSR");
 var _GridHeader = require("../GridHeader");
 var _base = require("../base");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["className", "children"];
+const _excluded = ["className", "children", "sidePanel"];
 const useUtilityClasses = (ownerState, density) => {
   const {
     autoHeight,
@@ -41,7 +41,8 @@ const GridRoot = (0, _forwardRef.forwardRef)(function GridRoot(props, ref) {
   const rootProps = (0, _useGridRootProps.useGridRootProps)();
   const {
       className,
-      children
+      children,
+      sidePanel
     } = props,
     other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   const apiRef = (0, _useGridPrivateApiContext.useGridPrivateApiContext)();
@@ -62,13 +63,17 @@ const GridRoot = (0, _forwardRef.forwardRef)(function GridRoot(props, ref) {
     return null;
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_GridRootStyles.GridRootStyles, (0, _extends2.default)({
-    className: (0, _clsx.default)(classes.root, className, cssVariables.className),
+    className: (0, _clsx.default)(classes.root, className, cssVariables.className, sidePanel && _gridClasses.gridClasses.withSidePanel),
     ownerState: ownerState
   }, other, {
     ref: handleRef,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_GridHeader.GridHeader, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_base.GridBody, {
-      children: children
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_base.GridFooterPlaceholder, {}), cssVariables.tag]
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: _gridClasses.gridClasses.mainContent,
+      role: "presentation",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_GridHeader.GridHeader, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_base.GridBody, {
+        children: children
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_base.GridFooterPlaceholder, {})]
+    }), sidePanel, cssVariables.tag]
   }));
 });
 process.env.NODE_ENV !== "production" ? GridRoot.propTypes = {
@@ -76,6 +81,7 @@ process.env.NODE_ENV !== "production" ? GridRoot.propTypes = {
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "pnpm proptypes"  |
   // ----------------------------------------------------------------------
+  sidePanel: _propTypes.default.node,
   /**
    * The system prop that allows defining system overrides as well as additional CSS styles.
    */

package/components/containers/GridRootStyles.js

@@ -9,16 +9,6 @@ var _gridClasses = require("../../constants/gridClasses");
 var _cssVariables = require("../../constants/cssVariables");
 var _useGridSelector = require("../../hooks/utils/useGridSelector");
 var _useGridPrivateApiContext = require("../../hooks/utils/useGridPrivateApiContext");
-const columnHeaderStyles = {
-  [`& .${_gridClasses.gridClasses.iconButtonContainer}`]: {
-    visibility: 'visible',
-    width: 'auto'
-  },
-  [`& .${_gridClasses.gridClasses.menuIcon}`]: {
-    width: 'auto',
-    visibility: 'visible'
-  }
-};
 const columnSeparatorTargetSize = 10;
 const columnSeparatorOffset = -5;
 const focusOutlineWidth = 1;
@@ -264,7 +254,7 @@ const GridRootStyles = exports.GridRootStyles = (0, _styles.styled)('div', {
   const baseBackground = _cssVariables.vars.colors.background.base;
   const headerBackground = _cssVariables.vars.header.background.base;
   const pinnedBackground = _cssVariables.vars.cell.background.pinned;
-  const hoverColor = _cssVariables.vars.colors.interactive.hover;
+  const hoverColor = removeOpacity(_cssVariables.vars.colors.interactive.hover);
   const hoverOpacity = _cssVariables.vars.colors.interactive.hoverOpacity;
   const selectedColor = _cssVariables.vars.colors.interactive.selected;
   const selectedOpacity = _cssVariables.vars.colors.interactive.selectedOpacity;
@@ -337,6 +327,9 @@ const GridRootStyles = exports.GridRootStyles = (0, _styles.styled)('div', {
     overflow: 'hidden',
     overflowAnchor: 'none',
     // Keep the same scrolling position
+    transform: 'translate(0, 0)',
+    // Create a stacking context to keep scrollbars from showing on top
+
     [`.${_gridClasses.gridClasses.main} > *:first-child${ignoreSsrWarning}`]: {
       borderTopLeftRadius: 'var(--unstable_DataGrid-radius)',
       borderTopRightRadius: 'var(--unstable_DataGrid-radius)'
@@ -367,6 +360,15 @@ const GridRootStyles = exports.GridRootStyles = (0, _styles.styled)('div', {
         width: 'unset'
       }
     },
+    [`&.${_gridClasses.gridClasses.withSidePanel}`]: {
+      flexDirection: 'row'
+    },
+    [`& .${_gridClasses.gridClasses.mainContent}`]: {
+      display: 'flex',
+      flexDirection: 'column',
+      overflow: 'hidden',
+      flex: 1
+    },
     [`& .${_gridClasses.gridClasses.columnHeader}, & .${_gridClasses.gridClasses.cell}`]: {
       WebkitTapHighlightColor: 'transparent',
       padding: '0 10px',
@@ -432,11 +434,14 @@ const GridRootStyles = exports.GridRootStyles = (0, _styles.styled)('div', {
     [`& .${_gridClasses.gridClasses['virtualScroller--hasScrollX']} .${_gridClasses.gridClasses['columnHeader--last']}`]: {
       overflow: 'hidden'
     },
-    [`& .${_gridClasses.gridClasses['columnHeader--sorted']} .${_gridClasses.gridClasses.iconButtonContainer}, & .${_gridClasses.gridClasses['columnHeader--filtered']} .${_gridClasses.gridClasses.iconButtonContainer}`]: {
+    [`& .${_gridClasses.gridClasses['pivotPanelField--sorted']} .${_gridClasses.gridClasses.iconButtonContainer},
+      & .${_gridClasses.gridClasses['columnHeader--sorted']} .${_gridClasses.gridClasses.iconButtonContainer},
+      & .${_gridClasses.gridClasses['columnHeader--filtered']} .${_gridClasses.gridClasses.iconButtonContainer}`]: {
       visibility: 'visible',
       width: 'auto'
     },
-    [`& .${_gridClasses.gridClasses.columnHeader}:not(.${_gridClasses.gridClasses['columnHeader--sorted']}) .${_gridClasses.gridClasses.sortIcon}`]: {
+    [`& .${_gridClasses.gridClasses.pivotPanelField}:not(.${_gridClasses.gridClasses['pivotPanelField--sorted']}) .${_gridClasses.gridClasses.sortButton},
+      & .${_gridClasses.gridClasses.columnHeader}:not(.${_gridClasses.gridClasses['columnHeader--sorted']}) .${_gridClasses.gridClasses.sortButton}`]: {
       opacity: 0,
       transition: _cssVariables.vars.transition(['opacity'], {
         duration: _cssVariables.vars.transitions.duration.short
@@ -505,18 +510,35 @@ const GridRootStyles = exports.GridRootStyles = (0, _styles.styled)('div', {
       backgroundColor: headerBackground
     },
     '@media (hover: hover)': {
-      [`& .${_gridClasses.gridClasses.columnHeader}:hover`]: columnHeaderStyles,
-      [`& .${_gridClasses.gridClasses.columnHeader}:not(.${_gridClasses.gridClasses['columnHeader--sorted']}):hover .${_gridClasses.gridClasses.sortIcon}`]: {
+      [`& .${_gridClasses.gridClasses.columnHeader}:hover`]: {
+        [`& .${_gridClasses.gridClasses.menuIcon}`]: {
+          width: 'auto',
+          visibility: 'visible'
+        },
+        [`& .${_gridClasses.gridClasses.iconButtonContainer}`]: {
+          visibility: 'visible',
+          width: 'auto'
+        }
+      },
+      [`& .${_gridClasses.gridClasses.columnHeader}:not(.${_gridClasses.gridClasses['columnHeader--sorted']}):hover .${_gridClasses.gridClasses.sortButton},
+        & .${_gridClasses.gridClasses.pivotPanelField}:not(.${_gridClasses.gridClasses['pivotPanelField--sorted']}):hover .${_gridClasses.gridClasses.sortButton},
+        & .${_gridClasses.gridClasses.pivotPanelField}:not(.${_gridClasses.gridClasses['pivotPanelField--sorted']}) .${_gridClasses.gridClasses.sortButton}:focus-visible`]: {
         opacity: 0.5
       }
     },
     '@media (hover: none)': {
-      [`& .${_gridClasses.gridClasses.columnHeader}`]: columnHeaderStyles,
+      [`& .${_gridClasses.gridClasses.columnHeader} .${_gridClasses.gridClasses.menuIcon}`]: {
+        width: 'auto',
+        visibility: 'visible'
+      },
       [`& .${_gridClasses.gridClasses.columnHeader}:focus,
         & .${_gridClasses.gridClasses['columnHeader--siblingFocused']}`]: {
         [`.${_gridClasses.gridClasses['columnSeparator--resizable']}`]: {
           color: _cssVariables.vars.colors.foreground.accent
         }
+      },
+      [`& .${_gridClasses.gridClasses.pivotPanelField}:not(.${_gridClasses.gridClasses['pivotPanelField--sorted']}) .${_gridClasses.gridClasses.sortButton}`]: {
+        opacity: 0.5
       }
     },
     [`& .${_gridClasses.gridClasses['columnSeparator--sideLeft']}`]: {
@@ -850,6 +872,9 @@ const GridRootStyles = exports.GridRootStyles = (0, _styles.styled)('div', {
 function setOpacity(color, opacity) {
   return `rgba(from ${color} r g b / ${opacity})`;
 }
+function removeOpacity(color) {
+  return setOpacity(color, 1);
+}
 function mix(background, overlay, opacity) {
   return `color-mix(in srgb,${background}, ${overlay} calc(${opacity} * 100%))`;
 }

package/components/containers/GridToolbarContainer.d.ts

@@ -3,6 +3,9 @@ import { SxProps, Theme } from '@mui/system';
 export type GridToolbarContainerProps = React.HTMLAttributes<HTMLDivElement> & {
   sx?: SxProps<Theme>;
 };
+/**
+ * @deprecated Use the {@link https://mui.com/x/react-data-grid/components/toolbar/ Toolbar} component instead. This component will be removed in a future major release.
+ */
 declare const GridToolbarContainer: React.ForwardRefExoticComponent<GridToolbarContainerProps> | React.ForwardRefExoticComponent<React.HTMLAttributes<HTMLDivElement> & {
   sx?: SxProps<Theme>;
 } & React.RefAttributes<HTMLDivElement>>;

package/components/containers/GridToolbarContainer.js

@@ -41,6 +41,10 @@ const GridToolbarContainerRoot = (0, _system.styled)(_toolbarV.Toolbar, {
   padding: _cssVariables.vars.spacing(0.5),
   minHeight: 'auto'
 });
+
+/**
+ * @deprecated Use the {@link https://mui.com/x/react-data-grid/components/toolbar/ Toolbar} component instead. This component will be removed in a future major release.
+ */
 const GridToolbarContainer = exports.GridToolbarContainer = (0, _forwardRef.forwardRef)(function GridToolbarContainer(props, ref) {
   const {
       className,

package/components/filterPanel/FilterPanelTrigger.js

@@ -13,7 +13,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _useId = _interopRequireDefault(require("@mui/utils/useId"));
 var _forwardRef = require("@mui/x-internals/forwardRef");
 var _useForkRef = _interopRequireDefault(require("@mui/utils/useForkRef"));
-var _GridPreferencePanelContext = require("../panel/GridPreferencePanelContext");
+var _GridPanelContext = require("../panel/GridPanelContext");
 var _useGridApiContext = require("../../hooks/utils/useGridApiContext");
 var _hooks = require("../../hooks");
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
@@ -55,7 +55,7 @@ const FilterPanelTrigger = exports.FilterPanelTrigger = (0, _forwardRef.forwardR
   const resolvedClassName = typeof className === 'function' ? className(state) : className;
   const {
     filterPanelTriggerRef
-  } = (0, _GridPreferencePanelContext.useGridPreferencePanelContext)();
+  } = (0, _GridPanelContext.useGridPanelContext)();
   const handleRef = (0, _useForkRef.default)(ref, filterPanelTriggerRef);
   const handleClick = event => {
     if (open) {

package/components/index.d.ts

@@ -18,6 +18,7 @@ export { GridPagination } from "./GridPagination.js";
 export * from "./GridRowCount.js";
 export * from "./GridRow.js";
 export * from "./GridSelectedRowCount.js";
+export * from "./GridShadowScrollArea.js";
 export * from "./columnsPanel/index.js";
 export * from "./export/index.js";
 export * from "./filterPanel/index.js";

package/components/index.js

@@ -241,6 +241,18 @@ Object.keys(_GridSelectedRowCount).forEach(function (key) {
     }
   });
 });
+var _GridShadowScrollArea = require("./GridShadowScrollArea");
+Object.keys(_GridShadowScrollArea).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _GridShadowScrollArea[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _GridShadowScrollArea[key];
+    }
+  });
+});
 var _columnsPanel = require("./columnsPanel");
 Object.keys(_columnsPanel).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/components/panel/GridPanel.d.ts

@@ -14,6 +14,7 @@ export interface GridPanelProps extends Pick<GridSlotProps['basePopper'], 'id' |
    */
   classes?: Partial<GridPanelClasses>;
   open: boolean;
+  onClose?: () => void;
 }
 export declare const gridPanelClasses: Record<keyof GridPanelClasses, string>;
 declare const GridPanel: React.ForwardRefExoticComponent<GridPanelProps> | React.ForwardRefExoticComponent<Omit<GridPanelProps, "ref"> & React.RefAttributes<HTMLDivElement>>;

package/components/panel/GridPanel.js

@@ -21,7 +21,7 @@ var _useGridApiContext = require("../../hooks/utils/useGridApiContext");
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
 var _assert = require("../../utils/assert");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["children", "className", "classes"];
+const _excluded = ["children", "className", "classes", "onClose"];
 const gridPanelClasses = exports.gridPanelClasses = (0, _utils.unstable_generateUtilityClasses)('MuiDataGrid', ['panel', 'paper']);
 const GridPanelRoot = (0, _styles.styled)(_assert.NotRendered, {
   name: 'MuiDataGrid',
@@ -36,16 +36,16 @@ const GridPanelContent = (0, _styles.styled)('div', {
   backgroundColor: _cssVariables.vars.colors.background.overlay,
   borderRadius: _cssVariables.vars.radius.base,
   boxShadow: _cssVariables.vars.shadows.overlay,
-  minWidth: 300,
-  maxHeight: 450,
   display: 'flex',
-  maxWidth: `calc(100vw - ${_cssVariables.vars.spacing(0.5)})`,
+  maxWidth: `calc(100vw - ${_cssVariables.vars.spacing(2)})`,
+  margin: _cssVariables.vars.spacing(1),
   overflow: 'auto'
 });
 const GridPanel = exports.GridPanel = (0, _forwardRef.forwardRef)((props, ref) => {
   const {
       children,
-      className
+      className,
+      onClose
     } = props,
     other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   const apiRef = (0, _useGridApiContext.useGridApiContext)();
@@ -56,11 +56,11 @@ const GridPanel = exports.GridPanel = (0, _forwardRef.forwardRef)((props, ref) =
   const onDidShow = (0, _useEventCallback.default)(() => setIsPlaced(true));
   const onDidHide = (0, _useEventCallback.default)(() => setIsPlaced(false));
   const handleClickAway = (0, _useEventCallback.default)(() => {
-    apiRef.current.hidePreferences();
+    onClose?.();
   });
   const handleKeyDown = (0, _useEventCallback.default)(event => {
     if (event.key === 'Escape') {
-      apiRef.current.hidePreferences();
+      onClose?.();
     }
   });
   const [fallbackTarget, setFallbackTarget] = React.useState(null);
@@ -109,6 +109,7 @@ process.env.NODE_ENV !== "production" ? GridPanel.propTypes = {
   className: _propTypes.default.string,
   flip: _propTypes.default.bool,
   id: _propTypes.default.string,
+  onClose: _propTypes.default.func,
   open: _propTypes.default.bool.isRequired,
   target: _propTypes.default /* @typescript-to-proptypes-ignore */.any
 } : void 0;

package/components/panel/GridPanelContext.d.ts

@@ -0,0 +1,13 @@
+import * as React from 'react';
+export interface GridPanelContextValue {
+  columnsPanelTriggerRef: React.RefObject<HTMLButtonElement | null>;
+  filterPanelTriggerRef: React.RefObject<HTMLButtonElement | null>;
+  aiAssistantPanelTriggerRef: React.RefObject<HTMLButtonElement | null>;
+}
+export declare const GridPanelContext: React.Context<GridPanelContextValue | undefined>;
+export declare function useGridPanelContext(): GridPanelContextValue;
+export declare function GridPanelContextProvider({
+  children
+}: {
+  children: React.ReactNode;
+}): React.JSX.Element;

package/components/panel/{GridPreferencePanelContext.js → GridPanelContext.js}

@@ -4,29 +4,31 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.GridPreferencePanelContext = void 0;
-exports.GridPreferencePanelContextProvider = GridPreferencePanelContextProvider;
-exports.useGridPreferencePanelContext = useGridPreferencePanelContext;
+exports.GridPanelContext = void 0;
+exports.GridPanelContextProvider = GridPanelContextProvider;
+exports.useGridPanelContext = useGridPanelContext;
 var React = _interopRequireWildcard(require("react"));
 var _jsxRuntime = require("react/jsx-runtime");
-const GridPreferencePanelContext = exports.GridPreferencePanelContext = /*#__PURE__*/React.createContext(undefined);
-function useGridPreferencePanelContext() {
-  const context = React.useContext(GridPreferencePanelContext);
+const GridPanelContext = exports.GridPanelContext = /*#__PURE__*/React.createContext(undefined);
+function useGridPanelContext() {
+  const context = React.useContext(GridPanelContext);
   if (context === undefined) {
     throw new Error('MUI X: Missing context.');
   }
   return context;
 }
-function GridPreferencePanelContextProvider({
+function GridPanelContextProvider({
   children
 }) {
   const columnsPanelTriggerRef = React.useRef(null);
   const filterPanelTriggerRef = React.useRef(null);
+  const aiAssistantPanelTriggerRef = React.useRef(null);
   const value = React.useMemo(() => ({
     columnsPanelTriggerRef,
-    filterPanelTriggerRef
+    filterPanelTriggerRef,
+    aiAssistantPanelTriggerRef
   }), []);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(GridPreferencePanelContext.Provider, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(GridPanelContext.Provider, {
     value: value,
     children: children
   });

package/components/panel/GridPanelFooter.js

@@ -29,8 +29,7 @@ const useUtilityClasses = ownerState => {
 };
 const GridPanelFooterRoot = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
-  slot: 'PanelFooter',
-  overridesResolver: (props, styles) => styles.panelFooter
+  slot: 'PanelFooter'
 })({
   padding: _cssVariables.vars.spacing(1),
   display: 'flex',

package/components/panel/GridPanelHeader.js

@@ -29,8 +29,7 @@ const useUtilityClasses = ownerState => {
 };
 const GridPanelHeaderRoot = (0, _system.styled)('div', {
   name: 'MuiDataGrid',
-  slot: 'PanelHeader',
-  overridesResolver: (props, styles) => styles.panelHeader
+  slot: 'PanelHeader'
 })({
   padding: _cssVariables.vars.spacing(1)
 });

package/components/panel/GridPreferencesPanel.js

@@ -14,7 +14,7 @@ var _gridPreferencePanelSelector = require("../../hooks/features/preferencesPane
 var _gridPreferencePanelsValue = require("../../hooks/features/preferencesPanel/gridPreferencePanelsValue");
 var _useGridApiContext = require("../../hooks/utils/useGridApiContext");
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
-var _GridPreferencePanelContext = require("./GridPreferencePanelContext");
+var _GridPanelContext = require("./GridPanelContext");
 var _jsxRuntime = require("react/jsx-runtime");
 function GridPreferencesPanel() {
   const apiRef = (0, _useGridApiContext.useGridApiContext)();
@@ -23,14 +23,29 @@ function GridPreferencesPanel() {
   const preferencePanelState = (0, _useGridSelector.useGridSelector)(apiRef, _gridPreferencePanelSelector.gridPreferencePanelStateSelector);
   const {
     columnsPanelTriggerRef,
-    filterPanelTriggerRef
-  } = (0, _GridPreferencePanelContext.useGridPreferencePanelContext)();
+    filterPanelTriggerRef,
+    aiAssistantPanelTriggerRef
+  } = (0, _GridPanelContext.useGridPanelContext)();
   const panelContent = apiRef.current.unstable_applyPipeProcessors('preferencePanel', null, preferencePanelState.openedPanelValue ?? _gridPreferencePanelsValue.GridPreferencePanelsValue.filters);
+  let target = null;
+  switch (preferencePanelState.openedPanelValue) {
+    case _gridPreferencePanelsValue.GridPreferencePanelsValue.filters:
+      target = filterPanelTriggerRef.current;
+      break;
+    case _gridPreferencePanelsValue.GridPreferencePanelsValue.columns:
+      target = columnsPanelTriggerRef.current;
+      break;
+    case _gridPreferencePanelsValue.GridPreferencePanelsValue.aiAssistant:
+      target = aiAssistantPanelTriggerRef.current;
+      break;
+    default:
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.panel, (0, _extends2.default)({
     id: preferencePanelState.panelId,
     open: columns.length > 0 && preferencePanelState.open,
     "aria-labelledby": preferencePanelState.labelId,
-    target: preferencePanelState.openedPanelValue === _gridPreferencePanelsValue.GridPreferencePanelsValue.filters ? filterPanelTriggerRef.current : columnsPanelTriggerRef.current
+    target: target,
+    onClose: () => apiRef.current.hidePreferences()
   }, rootProps.slotProps?.panel, {
     children: panelContent
   }));

package/components/panel/filterPanel/GridFilterForm.js

@@ -24,6 +24,7 @@ var _useGridApiContext = require("../../../hooks/utils/useGridApiContext");
 var _useGridRootProps = require("../../../hooks/utils/useGridRootProps");
 var _gridClasses = require("../../../constants/gridClasses");
 var _filterPanelUtils = require("./filterPanelUtils");
+var _pivoting = require("../../../hooks/features/pivoting");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["item", "hasMultipleFilters", "deleteFilter", "applyFilterChanges", "showMultiFilterOperators", "disableMultiFilterOperator", "applyMultiFilterOperatorChanges", "focusElementRef", "logicOperators", "columnsSort", "filterColumns", "deleteIconProps", "logicOperatorInputProps", "operatorInputProps", "columnInputProps", "valueInputProps", "readOnly", "children"],
   _excluded2 = ["InputComponentProps"];
@@ -43,16 +44,14 @@ const useUtilityClasses = ownerState => {
 };
 const GridFilterFormRoot = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
-  slot: 'FilterForm',
-  overridesResolver: (props, styles) => styles.filterForm
+  slot: 'FilterForm'
 })({
   display: 'flex',
   gap: _cssVariables.vars.spacing(1.5)
 });
 const FilterFormDeleteIcon = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
-  slot: 'FilterFormDeleteIcon',
-  overridesResolver: (_, styles) => styles.filterFormDeleteIcon
+  slot: 'FilterFormDeleteIcon'
 })({
   flexShrink: 0,
   display: 'flex',
@@ -61,30 +60,26 @@ const FilterFormDeleteIcon = (0, _styles.styled)('div', {
 });
 const FilterFormLogicOperatorInput = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
-  slot: 'FilterFormLogicOperatorInput',
-  overridesResolver: (_, styles) => styles.filterFormLogicOperatorInput
+  slot: 'FilterFormLogicOperatorInput'
 })({
   minWidth: 75,
   justifyContent: 'end'
 });
 const FilterFormColumnInput = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
-  slot: 'FilterFormColumnInput',
-  overridesResolver: (_, styles) => styles.filterFormColumnInput
+  slot: 'FilterFormColumnInput'
 })({
   width: 150
 });
 const FilterFormOperatorInput = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
-  slot: 'FilterFormOperatorInput',
-  overridesResolver: (_, styles) => styles.filterFormOperatorInput
+  slot: 'FilterFormOperatorInput'
 })({
   width: 150
 });
 const FilterFormValueInput = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
-  slot: 'FilterFormValueInput',
-  overridesResolver: (_, styles) => styles.filterFormValueInput
+  slot: 'FilterFormValueInput'
 })({
   width: 190
 });
@@ -142,6 +137,8 @@ const GridFilterForm = exports.GridFilterForm = (0, _forwardRef.forwardRef)(func
       InputComponentProps
     } = valueInputProps,
     valueInputPropsOther = (0, _objectWithoutPropertiesLoose2.default)(valueInputProps, _excluded2);
+  const pivotActive = (0, _useGridSelector.useGridSelector)(apiRef, _pivoting.gridPivotActiveSelector);
+  const initialColumns = (0, _useGridSelector.useGridSelector)(apiRef, _pivoting.gridPivotInitialColumnsSelector);
   const {
     filteredColumns,
     selectedField
@@ -156,6 +153,12 @@ const GridFilterForm = exports.GridFilterForm = (0, _forwardRef.forwardRef)(func
         selectedField: itemField
       };
     }
+    if (pivotActive) {
+      return {
+        filteredColumns: filterableColumns.filter(column => initialColumns.get(column.field) !== undefined),
+        selectedField: itemField
+      };
+    }
     if (filterColumns === undefined || typeof filterColumns !== 'function') {
       return {
         filteredColumns: filterableColumns,
@@ -177,7 +180,7 @@ const GridFilterForm = exports.GridFilterForm = (0, _forwardRef.forwardRef)(func
       }),
       selectedField: itemField
     };
-  }, [filterColumns, filterModel?.items, filterableColumns, item.field, columnLookup]);
+  }, [item.field, columnLookup, pivotActive, filterColumns, filterableColumns, filterModel?.items, initialColumns]);
   const sortedFilteredColumns = React.useMemo(() => {
     switch (columnsSort) {
       case 'asc':

package/components/quickFilter/QuickFilterControl.js

@@ -99,6 +99,7 @@ process.env.NODE_ENV !== "production" ? QuickFilterControl.propTypes = {
   // | To update them edit the TypeScript types and run "pnpm proptypes"  |
   // ----------------------------------------------------------------------
   autoComplete: _propTypes.default.string,
+  autoFocus: _propTypes.default.bool,
   /**
    * Override or extend the styles applied to the component.
    */
@@ -113,6 +114,7 @@ process.env.NODE_ENV !== "production" ? QuickFilterControl.propTypes = {
     current: _propTypes.default.object
   })]),
   label: _propTypes.default.node,
+  multiline: _propTypes.default.bool,
   placeholder: _propTypes.default.string,
   /**
    * A function to customize rendering of the component.

package/components/toolbar/GridToolbar.d.ts

@@ -13,5 +13,8 @@ export interface GridToolbarProps extends GridToolbarContainerProps, GridToolbar
    */
   quickFilterProps?: GridToolbarQuickFilterProps;
 }
+/**
+ * @deprecated Use the `showToolbar` prop to show the default toolbar instead. This component will be removed in a future major release.
+ */
 declare const GridToolbar: React.ForwardRefExoticComponent<GridToolbarProps> | React.ForwardRefExoticComponent<GridToolbarProps & React.RefAttributes<HTMLDivElement>>;
 export { GridToolbar };

package/components/toolbar/GridToolbar.js

@@ -21,6 +21,9 @@ var _GridToolbarQuickFilter = require("./GridToolbarQuickFilter");
 var _GridToolbar = require("../toolbarV8/GridToolbar");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["className", "csvOptions", "printOptions", "excelOptions", "showQuickFilter", "quickFilterProps"];
+/**
+ * @deprecated Use the `showToolbar` prop to show the default toolbar instead. This component will be removed in a future major release.
+ */
 const GridToolbar = exports.GridToolbar = (0, _forwardRef.forwardRef)(function GridToolbar(props, ref) {
   // TODO v7: think about where export option should be passed.
   // from slotProps={{ toolbarExport: { ...exportOption } }} seems to be more appropriate

package/components/toolbar/GridToolbarColumnsButton.d.ts

@@ -10,5 +10,8 @@ interface GridToolbarColumnsButtonProps {
     tooltip?: Partial<GridSlotProps['baseTooltip']>;
   };
 }
+/**
+ * @deprecated Use the {@link https://mui.com/x/react-data-grid/components/columns-panel/ Columns Panel Trigger} component instead. This component will be removed in a future major release.
+ */
 declare const GridToolbarColumnsButton: React.ForwardRefExoticComponent<GridToolbarColumnsButtonProps> | React.ForwardRefExoticComponent<GridToolbarColumnsButtonProps & React.RefAttributes<HTMLButtonElement>>;
 export { GridToolbarColumnsButton };

package/components/toolbar/GridToolbarColumnsButton.js

@@ -17,8 +17,11 @@ var _gridPreferencePanelSelector = require("../../hooks/features/preferencesPane
 var _gridPreferencePanelsValue = require("../../hooks/features/preferencesPanel/gridPreferencePanelsValue");
 var _useGridApiContext = require("../../hooks/utils/useGridApiContext");
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
-var _GridPreferencePanelContext = require("../panel/GridPreferencePanelContext");
+var _GridPanelContext = require("../panel/GridPanelContext");
 var _jsxRuntime = require("react/jsx-runtime");
+/**
+ * @deprecated Use the {@link https://mui.com/x/react-data-grid/components/columns-panel/ Columns Panel Trigger} component instead. This component will be removed in a future major release.
+ */
 const GridToolbarColumnsButton = exports.GridToolbarColumnsButton = (0, _forwardRef.forwardRef)(function GridToolbarColumnsButton(props, ref) {
   const {
     slotProps = {}
@@ -31,7 +34,7 @@ const GridToolbarColumnsButton = exports.GridToolbarColumnsButton = (0, _forward
   const rootProps = (0, _useGridRootProps.useGridRootProps)();
   const {
     columnsPanelTriggerRef
-  } = (0, _GridPreferencePanelContext.useGridPreferencePanelContext)();
+  } = (0, _GridPanelContext.useGridPanelContext)();
   const preferencePanel = (0, _useGridSelector.useGridSelector)(apiRef, _gridPreferencePanelSelector.gridPreferencePanelStateSelector);
   const handleRef = (0, _useForkRef.default)(ref, columnsPanelTriggerRef);
   const showColumns = event => {