refactor: adjust the handling of cancel operations

yejiajiehz · Dec 22, 2020 · 7f7b68e · 7f7b68e
1 parent f030e2d
commit 7f7b68e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/hooks/src/useDebounceEffect/index.ts b/packages/hooks/src/useDebounceEffect/index.ts
@@ -2,6 +2,7 @@ import { useEffect, EffectCallback, DependencyList, useState } from 'react';
 import { DebounceOptions } from '../useDebounce/debounceOptions';
 import useDebounceFn from '../useDebounceFn';
 import useUpdateEffect from '../useUpdateEffect';
+import useUnmount from '../useUnmount';
 
 function useDebounceEffect(
   effect: EffectCallback,
@@ -15,11 +16,11 @@ function useDebounceEffect(
   }, options);
 
   useEffect(() => {
-    run();
-
-    return cancel;
+    return run();
   }, deps);
 
+  useUnmount(cancel);
+
   useUpdateEffect(effect, [flag]);
 }
 

diff --git a/packages/hooks/src/useThrottleEffect/index.ts b/packages/hooks/src/useThrottleEffect/index.ts
@@ -2,6 +2,7 @@ import { useEffect, EffectCallback, DependencyList, useState } from 'react';
 import { ThrottleOptions } from '../useThrottle/throttleOptions';
 import useThrottleFn from '../useThrottleFn';
 import useUpdateEffect from '../useUpdateEffect';
+import useUnmount from '../useUnmount';
 
 function useThrottleEffect(
   effect: EffectCallback,
@@ -15,11 +16,11 @@ function useThrottleEffect(
   }, options);
 
   useEffect(() => {
-    run();
-
-    return cancel;
+    return run();
   }, deps);
 
+  useUnmount(cancel);
+
   useUpdateEffect(effect, [flag]);
 }