From 3c898f3ea593c957dc8a5b639f4662ff0417b905 Mon Sep 17 00:00:00 2001 From: Henry Lin Date: Tue, 23 May 2023 21:12:27 +0800 Subject: [PATCH] fix: preserve user-set onStop callbacks --- src/core.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core.ts b/src/core.ts index 5e16ddc..e15c9d3 100644 --- a/src/core.ts +++ b/src/core.ts @@ -246,8 +246,10 @@ export const effect = ( cleanupFn?.(); cleanupFn = fn() ?? undefined; }, options); + const baseStop = runner.effect.onStop; runner.effect.onStop = () => { cleanupFn?.(); + baseStop?.(); }; return runner; }; @@ -484,8 +486,10 @@ export const watch: WatchOverloads = < oldValue = effect(); } + const baseStop = effect.effect.onStop; effect.effect.onStop = () => { cleanup?.(); + baseStop?.(); }; return () => effect.effect.stop();