@mui/x-data-grid 5.6.0 → 5.6.1

package/context/GridContextProvider.d.ts

@@ -1,6 +1,9 @@
-/// <reference types="react" />
-export declare const GridContextProvider: ({ apiRef, props, children }: {
-    apiRef: any;
-    props: any;
-    children: any;
-}) => JSX.Element;
+import * as React from 'react';
+import { GridApiCommunity } from '../models/api/gridApiCommunity';
+declare type GridContextProviderProps = {
+    apiRef: React.MutableRefObject<GridApiCommunity>;
+    props: {};
+    children: React.ReactNode;
+};
+export declare const GridContextProvider: ({ apiRef, props, children }: GridContextProviderProps) => JSX.Element;
+export {};

package/hooks/features/columnMenu/useGridColumnMenu.d.ts

@@ -1,5 +1,7 @@
 import * as React from 'react';
 import { GridApiCommunity } from '../../../models/api/gridApiCommunity';
+import { GridStateInitializer } from '../../utils/useGridInitializeState';
+export declare const columnMenuStateInitializer: GridStateInitializer;
 /**
  * @requires useGridColumnResize (event)
  * @requires useGridInfiniteLoader (event)

package/hooks/features/columnMenu/useGridColumnMenu.js

@@ -1,21 +1,20 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { GridEvents } from '../../../models/events';
-import { useGridStateInit } from '../../utils/useGridStateInit';
 import { useGridLogger, useGridApiMethod, useGridApiEventHandler } from '../../utils';
 import { gridColumnMenuSelector } from './columnMenuSelector';
-
+export const columnMenuStateInitializer = state => _extends({}, state, {
+  columnMenu: {
+    open: false
+  }
+});
 /**
  * @requires useGridColumnResize (event)
  * @requires useGridInfiniteLoader (event)
  */
