Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/dirty-eyes-itch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"svelte": patch
---

fix: ensure all effect cleanup functions are untracked
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function action(dom, action, get_value) {
}

if (payload?.destroy) {
return () => untrack(() => /** @type {Function} */ (payload.destroy)());
return () => /** @type {Function} */ (payload.destroy)();
}
});
}
5 changes: 5 additions & 0 deletions packages/svelte/src/internal/client/reactivity/effects.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
current_component_context,
current_effect,
current_reaction,
current_untracking,
destroy_effect_children,
dev_current_component_function,
execute_effect,
Expand All @@ -14,6 +15,7 @@ import {
set_is_destroying_effect,
set_is_flushing_effect,
set_signal_status,
set_untracking,
untrack
} from '../runtime.js';
import {
Expand Down Expand Up @@ -295,11 +297,14 @@ export function execute_effect_teardown(effect) {
var teardown = effect.teardown;
if (teardown !== null) {
const previously_destroying_effect = is_destroying_effect;
const previous_untracking = current_untracking;
set_is_destroying_effect(true);
set_untracking(true);
try {
teardown.call(null);
} finally {
set_is_destroying_effect(previously_destroying_effect);
set_untracking(previous_untracking);
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions packages/svelte/src/internal/client/runtime.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ export function set_is_destroying_effect(value) {
is_destroying_effect = value;
}

/** @param {boolean} value */
export function set_untracking(value) {
current_untracking = value;
}

// Used for $inspect
export let is_batching_effect = false;
let is_inspecting_signal = false;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { test } from '../../test';

// nothing to test here — if the teardown function is not untracked, effect will loop
export default test({});
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<script>
let prop = $state();
let key = $state({});

function action() {
prop = {};
$effect.pre(() => {
return () => {
prop;
}
});
}

$effect(() => key = {});
</script>

{#key key}
<div use:action>test</div>
{/key}