fix recurse

pmndrs · Jan 21, 2025 · 030508d · 030508d
1 parent 87f50ba
commit 030508d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/tests/syncEffect/syncEffect.test.tsx b/tests/syncEffect/syncEffect.test.tsx
@@ -155,7 +155,7 @@ it('should not cause infinite loops when effect updates the watched atom asynchr
   expect(runCount).toBe(2)
 })
 
-it.only('should allow synchronous recursion with set.recurse for first run', function test() {
+it('should allow synchronous recursion with set.recurse for first run', function test() {
   const watchedAtom = atom(0)
   watchedAtom.debugLabel = 'watchedAtom'
 

diff --git a/tests/syncEffect/syncEffect.ts b/tests/syncEffect/syncEffect.ts
@@ -59,6 +59,7 @@ export function syncEffect(effect: Effect): Atom<void> & { effect: Effect } {
     let isMounted = false
     let isRecursing = false
     let fromCleanup = false
+    let hasChanged = false
     let runCleanup: (() => void) | undefined
 
     function makeGetAndSet(isSync: boolean) {
@@ -105,11 +106,16 @@ export function syncEffect(effect: Effect): Atom<void> & { effect: Effect } {
           INTERNAL_mountDependencies(internalAtom, atomState)
           return set(a, ...args)
         } finally {
+          INTERNAL_recomputeInvalidatedAtoms()
           isRecursing = false
-          const depsChanged = Array.from(deps).some(areDifferent)
-          if (depsChanged) {
-            refresh()
+          if (hasChanged) {
+            hasChanged = false
+            runEffect()
           }
+          // const depsChanged = Array.from(deps).some(areDifferent)
+          // if (depsChanged) {
+          //   refresh()
+          // }
         }
       }
 
@@ -149,20 +155,6 @@ export function syncEffect(effect: Effect): Atom<void> & { effect: Effect } {
       }
     }
 
-    function refresh() {
-      try {
-        ref.isRefreshing = true
-        delete atomState.v
-        INTERNAL_readAtomState(internalAtom)
-      } finally {
-        ref.isRefreshing = false
-      }
-    }
-
-    function areDifferent([a, v]: [Atom<unknown>, unknown]) {
-      return store.get(a) !== v
-    }
-
     const [
       ,
       ,
@@ -193,6 +185,10 @@ export function syncEffect(effect: Effect): Atom<void> & { effect: Effect } {
     })
 
     hookInto(atomState, 'u', function atomOnUpdate() {
+      if (isRecursing) {
+        hasChanged = true
+        return
+      }
       syncEffectChannel.add(runEffect)
     })
   }