@mui/x-data-grid-premium 5.14.0 → 5.15.2

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

@@ -40,10 +40,10 @@ const useGridAggregationPreProcessors = (apiRef, props) => {
     const {
       rulesOnLastColumnHydration
     } = apiRef.current.unstable_caches.aggregation;
-    const aggregationRules = props.private_disableAggregation ? {} : (0, _gridAggregationUtils.getAggregationRules)({
+    const aggregationRules = props.disableAggregation ? {} : (0, _gridAggregationUtils.getAggregationRules)({
       columnsLookup: columnsState.lookup,
       aggregationModel: (0, _gridAggregationSelectors.gridAggregationModelSelector)(apiRef),
-      aggregationFunctions: props.private_aggregationFunctions
+      aggregationFunctions: props.aggregationFunctions
     });
     columnsState.all.forEach(field => {
       const shouldHaveAggregationValue = !!aggregationRules[field];
@@ -68,19 +68,19 @@ const useGridAggregationPreProcessors = (apiRef, props) => {
     });
     apiRef.current.unstable_caches.aggregation.rulesOnLastColumnHydration = aggregationRules;
     return columnsState;
-  }, [apiRef, props.private_aggregationFunctions, props.private_disableAggregation]);
+  }, [apiRef, props.aggregationFunctions, props.disableAggregation]);
   const addGroupFooterRows = React.useCallback(groupingParams => {
     let newGroupingParams;
     let rulesOnLastRowHydration;
 
-    if (props.private_disableAggregation) {
+    if (props.disableAggregation) {
       newGroupingParams = groupingParams;
       rulesOnLastRowHydration = {};
     } else {
       const aggregationRules = (0, _gridAggregationUtils.getAggregationRules)({
         columnsLookup: (0, _xDataGridPro.gridColumnLookupSelector)(apiRef),
         aggregationModel: (0, _gridAggregationSelectors.gridAggregationModelSelector)(apiRef),
-        aggregationFunctions: props.private_aggregationFunctions
+        aggregationFunctions: props.aggregationFunctions
       });
       rulesOnLastRowHydration = aggregationRules; // If no column have an aggregation rule
       // Then don't create the footer rows
@@ -91,21 +91,22 @@ const useGridAggregationPreProcessors = (apiRef, props) => {
         newGroupingParams = (0, _gridAggregationUtils.addFooterRows)({
           groupingParams,
           aggregationRules,
-          getAggregationPosition: props.private_getAggregationPosition
+          getAggregationPosition: props.getAggregationPosition,
+          apiRef
         });
       }
     }
 
     apiRef.current.unstable_caches.aggregation.rulesOnLastRowHydration = rulesOnLastRowHydration;
     return newGroupingParams;
-  }, [apiRef, props.private_disableAggregation, props.private_getAggregationPosition, props.private_aggregationFunctions]);
+  }, [apiRef, props.disableAggregation, props.getAggregationPosition, props.aggregationFunctions]);
   const addColumnMenuButtons = React.useCallback((initialValue, column) => {
-    if (props.private_disableAggregation) {
+    if (props.disableAggregation) {
       return initialValue;
     }
 
     const availableAggregationFunctions = (0, _gridAggregationUtils.getAvailableAggregationFunctions)({
-      aggregationFunctions: props.private_aggregationFunctions,
+      aggregationFunctions: props.aggregationFunctions,
       column
     });
 
@@ -118,9 +119,9 @@ const useGridAggregationPreProcessors = (apiRef, props) => {
       label: apiRef.current.getLocaleText('aggregationMenuItemHeader'),
       availableAggregationFunctions: availableAggregationFunctions
     })];
-  }, [apiRef, props.private_aggregationFunctions, props.private_disableAggregation]);
+  }, [apiRef, props.aggregationFunctions, props.disableAggregation]);
   const stateExportPreProcessing = React.useCallback(prevState => {
-    if (props.private_disableAggregation) {
+    if (props.disableAggregation) {
       return prevState;
     }
 
@@ -131,26 +132,26 @@ const useGridAggregationPreProcessors = (apiRef, props) => {
     }
 
     return (0, _extends2.default)({}, prevState, {
-      private_aggregation: {
+      aggregation: {
         model: aggregationModelToExport
       }
     });
-  }, [apiRef, props.private_disableAggregation]);
+  }, [apiRef, props.disableAggregation]);
   const stateRestorePreProcessing = React.useCallback((params, context) => {
     var _context$stateToResto;
 
-    if (props.private_disableAggregation) {
+    if (props.disableAggregation) {
       return params;
     }
 
-    const aggregationModel = (_context$stateToResto = context.stateToRestore.private_aggregation) == null ? void 0 : _context$stateToResto.model;
+    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.private_disableAggregation]);
+  }, [apiRef, props.disableAggregation]);
   (0, _internals.useGridRegisterPipeProcessor)(apiRef, 'hydrateColumns', updateAggregatedColumns);
   (0, _internals.useGridRegisterPipeProcessor)(apiRef, 'hydrateRows', addGroupFooterRows);
   (0, _internals.useGridRegisterPipeProcessor)(apiRef, 'columnMenu', addColumnMenuButtons);

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

