Reset promiseRef on useQuery/Mutation hooks (#173)

* Reset the ref on unmount in the cleanup callbacks
rtk-incubator · Mar 16, 2021 · e7cbf48 · e7cbf48
1 parent ef42089
commit e7cbf48
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/react-hooks/buildHooks.ts b/src/react-hooks/buildHooks.ts
@@ -214,7 +214,11 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
       ]);
 
       useEffect(() => {
-        return () => void promiseRef.current?.unsubscribe();
+        return () => {
+          // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+          promiseRef.current?.unsubscribe();
+          promiseRef.current = undefined;
+        };
       }, []);
 
       return useMemo(
@@ -280,7 +284,13 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
 
       const promiseRef = useRef<MutationActionCreatorResult<any>>();
 
-      useEffect(() => () => void promiseRef.current?.unsubscribe(), []);
+      useEffect(() => {
+        return () => {
+          // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+          promiseRef.current?.unsubscribe();
+          promiseRef.current = undefined;
+        };
+      }, []);
 
       const triggerMutation = useCallback(
         function (args) {