@mui/x-data-grid-premium 5.13.1 → 5.15.1

package/node/hooks/features/aggregation/useGridAggregation.js

@@ -0,0 +1,118 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useGridAggregation = exports.aggregationStateInitializer = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var React = _interopRequireWildcard(require("react"));
+
+var _xDataGridPro = require("@mui/x-data-grid-pro");
+
+var _gridAggregationSelectors = require("./gridAggregationSelectors");
+
+var _gridAggregationUtils = require("./gridAggregationUtils");
+
+var _createAggregationLookup = require("./createAggregationLookup");
+
+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 aggregationStateInitializer = (state, props, apiRef) => {
+  var _ref, _props$aggregationMod, _props$initialState, _props$initialState$a;
+
+  apiRef.current.unstable_caches.aggregation = {
+    rulesOnLastColumnHydration: {},
+    rulesOnLastRowHydration: {}
+  };
+  return (0, _extends2.default)({}, state, {
+    aggregation: {
+      model: (_ref = (_props$aggregationMod = props.aggregationModel) != null ? _props$aggregationMod : (_props$initialState = props.initialState) == null ? void 0 : (_props$initialState$a = _props$initialState.aggregation) == null ? void 0 : _props$initialState$a.model) != null ? _ref : {}
+    }
+  });
+};
+
+exports.aggregationStateInitializer = aggregationStateInitializer;
+
+const useGridAggregation = (apiRef, props) => {
+  apiRef.current.unstable_registerControlState({
+    stateId: 'aggregation',
+    propModel: props.aggregationModel,
+    propOnChange: props.onAggregationModelChange,
+    stateSelector: _gridAggregationSelectors.gridAggregationModelSelector,
+    changeEvent: 'aggregationModelChange'
+  });
+  /**
+   * API METHODS
+   */
+
+  const setAggregationModel = React.useCallback(model => {
+    const currentModel = (0, _gridAggregationSelectors.gridAggregationModelSelector)(apiRef);
+
+    if (currentModel !== model) {
+      apiRef.current.setState((0, _gridAggregationUtils.mergeStateWithAggregationModel)(model));
+      apiRef.current.forceUpdate();
+    }
+  }, [apiRef]);
+  const applyAggregation = React.useCallback(() => {
+    const aggregationLookup = (0, _createAggregationLookup.createAggregationLookup)({
+      apiRef,
+      getAggregationPosition: props.getAggregationPosition,
+      aggregationFunctions: props.aggregationFunctions,
+      aggregationRowsScope: props.aggregationRowsScope
+    });
+    apiRef.current.setState(state => (0, _extends2.default)({}, state, {
+      aggregation: (0, _extends2.default)({}, state.aggregation, {
+        lookup: aggregationLookup
+      })
+    }));
+  }, [apiRef, props.getAggregationPosition, props.aggregationFunctions, props.aggregationRowsScope]);
+  const aggregationApi = {
+    setAggregationModel
+  };
+  (0, _xDataGridPro.useGridApiMethod)(apiRef, aggregationApi, 'GridAggregationApi');
+  /**
+   * EVENTS
+   */
+
+  const checkAggregationRulesDiff = React.useCallback(() => {
+    const {
+      rulesOnLastRowHydration,
+      rulesOnLastColumnHydration
+    } = apiRef.current.unstable_caches.aggregation;
+    const aggregationRules = props.disableAggregation ? {} : (0, _gridAggregationUtils.getAggregationRules)({
+      columnsLookup: (0, _xDataGridPro.gridColumnLookupSelector)(apiRef),
+      aggregationModel: (0, _gridAggregationSelectors.gridAggregationModelSelector)(apiRef),
+      aggregationFunctions: props.aggregationFunctions
+    }); // Re-apply the row hydration to add / remove the aggregation footers
+
+    if ((0, _gridAggregationUtils.hasAggregationRulesChanged)(rulesOnLastRowHydration, aggregationRules)) {
+      apiRef.current.unstable_requestPipeProcessorsApplication('hydrateRows');
+      applyAggregation();
+    } // Re-apply the column hydration to wrap / unwrap the aggregated columns
+
+
+    if ((0, _gridAggregationUtils.hasAggregationRulesChanged)(rulesOnLastColumnHydration, aggregationRules)) {
+      apiRef.current.unstable_requestPipeProcessorsApplication('hydrateColumns');
+    }
+  }, [apiRef, applyAggregation, props.aggregationFunctions, props.disableAggregation]);
+  (0, _xDataGridPro.useGridApiEventHandler)(apiRef, 'aggregationModelChange', checkAggregationRulesDiff);
+  (0, _xDataGridPro.useGridApiEventHandler)(apiRef, 'columnsChange', checkAggregationRulesDiff);
+  (0, _xDataGridPro.useGridApiEventHandler)(apiRef, 'filteredRowsSet', applyAggregation);
+  /**
+   * EFFECTS
+   */
+
+  React.useEffect(() => {
+    if (props.aggregationModel !== undefined) {
+      apiRef.current.setAggregationModel(props.aggregationModel);
+    }
+  }, [apiRef, props.aggregationModel]);
+};
+
+exports.useGridAggregation = useGridAggregation;

