pass filterResults in child node

mui · Dec 28, 2024 · a55ab95 · a55ab95
1 parent ae6ba64
commit a55ab95
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/x-data-grid-premium/src/hooks/features/rowGrouping/gridRowGroupingUtils.ts b/packages/x-data-grid-premium/src/hooks/features/rowGrouping/gridRowGroupingUtils.ts
@@ -161,6 +161,7 @@ export const filterRowTreeFromGroupingColumns = (
     areAncestorsExpanded: boolean,
     isParentPassingFilter: boolean,
     shouldFilterParent: boolean,
+    ancestorsResults: GridAggregatedFilterItemApplierResult[],
   ): number => {
     const filterResults: GridAggregatedFilterItemApplierResult = {
       passingFilterItems: null,
@@ -177,9 +178,10 @@ export const filterRowTreeFromGroupingColumns = (
 
       const row = apiRef.current.getRow(node.id);
       isRowMatchingFilters(row, shouldApplyItem, filterResults);
+      const allResults = [...ancestorsResults, filterResults];
       isPassingFiltering = passFilterLogic(
-        [filterResults.passingFilterItems],
-        [filterResults.passingQuickFilterValues],
+        allResults.map((result) => result.passingFilterItems),
+        allResults.map((result) => result.passingQuickFilterValues),
         filterModel,
         params.apiRef,
         filterCache,
@@ -203,6 +205,7 @@ export const filterRowTreeFromGroupingColumns = (
           areAncestorsExpanded && !!node.childrenExpanded,
           isPassingFiltering,
           allowGroupToFilter,
+          [...ancestorsResults, filterResults],
         );
         filteredDescendantCount += childSubTreeSize;
         if (childSubTreeSize > 0) {
@@ -235,7 +238,7 @@ export const filterRowTreeFromGroupingColumns = (
   for (let i = 0; i < nodes.length; i += 1) {
     const node = nodes[i];
     if (node.depth === 0) {
-      filterTreeNode(node, true, true, false);
+      filterTreeNode(node, true, true, false, []);
     }
   }
 

diff --git a/packages/x-data-grid-premium/src/tests/rowGrouping.DataGridPremium.test.tsx b/packages/x-data-grid-premium/src/tests/rowGrouping.DataGridPremium.test.tsx
@@ -2407,7 +2407,7 @@ describe('<DataGridPremium /> - Row grouping', () => {
         );
 
         // Corresponds to rows id 0 because of Cat A, ann id 4 because of Cat 1
-        expect(getColumnValues(1)).to.deep.equal(['', '0', '', '4']);
+        expect(getColumnValues(1)).to.deep.equal(['', '0', '1', '2', '', '4']);
       });
 
       it('should keep the correct count of the children and descendants in the filter state', () => {