fix: should update dependents with the value of the unwrapped atom wh…

…en the promise resolves (#2936) * test: should update dependents with the value of the unwrapped atom when the promise resolves * handle mounting and unmounting of sync and async dependencies separately * add failing tests * drop store changes * alternate fix * follow store refactor --------- Co-authored-by: daishi <[email protected]> Co-authored-by: Daishi Kato <[email protected]>
pmndrs · Jan 20, 2025 · 3c51426 · 3c51426
1 parent 2348ff6
commit 3c51426
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/vanilla/store.ts b/src/vanilla/store.ts
@@ -332,6 +332,7 @@ const buildStore = (...storeArgs: StoreArgs): Store => {
     const mountDependenciesIfAsync = () => {
       if (atomState.m) {
         mountDependencies(atom, atomState)
+        recomputeInvalidatedAtoms()
         flushCallbacks()
       }
     }
@@ -569,11 +570,17 @@ const buildStore = (...storeArgs: StoreArgs): Store => {
 
   const mountDependencies = (atom: AnyAtom, atomState: AtomState) => {
     if (atomState.m && !isPendingPromise(atomState.v)) {
-      for (const a of atomState.d.keys()) {
+      for (const [a, n] of atomState.d) {
         if (!atomState.m.d.has(a)) {
-          const aMounted = mountAtom(a, ensureAtomState(a))
+          const aState = ensureAtomState(a)
+          const aMounted = mountAtom(a, aState)
           aMounted.t.add(atom)
           atomState.m.d.add(a)
+          if (n !== aState.n) {
+            changedAtoms.set(a, aState)
+            aState.u?.()
+            invalidateDependents(aState)
+          }
         }
       }
       for (const a of atomState.m.d || []) {

diff --git a/tests/vanilla/utils/unwrap.test.ts b/tests/vanilla/utils/unwrap.test.ts
@@ -150,3 +150,17 @@ describe('unwrap', () => {
     expect(store.get(syncAtom)).toEqual('concrete')
   })
 })
+
+it('should update dependents with the value of the unwrapped atom when the promise resolves', async () => {
+  const store = createStore()
+  const asyncTarget = atom(() => Promise.resolve('value'))
+  const target = unwrap(asyncTarget)
+  const results: string[] = []
+  const derived = atom(async (get) => {
+    await Promise.resolve()
+    results.push('effect ' + get(target))
+  })
+  store.sub(derived, () => {})
+  await new Promise((r) => setTimeout(r))
+  expect(results).toEqual(['effect undefined', 'effect value'])
+})