fix: keep previous query status when fetching

Author: boschni

src/core/query.ts

@@ -479,7 +479,7 @@ export class Query<TData = unknown, TError = unknown, TQueryFnData = TData> {
           fetchMeta: action.meta,
           isFetching: true,
           isPaused: false,
-          status: state.updatedAt ? 'success' : 'loading',
+          status: state.status === 'idle' ? 'loading' : state.status,
         }
       case 'success':
         return {
@@ -503,11 +503,7 @@ export class Query<TData = unknown, TError = unknown, TQueryFnData = TData> {
             failureCount: 0,
             isFetching: false,
             isPaused: false,
-            status: state.error
-              ? 'error'
-              : state.updatedAt
-              ? 'success'
-              : 'idle',
+            status: state.status === 'loading' ? 'idle' : state.status,
           }
         }
 

src/core/tests/queryCache.test.tsx

@@ -1356,6 +1356,35 @@ describe('queryCache', () => {
 
       consoleMock.mockRestore()
     })
+
+    test('the previous query status should be kept when refetching', async () => {
+      const consoleMock = mockConsoleError()
+      const key = queryKey()
+
+      await queryClient.prefetchQuery(key, () => 'data')
+      const query = queryCache.find(key)!
+      expect(query.state.status).toBe('success')
+
+      await queryClient.prefetchQuery(key, () => Promise.reject('reject'), {
+        retry: false,
+      })
+      expect(query.state.status).toBe('error')
+
+      queryClient.prefetchQuery(
+        key,
+        async () => {
+          await sleep(10)
+          return Promise.reject('reject')
+        },
+        { retry: false }
+      )
+      expect(query.state.status).toBe('error')
+
+      await sleep(100)
+      expect(query.state.status).toBe('error')
+
+      consoleMock.mockRestore()
+    })
   })
 
   describe('QueryObserver', () => {

src/react/useBaseQuery.ts

@@ -47,7 +47,11 @@ export function useBaseQuery<TData, TError, TQueryFnData, TQueryData>(
 
   // Handle suspense
   if (observer.options.suspense || observer.options.useErrorBoundary) {
-    if (currentResult.isError && !errorResetBoundary.isReset()) {
+    if (
+      currentResult.isError &&
+      !errorResetBoundary.isReset() &&
+      !observer.getCurrentQuery().isFetching()
+    ) {
       throw currentResult.error
     }