fix(core): listener relative state

BataevDaniil · Oct 1, 2022 · 95526b2 · 95526b2
1 parent 6998bd5
commit 95526b2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 21 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@reatom/core",
   "private": false,
-  "version": "2.0.21",
+  "version": "2.0.22",
   "description": "State manager for both simple and complex applications",
   "source": "src/index.ts",
   "main": "build/index.js",

diff --git a/packages/core/src/createStore.ts b/packages/core/src/createStore.ts
@@ -152,7 +152,7 @@ export function createStore({
     let lastState = impossibleValue
     const listener: typeof cb = (_state, causes) => {
       const { state } = cache.get(atom)!
-      Object.is(lastState, state) || cb(state, causes)
+      Object.is(lastState, state) || cb(lastState = _state, causes)
     }
 
     listeners.add(listener)

diff --git a/packages/core/src/index.test.ts b/packages/core/src/index.test.ts
@@ -542,7 +542,6 @@ test('State updates order', async () => {
   const a = createAtom(
     { setB: () => null, _setC: () => null },
     ({ onAction, schedule, create }, state = 'a') => {
-
       onAction('setB', () => {
         state = 'b'
         schedule((dispatch) => {
@@ -554,30 +553,20 @@ test('State updates order', async () => {
         state = 'c'
       })
 
-      return state;
+      return state
     },
-  );
+  )
   const store = createStore()
   const listener = mockFn()
   store.subscribe(a, listener)
-  store.dispatch(a.setB());
+  store.dispatch(a.setB())
+
   await sleep()
 
-  /* Debug log */
-  // listener.calls.forEach(c => {
-  //   console.log(
-  //     parseCauses(c.i.at(1))
-  //   )
-  // })
-
-  assert.equal(parseCauses(listener.lastInput(1)), [
-    'DISPATCH: setB_atom14',
-    'setB (setB_atom14) handler',
-    'DISPATCH: _setC_atom14',
-    '_setC_atom14 action'
-  ])
-  assert.is(listener.calls.at(1)?.i.at(0), 'b');
+  assert.equal(
+    listener.calls.map((c) => c.i[0]),
+    ['a', 'c'],
+  )
 })
 
-
 test.run()