fix(usevibrate interval mode): fix useVibrate interval mode error

innocces · Sep 1, 2021 · f99082f · f99082f · vercel · Sep 1, 2021
1 parent 22ac04c
commit f99082f
Showing 1 changed file with 28 additions and 23 deletions.
diff --git a/packages/hooks/src/useVibrate/index.ts b/packages/hooks/src/useVibrate/index.ts
@@ -25,33 +25,38 @@ function useVibrate(
     };
   }, [timer, interval]);
 
-  const vibrateAction = useCallback<VibrateAction>((long) => {
-    return new Promise((resolve, reject) => {
-      try {
-        const vibrateMethod = long ? vibrateLong : vibrateShort;
-        vibrateMethod({
-          success: (res) => {
-            const computedGap =
-              (gap || DEFAULTGAP) + (long ? LONGINTERVAL : SHORTINTERVAL);
-            if (interval) {
-              timer.current = setTimeout(() => {
-                vibrateAction(long);
-              }, computedGap);
-            }
-            resolve(res);
-          },
-          fail: reject,
-        }).catch(reject);
-      } catch (e) {
-        reject(e);
-      }
-    });
-  }, []);
-
   const stopVibrateAction = useCallback(() => {
     timer.current && clearTimeout(timer.current);
   }, [timer]);
 
+  const vibrateAction = useCallback<VibrateAction>(
+    (long) => {
+      return new Promise((resolve, reject) => {
+        try {
+          const vibrateMethod = long ? vibrateLong : vibrateShort;
+          vibrateMethod({
+            success: (res) => {
+              const computedGap =
+                (gap || DEFAULTGAP) + (long ? LONGINTERVAL : SHORTINTERVAL);
+              if (interval) {
+                // whether timer exist, clear first to fix multi vibrate
+                stopVibrateAction();
+                timer.current = setTimeout(() => {
+                  vibrateAction(long);
+                }, computedGap);
+              }
+              resolve(res);
+            },
+            fail: reject,
+          }).catch(reject);
+        } catch (e) {
+          reject(e);
+        }
+      });
+    },
+    [stopVibrateAction],
+  );
+
   return [vibrateAction, stopVibrateAction];
 }