+
 export const useGridColumnMenu = apiRef => {
   const logger = useGridLogger(apiRef, 'useGridColumnMenu');
-  useGridStateInit(apiRef, state => _extends({}, state, {
-    columnMenu: {
-      open: false
-    }
-  }));
   /**
    * API METHODS
    */

package/hooks/features/columns/gridColumnsSelector.d.ts

@@ -63,38 +63,38 @@ export declare const gridFilterableColumnLookupSelector: import("../../../utils/
  * @deprecated Use `gridColumnFieldsSelector` instead.
  * @ignore - do not document.
  */
-export declare const allGridColumnsFieldsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, string[]>;
+export declare const allGridColumnsFieldsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, string[]> | ((...args: any[]) => any);
 /**
  * @category Columns
  * @deprecated Use `gridColumnDefinitionsSelector` instead.
  * @ignore - do not document.
  */
-export declare const allGridColumnsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridStateColDef[]>;
+export declare const allGridColumnsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridStateColDef[]> | ((...args: any[]) => any);
 /**
  * @category Visible Columns
  * @deprecated Use `gridVisibleColumnDefinitionsSelector` instead.
  * @ignore - do not document.
  */
-export declare const visibleGridColumnsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridStateColDef[]>;
+export declare const visibleGridColumnsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridStateColDef[]> | ((...args: any[]) => any);
 /**
  * @category Columns
  * @deprecated Use `gridFilterableColumnDefinitionsSelector` instead.
  * @ignore - do not document.
  */
-export declare const filterableGridColumnsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridStateColDef[]>;
+export declare const filterableGridColumnsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridStateColDef[]> | ((...args: any[]) => any);
 /**
  * @category Columns
  * @deprecated Use `gridFilterableColumnLookupSelector` instead (not the same return format).
  * @ignore - do not document.
  */
-export declare const filterableGridColumnsIdsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, string[]>;
+export declare const filterableGridColumnsIdsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, string[]> | ((...args: any[]) => any);
 /**
  * Get the amount of visible columns.
  * @category Visible Columns
- * @deprecated Use the length of `gridVisibleColumnDefinitionsSelector` instead.
+ * @deprecated Use the length of the array returned by `gridVisibleColumnDefinitionsSelector` instead.
  * @ignore - do not document.
  */
-export declare const visibleGridColumnsLengthSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, number>;
+export declare const visibleGridColumnsLengthSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, number> | ((...args: any[]) => any);
 /**
  * @category Visible Columns
  * @deprecated Use `gridColumnsTotalWidthSelector` or `gridColumnPositionsSelector` instead.
@@ -103,4 +103,4 @@ export declare const visibleGridColumnsLengthSelector: import("../../../utils/cr
 export declare const gridColumnsMetaSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, {
     totalWidth: number;
     positions: number[];
-}>;
+}> | ((...args: any[]) => any);

package/hooks/features/columns/gridColumnsSelector.js

@@ -1,11 +1,12 @@
 import { createSelector } from '../../../utils/createSelector';
-
+import { wrapWithWarningOnCall } from '../../../utils/warning';
 /**
  * @category Columns
  * @deprecated Use the selector returning exactly the value you are looking for.
  * @ignore - do not document.
  * TODO v6: Rename `gridColumnsStateSelector`
  */
+
 export const gridColumnsSelector = state => state.columns;
 /**
  * Get the field of each column.
@@ -98,50 +99,50 @@ export const gridFilterableColumnLookupSelector = createSelector(gridColumnDefin
  * @ignore - do not document.
  */
 
-export const allGridColumnsFieldsSelector = gridColumnFieldsSelector;
+export const allGridColumnsFieldsSelector = wrapWithWarningOnCall(gridColumnFieldsSelector, ['MUI: The method allGridColumnsFieldsSelector is deprecated and will be removed in the next major version.', 'Use gridColumnFieldsSelector instead']);
 /**
  * @category Columns
  * @deprecated Use `gridColumnDefinitionsSelector` instead.
  * @ignore - do not document.
  */
 
-export const allGridColumnsSelector = gridColumnDefinitionsSelector;
+export const allGridColumnsSelector = wrapWithWarningOnCall(gridColumnDefinitionsSelector, ['MUI: The method allGridColumnsSelector is deprecated and will be removed in the next major version.', 'Use gridColumnDefinitionsSelector instead']);
 /**
  * @category Visible Columns
  * @deprecated Use `gridVisibleColumnDefinitionsSelector` instead.
  * @ignore - do not document.
  */
 
-export const visibleGridColumnsSelector = gridVisibleColumnDefinitionsSelector;
+export const visibleGridColumnsSelector = wrapWithWarningOnCall(gridVisibleColumnDefinitionsSelector, ['MUI: The method visibleGridColumnsSelector is deprecated and will be removed in the next major version.', 'Use gridVisibleColumnDefinitionsSelector instead']);
 /**
  * @category Columns
  * @deprecated Use `gridFilterableColumnDefinitionsSelector` instead.
  * @ignore - do not document.
  */
 
-export const filterableGridColumnsSelector = gridFilterableColumnDefinitionsSelector;
+export const filterableGridColumnsSelector = wrapWithWarningOnCall(gridFilterableColumnDefinitionsSelector, ['MUI: The method filterableGridColumnsSelector is deprecated and will be removed in the next major version.', 'Use gridFilterableColumnDefinitionsSelector instead']);
 /**
  * @category Columns
  * @deprecated Use `gridFilterableColumnLookupSelector` instead (not the same return format).
  * @ignore - do not document.
  */
 
-export const filterableGridColumnsIdsSelector = createSelector(gridFilterableColumnDefinitionsSelector, columns => columns.map(col => col.field));
+export const filterableGridColumnsIdsSelector = wrapWithWarningOnCall(createSelector(gridFilterableColumnDefinitionsSelector, columns => columns.map(col => col.field)), ['MUI: The method filterableGridColumnsIdsSelector is deprecated and will be removed in the next major version.', 'Use gridFilterableColumnDefinitionsSelector instead.', 'The return format is now a lookup, if you want to get the same output as before, use the following code:', '', 'const lookup = gridFilterableColumnLookupSelector(apiRef);', 'const fields = gridColumnFieldsSelector(apiRef).filter(field => lookup[field]);']);
 /**
  * Get the amount of visible columns.
  * @category Visible Columns
- * @deprecated Use the length of `gridVisibleColumnDefinitionsSelector` instead.
+ * @deprecated Use the length of the array returned by `gridVisibleColumnDefinitionsSelector` instead.
  * @ignore - do not document.
  */
 
-export const visibleGridColumnsLengthSelector = createSelector(gridVisibleColumnDefinitionsSelector, visibleColumns => visibleColumns.length);
+export const visibleGridColumnsLengthSelector = wrapWithWarningOnCall(createSelector(gridVisibleColumnDefinitionsSelector, visibleColumns => visibleColumns.length), ['MUI: The method visibleGridColumnsLengthSelector is deprecated and will be removed in the next major version.', 'Use the length of the array returned by gridVisibleColumnDefinitionsSelector instead.']);
 /**
  * @category Visible Columns
  * @deprecated Use `gridColumnsTotalWidthSelector` or `gridColumnPositionsSelector` instead.
  * @ignore - do not document.
  */
 
-export const gridColumnsMetaSelector = createSelector(gridColumnPositionsSelector, gridColumnsTotalWidthSelector, (positions, totalWidth) => ({
+export const gridColumnsMetaSelector = wrapWithWarningOnCall(createSelector(gridColumnPositionsSelector, gridColumnsTotalWidthSelector, (positions, totalWidth) => ({
   totalWidth,
   positions
-}));
+})), ['MUI: The method gridColumnsMetaSelector is deprecated and will be removed in the next major version.', 'Use gridColumnsTotalWidthSelector or gridColumnPositionsSelector instead']);

package/hooks/features/columns/gridColumnsUtils.js

@@ -3,12 +3,14 @@ import { DEFAULT_GRID_COL_TYPE_KEY, getGridDefaultColumnTypes } from '../../../m
 import { gridColumnsSelector, gridColumnVisibilityModelSelector } from './gridColumnsSelector';
 import { clamp } from '../../../utils/utils';
 export const computeColumnTypes = (customColumnTypes = {}) => {
-  const allColumnTypes = _extends({}, getGridDefaultColumnTypes(), customColumnTypes);
+  const mergedColumnTypes = _extends({}, getGridDefaultColumnTypes());
 
-  const mergedColumnTypes = {};
-  Object.entries(allColumnTypes).forEach(([colType, colTypeDef]) => {
-    colTypeDef = _extends({}, allColumnTypes[colTypeDef.extendType || DEFAULT_GRID_COL_TYPE_KEY], colTypeDef);
-    mergedColumnTypes[colType] = colTypeDef;
+  Object.entries(customColumnTypes).forEach(([colType, colTypeDef]) => {
+    if (mergedColumnTypes[colType]) {
+      mergedColumnTypes[colType] = _extends({}, mergedColumnTypes[colType], colTypeDef);
+    } else {
+      mergedColumnTypes[colType] = _extends({}, mergedColumnTypes[colTypeDef.extendType || DEFAULT_GRID_COL_TYPE_KEY], colTypeDef);
+    }
   });
   return mergedColumnTypes;
 };

package/hooks/features/density/useGridDensity.d.ts

@@ -1,6 +1,8 @@
 import * as React from 'react';
 import { GridApiCommunity } from '../../../models/api/gridApiCommunity';
 import { DataGridProcessedProps } from '../../../models/props/DataGridProps';
+import { GridStateInitializer } from '../../utils/useGridInitializeState';
 export declare const COMPACT_DENSITY_FACTOR = 0.7;
 export declare const COMFORTABLE_DENSITY_FACTOR = 1.3;
+export declare const densityStateInitializer: GridStateInitializer<Pick<DataGridProcessedProps, 'density' | 'headerHeight' | 'rowHeight'>>;
 export declare const useGridDensity: (apiRef: React.MutableRefObject<GridApiCommunity>, props: Pick<DataGridProcessedProps, 'headerHeight' | 'rowHeight' | 'density'>) => void;

package/hooks/features/density/useGridDensity.js

@@ -3,7 +3,6 @@ import * as React from 'react';
 import { GridDensityTypes } from '../../../models/gridDensity';
 import { useGridLogger } from '../../utils/useGridLogger';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
-import { useGridStateInit } from '../../utils/useGridStateInit';
 import { gridDensitySelector } from './densitySelector';
 import { isDeepEqual } from '../../../utils/utils';
 export const COMPACT_DENSITY_FACTOR = 0.7;
@@ -37,11 +36,11 @@ const getUpdatedDensityState = (newDensity, newHeaderHeight, newRowHeight) => {
   }
 };
 
+export const densityStateInitializer = (state, props) => _extends({}, state, {
+  density: getUpdatedDensityState(props.density, props.headerHeight, props.rowHeight)
+});
 export const useGridDensity = (apiRef, props) => {
   const logger = useGridLogger(apiRef, 'useDensity');
-  useGridStateInit(apiRef, state => _extends({}, state, {
-    density: getUpdatedDensityState(props.density, props.headerHeight, props.rowHeight)
-  }));
   const setDensity = React.useCallback((newDensity, newHeaderHeight = props.headerHeight, newRowHeight = props.rowHeight) => {
     logger.debug(`Set grid density to ${newDensity}`);
     apiRef.current.setState(state => {

package/hooks/features/dimensions/useGridDimensions.js

@@ -7,7 +7,7 @@ import { useGridLogger } from '../../utils/useGridLogger';
 import { gridColumnsTotalWidthSelector } from '../columns';
 import { gridDensityHeaderHeightSelector, gridDensityRowHeightSelector } from '../density';
 import { useGridSelector } from '../../utils';
-import { getCurrentPageRows } from '../../utils/useCurrentPageRows';
+import { getVisibleRows } from '../../utils/useGridVisibleRows';
 import { gridRowsMetaSelector } from '../rows/gridRowsMetaSelector';
 const isTestEnvironment = process.env.NODE_ENV === 'test';
 
@@ -116,7 +116,7 @@ export function useGridDimensions(apiRef, props) {
       return 0;
     }
 
-    const currentPage = getCurrentPageRows(apiRef, {
+    const currentPage = getVisibleRows(apiRef, {
       pagination: props.pagination,
       paginationMode: props.paginationMode
     }); // TODO: Use a combination of scrollTop, dimensions.viewportInnerSize.height and rowsMeta.possitions

package/hooks/features/editRows/useGridEditing.d.ts

@@ -1,6 +1,8 @@
 import * as React from 'react';
 import { DataGridProcessedProps } from '../../../models/props/DataGridProps';
 import { GridApiCommunity } from '../../../models/api/gridApiCommunity';
+import { GridStateInitializer } from '../../utils/useGridInitializeState';
+export declare const editingStateInitializer: GridStateInitializer;
 /**
  * @requires useGridFocus - can be after, async only
  * @requires useGridParamsApi (method)

package/hooks/features/editRows/useGridEditing.js

@@ -5,10 +5,12 @@ import { GridCellModes } from '../../../models/gridEditRowModel';
 import { useGridApiEventHandler, useGridApiOptionHandler } from '../../utils/useGridApiEventHandler';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { useGridLogger } from '../../utils/useGridLogger';
-import { useGridStateInit } from '../../utils/useGridStateInit';
 import { gridEditRowsStateSelector } from './gridEditRowsSelector';
 import { useCellEditing } from './useGridCellEditing';
 import { useGridRowEditing } from './useGridRowEditing';
+export const editingStateInitializer = state => _extends({}, state, {
+  editRows: {}
+});
 /**
  * @requires useGridFocus - can be after, async only
  * @requires useGridParamsApi (method)
@@ -21,9 +23,6 @@ export function useGridEditing(apiRef, props) {
   const logger = useGridLogger(apiRef, 'useGridEditRows');
   useCellEditing(apiRef, props);
   useGridRowEditing(apiRef, props);
-  useGridStateInit(apiRef, state => _extends({}, state, {
-    editRows: {}
-  }));
   const debounceMap = React.useRef({});
   apiRef.current.unstable_updateControlState({
     stateId: 'editRows',

package/hooks/features/export/serializers/csvSerializer.js

@@ -1,4 +1,5 @@
 import { GRID_CHECKBOX_SELECTION_COL_DEF } from '../../../../colDef';
+import { buildWarning } from '../../../../utils/warning';
 
 const serialiseCellValue = (value, delimiterCharacter) => {
   if (typeof value === 'string') {
@@ -14,15 +15,14 @@ const serialiseCellValue = (value, delimiterCharacter) => {
   return value;
 };
 
-let warnedOnce = false;
+const objectFormattedValueWarning = buildWarning(['MUI: When the value of a field is an object or a `renderCell` is provided, the CSV export might not display the value correctly.', 'You can provide a `valueFormatter` with a string representation to be used.']);
 
 const serialiseRow = (id, columns, getCellParams, delimiterCharacter) => columns.map(column => {
   const cellParams = getCellParams(id, column.field);
 
   if (process.env.NODE_ENV !== 'production') {
-    if (!warnedOnce && String(cellParams.formattedValue) === '[object Object]') {
-      console.warn(['MUI: When the value of a field is an object or a `renderCell` is provided, the CSV export might not display the value correctly.', 'You can provide a `valueFormatter` with a string representation to be used.'].join('\n'));
-      warnedOnce = true;
+    if (String(cellParams.formattedValue) === '[object Object]') {
+      objectFormattedValueWarning();
     }
   }
 

package/hooks/features/filter/gridFilterSelector.d.ts

@@ -62,6 +62,7 @@ export declare const gridFilteredSortedRowIdsSelector: import("../../../utils/cr
  * @category Filtering
  * @deprecated Use `gridVisibleSortedRowIdsSelector` instead
  * @ignore - do not document.
+ * TODO: Add deprecation warning once we have the new selectors without the "visible" keyword.
  */
 export declare const gridVisibleRowsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridRowId[]>;
 /**

package/hooks/features/filter/gridFilterSelector.js

@@ -63,6 +63,7 @@ export const gridFilteredSortedRowIdsSelector = createSelector(gridFilteredSorte
  * @category Filtering
  * @deprecated Use `gridVisibleSortedRowIdsSelector` instead
  * @ignore - do not document.
+ * TODO: Add deprecation warning once we have the new selectors without the "visible" keyword.
  */
 
 export const gridVisibleRowsSelector = gridVisibleSortedRowIdsSelector;

package/hooks/features/focus/useGridFocus.d.ts

@@ -1,6 +1,8 @@
 import * as React from 'react';
 import { GridApiCommunity } from '../../../models/api/gridApiCommunity';
 import { DataGridProcessedProps } from '../../../models/props/DataGridProps';
+import { GridStateInitializer } from '../../utils/useGridInitializeState';
+export declare const focusStateInitializer: GridStateInitializer;
 /**
  * @requires useGridParamsApi (method)
  * @requires useGridRows (method)

package/hooks/features/focus/useGridFocus.js

@@ -6,8 +6,17 @@ import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { useGridLogger } from '../../utils/useGridLogger';
 import { useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
 import { isNavigationKey } from '../../../utils/keyboardUtils';
-import { useGridStateInit } from '../../utils/useGridStateInit';
 import { gridFocusCellSelector } from './gridFocusStateSelector';
+export const focusStateInitializer = state => _extends({}, state, {
+  focus: {
+    cell: null,
+    columnHeader: null
+  },
+  tabIndex: {
+    cell: null,
+    columnHeader: null
+  }
+});
 /**
  * @requires useGridParamsApi (method)
  * @requires useGridRows (method)
@@ -16,16 +25,6 @@ import { gridFocusCellSelector } from './gridFocusStateSelector';
 
 export const useGridFocus = (apiRef, props) => {
   const logger = useGridLogger(apiRef, 'useGridFocus');
-  useGridStateInit(apiRef, state => _extends({}, state, {
-    focus: {
-      cell: null,
-      columnHeader: null
-    },
-    tabIndex: {
-      cell: null,
-      columnHeader: null
-    }
-  }));
   const lastClickedCell = React.useRef(null);
   const setCellFocus = React.useCallback((id, field) => {
     // The row might have been deleted

package/hooks/features/keyboard/useGridKeyboardNavigation.js

@@ -4,7 +4,7 @@ import { gridVisibleColumnDefinitionsSelector } from '../columns/gridColumnsSele
 import { useGridLogger } from '../../utils/useGridLogger';
 import { useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
 import { gridVisibleSortedRowEntriesSelector } from '../filter/gridFilterSelector';
-import { useCurrentPageRows } from '../../utils/useCurrentPageRows';
+import { useGridVisibleRows } from '../../utils/useGridVisibleRows';
 import { GRID_CHECKBOX_SELECTION_COL_DEF } from '../../../colDef/gridCheckboxSelectionColDef';
 import { gridClasses } from '../../../constants/gridClasses';
 /**
@@ -21,7 +21,7 @@ import { gridClasses } from '../../../constants/gridClasses';
 
 export const useGridKeyboardNavigation = (apiRef, props) => {
   const logger = useGridLogger(apiRef, 'useGridKeyboardNavigation');
-  const currentPage = useCurrentPageRows(apiRef, props);
+  const currentPage = useGridVisibleRows(apiRef, props);
   const goToCell = React.useCallback((colIndex, rowIndex) => {
     logger.debug(`Navigating to cell row ${rowIndex}, col ${colIndex}`);
     apiRef.current.scrollToIndexes({

package/hooks/features/pagination/useGridPage.d.ts

@@ -1,8 +1,7 @@
 import * as React from 'react';
 import { GridApiCommunity } from '../../../models/api/gridApiCommunity';
 import { DataGridProcessedProps } from '../../../models/props/DataGridProps';
-import { GridStateInitializer } from '../../utils/useGridInitializeState';
-export declare const pageStateInitializer: GridStateInitializer<Pick<DataGridProcessedProps, 'initialState' | 'rowCount' | 'page'>>;
+export declare const getPageCount: (rowCount: number, pageSize: number) => number;
 /**
  * @requires useGridPageSize (event)
  */

package/hooks/features/pagination/useGridPage.js

@@ -6,8 +6,7 @@ import { gridVisibleTopLevelRowCountSelector } from '../filter';
 import { gridPageSelector } from './gridPaginationSelector';
 import { useGridRegisterPreProcessor } from '../../core/preProcessing';
 import { buildWarning } from '../../../utils/warning';
-
-const getPageCount = (rowCount, pageSize) => {
+export const getPageCount = (rowCount, pageSize) => {
   if (pageSize > 0 && rowCount > 0) {
     return Math.ceil(rowCount / pageSize);
   }
@@ -32,23 +31,12 @@ const mergeStateWithPage = page => state => _extends({}, state, {
 });
 
 const noRowCountInServerMode = buildWarning(["MUI: the 'rowCount' prop is undefined while using paginationMode='server'", 'For more detail, see http://mui.com/components/data-grid/pagination/#basic-implementation'], 'error');
-export const pageStateInitializer = (state, props) => {
-  var _ref, _props$page, _props$initialState, _props$initialState$p, _props$rowCount, _props$rowCount2;
-
-  return _extends({}, state, {
-    pagination: _extends({}, state.pagination, {
-      page: (_ref = (_props$page = props.page) != null ? _props$page : (_props$initialState = props.initialState) == null ? void 0 : (_props$initialState$p = _props$initialState.pagination) == null ? void 0 : _props$initialState$p.page) != null ? _ref : 0,
-      pageCount: getPageCount((_props$rowCount = props.rowCount) != null ? _props$rowCount : 0, state.pagination.pageSize),
-      rowCount: (_props$rowCount2 = props.rowCount) != null ? _props$rowCount2 : 0
-    })
-  });
-};
 /**
  * @requires useGridPageSize (event)
  */
 
 export const useGridPage = (apiRef, props) => {
-  var _props$initialState3, _props$initialState3$;
+  var _props$initialState2, _props$initialState2$;
 
   const logger = useGridLogger(apiRef, 'useGridPage');
   const visibleTopLevelRowCount = useGridSelector(apiRef, gridVisibleTopLevelRowCountSelector);
@@ -77,12 +65,12 @@ export const useGridPage = (apiRef, props) => {
    */
 
   const stateExportPreProcessing = React.useCallback(prevState => {
-    var _props$initialState2, _props$initialState2$;
+    var _props$initialState, _props$initialState$p;
 
     const pageToExport = gridPageSelector(apiRef);
     const shouldExportPage = // Always export if the page is controlled
     props.page != null || // Always export if the page has been initialized
-    ((_props$initialState2 = props.initialState) == null ? void 0 : (_props$initialState2$ = _props$initialState2.pagination) == null ? void 0 : _props$initialState2$.page) != null || // Export if the page value is not equal to the default value
+    ((_props$initialState = props.initialState) == null ? void 0 : (_props$initialState$p = _props$initialState.pagination) == null ? void 0 : _props$initialState$p.page) != null || // Export if the page value is not equal to the default value
     pageToExport !== 0;
 
     if (!shouldExportPage) {
@@ -94,7 +82,7 @@ export const useGridPage = (apiRef, props) => {
         page: pageToExport
       })
     });
-  }, [apiRef, props.page, (_props$initialState3 = props.initialState) == null ? void 0 : (_props$initialState3$ = _props$initialState3.pagination) == null ? void 0 : _props$initialState3$.page]);
+  }, [apiRef, props.page, (_props$initialState2 = props.initialState) == null ? void 0 : (_props$initialState2$ = _props$initialState2.pagination) == null ? void 0 : _props$initialState2$.page]);
   const stateRestorePreProcessing = React.useCallback((params, context) => {
     var _context$stateToResto, _context$stateToResto2;
 

package/hooks/features/pagination/useGridPageSize.d.ts

@@ -1,8 +1,7 @@
 import * as React from 'react';
 import { GridApiCommunity } from '../../../models/api/gridApiCommunity';
 import { DataGridProcessedProps } from '../../../models/props/DataGridProps';
-import { GridStateInitializer } from '../../utils/useGridInitializeState';
-export declare const pageSizeStateInitializer: GridStateInitializer<Pick<DataGridProcessedProps, 'pageSize' | 'initialState' | 'autoPageSize'>>;
+export declare const defaultPageSize: (autoPageSize: boolean) => 0 | 100;
 /**
  * @requires useGridDimensions (event) - can be after
  */

package/hooks/features/pagination/useGridPageSize.js

@@ -5,28 +5,7 @@ import { useGridLogger, useGridApiMethod, useGridApiEventHandler, useGridSelecto
 import { gridPageSizeSelector } from './gridPaginationSelector';
 import { gridDensityRowHeightSelector } from '../density';
 import { useGridRegisterPreProcessor } from '../../core/preProcessing';
-
-const defaultPageSize = autoPageSize => autoPageSize ? 0 : 100;
-
-export const pageSizeStateInitializer = (state, props) => {
-  var _props$initialState, _props$initialState$p;
-
-  let pageSize;
-
-  if (props.pageSize != null) {
-    pageSize = props.pageSize;
-  } else if (((_props$initialState = props.initialState) == null ? void 0 : (_props$initialState$p = _props$initialState.pagination) == null ? void 0 : _props$initialState$p.pageSize) != null) {
-    pageSize = props.initialState.pagination.pageSize;
-  } else {
-    pageSize = defaultPageSize(props.autoPageSize);
-  }
-
-  return _extends({}, state, {
-    pagination: {
-      pageSize
-    }
-  });
-};
+export const defaultPageSize = autoPageSize => autoPageSize ? 0 : 100;
 
 const mergeStateWithPageSize = pageSize => state => _extends({}, state, {
   pagination: _extends({}, state.pagination, {
@@ -39,7 +18,7 @@ const mergeStateWithPageSize = pageSize => state => _extends({}, state, {
 
 
 export const useGridPageSize = (apiRef, props) => {
-  var _props$initialState3, _props$initialState3$;
+  var _props$initialState2, _props$initialState2$;
 
   const logger = useGridLogger(apiRef, 'useGridPageSize');
   const rowHeight = useGridSelector(apiRef, gridDensityRowHeightSelector);
@@ -72,12 +51,12 @@ export const useGridPageSize = (apiRef, props) => {
    */
 
   const stateExportPreProcessing = React.useCallback(prevState => {
-    var _props$initialState2, _props$initialState2$;
+    var _props$initialState, _props$initialState$p;
 
     const pageSizeToExport = gridPageSizeSelector(apiRef);
     const shouldExportPageSize = // Always export if the page size is controlled
     props.pageSize != null || // Always export if the page size has been initialized
-    ((_props$initialState2 = props.initialState) == null ? void 0 : (_props$initialState2$ = _props$initialState2.pagination) == null ? void 0 : _props$initialState2$.pageSize) != null || // Export if the page size value is not equal to the default value
+    ((_props$initialState = props.initialState) == null ? void 0 : (_props$initialState$p = _props$initialState.pagination) == null ? void 0 : _props$initialState$p.pageSize) != null || // Export if the page size value is not equal to the default value
     pageSizeToExport !== defaultPageSize(props.autoPageSize);
 
     if (!shouldExportPageSize) {
@@ -89,7 +68,7 @@ export const useGridPageSize = (apiRef, props) => {
         pageSize: pageSizeToExport
       })
     });
-  }, [apiRef, props.pageSize, (_props$initialState3 = props.initialState) == null ? void 0 : (_props$initialState3$ = _props$initialState3.pagination) == null ? void 0 : _props$initialState3$.pageSize, props.autoPageSize]);
+  }, [apiRef, props.pageSize, (_props$initialState2 = props.initialState) == null ? void 0 : (_props$initialState2$ = _props$initialState2.pagination) == null ? void 0 : _props$initialState2$.pageSize, props.autoPageSize]);
   /**
    * TODO: Add error if `prop.autoHeight = true`
    */

package/hooks/features/pagination/useGridPagination.d.ts

@@ -1,6 +1,8 @@
 import * as React from 'react';
 import { GridApiCommunity } from '../../../models/api/gridApiCommunity';
 import { DataGridProcessedProps } from '../../../models/props/DataGridProps';
+import { GridStateInitializer } from '../../utils/useGridInitializeState';
+export declare const paginationStateInitializer: GridStateInitializer<Pick<DataGridProcessedProps, 'page' | 'pageSize' | 'rowCount' | 'initialState' | 'autoPageSize'>>;
 /**
  * @requires useGridFilter (state)
  * @requires useGridDimensions (event) - can be after

package/hooks/features/pagination/useGridPagination.js

@@ -1,5 +1,28 @@
-import { useGridPageSize } from './useGridPageSize';
-import { useGridPage } from './useGridPage';
+import _extends from "@babel/runtime/helpers/esm/extends";
+import { useGridPageSize, defaultPageSize } from './useGridPageSize';
+import { useGridPage, getPageCount } from './useGridPage';
+export const paginationStateInitializer = (state, props) => {
+  var _props$initialState, _props$initialState$p, _ref, _props$page, _props$initialState2, _props$initialState2$, _props$rowCount, _props$rowCount2;
+
+  let pageSize;
+
+  if (props.pageSize != null) {
+    pageSize = props.pageSize;
+  } else if (((_props$initialState = props.initialState) == null ? void 0 : (_props$initialState$p = _props$initialState.pagination) == null ? void 0 : _props$initialState$p.pageSize) != null) {
+    pageSize = props.initialState.pagination.pageSize;
+  } else {
+    pageSize = defaultPageSize(props.autoPageSize);
+  }
+
+  return _extends({}, state, {
+    pagination: {
+      pageSize,
+      page: (_ref = (_props$page = props.page) != null ? _props$page : (_props$initialState2 = props.initialState) == null ? void 0 : (_props$initialState2$ = _props$initialState2.pagination) == null ? void 0 : _props$initialState2$.page) != null ? _ref : 0,
+      pageCount: getPageCount((_props$rowCount = props.rowCount) != null ? _props$rowCount : 0, pageSize),
+      rowCount: (_props$rowCount2 = props.rowCount) != null ? _props$rowCount2 : 0
+    }
+  });
+};
 /**
  * @requires useGridFilter (state)
  * @requires useGridDimensions (event) - can be after

package/hooks/features/preferencesPanel/useGridPreferencesPanel.d.ts

@@ -1,7 +1,9 @@
 import * as React from 'react';
 import { GridApiCommunity } from '../../../models/api/gridApiCommunity';
 import { DataGridProcessedProps } from '../../../models/props/DataGridProps';
+import { GridStateInitializer } from '../../utils/useGridInitializeState';
+export declare const preferencePanelStateInitializer: GridStateInitializer<Pick<DataGridProcessedProps, 'initialState'>>;
 /**
  * TODO: Add a single `setPreferencePanel` method to avoid multiple `setState`
  */
-export declare const useGridPreferencesPanel: (apiRef: React.MutableRefObject<GridApiCommunity>, props: Pick<DataGridProcessedProps, 'initialState'>) => void;
+export declare const useGridPreferencesPanel: (apiRef: React.MutableRefObject<GridApiCommunity>) => void;