From 9989d111e2879224ef94bb9819d5189237b11253 Mon Sep 17 00:00:00 2001
From: Devansh Jethmalani <jethmalani.devansh@gmail.com>
Date: Sat, 20 Nov 2021 15:53:45 +0530
Subject: [PATCH] `subscribeWithSelector`: fireImmediately after subscribing

---
 src/middleware/subscribeWithSelector.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/middleware/subscribeWithSelector.ts b/src/middleware/subscribeWithSelector.ts
index de117b709..dc598cb3d 100644
--- a/src/middleware/subscribeWithSelector.ts
+++ b/src/middleware/subscribeWithSelector.ts
@@ -71,9 +71,7 @@ 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
   
@@ -81,6 +79,9 @@ const subscribeWithSelectorImpl: ESubscribeWithSelector =
       currentSelected = nextSelected
       emit()
     })
+    if (fireImmediately) emit()
+
+    return unsubscribe
   }
 
   return storeInitializer(parentSet, parentGet, updatedParentStore)