@mui/x-data-grid 7.0.0-beta.6 → 7.0.0-beta.7

package/hooks/features/pagination/useGridRowCount.js

@@ -0,0 +1,97 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import * as React from 'react';
+import { gridFilteredTopLevelRowCountSelector } from '../filter';
+import { useGridLogger, useGridSelector, useGridApiMethod } from '../../utils';
+import { useGridRegisterPipeProcessor } from '../../core/pipeProcessing';
+import { gridPaginationRowCountSelector } from './gridPaginationSelector';
+import { noRowCountInServerMode } from './gridPaginationUtils';
+
+/**
+ * @requires useGridFilter (state)
+ * @requires useGridDimensions (event) - can be after
+ */
+export const useGridRowCount = (apiRef, props) => {
+  var _props$initialState2;
+  const logger = useGridLogger(apiRef, 'useGridRowCount');
+  const visibleTopLevelRowCount = useGridSelector(apiRef, gridFilteredTopLevelRowCountSelector);
+  const rowCount = useGridSelector(apiRef, gridPaginationRowCountSelector);
+  apiRef.current.registerControlState({
+    stateId: 'paginationRowCount',
+    propModel: props.rowCount,
+    propOnChange: props.onRowCountChange,
+    stateSelector: gridPaginationRowCountSelector,
+    changeEvent: 'rowCountChange'
+  });
+
+  /**
+   * API METHODS
+   */
+  const setRowCount = React.useCallback(newRowCount => {
+    if (rowCount === newRowCount) {
+      return;
+    }
+    logger.debug("Setting 'rowCount' to", newRowCount);
+    apiRef.current.setState(state => _extends({}, state, {
+      pagination: _extends({}, state.pagination, {
+        rowCount: newRowCount
+      })
+    }));
+  }, [apiRef, logger, rowCount]);
+  const paginationRowCountApi = {
+    setRowCount
+  };
+  useGridApiMethod(apiRef, paginationRowCountApi, 'public');
+
+  /**
+   * PRE-PROCESSING
+   */
+  const stateExportPreProcessing = React.useCallback((prevState, context) => {
+    var _props$initialState;
+    const exportedRowCount = gridPaginationRowCountSelector(apiRef);
+    const shouldExportRowCount =
+    // Always export if the `exportOnlyDirtyModels` property is not activated
+    !context.exportOnlyDirtyModels ||
+    // Always export if the `rowCount` is controlled
+    props.rowCount != null ||
+    // Always export if the `rowCount` has been initialized
+    ((_props$initialState = props.initialState) == null || (_props$initialState = _props$initialState.pagination) == null ? void 0 : _props$initialState.rowCount) != null;
+    if (!shouldExportRowCount) {
+      return prevState;
+    }
+    return _extends({}, prevState, {
+      pagination: _extends({}, prevState.pagination, {
+        rowCount: exportedRowCount
+      })
+    });
+  }, [apiRef, props.rowCount, (_props$initialState2 = props.initialState) == null || (_props$initialState2 = _props$initialState2.pagination) == null ? void 0 : _props$initialState2.rowCount]);
+  const stateRestorePreProcessing = React.useCallback((params, context) => {
+    var _context$stateToResto;
+    const restoredRowCount = (_context$stateToResto = context.stateToRestore.pagination) != null && _context$stateToResto.rowCount ? context.stateToRestore.pagination.rowCount : gridPaginationRowCountSelector(apiRef);
+    apiRef.current.setState(state => _extends({}, state, {
+      pagination: _extends({}, state.pagination, {
+        rowCount: restoredRowCount
+      })
+    }));
+    return params;
+  }, [apiRef]);
+  useGridRegisterPipeProcessor(apiRef, 'exportState', stateExportPreProcessing);
+  useGridRegisterPipeProcessor(apiRef, 'restoreState', stateRestorePreProcessing);
+
+  /**
+   * EFFECTS
+   */
+  React.useEffect(() => {
+    if (process.env.NODE_ENV !== 'production') {
+      if (props.paginationMode === 'server' && props.rowCount == null) {
+        noRowCountInServerMode();
+      }
+    }
+  }, [props.rowCount, props.paginationMode]);
+  React.useEffect(() => {
+    if (props.paginationMode === 'client') {
+      apiRef.current.setRowCount(visibleTopLevelRowCount);
+    } else if (props.rowCount != null) {
+      apiRef.current.setRowCount(props.rowCount);
+    }
+  }, [apiRef, visibleTopLevelRowCount, props.paginationMode, props.rowCount]);
+};

