Simplify logic

mui · Dec 19, 2024 · 68b9f2a · 68b9f2a
1 parent b7b9114
commit 68b9f2a
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/...ges/x-data-grid-premium/src/hooks/features/rowGrouping/useGridRowGroupingPreProcessors.ts b/...ges/x-data-grid-premium/src/hooks/features/rowGrouping/useGridRowGroupingPreProcessors.ts
@@ -116,14 +116,13 @@ export const useGridRowGroupingPreProcessors = (
       const groupingColDefs = getGroupingColDefs(columnsState);
       let newColumnFields: string[] = [];
       const newColumnsLookup: GridColumnRawLookup = {};
-      const prevGroupingfields = columnsState.orderedFields.filter((field) =>
-        isGroupingColumn(field),
-      );
-      const currentGroupingfields: string[] = [];
+      const prevGroupingfields: string[] = [];
 
       // We only keep the non-grouping columns
       columnsState.orderedFields.forEach((field) => {
-        if (!isGroupingColumn(field)) {
+        if (isGroupingColumn(field)) {
+          prevGroupingfields.push(field);
+        } else {
           newColumnFields.push(field);
           newColumnsLookup[field] = columnsState.lookup[field];
         }
@@ -132,7 +131,6 @@ export const useGridRowGroupingPreProcessors = (
       // We add the grouping column
       groupingColDefs.forEach((groupingColDef) => {
         const matchingGroupingColDef = columnsState.lookup[groupingColDef.field];
-        currentGroupingfields.push(groupingColDef.field);
         if (matchingGroupingColDef) {
           groupingColDef.width = matchingGroupingColDef.width;
           groupingColDef.flex = matchingGroupingColDef.flex;
@@ -141,7 +139,7 @@ export const useGridRowGroupingPreProcessors = (
         newColumnsLookup[groupingColDef.field] = groupingColDef;
       });
 
-      if (prevGroupingfields.length !== currentGroupingfields.length) {
+      if (prevGroupingfields.length !== groupingColDefs.length) {
         const startIndex = newColumnFields[0] === GRID_CHECKBOX_SELECTION_FIELD ? 1 : 0;
         newColumnFields = [
           ...newColumnFields.slice(0, startIndex),