@dereekb/dbx-form 13.10.6 → 13.10.7

package/fesm2022/dereekb-dbx-form-mapbox.mjs

@@ -7,7 +7,7 @@ import * as i0 from '@angular/core';
 import { inject, ChangeDetectionStrategy, Component, Injector, NgModule, ElementRef, input, computed, effect } from '@angular/core';
 import { FieldType } from '@ngx-formly/material';
 import { combineLatest, map, shareReplay, BehaviorSubject, of, switchMap, startWith, distinctUntilChanged, skipWhile, filter, skip, throttleTime, first } from 'rxjs';
-import { SubscriptionObject, filterMaybe, asObservableFromGetter } from '@dereekb/rxjs';
+import { filterMaybe, asObservableFromGetter } from '@dereekb/rxjs';
 import { WaGeolocationService } from '@ng-web-apis/geolocation';
 import * as i3$1 from '@dereekb/dbx-web/mapbox';
 import { DbxMapboxMarkerComponent, DbxMapboxInjectionStore, DbxMapboxMapStore, DbxMapboxModule, provideMapboxStoreIfParentIsUnavailable, DbxMapboxService, mapboxZoomLevel, MAPBOX_MIN_ZOOM_LEVEL, MAPBOX_MAX_ZOOM_LEVEL } from '@dereekb/dbx-web/mapbox';
@@ -23,6 +23,7 @@ import * as i6 from '@angular/material/input';
 import { MatInputModule } from '@angular/material/input';
 import * as i2$1 from 'ngx-mapbox-gl';
 import { MapComponent, MarkerComponent } from 'ngx-mapbox-gl';
+import { cleanSubscription, completeOnDestroy } from '@dereekb/dbx-core';
 import * as i1 from '@ngx-formly/core';
 import { FormlyModule } from '@ngx-formly/core';
 import { DEFAULT_PROPS, DEFAULT_VALIDATION_MESSAGES, provideDynamicForm } from '@ng-forge/dynamic-forms';
