[core] fix remove column pinning position of desired order

mui · May 17, 2024 · 4a7b2ac · 4a7b2ac
1 parent afc0a85
commit 4a7b2ac
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/packages/x-data-grid/src/hooks/features/columns/gridColumnsUtils.ts b/packages/x-data-grid/src/hooks/features/columns/gridColumnsUtils.ts
@@ -331,11 +331,18 @@ export const createColumnsState = ({
     };
   } else {
     const currentState = gridColumnsStateSelector(apiRef.current.state);
+
+    const pinnedColumns = apiRef.current.state.pinnedColumns;
+    // Remove pinned columns
+    const desiredOrderedFields = currentState.orderedFields.filter(field => {
+      return !(pinnedColumns.left?.includes(field) || pinnedColumns.right?.includes(field))
+    });
+
     columnsState = {
       orderedFields: keepOnlyColumnsToUpsert ? [] : [...currentState.orderedFields],
       lookup: { ...currentState.lookup }, // Will be cleaned later if keepOnlyColumnsToUpsert=true
       columnVisibilityModel,
-      desiredOrderedFields: currentState.orderedFields, // Will be cleaned later
+      desiredOrderedFields, // Will be cleaned later
     };
   }