From d39d8c0675fd1ab13fa752b6a57e471ae864f7eb Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <trueadm@users.noreply.github.com>
Date: Wed, 5 Feb 2025 12:28:18 +0000
Subject: [PATCH] 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 <5968653+dummdidumm@users.noreply.github.com>
---
 .changeset/long-moles-join.md                    |  5 +++++
 .../src/internal/client/reactivity/effects.js    |  8 +-------
 .../samples/effect-tracking-unowned/_config.js   | 16 ++++++++++++++++
 .../samples/effect-tracking-unowned/main.svelte  | 12 ++++++++++++
 4 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/long-moles-join.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/effect-tracking-unowned/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/effect-tracking-unowned/main.svelte

diff --git a/.changeset/long-moles-join.md b/.changeset/long-moles-join.md
new file mode 100644
index 0000000000..92c3d7bf9d
--- /dev/null
+++ b/.changeset/long-moles-join.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: ensure tracking returns true, even if in unowned
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index eab6c767f8..9d7b5e9de6 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -164,13 +164,7 @@ function create_effect(type, fn, sync, push = true) {
  * @returns {boolean}
  */
 export function effect_tracking() {
-	if (active_reaction === null || untracking) {
-		return false;
-	}
-
-	// If it's skipped, that's because we're inside an unowned
-	// that is not being tracked by another reaction
-	return !skip_reaction;
+	return active_reaction !== null && !untracking;
 }
 
 /**
diff --git a/packages/svelte/tests/runtime-runes/samples/effect-tracking-unowned/_config.js b/packages/svelte/tests/runtime-runes/samples/effect-tracking-unowned/_config.js
new file mode 100644
index 0000000000..749b9997c2
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/effect-tracking-unowned/_config.js
@@ -0,0 +1,16 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, logs }) {
+		const b1 = target.querySelector('button');
+
+		b1?.click();
+		flushSync();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`<o>Store: new</o><p>Text: new message</p><button>Change Store</button>`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/effect-tracking-unowned/main.svelte b/packages/svelte/tests/runtime-runes/samples/effect-tracking-unowned/main.svelte
new file mode 100644
index 0000000000..3c16e3c036
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/effect-tracking-unowned/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	import { writable, fromStore, toStore } from "svelte/store";
+
+	const store = writable("previous");
+	let text = $derived(fromStore(store).current + " message");
+
+	text; // read derived in a non-tracking context
+</script>
+
+<o>Store: {$store}</o>
+<p>Text: {text}</p>
+<button onclick={() => { store.set("new"); }}>Change Store</button>