Skip to content

Commit d39d8c0

Browse files
trueadmdummdidumm
andauthored
fix: ensure tracking returns true, even if in unowned (#15214)
* fix: ensure tracking returns true, even if in unowned * fix: ensure tracking returns true, even if in unowned * Update packages/svelte/tests/runtime-runes/samples/effect-tracking-unowned/main.svelte --------- Co-authored-by: Simon H <[email protected]>
1 parent f67cf20 commit d39d8c0

File tree

4 files changed

+34
-7
lines changed

4 files changed

+34
-7
lines changed

.changeset/long-moles-join.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'svelte': patch
3+
---
4+
5+
fix: ensure tracking returns true, even if in unowned

packages/svelte/src/internal/client/reactivity/effects.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,7 @@ function create_effect(type, fn, sync, push = true) {
164164
* @returns {boolean}
165165
*/
166166
export function effect_tracking() {
167-
if (active_reaction === null || untracking) {
168-
return false;
169-
}
170-
171-
// If it's skipped, that's because we're inside an unowned
172-
// that is not being tracked by another reaction
173-
return !skip_reaction;
167+
return active_reaction !== null && !untracking;
174168
}
175169

176170
/**
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { flushSync } from 'svelte';
2+
import { test } from '../../test';
3+
4+
export default test({
5+
async test({ assert, target, logs }) {
6+
const b1 = target.querySelector('button');
7+
8+
b1?.click();
9+
flushSync();
10+
11+
assert.htmlEqual(
12+
target.innerHTML,
13+
`<o>Store: new</o><p>Text: new message</p><button>Change Store</button>`
14+
);
15+
}
16+
});
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<script>
2+
import { writable, fromStore, toStore } from "svelte/store";
3+
4+
const store = writable("previous");
5+
let text = $derived(fromStore(store).current + " message");
6+
7+
text; // read derived in a non-tracking context
8+
</script>
9+
10+
<o>Store: {$store}</o>
11+
<p>Text: {text}</p>
12+
<button onclick={() => { store.set("new"); }}>Change Store</button>

0 commit comments

Comments
 (0)