@skyux/ag-grid 6.0.0-beta.8 → 6.0.1

package/fesm2020/skyux-ag-grid.mjs

@@ -268,20 +268,10 @@ class SkyAgGridDataManagerAdapterDirective {
             .subscribe((value) => {
             this.updateColumnsInCurrentDataState(value.columnApi);
         });
-        let currentColumns;
-        agGrid.dragStarted
-            .pipe(takeUntil(this.ngUnsubscribe))
-            .subscribe((value) => {
-            currentColumns = this.getColumnOrder(value.columnApi);
-        });
         agGrid.dragStopped
             .pipe(takeUntil(this.ngUnsubscribe))
             .subscribe((value) => {
-            const newColumns = this.getColumnOrder(value.columnApi);
-            const hasChanged = currentColumns.findIndex((colId, i) => colId !== newColumns[i]);
-            if (hasChanged > -1) {
-                this.updateColumnsInCurrentDataState(value.columnApi);
-            }
+            this.updateColumnsInCurrentDataState(value.columnApi);
         });
         agGrid.rowSelected
             .pipe(takeUntil(this.ngUnsubscribe))
@@ -324,14 +314,17 @@ class SkyAgGridDataManagerAdapterDirective {
     updateColumnsInCurrentDataState(columnApi) {
         const columnOrder = this.getColumnOrder(columnApi);
         const viewState = this.currentDataState.getViewStateById(this.viewConfig.id);
-        viewState.displayedColumnIds = columnOrder;
-        this.dataManagerSvc.updateDataState(this.currentDataState.addOrUpdateView(this.viewConfig.id, viewState), this.viewConfig.id);
+        if (viewState.displayedColumnIds.length !== columnOrder.length ||
+            viewState.displayedColumnIds.some((col, i) => col !== columnOrder[i])) {
+            viewState.displayedColumnIds = columnOrder;
+            this.dataManagerSvc.updateDataState(this.currentDataState.addOrUpdateView(this.viewConfig.id, viewState), this.viewConfig.id);
+        }
     }
     getColumnOrder(columnApi) {
         return columnApi
-            .getAllGridColumns()
-            .filter((col) => col.isVisible())
-            .map((col) => col.getColDef().colId);
+            .getColumnState()
+            .filter((state) => !state.hide)
+            .map((state) => state.colId);
     }
     displayColumns(dataState) {
         const agGrid = this.currentAgGrid;
@@ -341,12 +334,16 @@ class SkyAgGridDataManagerAdapterDirective {
         if (viewState.displayedColumnIds) {
             displayedColumnIds = viewState.displayedColumnIds;
         }
-        const columns = agGrid.columnApi.getAllColumns();
-        for (const column of columns) {
-            const colId = column.getColId();
-            const colIndex = displayedColumnIds.indexOf(colId);
-            agGrid.columnApi.setColumnVisible(colId, colIndex !== -1);
-            agGrid.columnApi.moveColumn(colId, colIndex);
+        const columnOrder = this.getColumnOrder(agGrid.columnApi);
+        if (displayedColumnIds.length !== columnOrder.length ||
+            displayedColumnIds.some((col, i) => col !== columnOrder[i])) {
+            const hideColumns = agGrid.columnApi
+                .getColumnState()
+                .map((col) => col.colId)
+                .filter((colId) => !displayedColumnIds.includes(colId));
+            agGrid.columnApi.setColumnsVisible(hideColumns, false);
+            agGrid.columnApi.setColumnsVisible(displayedColumnIds, true);
+            agGrid.columnApi.moveColumns(displayedColumnIds, 0);
         }
     }
     selectAll() {