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

package/hooks/features/filter/gridFilterUtils.js

@@ -87,9 +87,8 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
   }
   let parsedValue;
   if (column.valueParser) {
-    var _filterItem$value;
     const parser = column.valueParser;
-    parsedValue = Array.isArray(filterItem.value) ? (_filterItem$value = filterItem.value) == null ? void 0 : _filterItem$value.map(x => parser(x, undefined, column, apiRef)) : parser(filterItem.value, undefined, column, apiRef);
+    parsedValue = Array.isArray(filterItem.value) ? filterItem.value?.map(x => parser(x, undefined, column, apiRef)) : parser(filterItem.value, undefined, column, apiRef);
   } else {
     parsedValue = filterItem.value;
   }
@@ -103,7 +102,7 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
     value: parsedValue
   });
   const filterOperators = column.filterOperators;
-  if (!(filterOperators != null && filterOperators.length)) {
+  if (!filterOperators?.length) {
     throw new Error(`MUI X: No filter operators found for column '${column.field}'.`);
   }
   const filterOperator = filterOperators.find(operator => operator.value === newFilterItem.operator);
@@ -157,7 +156,7 @@ const buildAggregatedFilterItemsApplier = (filterModel, apiRef, disableEval) =>
   }
 
   // We generate a new function with `new Function()` to avoid expensive patterns for JS engines
-  // such as a dynamic object assignment, e.g. `{ [dynamicKey]: value }`.
+  // such as a dynamic object assignment, for example `{ [dynamicKey]: value }`.
   const filterItemCore = new Function('appliers', 'row', 'shouldApplyFilter', `"use strict";
 ${appliers.map((applier, i) => `const shouldApply${i} = !shouldApplyFilter || shouldApplyFilter(${JSON.stringify(applier.item.field)});`).join('\n')}
 
@@ -173,8 +172,7 @@ return result$$;`.replaceAll('$$', String(filterItemsApplierId)));
   return filterItem;
 };
 export const shouldQuickFilterExcludeHiddenColumns = filterModel => {
-  var _filterModel$quickFil;
-  return (_filterModel$quickFil = filterModel.quickFilterExcludeHiddenColumns) != null ? _filterModel$quickFil : true;
+  return filterModel.quickFilterExcludeHiddenColumns ?? true;
 };
 
 /**
@@ -184,8 +182,7 @@ export const shouldQuickFilterExcludeHiddenColumns = filterModel => {
  * @returns {GridAggregatedFilterItemApplier | null} A method that checks if a row is matching the current filter model. If `null`, we consider that all the rows are matching the filters.
  */
 const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
-  var _filterModel$quickFil2, _filterModel$quickFil3;
-  const quickFilterValues = (_filterModel$quickFil2 = (_filterModel$quickFil3 = filterModel.quickFilterValues) == null ? void 0 : _filterModel$quickFil3.filter(Boolean)) != null ? _filterModel$quickFil2 : [];
+  const quickFilterValues = filterModel.quickFilterValues?.filter(Boolean) ?? [];
   if (quickFilterValues.length === 0) {
     return null;
   }
