[core] fix order of new columns when calling updateColumns

mui · May 17, 2024 · afc0a85 · afc0a85
1 parent fc54a8b
commit afc0a85
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/packages/x-data-grid/src/hooks/features/columns/gridColumnsUtils.ts b/packages/x-data-grid/src/hooks/features/columns/gridColumnsUtils.ts
@@ -405,9 +405,18 @@ export const createColumnsState = ({
   });
 
   if (columnsState.desiredOrderedFields) {
-    columnsState.orderedFields.sort((fieldA, fieldB) =>
-      columnsState.desiredOrderedFields!.indexOf(fieldA) - columnsState.desiredOrderedFields!.indexOf(fieldB)
-    );
+    columnsState.orderedFields.sort((fieldA, fieldB) => {
+      const indexA = columnsState.desiredOrderedFields!.indexOf(fieldA);
+      const indexB = columnsState.desiredOrderedFields!.indexOf(fieldB);
+      if (indexA === -1 && indexB !== -1) {
+        return 1;
+      }
+      if (indexB === -1 && indexA !== -1) {
+        return -1;
+      }
+
+      return indexA - indexB
+    });
 
     delete columnsState.desiredOrderedFields;
   }