@mui/x-data-grid 5.6.0 → 5.8.0

package/node/hooks/features/filter/useGridFilter.js

@@ -33,12 +33,14 @@ var _useFirstRender = require("../../utils/useFirstRender");
 
 var _rows = require("../rows");
 
-var _preProcessing = require("../../core/preProcessing");
+var _pipeProcessing = require("../../core/pipeProcessing");
 
-var _useGridRegisterFilteringMethod = require("./useGridRegisterFilteringMethod");
+var _strategyProcessing = require("../../core/strategyProcessing");
 
 var _gridFilterUtils = require("./gridFilterUtils");
 
+var _jsxRuntime = require("react/jsx-runtime");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -65,9 +67,9 @@ const filterStateInitializer = (state, props, apiRef) => {
 exports.filterStateInitializer = filterStateInitializer;
 
 const useGridFilter = (apiRef, props) => {
+  var _props$componentsProp2;
+
   const logger = (0, _useGridLogger.useGridLogger)(apiRef, 'useGridFilter');
-  const filteringMethodCollectionRef = React.useRef({});
-  const lastFilteringMethodApplied = React.useRef(null);
   apiRef.current.unstable_updateControlState({
     stateId: 'filter',
     propModel: props.filterModel,
@@ -81,17 +83,9 @@ const useGridFilter = (apiRef, props) => {
 
   const applyFilters = React.useCallback(() => {
     apiRef.current.setState(state => {
-      const rowGroupingName = (0, _rows.gridRowGroupingNameSelector)(state, apiRef.current.instanceId);
-      const filteringMethod = filteringMethodCollectionRef.current[rowGroupingName];
-
-      if (!filteringMethod) {
-        throw new Error('MUI: Invalid filtering method.');
-      }
-
       const filterModel = (0, _gridFilterSelector.gridFilterModelSelector)(state, apiRef.current.instanceId);
       const isRowMatchingFilters = props.filterMode === _gridFeatureMode.GridFeatureModeConstant.client ? (0, _gridFilterUtils.buildAggregatedFilterApplier)(filterModel, apiRef) : null;
-      lastFilteringMethodApplied.current = filteringMethod;
-      const filteringResult = filteringMethod({
+      const filteringResult = apiRef.current.unstable_applyStrategyProcessor('filtering', {
         isRowMatchingFilters
       });
       return (0, _extends2.default)({}, state, {
@@ -226,6 +220,16 @@ const useGridFilter = (apiRef, props) => {
       callbacks: [...params.callbacks, apiRef.current.unstable_applyFilters]
     });
   }, [apiRef, props.disableMultipleColumnsFiltering]);
+  const preferencePanelPreProcessing = React.useCallback((initialValue, value) => {
+    if (value === _gridPreferencePanelsValue.GridPreferencePanelsValue.filters) {
+      var _props$componentsProp;
+
+      const FilterPanel = props.components.FilterPanel;
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(FilterPanel, (0, _extends2.default)({}, (_props$componentsProp = props.componentsProps) == null ? void 0 : _props$componentsProp.filterPanel));
+    }
+
+    return initialValue;
+  }, [props.components.FilterPanel, (_props$componentsProp2 = props.componentsProps) == null ? void 0 : _props$componentsProp2.filterPanel]);
   const flatFilteringMethod = React.useCallback(params => {
     if (props.filterMode === _gridFeatureMode.GridFeatureModeConstant.client && params.isRowMatchingFilters) {
       const rowIds = (0, _rows.gridRowIdsSelector)(apiRef);
@@ -250,9 +254,10 @@ const useGridFilter = (apiRef, props) => {
       filteredDescendantCountLookup: {}
     };
   }, [apiRef, props.filterMode]);
-  (0, _preProcessing.useGridRegisterPreProcessor)(apiRef, 'exportState', stateExportPreProcessing);
-  (0, _preProcessing.useGridRegisterPreProcessor)(apiRef, 'restoreState', stateRestorePreProcessing);
-  (0, _useGridRegisterFilteringMethod.useGridRegisterFilteringMethod)(apiRef, 'none', flatFilteringMethod);
+  (0, _pipeProcessing.useGridRegisterPipeProcessor)(apiRef, 'exportState', stateExportPreProcessing);
+  (0, _pipeProcessing.useGridRegisterPipeProcessor)(apiRef, 'restoreState', stateRestorePreProcessing);
+  (0, _pipeProcessing.useGridRegisterPipeProcessor)(apiRef, 'preferencePanel', preferencePanelPreProcessing);
+  (0, _strategyProcessing.useGridRegisterStrategyProcessor)(apiRef, _strategyProcessing.GRID_DEFAULT_STRATEGY, 'filtering', flatFilteringMethod);
   /**
    * EVENTS
    */
@@ -269,30 +274,20 @@ const useGridFilter = (apiRef, props) => {
       }));
     }
   }, [apiRef, logger]);
-  const handlePreProcessorRegister = React.useCallback(name => {
-    if (name !== 'filteringMethod') {
-      return;
-    }
-
-    filteringMethodCollectionRef.current = apiRef.current.unstable_applyPreProcessors('filteringMethod', {});
-    const rowGroupingName = (0, _rows.gridRowGroupingNameSelector)(apiRef);
-
-    if (lastFilteringMethodApplied.current !== filteringMethodCollectionRef.current[rowGroupingName]) {
+  const handleStrategyProcessorChange = React.useCallback(methodName => {
+    if (methodName === 'filtering') {
       apiRef.current.unstable_applyFilters();
     }
   }, [apiRef]);
   (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.rowsSet, apiRef.current.unstable_applyFilters);
   (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.rowExpansionChange, apiRef.current.unstable_applyFilters);
   (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.columnsChange, handleColumnsChange);
-  (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.preProcessorRegister, handlePreProcessorRegister);
+  (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.activeStrategyProcessorChange, handleStrategyProcessorChange);
   /**
    * 1ST RENDER
    */
 
   (0, _useFirstRender.useFirstRender)(() => {
-    // This line of pre-processor initialization should always come after the registration of `flatFilteringMethod`
-    // Otherwise on the 1st render there would be no filtering method registered
-    filteringMethodCollectionRef.current = apiRef.current.unstable_applyPreProcessors('filteringMethod', {});
     apiRef.current.unstable_applyFilters();
   });
   /**

package/node/hooks/features/focus/useGridFocus.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useGridFocus = void 0;
+exports.useGridFocus = exports.focusStateInitializer = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -23,31 +23,39 @@ var _useGridApiEventHandler = require("../../utils/useGridApiEventHandler");
 
 var _keyboardUtils = require("../../../utils/keyboardUtils");
 
-var _useGridStateInit = require("../../utils/useGridStateInit");
-
 var _gridFocusStateSelector = require("./gridFocusStateSelector");
 
+var _gridColumnsSelector = require("../columns/gridColumnsSelector");
+
+var _useGridVisibleRows = require("../../utils/useGridVisibleRows");
+
+var _utils2 = require("../../../utils/utils");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+const focusStateInitializer = state => (0, _extends2.default)({}, state, {
+  focus: {
+    cell: null,
+    columnHeader: null
+  },
+  tabIndex: {
+    cell: null,
+    columnHeader: null
+  }
+});
 /**
  * @requires useGridParamsApi (method)
  * @requires useGridRows (method)
  * @requires useGridEditing (event)
  */
+
+
+exports.focusStateInitializer = focusStateInitializer;
+
 const useGridFocus = (apiRef, props) => {
   const logger = (0, _useGridLogger.useGridLogger)(apiRef, 'useGridFocus');
-  (0, _useGridStateInit.useGridStateInit)(apiRef, state => (0, _extends2.default)({}, 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
@@ -109,6 +117,38 @@ const useGridFocus = (apiRef, props) => {
     });
     apiRef.current.forceUpdate();
   }, [apiRef, logger]);
+  const moveFocusToRelativeCell = React.useCallback((id, field, direction) => {
+    let columnIndexToFocus = apiRef.current.getColumnIndex(field);
+    let rowIndexToFocus = apiRef.current.getRowIndexRelativeToVisibleRows(id);
+    const visibleColumns = (0, _gridColumnsSelector.gridVisibleColumnDefinitionsSelector)(apiRef);
+
+    if (direction === 'right') {
+      columnIndexToFocus += 1;
+    } else if (direction === 'left') {
+      columnIndexToFocus -= 1;
+    } else {
+      rowIndexToFocus += 1;
+    }
+
+    if (columnIndexToFocus >= visibleColumns.length) {
+      // Go to next row if we are at the last column
+      rowIndexToFocus += 1;
+      columnIndexToFocus = 0;
+    } else if (columnIndexToFocus < 0) {
+      // Go to previous row if we are at the first column
+      rowIndexToFocus -= 1;
+      columnIndexToFocus = visibleColumns.length - 1;
+    }
+
+    const currentPage = (0, _useGridVisibleRows.getVisibleRows)(apiRef, {
+      pagination: props.pagination,
+      paginationMode: props.paginationMode
+    });
+    rowIndexToFocus = (0, _utils2.clamp)(rowIndexToFocus, currentPage.range.firstRowIndex, currentPage.range.lastRowIndex);
+    const rowToFocus = currentPage.rows[rowIndexToFocus];
+    const columnToFocus = visibleColumns[columnIndexToFocus];
+    apiRef.current.setCellFocus(rowToFocus.id, columnToFocus.field);
+  }, [apiRef, props.pagination, props.paginationMode]);
   const handleCellDoubleClick = React.useCallback(({
     id,
     field
@@ -201,7 +241,8 @@ const useGridFocus = (apiRef, props) => {
   }, [apiRef]);
   (0, _useGridApiMethod.useGridApiMethod)(apiRef, {
     setCellFocus,
-    setColumnHeaderFocus
+    setColumnHeaderFocus,
+    unstable_moveFocusToRelativeCell: moveFocusToRelativeCell
   }, 'GridFocusApi');
   React.useEffect(() => {
     const cell = (0, _gridFocusStateSelector.gridFocusCellSelector)(apiRef);

package/node/hooks/features/{keyboard → keyboardNavigation}/useGridKeyboardNavigation.js

@@ -17,30 +17,31 @@ var _useGridApiEventHandler = require("../../utils/useGridApiEventHandler");
 
 var _gridFilterSelector = require("../filter/gridFilterSelector");
 
-var _useCurrentPageRows = require("../../utils/useCurrentPageRows");
+var _useGridVisibleRows = require("../../utils/useGridVisibleRows");
 
 var _gridCheckboxSelectionColDef = require("../../../colDef/gridCheckboxSelectionColDef");
 
 var _gridClasses = require("../../../constants/gridClasses");
 
+var _gridEditRowModel = require("../../../models/gridEditRowModel");
+
+var _keyboardUtils = require("../../../utils/keyboardUtils");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 /**
- * @requires useGridPage (state)
- * @requires useGridPageSize (state)
- * @requires useGridFilter (state)
- * @requires useGridColumns (state, method)
- * @requires useGridRows (state, method)
  * @requires useGridSorting (method) - can be after
+ * @requires useGridFilter (state) - can be after
+ * @requires useGridColumns (state, method) - can be after
  * @requires useGridDimensions (method) - can be after
  * @requires useGridFocus (method) - can be after
  * @requires useGridScroll (method) - can be after
  */
 const useGridKeyboardNavigation = (apiRef, props) => {
   const logger = (0, _useGridLogger.useGridLogger)(apiRef, 'useGridKeyboardNavigation');
-  const currentPage = (0, _useCurrentPageRows.useCurrentPageRows)(apiRef, props);
+  const currentPage = (0, _useGridVisibleRows.useGridVisibleRows)(apiRef, props);
   const goToCell = React.useCallback((colIndex, rowIndex) => {
     logger.debug(`Navigating to cell row ${rowIndex}, col ${colIndex}`);
     apiRef.current.scrollToIndexes({
@@ -130,8 +131,16 @@ const useGridKeyboardNavigation = (apiRef, props) => {
           break;
         }
 
-      case 'PageDown':
       case ' ':
+        {
+          if (!event.shiftKey && rowIndexBefore < lastRowIndexInPage) {
+            goToCell(colIndexBefore, Math.min(rowIndexBefore + viewportPageSize, lastRowIndexInPage));
+          }
+
+          break;
+        }
+
+      case 'PageDown':
         {
           if (rowIndexBefore < lastRowIndexInPage) {
             goToCell(colIndexBefore, Math.min(rowIndexBefore + viewportPageSize, lastRowIndexInPage));
@@ -286,8 +295,22 @@ const useGridKeyboardNavigation = (apiRef, props) => {
       event.preventDefault();
     }
   }, [apiRef, currentPage, goToCell, goToHeader]);
+  const handleCellKeyDown = React.useCallback((params, event) => {
+    // Ignore portal
+    if (!event.currentTarget.contains(event.target)) {
+      return;
+    } // Get the most recent params because the cell mode may have changed by another listener
+
+
+    const cellParams = apiRef.current.getCellParams(params.id, params.field);
+
+    if (cellParams.cellMode !== _gridEditRowModel.GridCellModes.Edit && (0, _keyboardUtils.isNavigationKey)(event.key)) {
+      apiRef.current.publishEvent(_events.GridEvents.cellNavigationKeyDown, cellParams, event);
+    }
+  }, [apiRef]);
   (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.cellNavigationKeyDown, handleCellNavigationKeyDown);
   (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.columnHeaderKeyDown, handleColumnHeaderKeyDown);
+  (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, _events.GridEvents.cellKeyDown, handleCellKeyDown);
 };
 
 exports.useGridKeyboardNavigation = useGridKeyboardNavigation;

package/node/hooks/features/pagination/useGridPage.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useGridPage = exports.pageStateInitializer = void 0;
+exports.useGridPage = exports.getPageCount = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -19,7 +19,7 @@ var _filter = require("../filter");
 
 var _gridPaginationSelector = require("./gridPaginationSelector");
 
-var _preProcessing = require("../../core/preProcessing");
+var _pipeProcessing = require("../../core/pipeProcessing");
 
 var _warning = require("../../../utils/warning");
 
@@ -35,6 +35,8 @@ const getPageCount = (rowCount, pageSize) => {
   return 0;
 };
 
+exports.getPageCount = getPageCount;
+
 const applyValidPage = paginationState => {
   if (!paginationState.pageCount) {
     return paginationState;
@@ -52,27 +54,12 @@ const mergeStateWithPage = page => state => (0, _extends2.default)({}, state, {
 });
 
 const noRowCountInServerMode = (0, _warning.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');
-
-const pageStateInitializer = (state, props) => {
-  var _ref, _props$page, _props$initialState, _props$initialState$p, _props$rowCount, _props$rowCount2;
-
-  return (0, _extends2.default)({}, state, {
-    pagination: (0, _extends2.default)({}, 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)
  */
 
-
-exports.pageStateInitializer = pageStateInitializer;
-
 const useGridPage = (apiRef, props) => {
-  var _props$initialState3, _props$initialState3$;
+  var _props$initialState2, _props$initialState2$;
 
   const logger = (0, _utils.useGridLogger)(apiRef, 'useGridPage');
   const visibleTopLevelRowCount = (0, _utils.useGridSelector)(apiRef, _filter.gridVisibleTopLevelRowCountSelector);
@@ -101,12 +88,12 @@ const useGridPage = (apiRef, props) => {
    */
 
   const stateExportPreProcessing = React.useCallback(prevState => {
-    var _props$initialState2, _props$initialState2$;
+    var _props$initialState, _props$initialState$p;
 
     const pageToExport = (0, _gridPaginationSelector.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) {
@@ -118,7 +105,7 @@ 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;
 
@@ -127,8 +114,8 @@ const useGridPage = (apiRef, props) => {
     apiRef.current.setState(mergeStateWithPage(page));
     return params;
   }, [apiRef]);
-  (0, _preProcessing.useGridRegisterPreProcessor)(apiRef, 'exportState', stateExportPreProcessing);
-  (0, _preProcessing.useGridRegisterPreProcessor)(apiRef, 'restoreState', stateRestorePreProcessing);
+  (0, _pipeProcessing.useGridRegisterPipeProcessor)(apiRef, 'exportState', stateExportPreProcessing);
+  (0, _pipeProcessing.useGridRegisterPipeProcessor)(apiRef, 'restoreState', stateRestorePreProcessing);
   /**
    * EVENTS
    */
@@ -146,7 +133,12 @@ const useGridPage = (apiRef, props) => {
     apiRef.current.forceUpdate();
   };
 
+  const handlePageChange = () => apiRef.current.scrollToIndexes({
+    rowIndex: (0, _gridPaginationSelector.gridPageSelector)(apiRef) * (0, _gridPaginationSelector.gridPageSizeSelector)(apiRef)
+  });
+
   (0, _utils.useGridApiEventHandler)(apiRef, _events.GridEvents.pageSizeChange, handlePageSizeChange);
+  (0, _utils.useGridApiEventHandler)(apiRef, _events.GridEvents.pageChange, handlePageChange);
   /**
    * EFFECTS
    */

package/node/hooks/features/pagination/useGridPageSize.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useGridPageSize = exports.pageSizeStateInitializer = void 0;
+exports.useGridPageSize = exports.defaultPageSize = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -19,7 +19,7 @@ var _gridPaginationSelector = require("./gridPaginationSelector");
 
 var _density = require("../density");
 
-var _preProcessing = require("../../core/preProcessing");
+var _pipeProcessing = require("../../core/pipeProcessing");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -27,27 +27,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 const defaultPageSize = autoPageSize => autoPageSize ? 0 : 100;
 
-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 (0, _extends2.default)({}, state, {
-    pagination: {
-      pageSize
-    }
-  });
-};
-
-exports.pageSizeStateInitializer = pageSizeStateInitializer;
+exports.defaultPageSize = defaultPageSize;
 
 const mergeStateWithPageSize = pageSize => state => (0, _extends2.default)({}, state, {
   pagination: (0, _extends2.default)({}, state.pagination, {
@@ -60,7 +40,7 @@ const mergeStateWithPageSize = pageSize => state => (0, _extends2.default)({}, s
 
 
 const useGridPageSize = (apiRef, props) => {
-  var _props$initialState3, _props$initialState3$;
+  var _props$initialState2, _props$initialState2$;
 
   const logger = (0, _utils.useGridLogger)(apiRef, 'useGridPageSize');
   const rowHeight = (0, _utils.useGridSelector)(apiRef, _density.gridDensityRowHeightSelector);
@@ -93,12 +73,12 @@ const useGridPageSize = (apiRef, props) => {
    */
 
   const stateExportPreProcessing = React.useCallback(prevState => {
-    var _props$initialState2, _props$initialState2$;
+    var _props$initialState, _props$initialState$p;
 
     const pageSizeToExport = (0, _gridPaginationSelector.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) {
@@ -110,7 +90,7 @@ 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`
    */
@@ -126,8 +106,8 @@ const useGridPageSize = (apiRef, props) => {
 
     return params;
   }, [apiRef]);
-  (0, _preProcessing.useGridRegisterPreProcessor)(apiRef, 'exportState', stateExportPreProcessing);
-  (0, _preProcessing.useGridRegisterPreProcessor)(apiRef, 'restoreState', stateRestorePreProcessing);
+  (0, _pipeProcessing.useGridRegisterPipeProcessor)(apiRef, 'exportState', stateExportPreProcessing);
+  (0, _pipeProcessing.useGridRegisterPipeProcessor)(apiRef, 'restoreState', stateRestorePreProcessing);
   /**
    * EVENTS
    */

package/node/hooks/features/pagination/useGridPagination.js

@@ -1,18 +1,48 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useGridPagination = void 0;
+exports.useGridPagination = exports.paginationStateInitializer = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _useGridPageSize = require("./useGridPageSize");
 
 var _useGridPage = require("./useGridPage");
 
+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 = (0, _useGridPageSize.defaultPageSize)(props.autoPageSize);
+  }
+
+  return (0, _extends2.default)({}, 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: (0, _useGridPage.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
  */
+
+
+exports.paginationStateInitializer = paginationStateInitializer;
+
 const useGridPagination = (apiRef, props) => {
   (0, _useGridPageSize.useGridPageSize)(apiRef, props);
   (0, _useGridPage.useGridPage)(apiRef, props);

package/node/hooks/features/preferencesPanel/useGridPreferencesPanel.js

@@ -5,40 +5,47 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useGridPreferencesPanel = void 0;
+exports.useGridPreferencesPanel = exports.preferencePanelStateInitializer = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var React = _interopRequireWildcard(require("react"));
 
+var _events = require("../../../models/events");
+
 var _useGridApiMethod = require("../../utils/useGridApiMethod");
 
 var _useGridLogger = require("../../utils/useGridLogger");
 
-var _useGridStateInit = require("../../utils/useGridStateInit");
-
-var _preProcessing = require("../../core/preProcessing");
+var _pipeProcessing = require("../../core/pipeProcessing");
 
 var _gridPreferencePanelSelector = require("./gridPreferencePanelSelector");
 
+var _useGridSelector = require("../../utils/useGridSelector");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+const preferencePanelStateInitializer = (state, props) => {
+  var _props$initialState$p, _props$initialState;
+
+  return (0, _extends2.default)({}, state, {
+    preferencePanel: (_props$initialState$p = (_props$initialState = props.initialState) == null ? void 0 : _props$initialState.preferencePanel) != null ? _props$initialState$p : {
+      open: false
+    }
+  });
+};
 /**
  * TODO: Add a single `setPreferencePanel` method to avoid multiple `setState`
  */
-const useGridPreferencesPanel = (apiRef, props) => {
-  const logger = (0, _useGridLogger.useGridLogger)(apiRef, 'useGridPreferencesPanel');
-  (0, _useGridStateInit.useGridStateInit)(apiRef, state => {
-    var _props$initialState$p, _props$initialState;
 
-    return (0, _extends2.default)({}, state, {
-      preferencePanel: (_props$initialState$p = (_props$initialState = props.initialState) == null ? void 0 : _props$initialState.preferencePanel) != null ? _props$initialState$p : {
-        open: false
-      }
-    });
-  });
+
+exports.preferencePanelStateInitializer = preferencePanelStateInitializer;
+
+const useGridPreferencesPanel = apiRef => {
+  const logger = (0, _useGridLogger.useGridLogger)(apiRef, 'useGridPreferencesPanel');
+  const preferencePanelState = (0, _useGridSelector.useGridSelector)(apiRef, _gridPreferencePanelSelector.gridPreferencePanelStateSelector);
   const hideTimeout = React.useRef();
   const immediateTimeout = React.useRef();
   /**
@@ -47,13 +54,20 @@ const useGridPreferencesPanel = (apiRef, props) => {
 
   const hidePreferences = React.useCallback(() => {
     logger.debug('Hiding Preferences Panel');
+
+    if (preferencePanelState.openedPanelValue) {
+      apiRef.current.publishEvent(_events.GridEvents.preferencePanelClose, {
+        openedPanelValue: preferencePanelState.openedPanelValue
+      });
+    }
+
     apiRef.current.setState(state => (0, _extends2.default)({}, state, {
       preferencePanel: {
         open: false
       }
     }));
     apiRef.current.forceUpdate();
-  }, [apiRef, logger]); // This is to prevent the preferences from closing when you open a select box or another panel,
+  }, [apiRef, logger, preferencePanelState.openedPanelValue]); // This is to prevent the preferences from closing when you open a select box or another panel,
   // The issue is in MUI core V4 => Fixed in V5
 
   const doNotHidePanel = React.useCallback(() => {
@@ -73,8 +87,11 @@ const useGridPreferencesPanel = (apiRef, props) => {
         openedPanelValue: newValue
       })
     }));
+    apiRef.current.publishEvent(_events.GridEvents.preferencePanelOpen, {
+      openedPanelValue: newValue
+    });
     apiRef.current.forceUpdate();
-  }, [doNotHidePanel, apiRef, logger]);
+  }, [logger, doNotHidePanel, apiRef]);
   (0, _useGridApiMethod.useGridApiMethod)(apiRef, {
     showPreferences,
     hidePreferences: hidePreferencesDelayed
@@ -105,8 +122,8 @@ const useGridPreferencesPanel = (apiRef, props) => {
 
     return params;
   }, [apiRef]);
-  (0, _preProcessing.useGridRegisterPreProcessor)(apiRef, 'exportState', stateExportPreProcessing);
-  (0, _preProcessing.useGridRegisterPreProcessor)(apiRef, 'restoreState', stateRestorePreProcessing);
+  (0, _pipeProcessing.useGridRegisterPipeProcessor)(apiRef, 'exportState', stateExportPreProcessing);
+  (0, _pipeProcessing.useGridRegisterPipeProcessor)(apiRef, 'restoreState', stateRestorePreProcessing);
   /**
    * EFFECTS
    */