Merge new useEffect and useImmediateEffect

src/hooks/useQuery.ts

@@ -1,5 +1,5 @@
 import { DocumentNode } from 'graphql';
-import { useEffect, useCallback, useContext, useRef, useState } from 'react';
+import { useCallback, useContext, useRef, useState } from 'react';
 import { pipe, subscribe } from 'wonka';
 import { Context } from '../context';
 import { OperationContext, RequestPolicy } from '../types';
@@ -42,35 +42,30 @@ export const useQuery = <T = any, V = object>(
     data: undefined,
   });
 
-  useEffect(() => {
-    return () => {
-      isMounted.current = false;
-    }
-  }, []);
-
   const executeQuery = useCallback(
     (opts?: Partial<OperationContext>) => {
       unsubscribe.current();
 
       if (args.pause) {
         setState(s => ({ ...s, fetching: false }));
         unsubscribe.current = noop;
-      } else {
-        setState(s => ({ ...s, fetching: true }));
+        return;
+      }
 
-        const [teardown] = pipe(
-          client.executeQuery(request, {
-            requestPolicy: args.requestPolicy,
-            ...opts,
-          }),
-          subscribe(
-            ({ data, error }) =>
-              isMounted.current && setState({ fetching: false, data, error })
-          )
-        );
+      setState(s => ({ ...s, fetching: true }));
 
-        unsubscribe.current = teardown;
-      }
+      const [teardown] = pipe(
+        client.executeQuery(request, {
+          requestPolicy: args.requestPolicy,
+          ...opts,
+        }),
+        subscribe(
+          ({ data, error }) =>
+            isMounted.current && setState({ fetching: false, data, error })
+        )
+      );
+
+      unsubscribe.current = teardown;
     },
     [request, client, args.pause, args.requestPolicy]
   );
@@ -79,7 +74,11 @@ export const useQuery = <T = any, V = object>(
   // treats it as a normal effect
   useImmediateEffect(() => {
     executeQuery();
-    return () => unsubscribe.current();
+
+    return () => {
+      isMounted.current = false;
+      unsubscribe.current();
+    };
   }, [executeQuery]);
 
   return [state, executeQuery];