@@ -88,11 +88,6 @@ const getLeafProperties = leafColDef => {
         }
 
         return params => {
-          // We only want to filter leaves
-          if (params.rowNode.groupingField != null) {
-            return true;
-          }
-
           return originalFn(params);
         };
       }
@@ -131,11 +126,6 @@ const getGroupingCriteriaProperties = (groupedByColDef, applyHeaderName) => {
         }
 
         return params => {
-          // We only want to filter the groups of the current grouping criteria
-          if (params.rowNode.groupingField !== groupedByColDef.field) {
-            return true;
-          }
-
           return originalFn(params);
         };
       }

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

@@ -9,6 +9,8 @@ exports.setStrategyAvailability = exports.mergeStateWithRowGroupingModel = expor
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _internals = require("@mui/x-data-grid-pro/internals");
+
 var _gridRowGroupingSelector = require("./gridRowGroupingSelector");
 
 const GRID_ROW_GROUPING_SINGLE_GROUPING_FIELD = '__row_group_by_columns_group__';
@@ -64,48 +66,56 @@ const shouldApplyFilterItemOnGroup = (columnField, node) => {
 const filterRowTreeFromGroupingColumns = params => {
   const {
     rowTree,
-    isRowMatchingFilters
+    isRowMatchingFilters,
+    filterModel
   } = params;
   const visibleRowsLookup = {};
   const filteredRowsLookup = {};
   const filteredDescendantCountLookup = {};
 
-  const filterTreeNode = (node, areAncestorsPassingChildren, areAncestorsExpanded) => {
-    var _node$children, _node$children2;
+  const filterTreeNode = (node, areAncestorsExpanded, ancestorsResults) => {
+    var _node$children;
 
-    let isMatchingFilters;
+    let isPassingFiltering = false;
+    let filterResults = {
+      passingFilterItems: null,
+      passingQuickFilterValues: null
+    };
 
-    if (!isRowMatchingFilters) {
-      isMatchingFilters = true;
-    } else {
+    if (isRowMatchingFilters && node.position !== 'footer') {
       const shouldApplyItem = node.isAutoGenerated ? columnField => shouldApplyFilterItemOnGroup(columnField, node) : undefined;
-      isMatchingFilters = isRowMatchingFilters(node.id, shouldApplyItem);
+      filterResults = isRowMatchingFilters(node.id, shouldApplyItem);
+    } else {
+      isPassingFiltering = true;
     }
 
     let filteredDescendantCount = 0;
     (_node$children = node.children) == null ? void 0 : _node$children.forEach(childId => {
       const childNode = rowTree[childId];
-      const childSubTreeSize = filterTreeNode(childNode, areAncestorsPassingChildren && isMatchingFilters, areAncestorsExpanded && !!node.childrenExpanded);
+      const childSubTreeSize = filterTreeNode(childNode, areAncestorsExpanded && !!node.childrenExpanded, [...ancestorsResults, filterResults]);
       filteredDescendantCount += childSubTreeSize;
     });
-    let shouldPassFilters;
 
-    if (!areAncestorsPassingChildren) {
-      shouldPassFilters = false;
-    } else if ((_node$children2 = node.children) != null && _node$children2.length) {
-      shouldPassFilters = isMatchingFilters && filteredDescendantCount > 0;
-    } else {
-      shouldPassFilters = isMatchingFilters;
+    if (isPassingFiltering === false) {
+      var _node$children2;
+
+      if ((_node$children2 = node.children) != null && _node$children2.length) {
+        // If node has children - it's passing if at least one child passes filters
+        isPassingFiltering = filteredDescendantCount > 0;
+      } else {
+        const allResults = [...ancestorsResults, filterResults];
+        isPassingFiltering = (0, _internals.passFilterLogic)(allResults.map(result => result.passingFilterItems), allResults.map(result => result.passingQuickFilterValues), filterModel);
+      }
     }
 
-    visibleRowsLookup[node.id] = shouldPassFilters && areAncestorsExpanded;
-    filteredRowsLookup[node.id] = shouldPassFilters;
+    visibleRowsLookup[node.id] = isPassingFiltering && areAncestorsExpanded;
+    filteredRowsLookup[node.id] = isPassingFiltering;
 
     if (node.footerId != null) {
-      visibleRowsLookup[node.footerId] = shouldPassFilters && areAncestorsExpanded && !!node.childrenExpanded;
+      visibleRowsLookup[node.footerId] = isPassingFiltering && areAncestorsExpanded && !!node.childrenExpanded;
     }
 
-    if (!shouldPassFilters) {
+    if (!isPassingFiltering) {
       return 0;
     }
 
@@ -124,7 +134,7 @@ const filterRowTreeFromGroupingColumns = params => {
     const node = nodes[i];
 
     if (node.depth === 0) {
-      filterTreeNode(node, true, true);
+      filterTreeNode(node, true, []);
     }
   }
 

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

@@ -156,7 +156,8 @@ const useGridRowGroupingPreProcessors = (apiRef, props) => {
     const rowTree = (0, _xDataGridPro.gridRowTreeSelector)(apiRef);
     return (0, _gridRowGroupingUtils.filterRowTreeFromGroupingColumns)({
       rowTree,
-      isRowMatchingFilters: params.isRowMatchingFilters
+      isRowMatchingFilters: params.isRowMatchingFilters,
+      filterModel: params.filterModel
     });
   }, [apiRef]);
   const sortRows = React.useCallback(params => {

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v5.14.0
+/** @license MUI v5.15.2
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/node/utils/releaseInfo.js

@@ -8,7 +8,7 @@ exports.getReleaseInfo = void 0;
 var _utils = require("@mui/utils");
 
 const getReleaseInfo = () => {
-  const releaseInfo = "MTY1ODQ0MDgwMDAwMA==";
+  const releaseInfo = "MTY2MDE2NTIwMDAwMA==";
 
   if (process.env.NODE_ENV !== 'production') {
     // A simple hack to set the value in the test environment (has no build step).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid-premium",
-  "version": "5.14.0",
+  "version": "5.15.2",
   "description": "The Premium plan edition of the data grid component (MUI X).",
   "author": "MUI Team",
   "main": "./node/index.js",
@@ -33,9 +33,9 @@
   "dependencies": {
     "@babel/runtime": "^7.18.6",
     "@mui/utils": "^5.4.1",
-    "@mui/x-data-grid": "5.14.0",
-    "@mui/x-data-grid-pro": "5.14.0",
-    "@mui/x-license-pro": "5.14.0",
+    "@mui/x-data-grid": "5.15.2",
+    "@mui/x-data-grid-pro": "5.15.2",
+    "@mui/x-license-pro": "5.15.0",
     "@types/format-util": "^1.0.2",
     "clsx": "^1.2.1",
     "exceljs": "^4.3.0",

package/typeOverloads/modules.d.ts

@@ -23,12 +23,12 @@ export interface GridColDefPremium<R extends GridValidRowModel = any, V = any, F
      * If `true`, the cells of the column can be aggregated based.
      * @default true
      */
-    private_aggregable?: boolean;
+    aggregable?: boolean;
     /**
      * Limit the aggregation function usable on this column.
      * By default, the column will have all the aggregation functions that are compatible with its type.
      */
-    private_availableAggregationFunctions?: string[];
+    availableAggregationFunctions?: string[];
     /**
      * Function that transforms a complex cell value into a key that be used for grouping the rows.
      * @param {GridGroupingValueGetterParams} params Object containing parameters for the getter.

package/utils/releaseInfo.js

@@ -1,6 +1,6 @@
 import { ponyfillGlobal } from '@mui/utils';
 export const getReleaseInfo = () => {
-  const releaseInfo = "MTY1ODQ0MDgwMDAwMA==";
+  const releaseInfo = "MTY2MDE2NTIwMDAwMA==";
 
   if (process.env.NODE_ENV !== 'production') {
     // A simple hack to set the value in the test environment (has no build step).