package/hooks/features/scroll/useGridScroll.js

@@ -45,7 +45,7 @@ function scrollIntoView(dimensions) {
 export const useGridScroll = (apiRef, props) => {
   const theme = useTheme();
   const logger = useGridLogger(apiRef, 'useGridScroll');
-  const colRef = apiRef.current.columnHeadersElementRef;
+  const colRef = apiRef.current.columnHeadersContainerRef;
   const virtualScrollerRef = apiRef.current.virtualScrollerRef;
   const visibleSortedRows = useGridSelector(apiRef, gridExpandedSortedRowEntriesSelector);
   const scrollToIndexes = React.useCallback(params => {

package/hooks/features/virtualization/gridVirtualizationSelectors.d.ts

@@ -1,5 +1,5 @@
-import { GridRenderContext } from '../../../models/params/gridScrollParams';
-import { GridStateCommunity } from '../../../models/gridStateCommunity';
+import type { GridColumnsRenderContext } from '../../../models/params/gridScrollParams';
+import type { GridStateCommunity } from '../../../models/gridStateCommunity';
 /**
  * Get the columns state
  * @category Virtualization
@@ -20,11 +20,11 @@ export declare const gridVirtualizationColumnEnabledSelector: import("../../../u
  * @category Virtualization
  * @ignore - do not document.
  */
-export declare const gridRenderContextSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, GridRenderContext>;
+export declare const gridRenderContextSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../../models/params/gridScrollParams").GridRenderContext>;
 /**
  * Get the render context, with only columns filled in.
  * This is cached, so it can be used to only re-render when the column interval changes.
  * @category Virtualization
  * @ignore - do not document.
  */
-export declare const gridRenderContextColumnsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, GridRenderContext>;
+export declare const gridRenderContextColumnsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, GridColumnsRenderContext>;

package/hooks/features/virtualization/gridVirtualizationSelectors.js

@@ -31,8 +31,6 @@ export const gridRenderContextSelector = createSelector(gridVirtualizationSelect
  * @ignore - do not document.
  */
 export const gridRenderContextColumnsSelector = createSelectorMemoized(state => state.virtualization.renderContext.firstColumnIndex, state => state.virtualization.renderContext.lastColumnIndex, (firstColumnIndex, lastColumnIndex) => ({
-  firstRowIndex: -1,
-  lastRowIndex: -1,
   firstColumnIndex,
   lastColumnIndex
 }));

package/hooks/features/virtualization/useGridVirtualScroller.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Theme } from '@mui/material/styles';
 import { GridPinnedRowsPosition } from '../rows/gridRowsInterfaces';
-import { GridRenderContext, GridRowEntry, GridRowId } from '../../../models';
+import type { GridRenderContext, GridColumnsRenderContext, GridRowEntry, GridRowId } from '../../../models';
 export declare const EMPTY_DETAIL_PANELS: Readonly<Map<GridRowId, React.ReactNode>>;
 export type VirtualScroller = ReturnType<typeof useGridVirtualScroller>;
 export declare const useGridVirtualScroller: () => {
@@ -41,4 +41,4 @@ export declare const useGridVirtualScroller: () => {
     };
 };
 export declare function areRenderContextsEqual(context1: GridRenderContext, context2: GridRenderContext): boolean;
-export declare function computeOffsetLeft(columnPositions: number[], renderContext: GridRenderContext, direction: Theme['direction'], pinnedLeftLength: number): number;
+export declare function computeOffsetLeft(columnPositions: number[], renderContext: GridColumnsRenderContext, direction: Theme['direction'], pinnedLeftLength: number): number;

package/hooks/utils/useLazyRef.d.ts

@@ -1,2 +1 @@
-import * as React from 'react';
-export declare function useLazyRef<T, U>(init: (arg?: U) => T, initArg?: U): React.MutableRefObject<T>;
+export { default as useLazyRef } from '@mui/utils/useLazyRef';

package/hooks/utils/useLazyRef.js

@@ -1,11 +1 @@
-import * as React from 'react';
-const UNINITIALIZED = {};
-
-// See https://github.com/facebook/react/issues/14490 for when to use this.
-export function useLazyRef(init, initArg) {
-  const ref = React.useRef(UNINITIALIZED);
-  if (ref.current === UNINITIALIZED) {
-    ref.current = init(initArg);
-  }
-  return ref;
-}
+export { default as useLazyRef } from '@mui/utils/useLazyRef';

package/hooks/utils/useOnMount.d.ts

@@ -1,2 +1 @@
-import * as React from 'react';
-export declare function useOnMount(fn: React.EffectCallback): void;
+export { default as useOnMount } from '@mui/utils/useOnMount';

package/hooks/utils/useOnMount.js

@@ -1,7 +1 @@
-import * as React from 'react';
-const EMPTY = [];
-export function useOnMount(fn) {
-  /* eslint-disable react-hooks/exhaustive-deps */
-  React.useEffect(fn, EMPTY);
-  /* eslint-enable react-hooks/exhaustive-deps */
-}
+export { default as useOnMount } from '@mui/utils/useOnMount';

package/hooks/utils/useTimeout.d.ts

@@ -1,11 +1 @@
-export declare class Timeout {
-    static create(): Timeout;
-    currentId: ReturnType<typeof setTimeout> | null;
-    /**
-     * Executes `fn` after `delay`, clearing any previously scheduled call.
-     */
-    start(delay: number, fn: Function): void;
-    clear: () => void;
-    disposeEffect: () => () => void;
-}
-export declare function useTimeout(): Timeout;
+export { default as useTimeout } from '@mui/utils/useTimeout';

package/hooks/utils/useTimeout.js

@@ -1,36 +1 @@
-'use client';
-
-import { useLazyRef } from './useLazyRef';
-import { useOnMount } from './useOnMount';
-export class Timeout {
-  constructor() {
-    this.currentId = null;
-    this.clear = () => {
-      if (this.currentId !== null) {
-        clearTimeout(this.currentId);
-        this.currentId = null;
-      }
-    };
-    this.disposeEffect = () => {
-      return this.clear;
-    };
-  }
-  static create() {
-    return new Timeout();
-  }
-  /**
-   * Executes `fn` after `delay`, clearing any previously scheduled call.
-   */
-  start(delay, fn) {
-    this.clear();
-    this.currentId = setTimeout(() => {
-      this.currentId = null;
-      fn();
-    }, delay);
-  }
-}
-export function useTimeout() {
-  const timeout = useLazyRef(Timeout.create).current;
-  useOnMount(timeout.disposeEffect);
-  return timeout;
-}
+export { default as useTimeout } from '@mui/utils/useTimeout';

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v7.0.0-beta.6
+ * @mui/x-data-grid v7.0.0-beta.7
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/internals/index.d.ts

@@ -6,7 +6,6 @@ export type { GridDetailPanelsProps } from '../components/GridDetailPanels';
 export type { GridPinnedRowsProps } from '../components/GridPinnedRows';
 export { GridHeaders } from '../components/GridHeaders';
 export { GridBaseColumnHeaders } from '../components/columnHeaders/GridBaseColumnHeaders';
-export { GridColumnHeadersInner } from '../components/columnHeaders/GridColumnHeadersInner';
 export { DATA_GRID_DEFAULT_SLOTS_COMPONENTS } from '../constants/defaultGridSlotsComponents';
 export { getGridFilter } from '../components/panel/filterPanel/GridFilterPanel';
 export { useGridRegisterPipeProcessor } from '../hooks/core/pipeProcessing';
@@ -61,6 +60,7 @@ export { useGridStatePersistence } from '../hooks/features/statePersistence/useG
 export type { GridRestoreStatePreProcessingContext } from '../hooks/features/statePersistence/gridStatePersistenceInterface';
 export { useGridVirtualScroller, EMPTY_DETAIL_PANELS, } from '../hooks/features/virtualization/useGridVirtualScroller';
 export * from '../hooks/features/virtualization';
+export { useGridColumnResize, columnResizeStateInitializer, } from '../hooks/features/columnResize/useGridColumnResize';
 export { useTimeout } from '../hooks/utils/useTimeout';
 export { useGridVisibleRows, getVisibleRows } from '../hooks/utils/useGridVisibleRows';
 export { useGridInitializeState } from '../hooks/utils/useGridInitializeState';

package/internals/index.js

@@ -3,7 +3,6 @@ export { GridVirtualScrollerContent } from '../components/virtualization/GridVir
 export { GridVirtualScrollerRenderZone } from '../components/virtualization/GridVirtualScrollerRenderZone';
 export { GridHeaders } from '../components/GridHeaders';
 export { GridBaseColumnHeaders } from '../components/columnHeaders/GridBaseColumnHeaders';
-export { GridColumnHeadersInner } from '../components/columnHeaders/GridColumnHeadersInner';
 export { DATA_GRID_DEFAULT_SLOTS_COMPONENTS } from '../constants/defaultGridSlotsComponents';
 export { getGridFilter } from '../components/panel/filterPanel/GridFilterPanel';
 export { useGridRegisterPipeProcessor } from '../hooks/core/pipeProcessing';
@@ -49,6 +48,7 @@ export { dimensionsStateInitializer, useGridDimensions } from '../hooks/features
 export { useGridStatePersistence } from '../hooks/features/statePersistence/useGridStatePersistence';
 export { useGridVirtualScroller, EMPTY_DETAIL_PANELS } from '../hooks/features/virtualization/useGridVirtualScroller';
 export * from '../hooks/features/virtualization';
+export { useGridColumnResize, columnResizeStateInitializer } from '../hooks/features/columnResize/useGridColumnResize';
 export { useTimeout } from '../hooks/utils/useTimeout';
 export { useGridVisibleRows, getVisibleRows } from '../hooks/utils/useGridVisibleRows';
 export { useGridInitializeState } from '../hooks/utils/useGridInitializeState';

package/internals/utils/getPinnedCellOffset.d.ts

@@ -0,0 +1,3 @@
+import { GridPinnedColumnPosition, gridColumnPositionsSelector } from '../../hooks/features/columns';
+import type { GridDimensions } from '../../hooks/features/dimensions';
+export declare const getPinnedCellOffset: (pinnedPosition: GridPinnedColumnPosition | undefined, computedWidth: number, columnIndex: number, columnPositions: ReturnType<typeof gridColumnPositionsSelector>, dimensions: GridDimensions) => number;

package/internals/utils/getPinnedCellOffset.js

@@ -0,0 +1,17 @@
+import { GridPinnedColumnPosition } from '../../hooks/features/columns';
+export const getPinnedCellOffset = (pinnedPosition, computedWidth, columnIndex, columnPositions, dimensions) => {
+  const scrollbarWidth = dimensions.hasScrollY ? dimensions.scrollbarSize : 0;
+  let pinnedOffset;
+  switch (pinnedPosition) {
+    case GridPinnedColumnPosition.LEFT:
+      pinnedOffset = columnPositions[columnIndex];
+      break;
+    case GridPinnedColumnPosition.RIGHT:
+      pinnedOffset = dimensions.columnsTotalWidth - columnPositions[columnIndex] - computedWidth + scrollbarWidth;
+      break;
+    default:
+      pinnedOffset = 0;
+      break;
+  }
+  return pinnedOffset;
+};

package/joy/joySlots.js

@@ -4,10 +4,9 @@ const _excluded = ["touchRippleRef", "inputProps", "onChange", "color", "size",
   _excluded2 = ["onChange", "label", "placeholder", "value", "inputRef", "type", "size", "variant"],
   _excluded3 = ["startIcon", "color", "endIcon", "size", "sx", "variant"],
   _excluded4 = ["color", "size", "sx", "touchRippleRef"],
-  _excluded5 = ["name", "checkedIcon", "color", "disableRipple", "disableFocusRipple", "disableTouchRipple", "edge", "icon", "inputProps", "inputRef", "size", "sx", "onChange", "onClick"],
-  _excluded6 = ["open", "onOpen", "value", "onChange", "size", "color", "variant", "inputProps", "MenuProps", "inputRef", "error", "native", "fullWidth", "labelId"],
-  _excluded7 = ["native"],
-  _excluded8 = ["shrink", "variant", "sx"];
+  _excluded5 = ["open", "onOpen", "value", "onChange", "size", "color", "variant", "inputProps", "MenuProps", "inputRef", "error", "native", "fullWidth", "labelId"],
+  _excluded6 = ["native"],
+  _excluded7 = ["shrink", "variant", "sx"];
 import * as React from 'react';
 import JoyCheckbox from '@mui/joy/Checkbox';
 import JoyInput from '@mui/joy/Input';
@@ -15,7 +14,6 @@ import JoyFormControl from '@mui/joy/FormControl';
 import JoyFormLabel from '@mui/joy/FormLabel';
 import JoyButton from '@mui/joy/Button';
 import JoyIconButton from '@mui/joy/IconButton';
-import JoySwitch from '@mui/joy/Switch';
 import JoySelect from '@mui/joy/Select';
 import JoyOption from '@mui/joy/Option';
 import JoyBox from '@mui/joy/Box';
@@ -156,43 +154,7 @@ const IconButton = /*#__PURE__*/React.forwardRef(function IconButton(_ref4, ref)
     sx: sx
   }));
 });
-const Switch = /*#__PURE__*/React.forwardRef(function Switch(_ref5, ref) {
-  let {
-      name,
-      color: colorProp,
-      edge,
-      icon,
-      inputProps,
-      inputRef,
-      size,
-      sx,
-      onChange,
-      onClick
-    } = _ref5,
-    props = _objectWithoutPropertiesLoose(_ref5, _excluded5);
-  return /*#__PURE__*/_jsx(JoySwitch, _extends({}, props, {
-    onChange: onChange,
-    size: convertSize(size),
-    color: convertColor(colorProp),
-    ref: ref,
-    slotProps: {
-      input: _extends({}, inputProps, {
-        name,
-        onClick: onClick,
-        ref: inputRef
-      }),
-      thumb: {
-        children: icon
-      }
-    },
-    sx: [_extends({}, edge === 'start' && {
-      ml: '-8px'
-    }, edge === 'end' && {
-      mr: '-8px'
-    }), ...(Array.isArray(sx) ? sx : [sx])]
-  }));
-});
-const Select = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
+const Select = /*#__PURE__*/React.forwardRef((_ref5, ref) => {
   let {
       open,
       onOpen,
@@ -204,8 +166,8 @@ const Select = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
       MenuProps,
       inputRef,
       labelId
-    } = _ref6,
-    props = _objectWithoutPropertiesLoose(_ref6, _excluded6);
+    } = _ref5,
+    props = _objectWithoutPropertiesLoose(_ref5, _excluded5);
   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
@@ -257,17 +219,17 @@ const Select = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
     }
   }));
 });
