Fix isLoading state determination

- Followup fix for #62
yuriyyakym · Dec 18, 2023 · 700c0ea · 700c0ea
1 parent c019dc4
commit 700c0ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/selector/asyncSelector.ts b/src/selector/asyncSelector.ts
@@ -55,11 +55,15 @@ const asyncSelector = <T extends (ReadableState | ReadableAsyncState)[], U>(
     const currentPendingVersion = (lastPendingVersion + 1) % Number.MAX_SAFE_INTEGER;
     lastPendingVersion = currentPendingVersion;
 
-    events.requested.emit();
-
     const status = getAggregatedAsyncStatus(asyncStates);
     const errors = asyncStates.map((state) => state.getAsync().error).filter(Boolean);
 
+    if (status === AsyncStatus.PENDING) {
+      isLoading = true;
+    }
+
+    events.requested.emit();
+
     if (errors.length > 0) {
       error = new AggregateError(errors);
       value = undefined;
@@ -70,10 +74,6 @@ const asyncSelector = <T extends (ReadableState | ReadableAsyncState)[], U>(
       return;
     }
 
-    if (status === AsyncStatus.PENDING) {
-      isLoading === true;
-    }
-
     if (status === AsyncStatus.FULFILLED) {
       const values = states.map((state) => state.get()) as StatesValues;
 

diff --git a/tests/selector.test.ts b/tests/selector.test.ts
@@ -183,11 +183,12 @@ test('emits `requested` event when one of async dependencies is requested', asyn
   expect(mergedState.get()).toEqual('Hello Noname');
 
   setTimeout(() => {
-    nameState.set(delay(10).then(() => 'Awai'));
+    nameState.set(delay(20).then(() => 'Awai'));
   }, 10);
 
   await mergedState.events.requested;
   expect(mergedState.getStatus()).toEqual(AsyncStatus.PENDING);
+  expect(mergedState.getAsync()).toMatchObject({ isLoading: true });
   await delay(5);
   expect(mergedState.events.fulfilled).resolves.toEqual('Hello Awai');
   expect(mergedState.events.changed).resolves.toEqual('Hello Awai');