fix(ssr): fix ssr conditionals

americanexpress · Aug 28, 2020 · 40185d0 · 40185d0
1 parent d65c36f
commit 40185d0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/__tests__/makeServerFetchye.spec.js b/__tests__/makeServerFetchye.spec.js
@@ -60,7 +60,7 @@ describe('makeServerFetchye', () => {
           "ok": true,
           "status": 200,
         },
-        "error": undefined,
+        "error": null,
       }
     `);
   });
@@ -109,7 +109,7 @@ describe('makeServerFetchye', () => {
           "ok": true,
           "status": 200,
         },
-        "error": undefined,
+        "error": null,
       }
     `);
   });

diff --git a/__tests__/runAsync.spec.js b/__tests__/runAsync.spec.js
@@ -64,7 +64,7 @@ describe('runAsync', () => {
             "fake": true,
           },
         },
-        "error": undefined,
+        "error": null,
       }
     `);
   });

diff --git a/src/runAsync.js b/src/runAsync.js
@@ -29,7 +29,7 @@ export const runAsync = async ({
   } else {
     dispatch(actions.errorAction({ hash: computedKey.hash, error: requestError }));
   }
-  return { data, error: requestError };
+  return { data, error: requestError || null };
 };
 
 export default runAsync;
diff --git a/src/useFetchye.js b/src/useFetchye.js
@@ -22,14 +22,14 @@ import { useFetchyeContext } from './useFetchyeContext';
 import { defaultMapOptionsToKey } from './defaultMapOptionsToKey';
 
 const getData = (data, isFirstRender, options) => {
-  if (!data && isFirstRender.current) {
+  if (!data && !isFirstRender.current) {
     return options?.initialData?.data;
   }
   return data;
 };
 
 const getError = (error, isFirstRender, options) => {
-  if (!error && isFirstRender.current) {
+  if (!error && !isFirstRender.current) {
     return options?.initialData?.error;
   }
   return error;