@skyux/ag-grid 13.6.0 → 13.6.2

package/fesm2022/skyux-ag-grid.mjs

@@ -7,7 +7,7 @@ import { SkyLibResourcesService, SkyI18nModule } from '@skyux/i18n';
 import { toSignal, toObservable, takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import * as i1 from '@skyux/core';
 import { SkyMutationObserverService, SkyIdModule, SkyViewkeeperModule, SkyMediaQueryService, SkyResizeObserverService, SkyAffixModule, SkyOverlayService, SkyScrollableHostService, SKY_STACKING_CONTEXT, SkyNumericModule, SkyDynamicComponentService, SkyDynamicComponentLocation, SkyLogService } from '@skyux/core';
-import { Subject, BehaviorSubject, ReplaySubject, takeUntil, combineLatest, of, distinctUntilChanged, take, Subscription, switchMap, merge, fromEvent, startWith, map, scan, filter as filter$1, fromEventPattern, isObservable, observeOn, asyncScheduler } from 'rxjs';
+import { Subject, BehaviorSubject, ReplaySubject, takeUntil, combineLatest, of, distinctUntilChanged, take, switchMap, fromEvent, Subscription, merge, startWith, map, scan, filter as filter$1, fromEventPattern, isObservable, observeOn, asyncScheduler } from 'rxjs';
 import { takeUntil as takeUntil$1, filter, first } from 'rxjs/operators';
 import * as i2$4 from '@skyux/theme';
 import { SkyThemeService, SkyThemeModule } from '@skyux/theme';
@@ -742,7 +742,7 @@ class SkyAgGridDataManagerAdapterDirective {
         }
     }
     ngOnDestroy() {
-        this.#ngUnsubscribe.next();
+        this.#unregisterAgGrid();
         this.#ngUnsubscribe.complete();
     }
     #checkForAgGrid(agGridList) {
@@ -769,6 +769,7 @@ class SkyAgGridDataManagerAdapterDirective {
         }
     }
     #unregisterAgGrid() {
+        this.#ngUnsubscribe.next();
         this.#currentAgGrid = undefined;
         /* istanbul ignore if */
         if (this.#dataStateSub) {
@@ -791,19 +792,12 @@ class SkyAgGridDataManagerAdapterDirective {
         this.#unregisterAgGrid();
         this.#currentAgGrid = agGrid;
         if (agGrid) {
-            agGrid.gridReady.pipe(takeUntil$1(this.#ngUnsubscribe)).subscribe(() => {
+            this.#dataStateSub = agGrid.gridReady
+                .pipe(takeUntil$1(this.#ngUnsubscribe), switchMap(() => {
                 if (this.#viewConfig && this.viewId) {
                     this.#viewConfig.onSelectAllClick = () => agGrid.api.selectAll();
                     this.#viewConfig.onClearAllClick = () => agGrid.api.deselectAll();
                     this.#dataManagerSvc.updateViewConfig(this.#viewConfig);
-                    this.#dataStateSub = this.#dataManagerSvc
-                        .getDataStateUpdates(this.#viewConfig.id)
-                        .pipe(takeUntil$1(this.#ngUnsubscribe))
-                        .subscribe((dataState) => {
-                        this.#currentDataState = dataState;
-                        this.#displayColumns(dataState);
-                        this.#applySort(dataState);
-                    });
                     if (agGrid.gridOptions?.context?.enableTopScroll) {
                         this.#dataManagerSvc.setViewkeeperClasses(this.viewId, [
                             '.ag-header',
@@ -811,7 +805,20 @@ class SkyAgGridDataManagerAdapterDirective {
                         ]);
                     }
                     this.#applyColumnWidths();
+                    return this.#dataManagerSvc.getDataStateUpdates(this.#viewConfig.id);
                 }
+                /* istanbul ignore next */
+                return of(undefined);
+            }), filter(Boolean))
+                .subscribe((dataState) => {
+                this.#currentDataState = dataState;
+                this.#displayColumns(dataState);
+                this.#applySort(dataState);
+            });
+            agGrid.gridReady
+                .pipe(takeUntil$1(this.#ngUnsubscribe), switchMap(() => fromEvent(agGrid.api, 'gridPreDestroyed')))
+                .subscribe(() => {
+                this.#unregisterAgGrid();
             });
             agGrid.columnMoved
                 .pipe(takeUntil$1(this.#ngUnsubscribe), filter((event) => ![
@@ -891,8 +898,8 @@ class SkyAgGridDataManagerAdapterDirective {
         }
     }
     #getColumnOrder(api) {
-        return api
-            .getColumnState()
+        /* istanbul ignore next */
+        return (api?.getColumnState() ?? [])
             .filter((state) => !state.hide)
             .map((state) => state.colId);
     }
@@ -906,8 +913,9 @@ class SkyAgGridDataManagerAdapterDirective {
                 displayedColumnIds = viewState.displayedColumnIds;
             }
             const columnOrder = this.#getColumnOrder(agGrid.api);
-            if (displayedColumnIds.length !== columnOrder.length ||
-                displayedColumnIds.some((col, i) => col !== columnOrder[i])) {
+            if ((displayedColumnIds.length !== columnOrder.length ||
+                displayedColumnIds.some((col, i) => col !== columnOrder[i])) &&
+                agGrid.api) {
                 const hideColumns = agGrid.api
                     .getColumnState()
                     .map((col) => col.colId)