package/node/hooks/features/aggregation/useGridAggregationPreProcessors.js

@@ -0,0 +1,162 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useGridAggregationPreProcessors = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var React = _interopRequireWildcard(require("react"));
+
+var _Divider = _interopRequireDefault(require("@mui/material/Divider"));
+
+var _xDataGridPro = require("@mui/x-data-grid-pro");
+
+var _internals = require("@mui/x-data-grid-pro/internals");
+
+var _gridAggregationUtils = require("./gridAggregationUtils");
+
+var _wrapColumnWithAggregation = require("./wrapColumnWithAggregation");
+
+var _GridAggregationColumnMenuItem = require("../../../components/GridAggregationColumnMenuItem");
+
+var _gridAggregationSelectors = require("./gridAggregationSelectors");
+
+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; }
+
+const Divider = () => /*#__PURE__*/(0, _jsxRuntime.jsx)(_Divider.default, {
+  onClick: event => event.stopPropagation()
+});
+
+const useGridAggregationPreProcessors = (apiRef, props) => {
+  const updateAggregatedColumns = React.useCallback(columnsState => {
+    const {
+      rulesOnLastColumnHydration
+    } = apiRef.current.unstable_caches.aggregation;
+    const aggregationRules = props.disableAggregation ? {} : (0, _gridAggregationUtils.getAggregationRules)({
+      columnsLookup: columnsState.lookup,
+      aggregationModel: (0, _gridAggregationSelectors.gridAggregationModelSelector)(apiRef),
+      aggregationFunctions: props.aggregationFunctions
+    });
+    columnsState.all.forEach(field => {
+      const shouldHaveAggregationValue = !!aggregationRules[field];
+      const haveAggregationColumnValue = !!rulesOnLastColumnHydration[field];
+      let column = columnsState.lookup[field];
+
+      if (haveAggregationColumnValue) {
+        column = (0, _wrapColumnWithAggregation.unwrapColumnFromAggregation)({
+          column
+        });
+      }
+
+      if (shouldHaveAggregationValue) {
+        column = (0, _wrapColumnWithAggregation.wrapColumnWithAggregationValue)({
+          column,
+          aggregationRule: aggregationRules[field],
+          apiRef
+        });
+      }
+
+      columnsState.lookup[field] = column;
+    });
+    apiRef.current.unstable_caches.aggregation.rulesOnLastColumnHydration = aggregationRules;
+    return columnsState;
+  }, [apiRef, props.aggregationFunctions, props.disableAggregation]);
+  const addGroupFooterRows = React.useCallback(groupingParams => {
+    let newGroupingParams;
+    let rulesOnLastRowHydration;
+
+    if (props.disableAggregation) {
+      newGroupingParams = groupingParams;
+      rulesOnLastRowHydration = {};
+    } else {
+      const aggregationRules = (0, _gridAggregationUtils.getAggregationRules)({
+        columnsLookup: (0, _xDataGridPro.gridColumnLookupSelector)(apiRef),
+        aggregationModel: (0, _gridAggregationSelectors.gridAggregationModelSelector)(apiRef),
+        aggregationFunctions: props.aggregationFunctions
+      });
+      rulesOnLastRowHydration = aggregationRules; // If no column have an aggregation rule
+      // Then don't create the footer rows
+
+      if (Object.values(aggregationRules).length === 0) {
+        newGroupingParams = groupingParams;
+      } else {
+        newGroupingParams = (0, _gridAggregationUtils.addFooterRows)({
+          groupingParams,
+          aggregationRules,
+          getAggregationPosition: props.getAggregationPosition,
+          apiRef
+        });
+      }
+    }
+
+    apiRef.current.unstable_caches.aggregation.rulesOnLastRowHydration = rulesOnLastRowHydration;
+    return newGroupingParams;
+  }, [apiRef, props.disableAggregation, props.getAggregationPosition, props.aggregationFunctions]);
+  const addColumnMenuButtons = React.useCallback((initialValue, column) => {
+    if (props.disableAggregation) {
+      return initialValue;
+    }
+
+    const availableAggregationFunctions = (0, _gridAggregationUtils.getAvailableAggregationFunctions)({
+      aggregationFunctions: props.aggregationFunctions,
+      column
+    });
+
+    if (availableAggregationFunctions.length === 0) {
+      return initialValue;
+    }
+
+    return [...initialValue, /*#__PURE__*/(0, _jsxRuntime.jsx)(Divider, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridAggregationColumnMenuItem.GridAggregationColumnMenuItem, {
+      column: column,
+      label: apiRef.current.getLocaleText('aggregationMenuItemHeader'),
+      availableAggregationFunctions: availableAggregationFunctions
+    })];
+  }, [apiRef, props.aggregationFunctions, props.disableAggregation]);
+  const stateExportPreProcessing = React.useCallback(prevState => {
+    if (props.disableAggregation) {
+      return prevState;
+    }
+
+    const aggregationModelToExport = (0, _gridAggregationSelectors.gridAggregationModelSelector)(apiRef);
+
+    if (Object.values(aggregationModelToExport).length === 0) {
+      return prevState;
+    }
+
+    return (0, _extends2.default)({}, prevState, {
+      aggregation: {
+        model: aggregationModelToExport
+      }
+    });
+  }, [apiRef, props.disableAggregation]);
+  const stateRestorePreProcessing = React.useCallback((params, context) => {
+    var _context$stateToResto;
+
+    if (props.disableAggregation) {
+      return params;
+    }
+
+    const aggregationModel = (_context$stateToResto = context.stateToRestore.aggregation) == null ? void 0 : _context$stateToResto.model;
+
+    if (aggregationModel != null) {
+      apiRef.current.setState((0, _gridAggregationUtils.mergeStateWithAggregationModel)(aggregationModel));
+    }
+
+    return params;
+  }, [apiRef, props.disableAggregation]);
+  (0, _internals.useGridRegisterPipeProcessor)(apiRef, 'hydrateColumns', updateAggregatedColumns);
+  (0, _internals.useGridRegisterPipeProcessor)(apiRef, 'hydrateRows', addGroupFooterRows);
+  (0, _internals.useGridRegisterPipeProcessor)(apiRef, 'columnMenu', addColumnMenuButtons);
+  (0, _internals.useGridRegisterPipeProcessor)(apiRef, 'exportState', stateExportPreProcessing);
+  (0, _internals.useGridRegisterPipeProcessor)(apiRef, 'restoreState', stateRestorePreProcessing);
+};
+
+exports.useGridAggregationPreProcessors = useGridAggregationPreProcessors;

