chore: simplify effectScope

yyx990803 · yyx990803 · commit 81a670873916 · 2022-01-28T21:02:09.000+08:00
diff --git a/packages/reactivity/src/effectScope.ts b/packages/reactivity/src/effectScope.ts
@@ -29,26 +29,22 @@ export class EffectScope {
   run<T>(fn: () => T): T | undefined {
     if (this.active) {
       try {
-        this.on()
+        activeEffectScope = this
         return fn()
       } finally {
-        this.off()
+        activeEffectScope = this.parent
       }
     } else if (__DEV__) {
       warn(`cannot run an inactive effect scope.`)
     }
   }
 
   on() {
-    if (this.active) {
-      activeEffectScope = this
-    }
+    activeEffectScope = this
   }
 
   off() {
-    if (this.active) {
-      activeEffectScope = this.parent
-    }
+    activeEffectScope = this.parent
   }
 
   stop(fromParent?: boolean) {

Original file line number	Diff line number	Diff line change
`@@ -29,26 +29,22 @@ export class EffectScope {`
`29`	`29`	`run<T>(fn: () => T): T \| undefined {`
`30`	`30`	`if (this.active) {`
`31`	`31`	`try {`
`32`		`- this.on()`
	`32`	`+ activeEffectScope = this`
`33`	`33`	`return fn()`
`34`	`34`	`} finally {`
`35`		`- this.off()`
	`35`	`+ activeEffectScope = this.parent`
`36`	`36`	`}`
`37`	`37`	`} else if (__DEV__) {`
`38`	`38`	warn(`cannot run an inactive effect scope.`)
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`on() {`
`43`		`- if (this.active) {`
`44`		`- activeEffectScope = this`
`45`		`- }`
	`43`	`+ activeEffectScope = this`
`46`	`44`	`}`
`47`	`45`
`48`	`46`	`off() {`
`49`		`- if (this.active) {`
`50`		`- activeEffectScope = this.parent`
`51`		`- }`
	`47`	`+ activeEffectScope = this.parent`
`52`	`48`	`}`
`53`	`49`
`54`	`50`	`stop(fromParent?: boolean) {`