@mui/x-data-grid 7.21.0 → 7.22.0

package/joy/joySlots.js

@@ -1,14 +1,17 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["touchRippleRef", "inputProps", "onChange", "color", "size", "checked", "sx", "value", "inputRef"],
-  _excluded2 = ["onChange", "label", "placeholder", "value", "inputRef", "type", "size", "variant"],
-  _excluded3 = ["startIcon", "color", "endIcon", "size", "sx", "variant"],
-  _excluded4 = ["color", "size", "sx", "touchRippleRef"],
-  _excluded5 = ["open", "onOpen", "value", "onChange", "size", "color", "variant", "inputProps", "MenuProps", "inputRef", "error", "native", "fullWidth", "labelId"],
-  _excluded6 = ["native"],
-  _excluded7 = ["shrink", "variant", "sx"];
+const _excluded = ["slotProps", "variant", "color", "sx"],
+  _excluded2 = ["touchRippleRef", "inputProps", "onChange", "color", "size", "checked", "sx", "value", "inputRef"],
+  _excluded3 = ["onChange", "label", "placeholder", "value", "inputRef", "type", "size", "variant"],
+  _excluded4 = ["startIcon", "color", "endIcon", "size", "sx", "variant"],
+  _excluded5 = ["color", "size", "sx", "touchRippleRef"],
+  _excluded6 = ["open", "onOpen", "value", "onChange", "size", "color", "variant", "inputProps", "MenuProps", "inputRef", "error", "native", "fullWidth", "labelId"],
+  _excluded7 = ["native"],
+  _excluded8 = ["shrink", "variant", "sx"];
 import * as React from 'react';
+import JoyBadge from '@mui/joy/Badge';
 import JoyCheckbox from '@mui/joy/Checkbox';
+import JoyDivider from '@mui/joy/Divider';
 import JoyInput from '@mui/joy/Input';
 import JoyFormControl from '@mui/joy/FormControl';
 import JoyFormLabel from '@mui/joy/FormLabel';
@@ -58,14 +61,27 @@ function convertVariant(variant, defaultVariant = 'plain') {
     filled: 'soft'
   }[variant] || defaultVariant;
 }
-const Checkbox = /*#__PURE__*/React.forwardRef((_ref, ref) => {
+const Badge = /*#__PURE__*/React.forwardRef((_ref, ref) => {
+  let {
+      color,
+      sx
+    } = _ref,
+    props = _objectWithoutPropertiesLoose(_ref, _excluded);
+  return /*#__PURE__*/_jsx(JoyBadge, _extends({}, props, {
+    color: convertColor(color),
+    variant: "plain",
+    sx: sx,
+    ref: ref
+  }));
+});
+const Checkbox = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
   let {
       inputProps,
       onChange,
       checked,
       inputRef
-    } = _ref,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded);
+    } = _ref2,
+    props = _objectWithoutPropertiesLoose(_ref2, _excluded2);
   return /*#__PURE__*/_jsx(JoyCheckbox, _extends({}, props, {
     slotProps: {
       input: _extends({}, inputProps, {
@@ -77,7 +93,7 @@ const Checkbox = /*#__PURE__*/React.forwardRef((_ref, ref) => {
     onChange: onChange
   }));
 });
-const TextField = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
+const TextField = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
   let {
       onChange,
       label,
@@ -87,8 +103,8 @@ const TextField = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
       type,
       size,
       variant
-    } = _ref2,
-    props = _objectWithoutPropertiesLoose(_ref2, _excluded2);
+    } = _ref3,
+    props = _objectWithoutPropertiesLoose(_ref3, _excluded3);
   const rootRef = useForkRef(ref, props.InputProps?.ref);
   const inputForkRef = useForkRef(inputRef, props?.inputProps?.ref);
   const {
@@ -116,7 +132,7 @@ const TextField = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
     })]
   });
 });