-const Option = /*#__PURE__*/React.forwardRef((_ref7, ref) => {
-  let props = _objectWithoutPropertiesLoose(_ref7, _excluded7);
+const Option = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
+  let props = _objectWithoutPropertiesLoose(_ref6, _excluded6);
   return /*#__PURE__*/_jsx(JoyOption, _extends({}, props, {
     ref: ref
   }));
 });
-const InputLabel = /*#__PURE__*/React.forwardRef((_ref8, ref) => {
+const InputLabel = /*#__PURE__*/React.forwardRef((_ref7, ref) => {
   let {
       sx
-    } = _ref8,
-    props = _objectWithoutPropertiesLoose(_ref8, _excluded8);
+    } = _ref7,
+    props = _objectWithoutPropertiesLoose(_ref7, _excluded7);
   return /*#__PURE__*/_jsx(JoyFormLabel, _extends({}, props, {
     ref: ref,
     sx: sx
@@ -296,8 +258,8 @@ const Pagination = /*#__PURE__*/React.forwardRef((props, ref) => {
   const paginationModel = gridPaginationModelSelector(apiRef);
   const visibleTopLevelRowCount = gridFilteredTopLevelRowCountSelector(apiRef);
   const rowCount = React.useMemo(() => {
-    var _ref9, _rootProps$rowCount;
-    return (_ref9 = (_rootProps$rowCount = rootProps.rowCount) != null ? _rootProps$rowCount : visibleTopLevelRowCount) != null ? _ref9 : 0;
+    var _ref8, _rootProps$rowCount;
+    return (_ref8 = (_rootProps$rowCount = rootProps.rowCount) != null ? _rootProps$rowCount : visibleTopLevelRowCount) != null ? _ref8 : 0;
   }, [rootProps.rowCount, visibleTopLevelRowCount]);
   const lastPage = React.useMemo(() => Math.floor(rowCount / (paginationModel.pageSize || 1)), [rowCount, paginationModel.pageSize]);
   const handlePageChange = React.useCallback(page => {
@@ -400,7 +362,6 @@ const joySlots = _extends({}, joyIconSlots, {
   baseTextField: TextField,
   baseButton: Button,
   baseIconButton: IconButton,
-  baseSwitch: Switch,
   baseSelect: Select,
   baseSelectOption: Option,
   baseInputLabel: InputLabel,

package/locales/jaJP.js

@@ -30,10 +30,9 @@ const jaJPGrid = {
   toolbarExportPrint: '印刷',
   toolbarExportExcel: 'Excelダウンロード',
   // Columns management text
-  // columnsManagementSearchTitle: 'Search',
-  // columnsManagementNoColumns: 'No columns',
-  // columnsManagementShowHideAllText: 'Show/Hide All',
-
+  columnsManagementSearchTitle: '検索',
+  columnsManagementNoColumns: 'カラムなし',
+  columnsManagementShowHideAllText: 'すべて表示/非表示',
   // Filter panel text
   filterPanelAddFilter: 'フィルター追加',
   filterPanelRemoveAll: 'すべて削除',

package/material/index.js

@@ -3,7 +3,6 @@ import MUICheckbox from '@mui/material/Checkbox';
 import MUITextField from '@mui/material/TextField';
 import MUIFormControl from '@mui/material/FormControl';
 import MUISelect from '@mui/material/Select';
-import MUISwitch from '@mui/material/Switch';
 import MUIButton from '@mui/material/Button';
 import MUIIconButton from '@mui/material/IconButton';
 import MUIInputAdornment from '@mui/material/InputAdornment';
@@ -56,7 +55,6 @@ const materialSlots = _extends({}, iconSlots, {
   baseTextField: MUITextField,
   baseFormControl: MUIFormControl,
   baseSelect: MUISelect,
-  baseSwitch: MUISwitch,
   baseButton: MUIButton,
   baseIconButton: MUIIconButton,
   baseInputAdornment: MUIInputAdornment,

package/models/api/gridApiCommon.d.ts

@@ -28,10 +28,10 @@ import { GridColumnGroupingApi } from './gridColumnGroupingApi';
 import type { GridInitialStateCommunity, GridStateCommunity } from '../gridStateCommunity';
 import { GridHeaderFilteringApi, GridHeaderFilteringPrivateApi } from './gridHeaderFilteringApi';
 import type { DataGridProcessedProps } from '../props/DataGridProps';
-import type { GridInfiniteLoaderPrivateApi } from './gridInfiniteLoaderApi';
-export interface GridApiCommon<GridState extends GridStateCommunity = any, GridInitialState extends GridInitialStateCommunity = any> extends GridCoreApi, GridPipeProcessingApi, GridDensityApi, GridDimensionsApi, GridRowApi, GridRowsMetaApi, GridEditingApi, GridParamsApi, GridColumnApi, GridRowSelectionApi, GridSortApi, GridPaginationApi, GridCsvExportApi, GridFocusApi, GridFilterApi, GridColumnMenuApi, GridPreferencesPanelApi, GridPrintExportApi, GridVirtualizationApi, GridLocaleTextApi, GridScrollApi, GridColumnSpanningApi, GridStateApi<GridState>, GridStatePersistenceApi<GridInitialState>, GridColumnGroupingApi, GridHeaderFilteringApi {
+import type { GridColumnResizeApi } from '../../hooks/features/columnResize';
+export interface GridApiCommon<GridState extends GridStateCommunity = any, GridInitialState extends GridInitialStateCommunity = any> extends GridCoreApi, GridPipeProcessingApi, GridDensityApi, GridDimensionsApi, GridRowApi, GridRowsMetaApi, GridEditingApi, GridParamsApi, GridColumnApi, GridRowSelectionApi, GridSortApi, GridPaginationApi, GridCsvExportApi, GridFocusApi, GridFilterApi, GridColumnMenuApi, GridPreferencesPanelApi, GridPrintExportApi, GridVirtualizationApi, GridLocaleTextApi, GridScrollApi, GridColumnSpanningApi, GridStateApi<GridState>, GridStatePersistenceApi<GridInitialState>, GridColumnGroupingApi, GridHeaderFilteringApi, GridColumnResizeApi {
 }
-export interface GridPrivateOnlyApiCommon<Api extends GridApiCommon, PrivateApi extends GridPrivateApiCommon, Props extends DataGridProcessedProps> extends GridCorePrivateApi<Api, PrivateApi, Props>, GridStatePrivateApi<PrivateApi['state']>, GridPipeProcessingPrivateApi, GridStrategyProcessingApi, GridColumnSpanningPrivateApi, GridRowsMetaPrivateApi, GridDimensionsPrivateApi, GridEditingPrivateApi, GridLoggerApi, GridFocusPrivateApi, GridHeaderFilteringPrivateApi, GridVirtualizationPrivateApi, GridInfiniteLoaderPrivateApi {
+export interface GridPrivateOnlyApiCommon<Api extends GridApiCommon, PrivateApi extends GridPrivateApiCommon, Props extends DataGridProcessedProps> extends GridCorePrivateApi<Api, PrivateApi, Props>, GridStatePrivateApi<PrivateApi['state']>, GridPipeProcessingPrivateApi, GridStrategyProcessingApi, GridColumnSpanningPrivateApi, GridRowsMetaPrivateApi, GridDimensionsPrivateApi, GridEditingPrivateApi, GridLoggerApi, GridFocusPrivateApi, GridHeaderFilteringPrivateApi, GridVirtualizationPrivateApi {
 }
 export interface GridPrivateApiCommon extends GridApiCommon, GridPrivateOnlyApiCommon<GridApiCommon, GridPrivateApiCommon, DataGridProcessedProps> {
 }

package/models/api/gridCoreApi.d.ts

@@ -67,11 +67,7 @@ export interface GridCorePrivateApi<GridPublicApi extends GridApiCommon, GridPri
     /**
      * The React ref of the grid column container virtualized div element.
      */
-    columnHeadersContainerElementRef?: React.RefObject<HTMLDivElement>;
-    /**
-     * The React ref of the grid column headers container element.
-     */
-    columnHeadersElementRef?: React.RefObject<HTMLDivElement>;
+    columnHeadersContainerRef?: React.RefObject<HTMLDivElement>;
     /**
      * The React ref of the grid header filter row element.
      */

package/models/events/gridEventLookup.d.ts

@@ -369,6 +369,12 @@ export interface GridControlledStateEventLookup {
     columnVisibilityModelChange: {
         params: GridColumnVisibilityModel;
     };
+    /**
+     * Fired when the row count change.
+     */
+    rowCountChange: {
+        params: number;
+    };
 }
 export interface GridControlledStateReasonLookup {
     filter: 'upsertFilterItem' | 'upsertFilterItems' | 'deleteFilterItem' | 'changeLogicOperator' | 'restoreState' | 'removeAllFilterItems';

package/models/gridHeaderFilteringModel.d.ts

@@ -1,5 +1,6 @@
 import { GridColDef } from './colDef';
 export type GridHeaderFilteringState = {
+    enabled: boolean;
     editing: GridColDef['field'] | null;
     menuOpen: GridColDef['field'] | null;
 };

package/models/gridSlotsComponent.d.ts

@@ -33,11 +33,6 @@ export interface GridBaseSlots {
      * @default Select
      */
     baseSelect: React.JSXElementConstructor<GridSlotProps['baseSelect']>;
-    /**
-     * The custom Switch component used in the grid.
-     * @default Switch
-     */
-    baseSwitch: React.JSXElementConstructor<GridSlotProps['baseSwitch']>;
     /**
      * The custom Button component used in the grid.
      * @default Button

package/models/gridStateCommunity.d.ts

@@ -5,6 +5,7 @@ import type { GridEditingState } from './gridEditRowModel';
 import { GridHeaderFilteringState } from './gridHeaderFilteringModel';
 import type { GridRowSelectionModel } from './gridRowSelectionModel';
 import type { GridVisibleRowsLookupState } from '../hooks/features/filter/gridFilterState';
+import type { GridColumnResizeState } from '../hooks/features/columnResize';
 /**
  * The state of `DataGrid`.
  */
@@ -29,6 +30,7 @@ export interface GridStateCommunity {
     preferencePanel: GridPreferencePanelState;
     density: GridDensityState;
     virtualization: GridVirtualizationState;
+    columnResize: GridColumnResizeState;
 }
 /**
  * The initial state of `DataGrid`.

package/models/params/gridScrollParams.d.ts

@@ -1,9 +1,11 @@
-export interface GridRenderContext {
-    firstRowIndex: number;
-    lastRowIndex: number;
+export interface GridColumnsRenderContext {
     firstColumnIndex: number;
     lastColumnIndex: number;
 }
+export interface GridRenderContext extends GridColumnsRenderContext {
+    firstRowIndex: number;
+    lastRowIndex: number;
+}
 export interface GridScrollParams {
     left: number;
     top: number;

package/models/props/DataGridProps.d.ts

@@ -24,6 +24,7 @@ import { GridColumnVisibilityModel } from '../../hooks/features/columns/gridColu
 import { GridCellModesModel, GridRowModesModel } from '../api/gridEditingApi';
 import { GridColumnGroupingModel } from '../gridColumnGrouping';
 import { GridPaginationModel } from '../gridPaginationProps';
+import type { GridAutosizeOptions } from '../../hooks/features/columnResize';
 export interface GridExperimentalFeatures {
     /**
      * Emits a warning if the cell receives focus without also syncing the focus state.
@@ -46,7 +47,7 @@ export interface DataGridProcessedProps<R extends GridValidRowModel = any> exten
  * The props of the `DataGrid` component after the pre-processing phase that the user should not be able to override.
  * Those are usually used in feature-hook for which the pro-plan has more advanced features (eg: multi-sorting, multi-filtering, ...).
  */
-export type DataGridForcedPropsKey = 'checkboxSelectionVisibleOnly' | 'disableMultipleColumnsFiltering' | 'disableMultipleColumnsSorting' | 'disableColumnReorder' | 'disableColumnResize' | 'keepColumnPositionIfDraggedOutside' | 'throttleRowsMs' | 'hideFooterRowCount' | 'pagination' | 'signature';
+export type DataGridForcedPropsKey = 'checkboxSelectionVisibleOnly' | 'disableMultipleColumnsFiltering' | 'disableMultipleColumnsSorting' | 'disableColumnReorder' | 'keepColumnPositionIfDraggedOutside' | 'throttleRowsMs' | 'hideFooterRowCount' | 'pagination' | 'signature';
 /**
  * The `DataGrid` options with a default value that must be merged with the value given through props.
  */
@@ -342,6 +343,16 @@ export interface DataGridPropsWithDefaultValues {
      * @default 166
      */
     rowPositionsDebounceMs: number;
+    /**
+     * If `true`, columns are autosized after the datagrid is mounted.
+     * @default false
+     */
+    autosizeOnMount: boolean;
+    /**
+     * If `true`, column autosizing on header separator double-click is disabled.
+     * @default false
+     */
+    disableAutosize: boolean;
 }
 /**
  * The `DataGrid` props with no default value.
@@ -559,6 +570,11 @@ export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel =
      * @param {GridCallbackDetails} details Additional details for this callback.
      */
     onPaginationModelChange?: (model: GridPaginationModel, details: GridCallbackDetails) => void;
+    /**
+     * Callback fired when the row count has changed.
+     * @param {number} count Updated row count.
+     */
+    onRowCountChange?: (count: number) => void;
     /**
      * Callback fired when the preferences panel is closed.
      * @param {GridPreferencePanelParams} params With all properties from [[GridPreferencePanelParams]].
@@ -714,4 +730,22 @@ export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel =
      * @param {string} data The data copied to the clipboard.
      */
     onClipboardCopy?: GridEventListener<'clipboardCopy'>;
+    /**
+     * The options for autosize when user-initiated.
+     */
+    autosizeOptions?: GridAutosizeOptions;
+    /**
+     * Callback fired while a column is being resized.
+     * @param {GridColumnResizeParams} params With all properties from [[GridColumnResizeParams]].
+     * @param {MuiEvent<React.MouseEvent>} event The event object.
+     * @param {GridCallbackDetails} details Additional details for this callback.
+     */
+    onColumnResize?: GridEventListener<'columnResize'>;
+    /**
+     * Callback fired when the width of a column is changed.
+     * @param {GridColumnResizeParams} params With all properties from [[GridColumnResizeParams]].
+     * @param {MuiEvent<React.MouseEvent>} event The event object.
+     * @param {GridCallbackDetails} details Additional details for this callback.
+     */
+    onColumnWidthChange?: GridEventListener<'columnWidthChange'>;
 }