Fix return typo and rearranged logic

reduxjs · Feb 1, 2022 · f80108e · f80108e
1 parent 8151c8c
commit f80108e
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/packages/toolkit/src/query/core/buildMiddleware/windowEventHandling.ts b/packages/toolkit/src/query/core/buildMiddleware/windowEventHandling.ts
@@ -39,25 +39,25 @@ export const build: SubMiddlewareBuilder = ({
         const querySubState = queries[queryCacheKey]
         const subscriptionSubState = subscriptions[queryCacheKey]
 
-        if (!subscriptionSubState || !querySubState) return
+        if (!subscriptionSubState || !querySubState) continue
 
-        if (Object.keys(subscriptionSubState).length === 0) {
-          api.dispatch(
-            removeQueryResult({
-              queryCacheKey: queryCacheKey as QueryCacheKey,
-            })
-          )
-        } else if (querySubState.status !== QueryStatus.uninitialized) {
-          const shouldRefetch =
-            Object.values(subscriptionSubState).some(
-              (sub) => sub[type] === true
-            ) ||
-            (Object.values(subscriptionSubState).every(
-              (sub) => sub[type] === undefined
-            ) &&
-              state.config[type])
+        const shouldRefetch =
+          Object.values(subscriptionSubState).some(
+            (sub) => sub[type] === true
+          ) ||
+          (Object.values(subscriptionSubState).every(
+            (sub) => sub[type] === undefined
+          ) &&
+            state.config[type])
 
-          if (shouldRefetch) {
+        if (shouldRefetch) {
+          if (Object.keys(subscriptionSubState).length === 0) {
+            api.dispatch(
+              removeQueryResult({
+                queryCacheKey: queryCacheKey as QueryCacheKey,
+              })
+            )
+          } else if (querySubState.status !== QueryStatus.uninitialized) {
             api.dispatch(refetchQuery(querySubState, queryCacheKey))
           }
         }