@skyux/ag-grid 4.12.1 → 4.12.2

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.12.2 (2021-12-02)
+
+- Added bug fixes and features from the `master` branch. [#173](https://github.com/blackbaud/skyux-ag-grid/pull/173)
+
 # 4.12.1 (2021-11-10)
 
 - Added bug fixes and features from the `master` branch. [#165](https://github.com/blackbaud/skyux-ag-grid/pull/165)

package/bundles/skyux-ag-grid.umd.js

@@ -1503,13 +1503,30 @@
                 agGrid.api.sizeColumnsToFit();
             });
             agGrid.columnMoved
+                .pipe(operators.takeUntil(this.ngUnsubscribe), operators.filter(function (event) {
+                return ![
+                    'gridInitializing',
+                    'uiColumnResized',
+                    'uiColumnDragged',
+                    'api'
+                ].includes(event.source);
+            }))
+                .subscribe(function (value) {
+                _this.updateColumnsInCurrentDataState(value.columnApi);
+            });
+            var currentColumns;
+            agGrid.dragStarted
                 .pipe(operators.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(operators.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
@@ -1553,6 +1570,17 @@
                 _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;