@skyux/ag-grid 4.12.1 → 4.12.2

package/fesm5/skyux-ag-grid.js

@@ -7,7 +7,7 @@ import { SkyDataManagerService, SkyDataManagerModule } from '@skyux/data-manager
 import { SkyInlineDeleteModule } from '@skyux/layout';
 import { SkyLibResourcesService, getStringForLocale, SKY_LIB_RESOURCES_PROVIDERS, SkyI18nModule } from '@skyux/i18n';
 import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { takeUntil, filter } from 'rxjs/operators';
 import { SkyThemeService } from '@skyux/theme';
 import { PopupComponent, RowNode, Events } from 'ag-grid-community';
 import { FormGroup, FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -1298,13 +1298,30 @@ var SkyAgGridDataManagerAdapterDirective = /** @class */ (function () {
             agGrid.api.sizeColumnsToFit();
         });
         agGrid.columnMoved
+            .pipe(takeUntil(this.ngUnsubscribe), filter(function (event) {
+            return ![
+                'gridInitializing',
+                'uiColumnResized',
+                'uiColumnDragged',
+                'api'
+            ].includes(event.source);
+        }))
+            .subscribe(function (value) {
+            _this.updateColumnsInCurrentDataState(value.columnApi);
+        });
+        var currentColumns;
+        agGrid.dragStarted
             .pipe(takeUntil(this.ngUnsubscribe))
-            .subscribe(function (event) {
-            var columnOrder = agGrid.columnApi.getAllDisplayedVirtualColumns().map(function (col) { return col.getColDef().colId; });
-            if (event.source !== 'api') {
-                var viewState = _this.currentDataState.getViewStateById(_this.viewConfig.id);
-                viewState.displayedColumnIds = columnOrder;
-                _this.dataManagerSvc.updateDataState(_this.currentDataState.addOrUpdateView(_this.viewConfig.id, viewState), _this.viewConfig.id);
+            .subscribe(function (value) {
+            currentColumns = _this.getColumnOrder(value.columnApi);
+        });
+        agGrid.dragStopped
+            .pipe(takeUntil(this.ngUnsubscribe))
+            .subscribe(function (value) {
+            var newColumns = _this.getColumnOrder(value.columnApi);
+            var hasChanged = currentColumns.findIndex(function (colId, i) { return colId !== newColumns[i]; });
+            if (hasChanged > -1) {
+                _this.updateColumnsInCurrentDataState(value.columnApi);
             }
         });
         agGrid.rowSelected
@@ -1348,6 +1365,17 @@ var SkyAgGridDataManagerAdapterDirective = /** @class */ (function () {
             _this.dataManagerSvc.updateDataState(_this.currentDataState, _this.viewConfig.id);
         });
     };
+    SkyAgGridDataManagerAdapterDirective.prototype.updateColumnsInCurrentDataState = function (columnApi) {
+        var columnOrder = this.getColumnOrder(columnApi);
+        var viewState = this.currentDataState.getViewStateById(this.viewConfig.id);
+        viewState.displayedColumnIds = columnOrder;
+        this.dataManagerSvc.updateDataState(this.currentDataState.addOrUpdateView(this.viewConfig.id, viewState), this.viewConfig.id);
+    };
+    SkyAgGridDataManagerAdapterDirective.prototype.getColumnOrder = function (columnApi) {
+        return columnApi
+            .getAllDisplayedVirtualColumns()
+            .map(function (col) { return col.getColDef().colId; });
+    };
     SkyAgGridDataManagerAdapterDirective.prototype.displayColumns = function (dataState) {
         var e_1, _a;
         var agGrid = this.currentAgGrid;