[DataGridPremium] Make row grouping work with negative filtering

packages/x-data-grid-premium/src/hooks/features/rowGrouping/gridRowGroupingUtils.ts

@@ -55,6 +55,7 @@ interface FilterRowTreeFromTreeDataParams {
   isRowMatchingFilters: GridAggregatedFilterItemApplier | null;
   filterModel: GridFilterModel;
   apiRef: React.MutableRefObject<GridPrivateApiPremium>;
+  rowGroupingColumnMode: 'single' | 'multiple';
 }
 
 /**
@@ -79,11 +80,36 @@ const shouldApplyFilterItemOnGroup = (columnField: string, node: GridGroupNode)
 export const filterRowTreeFromGroupingColumns = (
   params: FilterRowTreeFromTreeDataParams,
 ): Omit<GridFilterState, 'filterModel'> => {
-  const { apiRef, rowTree, isRowMatchingFilters, filterModel } = params;
+  const { apiRef, rowTree, isRowMatchingFilters, filterModel, rowGroupingColumnMode } = params;
   const filteredRowsLookup: Record<GridRowId, boolean> = {};
   const filteredChildrenCountLookup: Record<GridRowId, number> = {};
   const filteredDescendantCountLookup: Record<GridRowId, number> = {};
   const filterCache = {};
+  const isFilterItemAppliedOnGroup = (node: GridTreeNode): boolean => {
+    if (node.type === 'group' && node.isAutoGenerated) {
+      const groupFilterItems: string[] = [];
+      const leafFilterItems: string[] = [];
+      filterModel.items.forEach((item) => {
+        if (isGroupingColumn(item.field)) {
+          groupFilterItems.push(item.field);
+        } else {
+          leafFilterItems.push(item.field);
+        }
+      });
+      const groupingField =
+        rowGroupingColumnMode === 'multiple'
+          ? getRowGroupingFieldFromGroupingCriteria(node.groupingField!)
+          : GRID_ROW_GROUPING_SINGLE_GROUPING_FIELD;
+
+      const shouldApplyFilterOnGroupingField =
+        groupingField === groupFilterItems[groupFilterItems.length - 1];
+
+      if (shouldApplyFilterOnGroupingField && leafFilterItems.length === 0) {
+        return true;
+      }
+    }
+    return false;
+  };
 
   const filterTreeNode = (
     node: GridTreeNode,
@@ -102,15 +128,23 @@ export const filterRowTreeFromGroupingColumns = (
         node.type === 'group' && node.isAutoGenerated
           ? (columnField: string) => shouldApplyFilterItemOnGroup(columnField, node)
           : undefined;
-
       const row = apiRef.current.getRow(node.id);
       isRowMatchingFilters(row, shouldApplyItem, filterResults);
+      const allResults = [...ancestorsResults, filterResults];
+      isPassingFiltering = passFilterLogic(
+        allResults.map((result) => result.passingFilterItems),
+        allResults.map((result) => result.passingQuickFilterValues),
+        filterModel,
+        params.apiRef,
+        filterCache,
+      );
     } else {
       isPassingFiltering = true;
     }
 
     let filteredChildrenCount = 0;
     let filteredDescendantCount = 0;
+
     if (node.type === 'group') {
       node.children.forEach((childId) => {
         const childNode = rowTree[childId];
@@ -126,20 +160,10 @@ export const filterRowTreeFromGroupingColumns = (
       });
     }
 
-    if (isPassingFiltering === false) {
-      if (node.type === 'group') {
-        // If node has children - it's passing if at least one child passes filters
-        isPassingFiltering = filteredDescendantCount > 0;
-      } else {
-        const allResults = [...ancestorsResults, filterResults];
-        isPassingFiltering = passFilterLogic(
-          allResults.map((result) => result.passingFilterItems),
-          allResults.map((result) => result.passingQuickFilterValues),
-          filterModel,
-          params.apiRef,
-          filterCache,
-        );
-      }
+    const filterItemOnlyAppliedOnGroup = isFilterItemAppliedOnGroup(node);
+    if (node.type === 'group' && !filterItemOnlyAppliedOnGroup) {
+      // If node has children - it's passing if at least one child passes filters
+      isPassingFiltering = filteredDescendantCount > 0;
     }
 
     filteredRowsLookup[node.id] = isPassingFiltering;

packages/x-data-grid-premium/src/hooks/features/rowGrouping/useGridRowGroupingPreProcessors.ts

@@ -225,9 +225,10 @@ export const useGridRowGroupingPreProcessors = (
         isRowMatchingFilters: params.isRowMatchingFilters,
         filterModel: params.filterModel,
         apiRef,
+        rowGroupingColumnMode: props.rowGroupingColumnMode,
       });
     },
-    [apiRef],
+    [apiRef, props.rowGroupingColumnMode],
   );
 
   const sortRows = React.useCallback<GridStrategyProcessor<'sorting'>>(