package/node/hooks/features/aggregation/wrapColumnWithAggregation.js

@@ -0,0 +1,279 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.wrapColumnWithAggregationValue = exports.unwrapColumnFromAggregation = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var React = _interopRequireWildcard(require("react"));
+
+var _gridAggregationSelectors = require("./gridAggregationSelectors");
+
+var _GridFooterCell = require("../../../components/GridFooterCell");
+
+var _GridAggregationHeader = require("../../../components/GridAggregationHeader");
+
+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; }
+
+const AGGREGATION_WRAPPABLE_PROPERTIES = ['valueGetter', 'valueFormatter', 'renderCell', 'renderHeader', 'filterOperators'];
+
+const getAggregationValueWrappedValueGetter = ({
+  value: valueGetter,
+  getCellAggregationResult
+}) => {
+  const wrappedValueGetter = params => {
+    const cellAggregationResult = getCellAggregationResult(params.id, params.field);
+
+    if (cellAggregationResult != null) {
+      var _cellAggregationResul;
+
+      return (_cellAggregationResul = cellAggregationResult == null ? void 0 : cellAggregationResult.value) != null ? _cellAggregationResul : null;
+    }
+
+    if (valueGetter) {
+      return valueGetter(params);
+    }
+
+    return params.row[params.field];
+  };
+
+  return wrappedValueGetter;
+};
+
+const getAggregationValueWrappedValueFormatter = ({
+  value: valueFormatter,
+  aggregationRule,
+  getCellAggregationResult
+}) => {
+  // If neither the inline aggregation function nor the footer aggregation function have a custom value formatter,
+  // Then we don't wrap the column value formatter
+  if (!aggregationRule.aggregationFunction.valueFormatter) {
+    return valueFormatter;
+  }
+
+  const wrappedValueFormatter = params => {
+    if (params.id != null) {
+      const cellAggregationResult = getCellAggregationResult(params.id, params.field);
+
+      if (cellAggregationResult != null) {
+        return aggregationRule.aggregationFunction.valueFormatter(params);
+      }
+    }
+
+    if (valueFormatter) {
+      return valueFormatter(params);
+    }
+
+    return params.value;
+  };
+
+  return wrappedValueFormatter;
+};
+
+const getAggregationValueWrappedRenderCell = ({
+  value: renderCell,
+  aggregationRule,
+  getCellAggregationResult
+}) => {
+  const wrappedRenderCell = params => {
+    const cellAggregationResult = getCellAggregationResult(params.id, params.field);
+
+    if (cellAggregationResult != null) {
+      var _aggregationFunction$;
+
+      if (!renderCell) {
+        if (cellAggregationResult.position === 'footer') {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridFooterCell.GridFooterCell, (0, _extends2.default)({}, params));
+        }
+
+        return params.formattedValue;
+      }
+
+      const aggregationMeta = {
+        hasCellUnit: (_aggregationFunction$ = aggregationRule.aggregationFunction.hasCellUnit) != null ? _aggregationFunction$ : true,
+        aggregationFunctionName: aggregationRule.aggregationFunctionName
+      };
+      return renderCell((0, _extends2.default)({}, params, {
+        aggregation: aggregationMeta
+      }));
+    }
+
+    if (!renderCell) {
+      return params.formattedValue;
+    }
+
+    return renderCell(params);
+  };
+
+  return wrappedRenderCell;
+};
+/**
+ * Skips the filtering for aggregated rows
+ */
+
+
+const getWrappedFilterOperators = ({
+  value: filterOperators,
+  getCellAggregationResult
+}) => filterOperators.map(operator => {
+  return (0, _extends2.default)({}, operator, {
+    getApplyFilterFn: (filterItem, column) => {
+      const originalFn = operator.getApplyFilterFn(filterItem, column);
+
+      if (!originalFn) {
+        return null;
+      }
+
+      return params => {
+        if (getCellAggregationResult(params.id, params.field) != null) {
+          return true;
+        }
+
+        return originalFn(params);
+      };
+    }
+  });
+});
+/**
+ * Add the aggregation method around the header name
+ */
+
+
+const getWrappedRenderHeader = ({
+  value: renderHeader,
+  aggregationRule
+}) => {
+  const wrappedRenderCell = params => {
+    const aggregationMeta = {
+      aggregationRule
+    };
+
+    if (!renderHeader) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridAggregationHeader.GridAggregationHeader, (0, _extends2.default)({}, params, {
+        aggregation: aggregationMeta
+      }));
+    }
+
+    return renderHeader((0, _extends2.default)({}, params, {
+      aggregation: aggregationMeta
+    }));
+  };
+
+  return wrappedRenderCell;
+};
+/**
+ * Add a wrapper around each wrappable property of the column to customize the behavior of the aggregation cells.
+ */
+
+
+const wrapColumnWithAggregationValue = ({
+  column,
+  apiRef,
+  aggregationRule
+}) => {
+  const getCellAggregationResult = (id, field) => {
+    var _parent, _gridAggregationLooku;
+
+    let cellAggregationPosition = null;
+
+    if (id.toString().startsWith('auto-generated-row-')) {
+      cellAggregationPosition = 'inline';
+    } else if (id.toString().startsWith('auto-generated-group-footer-')) {
+      cellAggregationPosition = 'footer';
+    }
+
+    if (cellAggregationPosition == null) {
+      return null;
+    } // TODO: Add custom root id
+
+
+    const groupId = cellAggregationPosition === 'inline' ? id : (_parent = apiRef.current.getRowNode(id).parent) != null ? _parent : '';
+    const aggregationResult = (_gridAggregationLooku = (0, _gridAggregationSelectors.gridAggregationLookupSelector)(apiRef)[groupId]) == null ? void 0 : _gridAggregationLooku[field];
+
+    if (!aggregationResult || aggregationResult.position !== cellAggregationPosition) {
+      return null;
+    }
+
+    return aggregationResult;
+  };
+
+  const aggregationWrappedProperties = {};
+  const wrappedColumn = (0, _extends2.default)({}, column, {
+    aggregationWrappedProperties
+  });
+
+  const wrapColumnProperty = (property, wrapper) => {
+    const originalValue = column[property];
+    const wrappedProperty = wrapper({
+      apiRef,
+      value: originalValue,
+      colDef: column,
+      aggregationRule,
+      getCellAggregationResult
+    });
+
+    if (wrappedProperty !== originalValue) {
+      aggregationWrappedProperties[property] = {
+        original: originalValue,
+        wrapped: wrappedProperty
+      };
+      wrappedColumn[property] = wrappedProperty;
+    }
+  };
+
+  wrapColumnProperty('valueGetter', getAggregationValueWrappedValueGetter);
+  wrapColumnProperty('valueFormatter', getAggregationValueWrappedValueFormatter);
+  wrapColumnProperty('renderCell', getAggregationValueWrappedRenderCell);
+  wrapColumnProperty('renderHeader', getWrappedRenderHeader);
+  wrapColumnProperty('filterOperators', getWrappedFilterOperators);
+
+  if (Object.keys(aggregationWrappedProperties).length === 0) {
+    return column;
+  }
+
+  return wrappedColumn;
+};
+/**
+ * Remove the aggregation wrappers around the wrappable properties of the column.
+ */
+
+
+exports.wrapColumnWithAggregationValue = wrapColumnWithAggregationValue;
+
+const unwrapColumnFromAggregation = ({
+  column
+}) => {
+  if (!column.aggregationWrappedProperties) {
+    return column;
+  }
+
+  const originalProperties = Object.entries(column.aggregationWrappedProperties);
+
+  if (originalProperties.length === 0) {
+    return column;
+  }
+
+  const unwrappedColumn = (0, _extends2.default)({}, column);
+  originalProperties.forEach(([propertyName, {
+    original,
+    wrapped
+  }]) => {
+    // The value changed since we wrapped it
+    if (wrapped !== column[propertyName]) {
+      return;
+    }
+
+    unwrappedColumn[propertyName] = original;
+  });
+  return unwrappedColumn;
+};
+
+exports.unwrapColumnFromAggregation = unwrapColumnFromAggregation;

