Fix useImmediateEffect teardown

urql-graphql · Jun 3, 2019 · 1ca0d9f · 1ca0d9f
1 parent 7c97dd9
commit 1ca0d9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/hooks/useImmediateEffect.ts b/src/hooks/useImmediateEffect.ts
@@ -9,7 +9,7 @@ enum EffectState {
 type Effect = () => void | (() => void);
 
 /** This executes an effect immediately on initial render and then treats it as a normal effect */
-export const useImmediateEffect = (effect: Effect) => {
+export const useImmediateEffect = (effect: Effect, changes?: any[]) => {
   const state = useRef(EffectState.BeforeMount);
 
   useEffect(() => {

diff --git a/src/hooks/useQuery.ts b/src/hooks/useQuery.ts
@@ -69,7 +69,10 @@ export const useQuery = <T = any, V = object>(
 
   // Calls executeQuery on initial render immediately, then
   // treats it as a normal effect
-  useImmediateEffect(executeQuery);
+  useImmediateEffect(() => {
+    executeQuery();
+    return () => unsubscribe.current();
+  }, [executeQuery]);
 
   return [state, executeQuery];
 };