diff --git a/.changeset/common-candles-sneeze.md b/.changeset/common-candles-sneeze.md new file mode 100644 index 0000000000..a0ef7b610b --- /dev/null +++ b/.changeset/common-candles-sneeze.md @@ -0,0 +1,5 @@ +--- +'svelte': patch +--- + +fix: don't mark deriveds while an effect is updating diff --git a/packages/svelte/src/internal/client/constants.js b/packages/svelte/src/internal/client/constants.js index a3ad988ba1..f92fba73be 100644 --- a/packages/svelte/src/internal/client/constants.js +++ b/packages/svelte/src/internal/client/constants.js @@ -48,7 +48,8 @@ export const EFFECT_OFFSCREEN = 1 << 25; /** * Tells that we marked this derived and its reactions as visited during the "mark as (maybe) dirty"-phase. * Will be lifted during execution of the derived and during checking its dirty state (both are necessary - * because a derived might be checked but not executed). + * because a derived might be checked but not executed). This is a pure performance optimization flag and + * should not be used for any other purpose! */ export const WAS_MARKED = 1 << 16; diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js index 9235c5f673..1831183e6f 100644 --- a/packages/svelte/src/internal/client/reactivity/sources.js +++ b/packages/svelte/src/internal/client/reactivity/sources.js @@ -27,7 +27,8 @@ import { ROOT_EFFECT, ASYNC, WAS_MARKED, - CONNECTED + CONNECTED, + REACTION_IS_UPDATING } from '#client/constants'; import * as e from '../errors.js'; import { legacy_mode_flag, tracing_mode_flag } from '../../flags/index.js'; @@ -356,8 +357,11 @@ function mark_reactions(signal, status, updated_during_traversal) { batch_values?.delete(derived); if ((flags & WAS_MARKED) === 0) { - // Only connected deriveds can be reliably unmarked right away - if (flags & CONNECTED) { + // Only connected deriveds being executed outside the update cycle can be reliably unmarked right away + if ( + flags & CONNECTED && + (active_effect === null || (active_effect.f & REACTION_IS_UPDATING) === 0) + ) { reaction.f |= WAS_MARKED; } diff --git a/packages/svelte/tests/runtime-runes/samples/derived-dep-set-while-rendering/Child.svelte b/packages/svelte/tests/runtime-runes/samples/derived-dep-set-while-rendering/Child.svelte new file mode 100644 index 0000000000..9771762c0b --- /dev/null +++ b/packages/svelte/tests/runtime-runes/samples/derived-dep-set-while-rendering/Child.svelte @@ -0,0 +1,7 @@ + diff --git a/packages/svelte/tests/runtime-runes/samples/derived-dep-set-while-rendering/_config.js b/packages/svelte/tests/runtime-runes/samples/derived-dep-set-while-rendering/_config.js new file mode 100644 index 0000000000..60985cdd12 --- /dev/null +++ b/packages/svelte/tests/runtime-runes/samples/derived-dep-set-while-rendering/_config.js @@ -0,0 +1,29 @@ +import { flushSync } from 'svelte'; +import { test } from '../../test'; + +export default test({ + async test({ assert, target }) { + const [show, hide] = target.querySelectorAll('button'); + + hide.click(); + flushSync(); + assert.htmlEqual( + target.innerHTML, + ` + + + ` + ); + + show.click(); + flushSync(); + assert.htmlEqual( + target.innerHTML, + ` + + +
visible
+ ` + ); + } +}); diff --git a/packages/svelte/tests/runtime-runes/samples/derived-dep-set-while-rendering/main.svelte b/packages/svelte/tests/runtime-runes/samples/derived-dep-set-while-rendering/main.svelte new file mode 100644 index 0000000000..3359a6305b --- /dev/null +++ b/packages/svelte/tests/runtime-runes/samples/derived-dep-set-while-rendering/main.svelte @@ -0,0 +1,14 @@ + + + + +{#if visible2} + +
visible
+{/if} diff --git a/packages/svelte/tests/runtime-runes/samples/derived-dep-set-while-rendering/store.svelte.js b/packages/svelte/tests/runtime-runes/samples/derived-dep-set-while-rendering/store.svelte.js new file mode 100644 index 0000000000..b48155e823 --- /dev/null +++ b/packages/svelte/tests/runtime-runes/samples/derived-dep-set-while-rendering/store.svelte.js @@ -0,0 +1,13 @@ +class RawStore { + values = $state.raw({ visible: true }); + + get(key) { + return this.values[key]; + } + + set(key, value) { + this.values = { ...this.values, [key]: value }; + } +} + +export const store = new RawStore();