fix: isLoading and isValidating should always respect cache value

fix #2030
vercel · Jun 24, 2022 · 4eebfa8 · 4eebfa8
1 parent 790e044
commit 4eebfa8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/use-swr.ts b/core/use-swr.ts
@@ -204,8 +204,8 @@ export const useSWRHandler = <Data = any, Error = any>(
     isInitialMount &&
     shouldDoInitialRevalidation
   )
-  const isValidating = cached.isValidating || defaultValidatingState
-  const isLoading = cached.isLoading || defaultValidatingState
+  const isValidating = isUndefined(cached.isValidating) ? defaultValidatingState : cached.isValidating
+  const isLoading = isUndefined(cached.isLoading) ? defaultValidatingState : cached.isLoading
 
   // The revalidation function is a carefully crafted wrapper of the original
   // `fetcher`, to correctly handle the many edge cases.