fix activation observe re-running itself

LegendApp · Nov 21, 2023 · 1bc3d25 · 1bc3d25
1 parent 921c34e
commit 1bc3d25
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/persist/persistActivateNode.ts b/src/persist/persistActivateNode.ts
@@ -164,7 +164,10 @@ export function persistActivateNode() {
                 },
             }) as unknown as Observable<WithState>;
 
-            if (newValue === undefined) {
+            const nodeVal = getNodeValue(node);
+            if (nodeVal !== undefined) {
+                newValue = nodeVal;
+            } else if (newValue === undefined) {
                 newValue = initial;
             }
 

diff --git a/src/persist/persistObservable.ts b/src/persist/persistObservable.ts
@@ -554,7 +554,7 @@ async function loadLocal<T>(
 
         localState.persistenceLocal = persistenceLocal;
 
-        if (!initialized.get()) {
+        if (!initialized.peek()) {
             await when(initialized);
         }