package/node/hooks/features/export/serializer/excelSerializer.js

@@ -61,7 +61,8 @@ const serializeRow = (id, columns, api, defaultValueOptionsFormulae) => {
   api.unstable_calculateColSpan({
     rowId: id,
     minFirstColumn: 0,
-    maxLastColumn: columns.length - 1
+    maxLastColumn: columns.length,
+    columns
   });
   columns.forEach((column, colIndex) => {
     const colSpanInfo = api.unstable_getCellColSpanInfo(id, colIndex);

package/node/hooks/features/index.js

@@ -4,6 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
+var _aggregation = require("./aggregation");
+
+Object.keys(_aggregation).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _aggregation[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _aggregation[key];
+    }
+  });
+});
+
 var _rowGrouping = require("./rowGrouping");
 
 Object.keys(_rowGrouping).forEach(function (key) {

package/node/hooks/features/rowGrouping/createGroupingColDef.js

@@ -15,6 +15,8 @@ var React = _interopRequireWildcard(require("react"));
 
 var _xDataGridPro = require("@mui/x-data-grid-pro");
 
+var _GridGroupingColumnFooterCell = require("../../../components/GridGroupingColumnFooterCell");
+
 var _GridGroupingCriteriaCell = require("../../../components/GridGroupingCriteriaCell");
 
 var _GridGroupingColumnLeafCell = require("../../../components/GridGroupingColumnLeafCell");
@@ -173,7 +175,12 @@ const createGroupingColDefForOneGroupingCriteria = ({
   const commonProperties = {
     width: Math.max(((_groupedByColDef$widt = groupedByColDef.width) != null ? _groupedByColDef$widt : _xDataGridPro.GRID_STRING_COL_DEF.width) + 40, (_leafColDef$width = leafColDef == null ? void 0 : leafColDef.width) != null ? _leafColDef$width : 0),
     renderCell: params => {
-      // Render leaves
+      // Render footer
+      if (params.rowNode.position === 'footer') {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridGroupingColumnFooterCell.GridGroupingColumnFooterCell, (0, _extends2.default)({}, params));
+      } // Render leaves
+
+
       if (params.rowNode.groupingField == null) {
         if (leafColDef) {
           const leafParams = (0, _extends2.default)({}, params.api.getCellParams(params.id, leafField), {
@@ -275,7 +282,12 @@ const createGroupingColDefForAllGroupingCriteria = ({
       return ((_columnsLookup$field$ = columnsLookup[field].width) != null ? _columnsLookup$field$ : _xDataGridPro.GRID_STRING_COL_DEF.width) + 40;
     }), (_leafColDef$width2 = leafColDef == null ? void 0 : leafColDef.width) != null ? _leafColDef$width2 : 0),
     renderCell: params => {
-      // Render the leaves
+      // Render footer
+      if (params.rowNode.position === 'footer') {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridGroupingColumnFooterCell.GridGroupingColumnFooterCell, (0, _extends2.default)({}, params));
+      } // Render the leaves
+
+
       if (params.rowNode.groupingField == null) {
         if (leafColDef) {
           const leafParams = (0, _extends2.default)({}, params.api.getCellParams(params.id, leafField), {

package/node/hooks/features/rowGrouping/gridRowGroupingUtils.js

@@ -101,13 +101,17 @@ const filterRowTreeFromGroupingColumns = params => {
     visibleRowsLookup[node.id] = shouldPassFilters && areAncestorsExpanded;
     filteredRowsLookup[node.id] = shouldPassFilters;
 
+    if (node.footerId != null) {
+      visibleRowsLookup[node.footerId] = shouldPassFilters && areAncestorsExpanded && !!node.childrenExpanded;
+    }
+
     if (!shouldPassFilters) {
       return 0;
     }
 
     filteredDescendantCountLookup[node.id] = filteredDescendantCount;
 
-    if (!node.children) {
+    if (!node.children && !node.isAutoGenerated) {
       return filteredDescendantCount + 1;
     }