refactor(useRafInterval): optimize useEffect cleanup fn (alibaba#2426)

raotaohub · Mar 28, 2024 · d1bd918 · d1bd918
1 parent 2d51ce4
commit d1bd918
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/packages/hooks/src/useRafInterval/index.ts b/packages/hooks/src/useRafInterval/index.ts
@@ -51,6 +51,12 @@ function useRafInterval(
   const fnRef = useLatest(fn);
   const timerRef = useRef<Handle>();
 
+  const clear = useCallback(() => {
+    if (timerRef.current) {
+      clearRafInterval(timerRef.current);
+    }
+  }, []);
+
   useEffect(() => {
     if (!isNumber(delay) || delay < 0) {
       return;
@@ -61,19 +67,9 @@ function useRafInterval(
     timerRef.current = setRafInterval(() => {
       fnRef.current();
     }, delay);
-    return () => {
-      if (timerRef.current) {
-        clearRafInterval(timerRef.current);
-      }
-    };
+    return clear;
   }, [delay]);
 
-  const clear = useCallback(() => {
-    if (timerRef.current) {
-      clearRafInterval(timerRef.current);
-    }
-  }, []);
-
   return clear;
 }