feat(effect): handle nested effects

stackblitz · Oct 5, 2024 · 2e608ff · 2e608ff
1 parent 827737a
commit 2e608ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/effect.ts b/lib/effect.ts
@@ -8,6 +8,7 @@ export function effect(fn: () => void) {
 }
 
 export class Effect implements IEffect, Subscriber {
+	scope = currentEffectScope;
 	nextNotify = undefined;
 
 	// Subscriber
@@ -32,7 +33,12 @@ export class Effect implements IEffect, Subscriber {
 
 	run() {
 		const lastActiveSub = Subscriber.startTrack(this);
-		this.fn();
+		if (this.scope !== undefined) {
+			this.scope.run(this.fn);
+		}
+		else {
+			this.fn();
+		}
 		Subscriber.endTrack(this, lastActiveSub);
 	}
 }
diff --git a/lib/effectScope.ts b/lib/effectScope.ts
@@ -6,12 +6,12 @@ export class EffectScope {
 	subs: Subscriber[] = [];
 
 	run<T>(fn: () => T) {
-		const original = currentEffectScope;
+		const lastEffectScope = currentEffectScope;
 		try {
 			currentEffectScope = this;
 			return fn();
 		} finally {
-			currentEffectScope = original;
+			currentEffectScope = lastEffectScope;
 		}
 	}