chore(sync): added code to sync changes with pr#98

Author: DyBev

packages/fetchye/__tests__/queryHelpers.spec.js

@@ -37,6 +37,19 @@ describe('isLoading', () => {
     })).toEqual(true);
   });
 
+  it('should return true if numOfRenders === 1 and options.forceInitialFetch === true', () => {
+    expect(isLoading({
+      loading: false,
+      numOfRenders: 1,
+      data: {},
+      options: {
+        defer: false,
+        forceInitialFetch: true,
+      },
+      error: undefined,
+    })).toEqual(true);
+  });
+
   it('should return false if there are errors present', () => {
     expect(isLoading({
       loading: false, options: { defer: false }, error: { },

packages/fetchye/src/queryHelpers.js

@@ -15,7 +15,7 @@
  */
 
 export const isLoading = ({
-  loading, data, options, error,
+  loading, data, numOfRenders, options, error,
 }) => {
   // if defer is true
   if (options.defer) {
@@ -30,7 +30,7 @@ export const isLoading = ({
   }
 
   // Here to mimic what happens in the useEffect
-  if (!data && !error) {
+  if ((!data && !error) || (numOfRenders === 1 && options.forceInitialFetch === true)) {
     return true;
   }
 

packages/fetchye/src/useFetchye.js

@@ -63,6 +63,7 @@ const useFetchye = (
       data: selectorState.current.data || options.initialData?.data,
       options,
       error: selectorState.current.error,
+      numOfRenders: numOfRenders.current,
     }),
     error: passInitialData(
       selectorState.current.error,