fix(reactivity): scheduled effect should not execute if stopped

fix #910

packages/reactivity/__tests__/effect.spec.ts

@@ -678,6 +678,28 @@ describe('reactivity/effect', () => {
     expect(dummy).toBe(3)
   })
 
+  it('stop with scheduler', () => {
+    let dummy
+    const obj = reactive({ prop: 1 })
+    const queue: (() => void)[] = []
+    const runner = effect(
+      () => {
+        dummy = obj.prop
+      },
+      {
+        scheduler: e => queue.push(e)
+      }
+    )
+    obj.prop = 2
+    expect(dummy).toBe(1)
+    expect(queue.length).toBe(1)
+    stop(runner)
+
+    // a scheduled effect should not execute anymore after stopped
+    queue.forEach(e => e())
+    expect(dummy).toBe(1)
+  })
+
   it('events: onStop', () => {
     const onStop = jest.fn()
     const runner = effect(() => {}, {

packages/reactivity/src/effect.ts

@@ -10,7 +10,7 @@ type KeyToDepMap = Map<any, Dep>
 const targetMap = new WeakMap<any, KeyToDepMap>()
 
 export interface ReactiveEffect<T = any> {
-  (): T
+  (...args: any[]): T
   _isEffect: true
   active: boolean
   raw: () => T
@@ -75,23 +75,12 @@ export function stop(effect: ReactiveEffect) {
 }
 
 function createReactiveEffect<T = any>(
-  fn: () => T,
+  fn: (...args: any[]) => T,
   options: ReactiveEffectOptions
 ): ReactiveEffect<T> {
   const effect = function reactiveEffect(...args: unknown[]): unknown {
-    return run(effect, fn, args)
-  } as ReactiveEffect
-  effect._isEffect = true
-  effect.active = true
-  effect.raw = fn
-  effect.deps = []
-  effect.options = options
-  return effect
-}
-
-function run(effect: ReactiveEffect, fn: Function, args: unknown[]): unknown {
     if (!effect.active) {
-    return fn(...args)
+      return options.scheduler ? undefined : fn(...args)
     }
     if (!effectStack.includes(effect)) {
       cleanup(effect)
@@ -106,6 +95,13 @@ function run(effect: ReactiveEffect, fn: Function, args: unknown[]): unknown {
         activeEffect = effectStack[effectStack.length - 1]
       }
     }
+  } as ReactiveEffect
+  effect._isEffect = true
+  effect.active = true
+  effect.raw = fn
+  effect.deps = []
+  effect.options = options
+  return effect
 }
 
 function cleanup(effect: ReactiveEffect) {