@@ -110,21 +111,21 @@ class DbxFormMapboxLatLngFieldComponent extends FieldType {
     dbxMapboxInjectionStore = inject(DbxMapboxInjectionStore, { optional: true });
     dbxMapboxMapStore = inject(DbxMapboxMapStore);
     injector = inject(Injector);
-    _sub = new SubscriptionObject();
-    _geoSub = new SubscriptionObject();
-    _centerSub = new SubscriptionObject();
-    _flyToCenterSub = new SubscriptionObject();
-    _clickSub = new SubscriptionObject();
-    _zoom = new BehaviorSubject(12);
-    _markerConfig = new BehaviorSubject(of(DEFAULT_DBX_FORM_MAPBOX_LAT_LNG_MARKER_CONFIG));
+    _sub = cleanSubscription();
+    _geoSub = cleanSubscription();
+    _centerSub = cleanSubscription();
+    _flyToCenterSub = cleanSubscription();
+    _clickSub = cleanSubscription();
+    _zoom = completeOnDestroy(new BehaviorSubject(12));
+    _markerConfig = completeOnDestroy(new BehaviorSubject(of(DEFAULT_DBX_FORM_MAPBOX_LAT_LNG_MARKER_CONFIG)));
     _latLngStringFunction;
     _latLngPointFunction;
     compactClass$ = mapCompactModeObs(this.compact?.mode$, {
         compact: 'dbx-mapbox-input-field-compact'
     }).pipe(filterMaybe());
-    _useCurrentLocationDisabled = new BehaviorSubject(false);
+    _useCurrentLocationDisabled = completeOnDestroy(new BehaviorSubject(false));
     useCurrentLocationDisabled$ = this._useCurrentLocationDisabled.asObservable();
-    _formControlObs = new BehaviorSubject(undefined);
+    _formControlObs = completeOnDestroy(new BehaviorSubject(undefined));
     formControl$ = this._formControlObs.pipe(filterMaybe());
     value$ = this.formControl$.pipe(switchMap((control) => control.valueChanges.pipe(startWith(control.value))), shareReplay(1));
     latLng$ = this.value$.pipe(filterMaybe(), map((x) => this._latLngPointFunction(x)), distinctUntilChanged(isSameLatLngPoint), shareReplay(1));
@@ -243,14 +244,6 @@ class DbxFormMapboxLatLngFieldComponent extends FieldType {
     }
     ngOnDestroy() {
         super.ngOnDestroy();
-        this._zoom.complete();
-        this._markerConfig.complete();
-        this._formControlObs.complete();
-        this._sub.destroy();
-        this._geoSub.destroy();
-        this._centerSub.destroy();
-        this._flyToCenterSub.destroy();
-        this._clickSub.destroy();
     }
     flyToMarker() {
         this.dbxMapboxMapStore.easeTo(this.nonZeroLatLng$.pipe(first(), map((x) => ({ center: x }))));
@@ -452,13 +445,13 @@ class DbxForgeMapboxLatLngFieldComponent {
     // Internal text form control for the coordinate input
     textCtrl = new FormControl('');
     // Subscription management
-    _sub = new SubscriptionObject();
-    _geoSub = new SubscriptionObject();
-    _centerSub = new SubscriptionObject();
-    _flyToCenterSub = new SubscriptionObject();
-    _clickSub = new SubscriptionObject();
-    _zoom = new BehaviorSubject(12);
-    _markerConfig = new BehaviorSubject(of(DEFAULT_DBX_FORGE_MAPBOX_LAT_LNG_MARKER_CONFIG));
+    _sub = cleanSubscription();
+    _geoSub = cleanSubscription();
+    _centerSub = cleanSubscription();
+    _flyToCenterSub = cleanSubscription();
+    _clickSub = cleanSubscription();
+    _zoom = completeOnDestroy(new BehaviorSubject(12));
+    _markerConfig = completeOnDestroy(new BehaviorSubject(of(DEFAULT_DBX_FORGE_MAPBOX_LAT_LNG_MARKER_CONFIG)));
     // Reactive lat/lng conversion functions derived from props so latLng$ recomputes when props arrive.
     latLngPointConfigSignal = computed(() => {
         const p = this.props();
@@ -469,7 +462,7 @@ class DbxForgeMapboxLatLngFieldComponent {
     compactClass$ = mapCompactModeObs(this.compact?.mode$, {
         compact: 'dbx-mapbox-input-field-compact'
     }).pipe(filterMaybe());
-    _useCurrentLocationDisabled = new BehaviorSubject(false);
+    _useCurrentLocationDisabled = completeOnDestroy(new BehaviorSubject(false));
     useCurrentLocationDisabled$ = this._useCurrentLocationDisabled.asObservable();
     // Field value signal (double-call pattern)
     fieldValue = computed(() => {
@@ -586,16 +579,6 @@ class DbxForgeMapboxLatLngFieldComponent {
             }
         });
     }
-    ngOnDestroy() {
-        this._zoom.complete();
-        this._markerConfig.complete();
-        this._useCurrentLocationDisabled.complete();
-        this._sub.destroy();
-        this._geoSub.destroy();
-        this._centerSub.destroy();
-        this._flyToCenterSub.destroy();
-        this._clickSub.destroy();
-    }
     flyToMarker() {
         this.dbxMapboxMapStore.easeTo(this.nonZeroLatLng$.pipe(first(), map((x) => ({ center: x }))));
     }
@@ -742,9 +725,9 @@ class DbxFormMapboxZoomFieldComponent extends FieldType {
         compact: 'dbx-mapbox-input-field-compact'
     }).pipe(filterMaybe());
     compactClassSignal = toSignal(this.compactClass$, { initialValue: '' });
-    _sub = new SubscriptionObject();
-    _center = new BehaviorSubject(undefined);
-    _formControlObs = new BehaviorSubject(undefined);
+    _sub = cleanSubscription();
+    _center = completeOnDestroy(new BehaviorSubject(undefined));
+    _formControlObs = completeOnDestroy(new BehaviorSubject(undefined));
     formControl$ = this._formControlObs.pipe(filterMaybe());
     value$ = this.formControl$.pipe(switchMap((control) => control.valueChanges.pipe(startWith(control.value))), shareReplay(1));
     zoom$ = this.value$.pipe(filterMaybe(), shareReplay(1));
@@ -813,9 +796,6 @@ class DbxFormMapboxZoomFieldComponent extends FieldType {
     }
     ngOnDestroy() {
         super.ngOnDestroy();
-        this._formControlObs.complete();
-        this._center.complete();
-        this._sub.destroy();
         if (!this._undoZoomLimit) {
             this.dbxMapboxMapStore.setZoomRange({});
         }
@@ -952,8 +932,8 @@ class DbxForgeMapboxZoomFieldComponent {
     }).pipe(filterMaybe());
     compactClassSignal = toSignal(this.compactClass$, { initialValue: '' });
     // Subscription management
-    _sub = new SubscriptionObject();
-    _center = new BehaviorSubject(undefined);
+    _sub = cleanSubscription();
+    _center = completeOnDestroy(new BehaviorSubject(undefined));
     // Field value signal (double-call pattern)
     fieldValue = computed(() => {
         const state = this.field()?.();
@@ -1033,8 +1013,6 @@ class DbxForgeMapboxZoomFieldComponent {
         });
     }
     ngOnDestroy() {
-        this._center.complete();
-        this._sub.destroy();
         if (!this._undoZoomLimit) {
             this.dbxMapboxMapStore.setZoomRange({});
         }