subscribeWithSelector: fireImmediately after subscribing

devanshj · Nov 20, 2021 · 9989d11 · 9989d11
1 parent 9697e01
commit 9989d11
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/middleware/subscribeWithSelector.ts b/src/middleware/subscribeWithSelector.ts
@@ -71,16 +71,17 @@ const subscribeWithSelectorImpl: ESubscribeWithSelector =
     let previousSelected = currentSelected as E.Previous<ESelectedState>
     const emit = () => listener(currentSelected, previousSelected)
 
-    if (fireImmediately) emit()
-
-    return parentSubscribe(() => {
+    let unsubscribe = parentSubscribe(() => {
       let nextSelected = selector(parentGet())
       if (equals(currentSelected, nextSelected)) return
 
       previousSelected = E.previous(currentSelected)
       currentSelected = nextSelected
       emit()
     })
+    if (fireImmediately) emit()
+
+    return unsubscribe
   }
 
   return storeInitializer(parentSet, parentGet, updatedParentStore)