-const Button = /*#__PURE__*/React.forwardRef(function Button(_ref3, ref) {
+const Button = /*#__PURE__*/React.forwardRef(function Button(_ref4, ref) {
   let {
       startIcon,
       color,
@@ -124,8 +140,8 @@ const Button = /*#__PURE__*/React.forwardRef(function Button(_ref3, ref) {
       size,
       sx,
       variant
-    } = _ref3,
-    props = _objectWithoutPropertiesLoose(_ref3, _excluded3);
+    } = _ref4,
+    props = _objectWithoutPropertiesLoose(_ref4, _excluded4);
   return /*#__PURE__*/_jsx(JoyButton, _extends({}, props, {
     size: convertSize(size),
     color: convertColor(color),
@@ -136,13 +152,13 @@ const Button = /*#__PURE__*/React.forwardRef(function Button(_ref3, ref) {
     sx: sx
   }));
 });
-const IconButton = /*#__PURE__*/React.forwardRef(function IconButton(_ref4, ref) {
+const IconButton = /*#__PURE__*/React.forwardRef(function IconButton(_ref5, ref) {
   let {
       color,
       size,
       sx
-    } = _ref4,
-    props = _objectWithoutPropertiesLoose(_ref4, _excluded4);
+    } = _ref5,
+    props = _objectWithoutPropertiesLoose(_ref5, _excluded5);
   return /*#__PURE__*/_jsx(JoyIconButton, _extends({}, props, {
     size: convertSize(size),
     color: convertColor(color) ?? 'neutral',
@@ -151,7 +167,7 @@ const IconButton = /*#__PURE__*/React.forwardRef(function IconButton(_ref4, ref)
     sx: sx
   }));
 });
-const Select = /*#__PURE__*/React.forwardRef((_ref5, ref) => {
+const Select = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
   let {
       open,
       onOpen,
@@ -163,8 +179,8 @@ const Select = /*#__PURE__*/React.forwardRef((_ref5, ref) => {
       MenuProps,
       inputRef,
       labelId
-    } = _ref5,
-    props = _objectWithoutPropertiesLoose(_ref5, _excluded5);
+    } = _ref6,
+    props = _objectWithoutPropertiesLoose(_ref6, _excluded6);
   const handleChange = (event, newValue) => {
     if (event && onChange) {
       // Same as in https://github.com/mui/material-ui/blob/e5558282a8f36856aef1299f3a36f3235e92e770/packages/mui-material/src/Select/SelectInput.js#L288-L300
@@ -215,17 +231,17 @@ const Select = /*#__PURE__*/React.forwardRef((_ref5, ref) => {
     }
   }));
 });
-const Option = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
-  let props = _objectWithoutPropertiesLoose(_ref6, _excluded6);
+const Option = /*#__PURE__*/React.forwardRef((_ref7, ref) => {
+  let props = _objectWithoutPropertiesLoose(_ref7, _excluded7);
   return /*#__PURE__*/_jsx(JoyOption, _extends({}, props, {
     ref: ref
   }));
 });
-const InputLabel = /*#__PURE__*/React.forwardRef((_ref7, ref) => {
+const InputLabel = /*#__PURE__*/React.forwardRef((_ref8, ref) => {
   let {
       sx
-    } = _ref7,
-    props = _objectWithoutPropertiesLoose(_ref7, _excluded7);
+    } = _ref8,
+    props = _objectWithoutPropertiesLoose(_ref8, _excluded8);
   return /*#__PURE__*/_jsx(JoyFormLabel, _extends({}, props, {
     ref: ref,
     sx: sx
@@ -351,7 +367,9 @@ const LoadingOverlay = /*#__PURE__*/React.forwardRef((props, ref) => {
   }));
 });
 const joySlots = _extends({}, joyIconSlots, {
+  baseBadge: Badge,
   baseCheckbox: Checkbox,
+  baseDivider: JoyDivider,
   baseTextField: TextField,
   baseButton: Button,
   baseIconButton: IconButton,

package/locales/daDK.js

@@ -33,8 +33,7 @@ const daDKGrid = {
   columnsManagementSearchTitle: 'Søg',
   columnsManagementNoColumns: 'Ingen søjler',
   columnsManagementShowHideAllText: 'Vis/Skjul Alle',
-  // columnsManagementReset: 'Reset',
-
+  columnsManagementReset: 'Nulstil',
   // Filter panel text
   filterPanelAddFilter: 'Tilføj filter',
   filterPanelRemoveAll: 'Fjern alle',
@@ -48,9 +47,9 @@ const daDKGrid = {
   filterPanelInputPlaceholder: 'Filterværdi',
   // Filter operators text
   filterOperatorContains: 'indeholder',
-  // filterOperatorDoesNotContain: 'does not contain',
+  filterOperatorDoesNotContain: 'indeholder ikke',
   filterOperatorEquals: 'lig med',
-  // filterOperatorDoesNotEqual: 'does not equal',
+  filterOperatorDoesNotEqual: 'ikke lig med',
   filterOperatorStartsWith: 'begynder med',
   filterOperatorEndsWith: 'ender med',
   filterOperatorIs: 'er lig med',
@@ -70,9 +69,9 @@ const daDKGrid = {
   'filterOperator<=': '<=',
   // Header filter operators text
   headerFilterOperatorContains: 'Indeholder',
-  // headerFilterOperatorDoesNotContain: 'Does not contain',
+  headerFilterOperatorDoesNotContain: 'Indeholder ikke',
   headerFilterOperatorEquals: 'Lig med',
-  // headerFilterOperatorDoesNotEqual: 'Does not equal',
+  headerFilterOperatorDoesNotEqual: 'Ikke lig med',
   headerFilterOperatorStartsWith: 'Begynder med',
   headerFilterOperatorEndsWith: 'Ender med',
   headerFilterOperatorIs: 'Er lig med',

package/locales/itIT.js

@@ -30,11 +30,10 @@ const itITGrid = {
   toolbarExportPrint: 'Stampa',
   toolbarExportExcel: 'Scarica come Excel',
   // Columns management text
-  // columnsManagementSearchTitle: 'Search',
-  // columnsManagementNoColumns: 'No columns',
-  // columnsManagementShowHideAllText: 'Show/Hide All',
-  // columnsManagementReset: 'Reset',
-
+  columnsManagementSearchTitle: 'Cerca',
+  columnsManagementNoColumns: 'Nessuna colonna',
+  columnsManagementShowHideAllText: 'Mostra/Nascondi Tutto',
+  columnsManagementReset: 'Resetta',
   // Filter panel text
   filterPanelAddFilter: 'Aggiungi un filtro',
   filterPanelRemoveAll: 'Rimuovi filtri',
@@ -48,13 +47,13 @@ const itITGrid = {
   filterPanelInputPlaceholder: 'Filtra il valore',
   // Filter operators text
   filterOperatorContains: 'contiene',
-  // filterOperatorDoesNotContain: 'does not contain',
+  filterOperatorDoesNotContain: 'non contiene',
   filterOperatorEquals: 'uguale a',
-  // filterOperatorDoesNotEqual: 'does not equal',
+  filterOperatorDoesNotEqual: 'diverso da',
   filterOperatorStartsWith: 'comincia per',
   filterOperatorEndsWith: 'termina per',
   filterOperatorIs: 'uguale a',
-  filterOperatorNot: 'diversa da',
+  filterOperatorNot: 'diverso da',
   filterOperatorAfter: 'dopo il',
   filterOperatorOnOrAfter: 'a partire dal',
   filterOperatorBefore: 'prima del',
@@ -70,26 +69,26 @@ const itITGrid = {
   'filterOperator<=': '<=',
   // Header filter operators text
   headerFilterOperatorContains: 'Contiene',
-  // headerFilterOperatorDoesNotContain: 'Does not contain',
-  headerFilterOperatorEquals: 'uguale a',
-  // headerFilterOperatorDoesNotEqual: 'Does not equal',
-  headerFilterOperatorStartsWith: 'comincia per',
-  headerFilterOperatorEndsWith: 'termina per',
-  headerFilterOperatorIs: 'uguale a',
-  headerFilterOperatorNot: 'diversa da',
-  headerFilterOperatorAfter: 'dopo il',
-  headerFilterOperatorOnOrAfter: 'a partire dal',
-  headerFilterOperatorBefore: 'prima del',
-  headerFilterOperatorOnOrBefore: 'fino al',
-  headerFilterOperatorIsEmpty: 'è vuoto',
-  headerFilterOperatorIsNotEmpty: 'non è vuoto',
-  headerFilterOperatorIsAnyOf: 'è uno tra',
-  'headerFilterOperator=': 'uguale a',
-  'headerFilterOperator!=': 'diverso da',
-  'headerFilterOperator>': 'maggiore di',
-  'headerFilterOperator>=': 'maggiore o uguale a',
-  'headerFilterOperator<': 'minore di',
-  'headerFilterOperator<=': 'minore o uguale a',
+  headerFilterOperatorDoesNotContain: 'Non contiene',
+  headerFilterOperatorEquals: 'Uguale a',
+  headerFilterOperatorDoesNotEqual: 'Diverso da',
+  headerFilterOperatorStartsWith: 'Comincia per',
+  headerFilterOperatorEndsWith: 'Termina per',
+  headerFilterOperatorIs: 'Uguale a',
+  headerFilterOperatorNot: 'Diverso da',
+  headerFilterOperatorAfter: 'Dopo il',
+  headerFilterOperatorOnOrAfter: 'A partire dal',
+  headerFilterOperatorBefore: 'Prima del',
+  headerFilterOperatorOnOrBefore: 'Fino al',
+  headerFilterOperatorIsEmpty: 'È vuoto',
+  headerFilterOperatorIsNotEmpty: 'Non è vuoto',
+  headerFilterOperatorIsAnyOf: 'È uno tra',
+  'headerFilterOperator=': 'Uguale a',
+  'headerFilterOperator!=': 'Diverso da',
+  'headerFilterOperator>': 'Maggiore di',
+  'headerFilterOperator>=': 'Maggiore o uguale a',
+  'headerFilterOperator<': 'Minore di',
+  'headerFilterOperator<=': 'Minore o uguale a',
   // Filter values text
   filterValueAny: 'qualunque',
   filterValueTrue: 'vero',

package/locales/ptBR.js

@@ -47,9 +47,9 @@ const ptBRGrid = {
   filterPanelInputPlaceholder: 'Filtrar valor',
   // Filter operators text
   filterOperatorContains: 'contém',
-  // filterOperatorDoesNotContain: 'does not contain',
+  filterOperatorDoesNotContain: 'não contém',
   filterOperatorEquals: 'é igual a',
-  // filterOperatorDoesNotEqual: 'does not equal',
+  filterOperatorDoesNotEqual: 'não é igual a',
   filterOperatorStartsWith: 'começa com',
   filterOperatorEndsWith: 'termina com',
   filterOperatorIs: 'é',
@@ -69,9 +69,9 @@ const ptBRGrid = {
   'filterOperator<=': 'menor ou igual que',
   // Header filter operators text
   headerFilterOperatorContains: 'Contém',
-  // headerFilterOperatorDoesNotContain: 'Does not contain',
+  headerFilterOperatorDoesNotContain: 'Não contém',
   headerFilterOperatorEquals: 'Igual',
-  // headerFilterOperatorDoesNotEqual: 'Does not equal',
+  headerFilterOperatorDoesNotEqual: 'Não é igual a',
   headerFilterOperatorStartsWith: 'Começa com',
   headerFilterOperatorEndsWith: 'Termina com',
   headerFilterOperatorIs: 'É',

package/material/index.js

@@ -1,5 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import MUIBadge from '@mui/material/Badge';
 import MUICheckbox from '@mui/material/Checkbox';
+import MUIDivider from '@mui/material/Divider';
 import MUITextField from '@mui/material/TextField';
 import MUIFormControl from '@mui/material/FormControl';
 import MUISelect from '@mui/material/Select';
@@ -51,7 +53,9 @@ const iconSlots = {
   columnReorderIcon: GridDragIcon
 };
 const materialSlots = _extends({}, iconSlots, {
+  baseBadge: MUIBadge,
   baseCheckbox: MUICheckbox,
+  baseDivider: MUIDivider,
   baseTextField: MUITextField,
   baseFormControl: MUIFormControl,
   baseSelect: MUISelect,

package/models/gridExport.d.ts

@@ -141,7 +141,7 @@ export interface GridPrintExportOptions extends GridExportOptions {
     /**
      * Provide Print specific styles to the print window.
      */
-    pageStyle?: string | Function;
+    pageStyle?: string | (() => string);
     /**
      * Function that returns the list of row ids to export in the order they should be exported.
      * @param {GridPrintGetRowsToExportParams} params With all properties from [[GridPrintGetRowsToExportParams]].

package/models/gridSlotsComponent.d.ts

@@ -3,6 +3,11 @@ import type { GridSlotProps } from './gridSlotsComponentsProps';
 import type { GridIconSlotsComponent } from './gridIconSlotsComponent';
 export type { GridSlotProps } from './gridSlotsComponentsProps';
 export interface GridBaseSlots {
+    /**
+     * The custom Badge component used in the grid for both header and cells.
+     * @default Badge
+     */
+    baseBadge: React.JSXElementConstructor<GridSlotProps['baseBadge']>;
     /**
      * The custom Checkbox component used in the grid for both header and cells.
      * @default Checkbox
@@ -13,6 +18,11 @@ export interface GridBaseSlots {
      * @default Chip
      */
     baseChip: React.JSXElementConstructor<GridSlotProps['baseChip']>;
+    /**
+     * The custom Divider component used in the grid.
+     * @default Divider
+     */
+    baseDivider: React.JSXElementConstructor<GridSlotProps['baseDivider']>;
     /**
      * The custom InputAdornment component used in the grid.
      * @default InputAdornment

package/models/gridSlotsComponentsProps.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import type { BadgeProps } from '@mui/material/Badge';
 import type { CheckboxProps } from '@mui/material/Checkbox';
 import type { TextFieldProps } from '@mui/material/TextField';
 import type { FormControlProps } from '@mui/material/FormControl';
@@ -30,8 +31,13 @@ import type { GridColumnsManagementProps } from '../components/columnsManagement
 import type { GridLoadingOverlayProps } from '../components/GridLoadingOverlay';
 import type { GridRowCountProps } from '../components/GridRowCount';
 import type { GridColumnHeaderSortIconProps } from '../components/columnHeaders/GridColumnHeaderSortIcon';
+type DividerProps = {};
+export interface BaseBadgePropsOverrides {
+}
 export interface BaseCheckboxPropsOverrides {
 }
+export interface BaseDividerPropsOverrides {
+}
 export interface BaseTextFieldPropsOverrides {
 }
 export interface BaseFormControlPropsOverrides {
@@ -95,7 +101,9 @@ export interface SkeletonCellPropsOverrides {
 export interface RowPropsOverrides {
 }
 export interface GridSlotProps {
+    baseBadge: BadgeProps & BaseBadgePropsOverrides;
     baseCheckbox: CheckboxProps & BaseCheckboxPropsOverrides;
+    baseDivider: DividerProps & BaseDividerPropsOverrides;
     baseTextField: TextFieldProps & BaseTextFieldPropsOverrides;
     baseFormControl: FormControlProps & BaseFormControlPropsOverrides;
     baseSelect: SelectProps & BaseSelectPropsOverrides;
@@ -139,3 +147,4 @@ export interface GridSlotProps {
 export type GridSlotsComponentsProps = Partial<{
     [K in keyof GridSlotProps]: Partial<GridSlotProps[K]>;
 }>;
+export {};

package/modern/components/cell/GridBooleanCell.js

@@ -4,6 +4,8 @@ const _excluded = ["id", "value", "formattedValue", "api", "field", "row", "rowN
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import composeClasses from '@mui/utils/composeClasses';
+import { useGridSelector } from "../../hooks/utils/useGridSelector.js";
+import { gridRowMaximumTreeDepthSelector } from "../../hooks/features/rows/gridRowsSelector.js";
 import { getDataGridUtilityClass } from "../../constants/gridClasses.js";
 import { useGridRootProps } from "../../hooks/utils/useGridRootProps.js";
 import { useGridApiContext } from "../../hooks/utils/useGridApiContext.js";
@@ -20,7 +22,8 @@ const useUtilityClasses = ownerState => {
 };
 function GridBooleanCellRaw(props) {
   const {
-      value
+      value,
+      rowNode
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const apiRef = useGridApiContext();
@@ -29,7 +32,14 @@ function GridBooleanCellRaw(props) {
     classes: rootProps.classes
   };
   const classes = useUtilityClasses(ownerState);
+  const maxDepth = useGridSelector(apiRef, gridRowMaximumTreeDepthSelector);
+  const isServerSideRowGroupingRow =
+  // @ts-expect-error - Access tree data prop
+  maxDepth > 0 && rowNode.type === 'group' && rootProps.treeData === false;
   const Icon = React.useMemo(() => value ? rootProps.slots.booleanCellTrueIcon : rootProps.slots.booleanCellFalseIcon, [rootProps.slots.booleanCellFalseIcon, rootProps.slots.booleanCellTrueIcon, value]);
+  if (isServerSideRowGroupingRow && value === undefined) {
+    return null;
+  }
   return /*#__PURE__*/_jsx(Icon, _extends({
     fontSize: "small",
     className: classes.root,

package/modern/components/columnHeaders/GridColumnHeaderFilterIconButton.js

@@ -2,7 +2,6 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { unstable_composeClasses as composeClasses, unstable_useId as useId } from '@mui/utils';
-import Badge from '@mui/material/Badge';
 import { useGridSelector } from "../../hooks/index.js";
 import { gridPreferencePanelStateSelector } from "../../hooks/features/preferencesPanel/gridPreferencePanelSelector.js";
 import { GridPreferencePanelsValue } from "../../hooks/features/preferencesPanel/gridPreferencePanelsValue.js";
@@ -76,7 +75,7 @@ function GridColumnHeaderFilterIconButton(props) {
     enterDelay: 1000
   }, rootProps.slotProps?.baseTooltip, {
     children: /*#__PURE__*/_jsxs(GridIconButtonContainer, {
-      children: [counter > 1 && /*#__PURE__*/_jsx(Badge, {
+      children: [counter > 1 && /*#__PURE__*/_jsx(rootProps.slots.baseBadge, {
         badgeContent: counter,
         color: "default",
         children: iconButton

package/modern/components/columnHeaders/GridColumnHeaderSortIcon.js

@@ -4,7 +4,6 @@ const _excluded = ["direction", "index", "sortingOrder", "disabled"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import composeClasses from '@mui/utils/composeClasses';
-import Badge from '@mui/material/Badge';
 import { useGridApiContext } from "../../hooks/utils/useGridApiContext.js";
 import { getDataGridUtilityClass } from "../../constants/gridClasses.js";
 import { useGridRootProps } from "../../hooks/utils/useGridRootProps.js";
@@ -63,7 +62,7 @@ function GridColumnHeaderSortIconRaw(props) {
     children: iconElement
   }));
   return /*#__PURE__*/_jsxs(GridIconButtonContainer, {
-    children: [index != null && /*#__PURE__*/_jsx(Badge, {
+    children: [index != null && /*#__PURE__*/_jsx(rootProps.slots.baseBadge, {
       badgeContent: index,
       color: "default",
       overlap: "circular",

package/modern/components/containers/GridRootStyles.js

@@ -152,6 +152,8 @@ export const GridRootStyles = styled('div', {
     [`& .${c.treeDataGroupingCellToggle}`]: styles.treeDataGroupingCellToggle
   }, {
     [`& .${c.treeDataGroupingCellLoadingContainer}`]: styles.treeDataGroupingCellLoadingContainer
+  }, {
+    [`& .${c.groupingCriteriaCellLoadingContainer}`]: styles.groupingCriteriaCellLoadingContainer
   }, {
     [`& .${c.detailPanelToggleCell}`]: styles.detailPanelToggleCell
   }, {
@@ -685,7 +687,7 @@ export const GridRootStyles = styled('div', {
       alignSelf: 'stretch',
       marginRight: t.spacing(2)
     },
-    [`& .${c.treeDataGroupingCellLoadingContainer}`]: {
+    [`& .${c.treeDataGroupingCellLoadingContainer}, .${c.groupingCriteriaCellLoadingContainer}`]: {
       display: 'flex',
       alignItems: 'center',
       justifyContent: 'center',
@@ -718,7 +720,7 @@ export const GridRootStyles = styled('div', {
       }
     },
     [`& .${c.filler}`]: {
-      flex: 1
+      flex: '1 0 auto'
     },
     [`& .${c['filler--borderBottom']}`]: {
       borderBottom: '1px solid var(--DataGrid-rowBorderColor)'

package/modern/components/panel/filterPanel/GridFilterInputBoolean.js

@@ -38,7 +38,7 @@ function GridFilterInputBoolean(props) {
     const value = event.target.value;
     setFilterValueState(value);
     applyValue(_extends({}, item, {
-      value
+      value: Boolean(value)
     }));
   }, [applyValue, item]);
   React.useEffect(() => {

package/modern/components/panel/filterPanel/GridFilterInputMultipleValue.js

@@ -39,9 +39,9 @@ function GridFilterInputMultipleValue(props) {
   const handleChange = React.useCallback((event, value) => {
     setFilterValueState(value.map(String));
     applyValue(_extends({}, item, {
-      value: [...value]
+      value: [...value.map(filterItemValue => type === 'number' ? Number(filterItemValue) : filterItemValue)]
     }));
-  }, [applyValue, item]);
+  }, [applyValue, item, type]);
   return /*#__PURE__*/_jsx(Autocomplete, _extends({
     multiple: true,
     freeSolo: true,

package/modern/components/panel/filterPanel/GridFilterInputValue.js

@@ -34,13 +34,13 @@ function GridFilterInputValue(props) {
     setIsApplying(true);
     filterTimeout.start(rootProps.filterDebounceMs, () => {
       const newItem = _extends({}, item, {
-        value,
+        value: type === 'number' ? Number(value) : value,
         fromInput: id
       });
       applyValue(newItem);
       setIsApplying(false);
     });
-  }, [id, applyValue, item, rootProps.filterDebounceMs, filterTimeout]);
+  }, [filterTimeout, rootProps.filterDebounceMs, item, type, id, applyValue]);
   React.useEffect(() => {
     const itemPlusTag = item;
     if (itemPlusTag.fromInput !== id || item.value === undefined) {

package/modern/components/toolbar/GridToolbar.js

@@ -3,7 +3,6 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 const _excluded = ["className", "csvOptions", "printOptions", "excelOptions", "showQuickFilter", "quickFilterProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import Box from '@mui/material/Box';
 import { GridToolbarContainer } from "../containers/GridToolbarContainer.js";
 import { GridToolbarColumnsButton } from "./GridToolbarColumnsButton.js";
 import { GridToolbarDensitySelector } from "./GridToolbarDensitySelector.js";
@@ -36,8 +35,8 @@ const GridToolbar = /*#__PURE__*/React.forwardRef(function GridToolbar(props, re
       // TODO: remove the reference to excelOptions in community package
       ,
       excelOptions: excelOptions
-    }), /*#__PURE__*/_jsx(Box, {
-      sx: {
+    }), /*#__PURE__*/_jsx("div", {
+      style: {
         flex: 1
       }
     }), showQuickFilter && /*#__PURE__*/_jsx(GridToolbarQuickFilter, _extends({}, quickFilterProps))]

package/modern/components/toolbar/GridToolbarExport.js

@@ -78,19 +78,7 @@ process.env.NODE_ENV !== "production" ? GridPrintExportMenuItem.propTypes = {
     hideFooter: PropTypes.bool,
     hideToolbar: PropTypes.bool,
     includeCheckboxes: PropTypes.bool,
-    pageStyle: PropTypes.oneOfType([PropTypes.shape({
-      '__@hasInstance@646': PropTypes.func.isRequired,
-      '__@metadata@648': PropTypes.any,
-      apply: PropTypes.func.isRequired,
-      arguments: PropTypes.any.isRequired,
-      bind: PropTypes.func.isRequired,
-      call: PropTypes.func.isRequired,
-      caller: PropTypes.object.isRequired,
-      length: PropTypes.number.isRequired,
-      name: PropTypes.string.isRequired,
-      prototype: PropTypes.any.isRequired,
-      toString: PropTypes.func.isRequired
-    }), PropTypes.string])
+    pageStyle: PropTypes.oneOfType([PropTypes.func, PropTypes.string])
   })
 } : void 0;
 const GridToolbarExport = /*#__PURE__*/React.forwardRef(function GridToolbarExport(props, ref) {

package/modern/components/toolbar/GridToolbarFilterButton.js

@@ -3,7 +3,6 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { styled } from '@mui/material/styles';
 import { unstable_composeClasses as composeClasses, unstable_capitalize as capitalize, unstable_useId as useId } from '@mui/utils';
-import Badge from '@mui/material/Badge';
 import { gridColumnLookupSelector } from "../../hooks/features/columns/gridColumnsSelector.js";
 import { useGridSelector } from "../../hooks/utils/useGridSelector.js";
 import { gridFilterActiveItemsSelector } from "../../hooks/features/filter/gridFilterSelector.js";
@@ -104,7 +103,7 @@ const GridToolbarFilterButton = /*#__PURE__*/React.forwardRef(function GridToolb
       "aria-controls": isOpen ? filterPanelId : undefined,
       "aria-expanded": isOpen,
       "aria-haspopup": true,
-      startIcon: /*#__PURE__*/_jsx(Badge, {
+      startIcon: /*#__PURE__*/_jsx(rootProps.slots.baseBadge, {
         badgeContent: activeFilters.length,
         color: "primary",
         children: /*#__PURE__*/_jsx(rootProps.slots.openFilterButtonIcon, {})

package/modern/components/virtualization/GridBottomContainer.js

@@ -4,9 +4,6 @@ import clsx from 'clsx';
 import { styled } from '@mui/system';
 import composeClasses from '@mui/utils/composeClasses';
 import { gridClasses, getDataGridUtilityClass } from "../../constants/gridClasses.js";
-import { gridDimensionsSelector } from "../../hooks/features/dimensions/gridDimensionsSelectors.js";
-import { useGridApiContext } from "../../hooks/utils/useGridApiContext.js";
-import { useGridSelector } from "../../hooks/utils/useGridSelector.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const useUtilityClasses = () => {
   const slots = {
@@ -21,22 +18,8 @@ const Element = styled('div')({
 });
 export function GridBottomContainer(props) {
   const classes = useUtilityClasses();
-  const apiRef = useGridApiContext();
-  const {
-    viewportOuterSize,
-    minimumSize,
-    hasScrollX,
-    scrollbarSize
-  } = useGridSelector(apiRef, gridDimensionsSelector);
-  const scrollHeight = hasScrollX ? scrollbarSize : 0;
-  const offset = Math.max(viewportOuterSize.height - minimumSize.height -
-  // Subtract scroll height twice to account for GridVirtualScrollerFiller and horizontal scrollbar
-  2 * scrollHeight, 0);
   return /*#__PURE__*/_jsx(Element, _extends({}, props, {
     className: clsx(classes.root, gridClasses['container--bottom']),
-    style: {
-      transform: `translateY(${offset}px)`
-    },
     role: "presentation"
   }));
 }

package/modern/components/virtualization/GridMainContainer.js

@@ -7,7 +7,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const GridPanelAnchor = styled('div')({
   position: 'absolute',
   top: `var(--DataGrid-headersTotalHeight)`,
-  left: 0
+  left: 0,
+  width: 'calc(100% - (var(--DataGrid-hasScrollY) * var(--DataGrid-scrollbarSize)))'
 });
 const Element = styled('div', {
   name: 'MuiDataGrid',

package/modern/components/virtualization/GridVirtualScroller.js

@@ -40,6 +40,8 @@ const Scroller = styled('div', {
   flexGrow: 1,
   overflow: 'scroll',
   scrollbarWidth: 'none' /* Firefox */,
+  display: 'flex',
+  flexDirection: 'column',
   '&::-webkit-scrollbar': {
     display: 'none' /* Safari and Chrome */
   },