refactor(useRafTimeout): optimize useEffect cleanup fn (alibaba#2420)

byethewind · Feb 26, 2024 · f105b07 · f105b07
1 parent fef3676
commit f105b07
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/packages/hooks/src/useRafTimeout/index.ts b/packages/hooks/src/useRafTimeout/index.ts
@@ -46,24 +46,20 @@ function useRafTimeout(fn: () => void, delay: number | undefined) {
   const fnRef = useLatest(fn);
   const timerRef = useRef<Handle>();
 
+  const clear = useCallback(() => {
+    if (timerRef.current) {
+      clearRafTimeout(timerRef.current);
+    }
+  }, []);
+
   useEffect(() => {
     if (!isNumber(delay) || delay < 0) return;
     timerRef.current = setRafTimeout(() => {
       fnRef.current();
     }, delay);
-    return () => {
-      if (timerRef.current) {
-        clearRafTimeout(timerRef.current);
-      }
-    };
+    return clear;
   }, [delay]);
 
-  const clear = useCallback(() => {
-    if (timerRef.current) {
-      clearRafTimeout(timerRef.current);
-    }
-  }, []);
-
   return clear;
 }