fix(useIntervalFn): prevent timer being set after pause is called in cb (#4258)

laporchen · antfu · web-flow · commit 59f8c9440e8d · 2024-10-24T16:49:19.000Z
Co-authored-by: Anthony Fu &lt;anthonyfu117@hotmail.com&gt;
diff --git a/packages/shared/useIntervalFn/index.test.ts b/packages/shared/useIntervalFn/index.test.ts
@@ -91,6 +91,27 @@ describe('useIntervalFn', () => {
     expect(callback).toHaveBeenCalledTimes(0)
   })
 
+  it('pause in callback', async () => {
+    const pausable = useIntervalFn(() => {
+      callback()
+      pausable.pause()
+    }, 50, { immediateCallback: true, immediate: false })
+
+    pausable.resume()
+    expect(pausable.isActive.value).toBeFalsy()
+    expect(callback).toHaveBeenCalledTimes(1)
+
+    await promiseTimeout(60)
+    expect(callback).toHaveBeenCalledTimes(1)
+
+    pausable.resume()
+    expect(pausable.isActive.value).toBeFalsy()
+    expect(callback).toHaveBeenCalledTimes(2)
+
+    await promiseTimeout(60)
+    expect(callback).toHaveBeenCalledTimes(2)
+  })
+
   it('cant work when interval is negative', async () => {
     const { isActive } = useIntervalFn(callback, -1)
 
diff --git a/packages/shared/useIntervalFn/index.ts b/packages/shared/useIntervalFn/index.ts
@@ -56,7 +56,8 @@ export function useIntervalFn(cb: Fn, interval: MaybeRefOrGetter<number> = 1000,
     if (immediateCallback)
       cb()
     clean()
-    timer = setInterval(cb, intervalValue)
+    if (isActive.value)
+      timer = setInterval(cb, intervalValue)
   }
 
   if (immediate && isClient)

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ export function useIntervalFn(cb: Fn, interval: MaybeRefOrGetter<number> = 1000,`
`56`	`56`	`if (immediateCallback)`
`57`	`57`	`cb()`
`58`	`58`	`clean()`
`59`		`- timer = setInterval(cb, intervalValue)`
	`59`	`+ if (isActive.value)`
	`60`	`+ timer = setInterval(cb, intervalValue)`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`if (immediate && isClient)`