@ethlete/core 4.32.0 → 4.32.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @ethlete/core
 
+## 4.32.1
+
+### Patch Changes
+
+- [`ba5501f`](https://github.com/ethlete-io/ethdk/commit/ba5501f9d86878d1d02a2dea68ccaf591ff48611) Thanks [@TomTomB](https://github.com/TomTomB)! - Let a user selection change in `SelectionModel` cancel a pending `setSelectionFromValue$`, and expose `isSyncingSelectionFromValue` while it waits for options.
+
 ## 4.32.0
 
 ### Minor Changes

package/fesm2022/ethlete-core.mjs

@@ -3078,6 +3078,9 @@ function formatRuntimeError(code, message, devOnly) {
 }
 
 class SelectionModel {
+    get isSyncingSelectionFromValue() {
+        return this._isSyncingSelectionFromValue;
+    }
     get selection$() {
         return this._selection$.asObservable();
     }
@@ -3129,6 +3132,7 @@ class SelectionModel {
     constructor() {
         this._destroy$ = createDestroy();
         this._lastSelectionSetSubscription = null;
+        this._isSyncingSelectionFromValue = false;
         this._selection$ = new BehaviorSubject([]);
         this._options$ = new BehaviorSubject([]);
         this.optionsSignal = toSignal(this.options$);
@@ -3175,19 +3179,22 @@ class SelectionModel {
         }
         else {
             const selection = this.getOptionByValue(value);
-            if (selection) {
-                this.setSelection(selection);
-            }
-            else {
-                this.clearSelectedOptions();
-            }
+            this.setSelection(selection !== undefined ? selection : []);
         }
     }
+    /**
+     * Applies `value` once options are available. Until then, and while applying it, `isSyncingSelectionFromValue` is `true`.
+     * Any user selection change cancels a pending sync.
+     */
     setSelectionFromValue$(value) {
-        this._lastSelectionSetSubscription?.unsubscribe();
+        this._cancelPendingSelectionFromValue();
+        this._isSyncingSelectionFromValue = true;
         this._lastSelectionSetSubscription = this.options$
-            .pipe(takeUntil(this._destroy$), filter((o) => !!o.length), tap(() => this.setSelectionFromValue(value)), take(1))
-            .subscribe();
+            .pipe(takeUntil(this._destroy$), filter((o) => !!o.length), take(1))
+            .subscribe(() => {
+            this.setSelectionFromValue(value);
+            this._isSyncingSelectionFromValue = false;
+        });
     }
     setValueBinding(fnOrPropertyPath) {
         this._valueBinding$.next(fnOrPropertyPath);
@@ -3403,6 +3410,7 @@ class SelectionModel {
         });
     }
     addSelectedOption(option) {
+        this._cancelPendingSelectionFromValue();
         if (this.allowMultiple) {
             if (this.isSelected(option))
                 return;
@@ -3413,6 +3421,7 @@ class SelectionModel {
         }
     }
     removeSelectedOption(option) {
+        this._cancelPendingSelectionFromValue();
         const optionKey = this.execFnOrGetOptionProperty(option, this.keyBinding);
         if (!this.isSelected(option))
             return;
@@ -3422,6 +3431,7 @@ class SelectionModel {
         }));
     }
     clearSelectedOptions() {
+        this._cancelPendingSelectionFromValue();
         this._selection$.next([]);
     }
     toggleSelectedOption(option) {
@@ -3434,6 +3444,7 @@ class SelectionModel {
     }
     // FIXME: Toggle should respect disabled binding if it exists
     toggleAllSelectedOptions() {
+        this._cancelPendingSelectionFromValue();
         const filteredOptions = this.getFilteredOptions();
         const unselectedOptions = filteredOptions.filter((option) => !this.isSelected(option));
         if (unselectedOptions.length) {
@@ -3445,6 +3456,11 @@ class SelectionModel {
             this._selection$.next(selection);
         }
     }
+    _cancelPendingSelectionFromValue() {
+        this._lastSelectionSetSubscription?.unsubscribe();
+        this._lastSelectionSetSubscription = null;
+        this._isSyncingSelectionFromValue = false;
+    }
 }
 
 const scrollBehaviorSupported = supportsScrollBehavior();