@tanstack/react-query 4.35.0 → 4.35.7

package/build/umd/index.development.js

@@ -1044,8 +1044,8 @@
         }
       }
 
-      if (!Array.isArray(this.options.queryKey)) {
-        {
+      {
+        if (!Array.isArray(this.options.queryKey)) {
           this.logger.error("As of v4, queryKey needs to be an Array. If you are using a string like 'repoData', please change it to an Array, e.g. ['repoData']");
         }
       }
@@ -1242,7 +1242,8 @@
             const error = action.error;
 
             if (isCancelledError(error) && error.revert && this.revertState) {
-              return { ...this.revertState
+              return { ...this.revertState,
+                fetchStatus: 'idle'
               };
             }
 
@@ -3262,18 +3263,23 @@
         mutationKey: dehydratedMutation.mutationKey
       }, dehydratedMutation.state);
     });
-    queries.forEach(dehydratedQuery => {
+    queries.forEach(({
+      queryKey,
+      state,
+      queryHash
+    }) => {
       var _options$defaultOptio2;
 
-      const query = queryCache.get(dehydratedQuery.queryHash); // Reset fetch status to idle in the dehydrated state to avoid
-      // query being stuck in fetching state upon hydration
-
-      const dehydratedQueryState = { ...dehydratedQuery.state,
-        fetchStatus: 'idle'
-      }; // Do not hydrate if an existing query exists with newer data
+      const query = queryCache.get(queryHash); // Do not hydrate if an existing query exists with newer data
 
       if (query) {
-        if (query.state.dataUpdatedAt < dehydratedQueryState.dataUpdatedAt) {
+        if (query.state.dataUpdatedAt < state.dataUpdatedAt) {
+          // omit fetchStatus from dehydrated state
+          // so that query stays in its current fetchStatus
+          const {
+            fetchStatus: _ignored,
+            ...dehydratedQueryState
+          } = state;
           query.setState(dehydratedQueryState);
         }
 
@@ -3282,9 +3288,13 @@
 
 
       queryCache.build(client, { ...(options == null ? void 0 : (_options$defaultOptio2 = options.defaultOptions) == null ? void 0 : _options$defaultOptio2.queries),
-        queryKey: dehydratedQuery.queryKey,
-        queryHash: dehydratedQuery.queryHash
-      }, dehydratedQueryState);
+        queryKey,
+        queryHash
+      }, // Reset fetch status to idle to avoid
+      // query being stuck in fetching state upon hydration
+      { ...state,
+        fetchStatus: 'idle'
+      });
     });
   }