@@ -197,7 +194,7 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
   const publicApiRef = getPublicApiRef(apiRef);
   columnFields.forEach(field => {
     const column = apiRef.current.getColumn(field);
-    const getApplyQuickFilterFn = column == null ? void 0 : column.getApplyQuickFilterFn;
+    const getApplyQuickFilterFn = column?.getApplyQuickFilterFn;
     if (getApplyQuickFilterFn) {
       appliersPerField.push({
         column,
@@ -252,9 +249,8 @@ export const buildAggregatedFilterApplier = (filterModel, apiRef, disableEval) =
   const isRowMatchingFilterItems = buildAggregatedFilterItemsApplier(filterModel, apiRef, disableEval);
   const isRowMatchingQuickFilter = buildAggregatedQuickFilterApplier(filterModel, apiRef);
   return function isRowMatchingFilters(row, shouldApplyFilter, result) {
-    var _isRowMatchingFilterI, _isRowMatchingQuickFi;
-    result.passingFilterItems = (_isRowMatchingFilterI = isRowMatchingFilterItems == null ? void 0 : isRowMatchingFilterItems(row, shouldApplyFilter)) != null ? _isRowMatchingFilterI : null;
-    result.passingQuickFilterValues = (_isRowMatchingQuickFi = isRowMatchingQuickFilter == null ? void 0 : isRowMatchingQuickFilter(row, shouldApplyFilter)) != null ? _isRowMatchingQuickFi : null;
+    result.passingFilterItems = isRowMatchingFilterItems?.(row, shouldApplyFilter) ?? null;
+    result.passingQuickFilterValues = isRowMatchingQuickFilter?.(row, shouldApplyFilter) ?? null;
   };
 };
 const isNotNull = result => result != null;
@@ -271,12 +267,11 @@ export const passFilterLogic = (allFilterItemResults, allQuickFilterResults, fil
 
   // get result for filter items model
   if (cleanedFilterItemResults.length > 0) {
-    var _filterModel$logicOpe;
     // Return true if the item pass with one of the rows
     const filterItemPredicate = item => {
       return cleanedFilterItemResults.some(filterItemResult => filterItemResult[item.id]);
     };
-    const logicOperator = (_filterModel$logicOpe = filterModel.logicOperator) != null ? _filterModel$logicOpe : getDefaultGridFilterModel().logicOperator;
+    const logicOperator = filterModel.logicOperator ?? getDefaultGridFilterModel().logicOperator;
     if (logicOperator === GridLogicOperator.And) {
       const passesAllFilters = cleanedFilterItems.every(filterItemPredicate);
       if (!passesAllFilters) {
@@ -292,12 +287,11 @@ export const passFilterLogic = (allFilterItemResults, allQuickFilterResults, fil
 
   // get result for quick filter model
   if (cleanedQuickFilterResults.length > 0 && filterModel.quickFilterValues != null) {
-    var _filterModel$quickFil4;
     // Return true if the item pass with one of the rows
     const quickFilterValuePredicate = value => {
       return cleanedQuickFilterResults.some(quickFilterValueResult => quickFilterValueResult[value]);
     };
-    const quickFilterLogicOperator = (_filterModel$quickFil4 = filterModel.quickFilterLogicOperator) != null ? _filterModel$quickFil4 : getDefaultGridFilterModel().quickFilterLogicOperator;
+    const quickFilterLogicOperator = filterModel.quickFilterLogicOperator ?? getDefaultGridFilterModel().quickFilterLogicOperator;
     if (quickFilterLogicOperator === GridLogicOperator.And) {
       const passesAllQuickFilterValues = filterModel.quickFilterValues.every(quickFilterValuePredicate);
       if (!passesAllQuickFilterValues) {

package/hooks/features/filter/useGridFilter.js

@@ -18,8 +18,7 @@ import { buildAggregatedFilterApplier, sanitizeFilterModel, mergeStateWithFilter
 import { isDeepEqual } from '../../../utils/utils';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const filterStateInitializer = (state, props, apiRef) => {
-  var _ref, _props$filterModel, _props$initialState;
-  const filterModel = (_ref = (_props$filterModel = props.filterModel) != null ? _props$filterModel : (_props$initialState = props.initialState) == null || (_props$initialState = _props$initialState.filter) == null ? void 0 : _props$initialState.filterModel) != null ? _ref : getDefaultGridFilterModel();
+  const filterModel = props.filterModel ?? props.initialState?.filter?.filterModel ?? getDefaultGridFilterModel();
   return _extends({}, state, {
     filter: {
       filterModel: sanitizeFilterModel(filterModel, props.disableMultipleColumnsFiltering, apiRef),
@@ -49,7 +48,6 @@ function createMemoizedValues() {
  * @requires useGridRows (event)
  */
 export const useGridFilter = (apiRef, props) => {
-  var _props$initialState3, _props$slotProps2;
   const logger = useGridLogger(apiRef, 'useGridFilter');
   apiRef.current.registerControlState({
     stateId: 'filter',
@@ -64,7 +62,7 @@ export const useGridFilter = (apiRef, props) => {
       const isRowMatchingFilters = props.filterMode === 'client' ? buildAggregatedFilterApplier(filterModel, apiRef, props.disableEval) : null;
       const filteringResult = apiRef.current.applyStrategyProcessor('filtering', {
         isRowMatchingFilters,
-        filterModel: filterModel != null ? filterModel : getDefaultGridFilterModel()
+        filterModel: filterModel ?? getDefaultGridFilterModel()
       });
       const newState = _extends({}, state, {
         filter: _extends({}, state.filter, filteringResult)
@@ -133,7 +131,6 @@ export const useGridFilter = (apiRef, props) => {
     if (targetColumnField) {
       const filterModel = gridFilterModelSelector(apiRef);
       const filterItemsWithValue = filterModel.items.filter(item => {
-        var _column$filterOperato;
         if (item.value !== undefined) {
           // Some filters like `isAnyOf` support array as `item.value`.
           // If array is empty, we want to remove it from the filter model.
@@ -143,8 +140,8 @@ export const useGridFilter = (apiRef, props) => {
           return true;
         }
         const column = apiRef.current.getColumn(item.field);
-        const filterOperator = (_column$filterOperato = column.filterOperators) == null ? void 0 : _column$filterOperato.find(operator => operator.value === item.operator);
-        const requiresFilterValue = typeof (filterOperator == null ? void 0 : filterOperator.requiresFilterValue) === 'undefined' ? true : filterOperator == null ? void 0 : filterOperator.requiresFilterValue;
+        const filterOperator = column.filterOperators?.find(operator => operator.value === item.operator);
+        const requiresFilterValue = typeof filterOperator?.requiresFilterValue === 'undefined' ? true : filterOperator?.requiresFilterValue;
 
         // Operators like `isEmpty` don't have and don't require `item.value`.
         // So we don't want to remove them from the filter model if `item.value === undefined`.
@@ -224,7 +221,6 @@ export const useGridFilter = (apiRef, props) => {
    * PRE-PROCESSING
    */
   const stateExportPreProcessing = React.useCallback((prevState, context) => {
-    var _props$initialState2;
     const filterModelToExport = gridFilterModelSelector(apiRef);
     const shouldExportFilterModel =
     // Always export if the `exportOnlyDirtyModels` property is not activated
@@ -232,7 +228,7 @@ export const useGridFilter = (apiRef, props) => {
     // Always export if the model is controlled
     props.filterModel != null ||
     // Always export if the model has been initialized
-    ((_props$initialState2 = props.initialState) == null || (_props$initialState2 = _props$initialState2.filter) == null ? void 0 : _props$initialState2.filterModel) != null ||
+    props.initialState?.filter?.filterModel != null ||
     // Export if the model is not equal to the default value
     !isDeepEqual(filterModelToExport, getDefaultGridFilterModel());
     if (!shouldExportFilterModel) {
@@ -243,10 +239,9 @@ export const useGridFilter = (apiRef, props) => {
         filterModel: filterModelToExport
       }
     });
-  }, [apiRef, props.filterModel, (_props$initialState3 = props.initialState) == null || (_props$initialState3 = _props$initialState3.filter) == null ? void 0 : _props$initialState3.filterModel]);
+  }, [apiRef, props.filterModel, props.initialState?.filter?.filterModel]);
   const stateRestorePreProcessing = React.useCallback((params, context) => {
-    var _context$stateToResto;
-    const filterModel = (_context$stateToResto = context.stateToRestore.filter) == null ? void 0 : _context$stateToResto.filterModel;
+    const filterModel = context.stateToRestore.filter?.filterModel;
     if (filterModel == null) {
       return params;
     }
@@ -257,12 +252,11 @@ export const useGridFilter = (apiRef, props) => {
   }, [apiRef, props.disableMultipleColumnsFiltering]);
   const preferencePanelPreProcessing = React.useCallback((initialValue, value) => {
     if (value === GridPreferencePanelsValue.filters) {
-      var _props$slotProps;
       const FilterPanel = props.slots.filterPanel;
-      return /*#__PURE__*/_jsx(FilterPanel, _extends({}, (_props$slotProps = props.slotProps) == null ? void 0 : _props$slotProps.filterPanel));
+      return /*#__PURE__*/_jsx(FilterPanel, _extends({}, props.slotProps?.filterPanel));
     }
     return initialValue;
-  }, [props.slots.filterPanel, (_props$slotProps2 = props.slotProps) == null ? void 0 : _props$slotProps2.filterPanel]);
+  }, [props.slots.filterPanel, props.slotProps?.filterPanel]);
   const {
     getRowId
   } = props;

package/hooks/features/focus/useGridFocus.js

@@ -44,7 +44,7 @@ export const useGridFocus = (apiRef, props) => {
   }, [apiRef]);
   const setCellFocus = React.useCallback((id, field) => {
     const focusedCell = gridFocusCellSelector(apiRef);
-    if ((focusedCell == null ? void 0 : focusedCell.id) === id && (focusedCell == null ? void 0 : focusedCell.field) === field) {
+    if (focusedCell?.id === id && focusedCell?.field === field) {
       return;
     }
     apiRef.current.setState(state => {
@@ -252,8 +252,7 @@ export const useGridFocus = (apiRef, props) => {
     apiRef.current.setColumnGroupHeaderFocus(fields[0], depth, event);
   }, [apiRef]);
   const handleBlur = React.useCallback((_, event) => {
-    var _event$relatedTarget;
-    if ((_event$relatedTarget = event.relatedTarget) != null && _event$relatedTarget.className.includes(gridClasses.columnHeader)) {
+    if (event.relatedTarget?.className.includes(gridClasses.columnHeader)) {
       return;
     }
     logger.debug(`Clearing focus`);
@@ -286,11 +285,11 @@ export const useGridFocus = (apiRef, props) => {
       }
       return;
     }
-    if ((cellParams == null ? void 0 : cellParams.id) === focusedCell.id && (cellParams == null ? void 0 : cellParams.field) === focusedCell.field) {
+    if (cellParams?.id === focusedCell.id && cellParams?.field === focusedCell.field) {
       return;
     }
     const cellElement = apiRef.current.getCellElement(focusedCell.id, focusedCell.field);
-    if (cellElement != null && cellElement.contains(event.target)) {
+    if (cellElement?.contains(event.target)) {
       return;
     }
     if (cellParams) {
@@ -316,7 +315,7 @@ export const useGridFocus = (apiRef, props) => {
       return;
     }
     const cell = gridFocusCellSelector(apiRef);
-    if ((cell == null ? void 0 : cell.id) !== params.id || (cell == null ? void 0 : cell.field) !== params.field) {
+    if (cell?.id !== params.id || cell?.field !== params.field) {
       apiRef.current.setCellFocus(params.id, params.field);
     }
   }, [apiRef]);

package/hooks/features/headerFiltering/gridHeaderFilteringSelectors.js

@@ -2,9 +2,6 @@ import { createSelector } from '../../../utils/createSelector';
 export const gridHeaderFilteringStateSelector = state => state.headerFiltering;
 export const gridHeaderFilteringEnabledSelector = createSelector(gridHeaderFilteringStateSelector,
 // No initialization in MIT, so we need to default to false to be used by `getTotalHeaderHeight`
-headerFilteringState => {
-  var _headerFilteringState;
-  return (_headerFilteringState = headerFilteringState == null ? void 0 : headerFilteringState.enabled) != null ? _headerFilteringState : false;
-});
+headerFilteringState => headerFilteringState?.enabled ?? false);
 export const gridHeaderFilteringEditFieldSelector = createSelector(gridHeaderFilteringStateSelector, headerFilteringState => headerFilteringState.editing);
 export const gridHeaderFilteringMenuSelector = createSelector(gridHeaderFilteringStateSelector, headerFilteringState => headerFilteringState.menuOpen);

package/hooks/features/headerFiltering/useGridHeaderFiltering.js

@@ -3,25 +3,20 @@ import * as React from 'react';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { useGridLogger } from '../../utils';
 import { gridColumnLookupSelector, gridColumnVisibilityModelSelector, gridColumnFieldsSelector } from '../columns/gridColumnsSelector';
-export const headerFilteringStateInitializer = (state, props) => {
-  var _props$headerFilters;
-  return _extends({}, state, {
-    // @ts-expect-error Access `Pro` prop in MIT
-    headerFiltering: {
-      enabled: (_props$headerFilters = props.headerFilters) != null ? _props$headerFilters : false,
-      editing: null,
-      menuOpen: null
-    }
-  });
-};
+export const headerFilteringStateInitializer = (state, props) => _extends({}, state, {
+  // @ts-expect-error Access `Pro` prop in MIT
+  headerFiltering: {
+    enabled: props.headerFilters ?? false,
+    editing: null,
+    menuOpen: null
+  }
+});
 export const useGridHeaderFiltering = (apiRef, props) => {
-  var _props$headerFilters2;
   const logger = useGridLogger(apiRef, 'useGridHeaderFiltering');
   // @ts-expect-error Access `Pro` prop in MIT
-  const isHeaderFilteringEnabled = (_props$headerFilters2 = props.headerFilters) != null ? _props$headerFilters2 : false;
+  const isHeaderFilteringEnabled = props.headerFilters ?? false;
   const setHeaderFilterState = React.useCallback(headerFilterState => {
     apiRef.current.setState(state => {
-      var _headerFilterState$ed, _headerFilterState$me;
       // Safety check to avoid MIT users from using it
       // This hook should ultimately be moved to the Pro package
       if (props.signature === 'DataGrid') {
@@ -29,9 +24,9 @@ export const useGridHeaderFiltering = (apiRef, props) => {
       }
       return _extends({}, state, {
         headerFiltering: {
-          enabled: isHeaderFilteringEnabled != null ? isHeaderFilteringEnabled : false,
-          editing: (_headerFilterState$ed = headerFilterState.editing) != null ? _headerFilterState$ed : null,
-          menuOpen: (_headerFilterState$me = headerFilterState.menuOpen) != null ? _headerFilterState$me : null
+          enabled: isHeaderFilteringEnabled ?? false,
+          editing: headerFilterState.editing ?? null,
+          menuOpen: headerFilterState.menuOpen ?? null
         }
       });
     });

package/hooks/features/keyboardNavigation/useGridKeyboardNavigation.js

@@ -127,8 +127,7 @@ export const useGridKeyboardNavigation = (apiRef, props) => {
     apiRef.current.setColumnGroupHeaderFocus(field, depth, event);
   }, [apiRef, logger]);
   const getRowIdFromIndex = React.useCallback(rowIndex => {
-    var _currentPageRows$rowI;
-    return (_currentPageRows$rowI = currentPageRows[rowIndex]) == null ? void 0 : _currentPageRows$rowI.id;
+    return currentPageRows[rowIndex]?.id;
   }, [currentPageRows]);
   const handleColumnHeaderKeyDown = React.useCallback((params, event) => {
     const headerTitleNode = event.currentTarget.querySelector(`.${gridClasses.columnHeaderTitleContainerContent}`);

package/hooks/features/pagination/gridPaginationSelector.js

@@ -66,9 +66,8 @@ export const gridPaginationRowRangeSelector = createSelectorMemoized(gridPaginat
   let lastRowIndex = firstRowIndex;
   let topLevelRowAdded = 0;
   while (lastRowIndex < visibleSortedRowEntries.length && topLevelRowAdded <= topLevelRowsInCurrentPageCount) {
-    var _rowTree$row$id;
     const row = visibleSortedRowEntries[lastRowIndex];
-    const depth = (_rowTree$row$id = rowTree[row.id]) == null ? void 0 : _rowTree$row$id.depth;
+    const depth = rowTree[row.id]?.depth;
     if (depth === undefined) {
       lastRowIndex += 1;
     } else {

package/hooks/features/pagination/useGridPagination.js

@@ -3,10 +3,9 @@ import { throwIfPageSizeExceedsTheLimit, getDefaultGridPaginationModel } from '.
 import { useGridPaginationModel } from './useGridPaginationModel';
 import { useGridRowCount } from './useGridRowCount';
 export const paginationStateInitializer = (state, props) => {
-  var _props$paginationMode, _props$initialState, _props$rowCount, _props$initialState2;
-  const paginationModel = _extends({}, getDefaultGridPaginationModel(props.autoPageSize), (_props$paginationMode = props.paginationModel) != null ? _props$paginationMode : (_props$initialState = props.initialState) == null || (_props$initialState = _props$initialState.pagination) == null ? void 0 : _props$initialState.paginationModel);
+  const paginationModel = _extends({}, getDefaultGridPaginationModel(props.autoPageSize), props.paginationModel ?? props.initialState?.pagination?.paginationModel);
   throwIfPageSizeExceedsTheLimit(paginationModel.pageSize, props.signature);
-  const rowCount = (_props$rowCount = props.rowCount) != null ? _props$rowCount : (_props$initialState2 = props.initialState) == null || (_props$initialState2 = _props$initialState2.pagination) == null ? void 0 : _props$initialState2.rowCount;
+  const rowCount = props.rowCount ?? props.initialState?.pagination?.rowCount;
   return _extends({}, state, {
     pagination: {
       paginationModel,

package/hooks/features/pagination/useGridPaginationModel.js

@@ -6,12 +6,11 @@ import { useGridRegisterPipeProcessor } from '../../core/pipeProcessing';
 import { gridPageCountSelector, gridPaginationModelSelector } from './gridPaginationSelector';
 import { getPageCount, defaultPageSize, throwIfPageSizeExceedsTheLimit, getDefaultGridPaginationModel, getValidPage } from './gridPaginationUtils';
 export const getDerivedPaginationModel = (paginationState, signature, paginationModelProp) => {
-  var _paginationModelProp$;
   let paginationModel = paginationState.paginationModel;
   const rowCount = paginationState.rowCount;
-  const pageSize = (_paginationModelProp$ = paginationModelProp == null ? void 0 : paginationModelProp.pageSize) != null ? _paginationModelProp$ : paginationModel.pageSize;
+  const pageSize = paginationModelProp?.pageSize ?? paginationModel.pageSize;
   const pageCount = getPageCount(rowCount, pageSize);
-  if (paginationModelProp && ((paginationModelProp == null ? void 0 : paginationModelProp.page) !== paginationModel.page || (paginationModelProp == null ? void 0 : paginationModelProp.pageSize) !== paginationModel.pageSize)) {
+  if (paginationModelProp && (paginationModelProp?.page !== paginationModel.page || paginationModelProp?.pageSize !== paginationModel.pageSize)) {
     paginationModel = paginationModelProp;
   }
   const validPage = getValidPage(paginationModel.page, pageCount);
@@ -29,7 +28,6 @@ export const getDerivedPaginationModel = (paginationState, signature, pagination
  * @requires useGridDimensions (event) - can be after
  */
 export const useGridPaginationModel = (apiRef, props) => {
-  var _props$initialState2;
   const logger = useGridLogger(apiRef, 'useGridPaginationModel');
   const densityFactor = useGridSelector(apiRef, gridDensityFactorSelector);
   const rowHeight = Math.floor(props.rowHeight * densityFactor);
@@ -89,7 +87,6 @@ export const useGridPaginationModel = (apiRef, props) => {
    * PRE-PROCESSING
    */
   const stateExportPreProcessing = React.useCallback((prevState, context) => {
-    var _props$initialState;
     const paginationModel = gridPaginationModelSelector(apiRef);
     const shouldExportPaginationModel =
     // Always export if the `exportOnlyDirtyModels` property is not activated
@@ -97,7 +94,7 @@ export const useGridPaginationModel = (apiRef, props) => {
     // Always export if the `paginationModel` is controlled
     props.paginationModel != null ||
     // Always export if the `paginationModel` has been initialized
-    ((_props$initialState = props.initialState) == null || (_props$initialState = _props$initialState.pagination) == null ? void 0 : _props$initialState.paginationModel) != null ||
+    props.initialState?.pagination?.paginationModel != null ||
     // Export if `page` or `pageSize` is not equal to the default value
     paginationModel.page !== 0 && paginationModel.pageSize !== defaultPageSize(props.autoPageSize);
     if (!shouldExportPaginationModel) {
@@ -108,10 +105,9 @@ export const useGridPaginationModel = (apiRef, props) => {
         paginationModel
       })
     });
-  }, [apiRef, props.paginationModel, (_props$initialState2 = props.initialState) == null || (_props$initialState2 = _props$initialState2.pagination) == null ? void 0 : _props$initialState2.paginationModel, props.autoPageSize]);
+  }, [apiRef, props.paginationModel, props.initialState?.pagination?.paginationModel, props.autoPageSize]);
   const stateRestorePreProcessing = React.useCallback((params, context) => {
-    var _context$stateToResto, _context$stateToResto2;
-    const paginationModel = (_context$stateToResto = context.stateToRestore.pagination) != null && _context$stateToResto.paginationModel ? _extends({}, getDefaultGridPaginationModel(props.autoPageSize), (_context$stateToResto2 = context.stateToRestore.pagination) == null ? void 0 : _context$stateToResto2.paginationModel) : gridPaginationModelSelector(apiRef);
+    const paginationModel = context.stateToRestore.pagination?.paginationModel ? _extends({}, getDefaultGridPaginationModel(props.autoPageSize), context.stateToRestore.pagination?.paginationModel) : gridPaginationModelSelector(apiRef);
     apiRef.current.setState(state => _extends({}, state, {
       pagination: _extends({}, state.pagination, {
         paginationModel: getDerivedPaginationModel(state.pagination, props.signature, paginationModel)
@@ -126,9 +122,8 @@ export const useGridPaginationModel = (apiRef, props) => {
    * EVENTS
    */
   const handlePaginationModelChange = () => {
-    var _apiRef$current$virtu;
     const paginationModel = gridPaginationModelSelector(apiRef);
-    if ((_apiRef$current$virtu = apiRef.current.virtualScrollerRef) != null && _apiRef$current$virtu.current) {
+    if (apiRef.current.virtualScrollerRef?.current) {
       apiRef.current.scrollToIndexes({
         rowIndex: paginationModel.page * paginationModel.pageSize
       });

package/hooks/features/pagination/useGridRowCount.js

@@ -11,7 +11,6 @@ import { noRowCountInServerMode } from './gridPaginationUtils';
  * @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);
@@ -46,7 +45,6 @@ export const useGridRowCount = (apiRef, props) => {
    * 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
@@ -54,7 +52,7 @@ export const useGridRowCount = (apiRef, props) => {
     // 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;
+    props.initialState?.pagination?.rowCount != null;
     if (!shouldExportRowCount) {
       return prevState;
     }
@@ -63,10 +61,9 @@ export const useGridRowCount = (apiRef, props) => {
         rowCount: exportedRowCount
       })
     });
-  }, [apiRef, props.rowCount, (_props$initialState2 = props.initialState) == null || (_props$initialState2 = _props$initialState2.pagination) == null ? void 0 : _props$initialState2.rowCount]);
+  }, [apiRef, props.rowCount, props.initialState?.pagination?.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);
+    const restoredRowCount = context.stateToRestore.pagination?.rowCount ? context.stateToRestore.pagination.rowCount : gridPaginationRowCountSelector(apiRef);
     apiRef.current.setState(state => _extends({}, state, {
       pagination: _extends({}, state.pagination, {
         rowCount: restoredRowCount

package/hooks/features/preferencesPanel/useGridPreferencesPanel.js

@@ -4,20 +4,16 @@ import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { useGridLogger } from '../../utils/useGridLogger';
 import { useGridRegisterPipeProcessor } from '../../core/pipeProcessing';
 import { gridPreferencePanelStateSelector } from './gridPreferencePanelSelector';
-export const preferencePanelStateInitializer = (state, props) => {
-  var _props$initialState$p, _props$initialState;
-  return _extends({}, state, {
-    preferencePanel: (_props$initialState$p = (_props$initialState = props.initialState) == null ? void 0 : _props$initialState.preferencePanel) != null ? _props$initialState$p : {
-      open: false
-    }
-  });
-};
+export const preferencePanelStateInitializer = (state, props) => _extends({}, state, {
+  preferencePanel: props.initialState?.preferencePanel ?? {
+    open: false
+  }
+});
 
 /**
  * TODO: Add a single `setPreferencePanel` method to avoid multiple `setState`
  */
 export const useGridPreferencesPanel = (apiRef, props) => {
-  var _props$initialState3;
   const logger = useGridLogger(apiRef, 'useGridPreferencesPanel');
   const hideTimeout = React.useRef();
   const immediateTimeout = React.useRef();
@@ -77,13 +73,12 @@ export const useGridPreferencesPanel = (apiRef, props) => {
    * PRE-PROCESSING
    */
   const stateExportPreProcessing = React.useCallback((prevState, context) => {
-    var _props$initialState2;
     const preferencePanelToExport = gridPreferencePanelStateSelector(apiRef.current.state);
     const shouldExportPreferencePanel =
     // Always export if the `exportOnlyDirtyModels` property is not activated
     !context.exportOnlyDirtyModels ||
     // Always export if the panel was initialized
-    ((_props$initialState2 = props.initialState) == null ? void 0 : _props$initialState2.preferencePanel) != null ||
+    props.initialState?.preferencePanel != null ||
     // Always export if the panel is opened
     preferencePanelToExport.open;
     if (!shouldExportPreferencePanel) {
@@ -92,7 +87,7 @@ export const useGridPreferencesPanel = (apiRef, props) => {
     return _extends({}, prevState, {
       preferencePanel: preferencePanelToExport
     });
-  }, [apiRef, (_props$initialState3 = props.initialState) == null ? void 0 : _props$initialState3.preferencePanel]);
+  }, [apiRef, props.initialState?.preferencePanel]);
   const stateRestorePreProcessing = React.useCallback((params, context) => {
     const preferencePanel = context.stateToRestore.preferencePanel;
     if (preferencePanel != null) {

package/hooks/features/rowSelection/useGridRowSelection.js

@@ -7,7 +7,7 @@ import { gridRowsLookupSelector } from '../rows/gridRowsSelector';
 import { gridRowSelectionStateSelector, selectedGridRowsSelector, selectedIdsLookupSelector } from './gridRowSelectionSelector';
 import { gridPaginatedVisibleSortedGridRowIdsSelector } from '../pagination';
 import { gridFocusCellSelector } from '../focus/gridFocusStateSelector';
-import { gridExpandedSortedRowIdsSelector } from '../filter/gridFilterSelector';
+import { gridExpandedSortedRowIdsSelector, gridFilterModelSelector } from '../filter/gridFilterSelector';
 import { GRID_CHECKBOX_SELECTION_COL_DEF, GRID_ACTIONS_COLUMN_TYPE } from '../../../colDef';
 import { GridCellModes } from '../../../models/gridEditRowModel';
 import { isKeyboardEvent, isNavigationKey } from '../../../utils/keyboardUtils';
@@ -28,12 +28,9 @@ const getSelectionModelPropValue = (selectionModelProp, prevSelectionModel) => {
   }
   return [selectionModelProp];
 };
-export const rowSelectionStateInitializer = (state, props) => {
-  var _getSelectionModelPro;
-  return _extends({}, state, {
-    rowSelection: props.rowSelection ? (_getSelectionModelPro = getSelectionModelPropValue(props.rowSelectionModel)) != null ? _getSelectionModelPro : [] : []
-  });
-};
+export const rowSelectionStateInitializer = (state, props) => _extends({}, state, {
+  rowSelection: props.rowSelection ? getSelectionModelPropValue(props.rowSelectionModel) ?? [] : []
+});
 
 /**
  * @requires useGridRows (state, method) - can be after
@@ -67,9 +64,8 @@ export const useGridRowSelection = (apiRef, props) => {
   const canHaveMultipleSelection = isMultipleRowSelectionEnabled(props);
   const visibleRows = useGridVisibleRows(apiRef, props);
   const expandMouseRowRangeSelection = React.useCallback(id => {
-    var _lastRowToggled$curre;
     let endId = id;
-    const startId = (_lastRowToggled$curre = lastRowToggled.current) != null ? _lastRowToggled$curre : id;
+    const startId = lastRowToggled.current ?? id;
     const isSelected = apiRef.current.isRowSelected(id);
     if (isSelected) {
       const visibleRowIds = gridExpandedSortedRowIdsSelector(apiRef);
@@ -113,7 +109,7 @@ export const useGridRowSelection = (apiRef, props) => {
       return false;
     }
     const rowNode = apiRef.current.getRowNode(id);
-    if ((rowNode == null ? void 0 : rowNode.type) === 'footer' || (rowNode == null ? void 0 : rowNode.type) === 'pinnedRow') {
+    if (rowNode?.type === 'footer' || rowNode?.type === 'pinnedRow') {
       return false;
     }
     return true;
@@ -235,11 +231,10 @@ export const useGridRowSelection = (apiRef, props) => {
     }
   }, [apiRef, canHaveMultipleSelection, checkboxSelection]);
   const handleRowClick = React.useCallback((params, event) => {
-    var _closest;
     if (disableRowSelectionOnClick) {
       return;
     }
-    const field = (_closest = event.target.closest(`.${gridClasses.cell}`)) == null ? void 0 : _closest.getAttribute('data-field');
+    const field = event.target.closest(`.${gridClasses.cell}`)?.getAttribute('data-field');
     if (field === GRID_CHECKBOX_SELECTION_COL_DEF.field) {
       // click on checkbox should not trigger row selection
       return;
@@ -250,7 +245,7 @@ export const useGridRowSelection = (apiRef, props) => {
     }
     if (field) {
       const column = apiRef.current.getColumn(field);
-      if ((column == null ? void 0 : column.type) === GRID_ACTIONS_COLUMN_TYPE) {
+      if (column?.type === GRID_ACTIONS_COLUMN_TYPE) {
         return;
       }
     }
@@ -266,8 +261,7 @@ export const useGridRowSelection = (apiRef, props) => {
   }, [disableRowSelectionOnClick, canHaveMultipleSelection, apiRef, expandMouseRowRangeSelection, handleSingleRowSelection]);
   const preventSelectionOnShift = React.useCallback((params, event) => {
     if (canHaveMultipleSelection && event.shiftKey) {
-      var _window$getSelection;
-      (_window$getSelection = window.getSelection()) == null || _window$getSelection.removeAllRanges();
+      window.getSelection()?.removeAllRanges();
     }
   }, [canHaveMultipleSelection]);
   const handleRowSelectionCheckboxChange = React.useCallback((params, event) => {
@@ -280,7 +274,8 @@ export const useGridRowSelection = (apiRef, props) => {
   const handleHeaderSelectionCheckboxChange = React.useCallback(params => {
     const shouldLimitSelectionToCurrentPage = props.checkboxSelectionVisibleOnly && props.pagination;
     const rowsToBeSelected = shouldLimitSelectionToCurrentPage ? gridPaginatedVisibleSortedGridRowIdsSelector(apiRef) : gridExpandedSortedRowIdsSelector(apiRef);
-    apiRef.current.selectRows(rowsToBeSelected, params.value);
+    const filterModel = gridFilterModelSelector(apiRef);
+    apiRef.current.selectRows(rowsToBeSelected, params.value, filterModel?.items.length > 0);
   }, [apiRef, props.checkboxSelectionVisibleOnly, props.pagination]);
   const handleCellKeyDown = React.useCallback((params, event) => {
     // Get the most recent cell mode because it may have been changed by another listener

package/hooks/features/rows/gridRowsSelector.js

@@ -22,29 +22,22 @@ export const gridDataRowIdsSelector = createSelector(gridRowsStateSelector, rows
 /**
  * @ignore - do not document.
  */
-export const gridAdditionalRowGroupsSelector = createSelector(gridRowsStateSelector, rows => rows == null ? void 0 : rows.additionalRowGroups);
+export const gridAdditionalRowGroupsSelector = createSelector(gridRowsStateSelector, rows => rows?.additionalRowGroups);
 
 /**
  * @ignore - do not document.
  */
 export const gridPinnedRowsSelector = createSelectorMemoized(gridAdditionalRowGroupsSelector, additionalRowGroups => {
-  var _rawPinnedRows$bottom, _rawPinnedRows$bottom2, _rawPinnedRows$top$ma, _rawPinnedRows$top;
-  const rawPinnedRows = additionalRowGroups == null ? void 0 : additionalRowGroups.pinnedRows;
+  const rawPinnedRows = additionalRowGroups?.pinnedRows;
   return {
-    bottom: (_rawPinnedRows$bottom = rawPinnedRows == null || (_rawPinnedRows$bottom2 = rawPinnedRows.bottom) == null ? void 0 : _rawPinnedRows$bottom2.map(rowEntry => {
-      var _rowEntry$model;
-      return {
-        id: rowEntry.id,
-        model: (_rowEntry$model = rowEntry.model) != null ? _rowEntry$model : {}
-      };
-    })) != null ? _rawPinnedRows$bottom : [],
-    top: (_rawPinnedRows$top$ma = rawPinnedRows == null || (_rawPinnedRows$top = rawPinnedRows.top) == null ? void 0 : _rawPinnedRows$top.map(rowEntry => {
-      var _rowEntry$model2;
-      return {
-        id: rowEntry.id,
-        model: (_rowEntry$model2 = rowEntry.model) != null ? _rowEntry$model2 : {}
-      };
-    })) != null ? _rawPinnedRows$top$ma : []
+    bottom: rawPinnedRows?.bottom?.map(rowEntry => ({
+      id: rowEntry.id,
+      model: rowEntry.model ?? {}
+    })) ?? [],
+    top: rawPinnedRows?.top?.map(rowEntry => ({
+      id: rowEntry.id,
+      model: rowEntry.model ?? {}
+    })) ?? []
   };
 });
 
@@ -52,6 +45,5 @@ export const gridPinnedRowsSelector = createSelectorMemoized(gridAdditionalRowGr
  * @ignore - do not document.
  */
 export const gridPinnedRowsCountSelector = createSelector(gridPinnedRowsSelector, pinnedRows => {
-  var _pinnedRows$top, _pinnedRows$bottom;
-  return ((pinnedRows == null || (_pinnedRows$top = pinnedRows.top) == null ? void 0 : _pinnedRows$top.length) || 0) + ((pinnedRows == null || (_pinnedRows$bottom = pinnedRows.bottom) == null ? void 0 : _pinnedRows$bottom.length) || 0);
+  return (pinnedRows?.top?.length || 0) + (pinnedRows?.bottom?.length || 0);
 });