fix: do not start with loading true: check if on revalidating

cicerchie · Aug 21, 2021 · bfb36fb · bfb36fb
1 parent 5133e15
commit bfb36fb
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/lib/swr.ts b/src/lib/swr.ts
@@ -27,7 +27,7 @@ interface SWRStore<T> {
 const defaultSWRStore = {
   data: undefined,
   error: undefined,
-  isLoading: true,
+  isLoading: false,
   isFetching: false,
 };
 
@@ -62,7 +62,11 @@ const swrMachine: FSMMachineConfig = {
             ctx = { ...ctx, isLoading: false, data };
           }
         }
-        return { ...ctx, isFetching: true };
+        return {
+          ...ctx,
+          isLoading: !(ctx.data || ctx.error),
+          isFetching: true,
+        };
       },
       on: {
         revalidate: null,