tweak

Author: trueadm

packages/svelte/src/internal/client/context.js

@@ -13,7 +13,7 @@ import {
 } from './runtime.js';
 import { effect, teardown } from './reactivity/effects.js';
 import { legacy_mode_flag } from '../flags/index.js';
-import { CTX_CONTAINS_TEARDOWN, CTX_DESTROYED, TEARDOWN_PROPS } from './constants.js';
+import { CTX_DESTROYED, TEARDOWN_PROPS } from './constants.js';
 import { define_property } from '../shared/utils.js';
 
 /** @type {ComponentContext | null} */
@@ -136,24 +136,27 @@ export function push(props, runes = false, fn) {
 	}
 
 	teardown(() => {
-		if ((ctx.f & (CTX_CONTAINS_TEARDOWN | CTX_DESTROYED)) === 0) {
+		if ((ctx.f & CTX_DESTROYED) !== 0) {
 			return;
 		}
 		// Mark the context as destroyed, so any derived props can use
 		// the latest known value before teardown
 		ctx.f ^= CTX_DESTROYED;
 
-		var teardown_props = ctx.tp;
-		if (TEARDOWN_PROPS in props) {
-			props[TEARDOWN_PROPS] = teardown_props;
-			return;
-		}
-		// Apply the latest known props before teardown over existing props
-		for (var key in teardown_props) {
-			define_property(props, key, {
-				value: teardown_props[key],
-				configurable: true
-			});
+		// Only apply the latest known props before teardown in legacy mode
+		if (!is_runes()) {
+			var teardown_props = ctx.tp;
+			if (TEARDOWN_PROPS in props) {
+				props[TEARDOWN_PROPS] = teardown_props;
+				return;
+			}
+			// Apply the latest known props before teardown over existing props
+			for (var key in teardown_props) {
+				define_property(props, key, {
+					value: teardown_props[key],
+					configurable: true
+				});
+			}
 		}
 	});
 
@@ -198,11 +201,12 @@ export function pop(component) {
 		}
 		context_stack_item.m = true;
 
-		effect(() => {
-			if ((context_stack_item.f & CTX_CONTAINS_TEARDOWN) !== 0) {
+		// Only apply the latest known props before teardown in legacy mode
+		if (!is_runes()) {
+			effect(() => {
 				context_stack_item.tp = { ...context_stack_item.s };
-			}
-		});
+			});
+		}
 	}
 	// Micro-optimization: Don't set .a above to the empty object
 	// so it can be garbage-collected when the return here is unused

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

@@ -1,4 +1,4 @@
-/** @import { Source } from './types.js' */
+/** @import { Derived, Source } from './types.js' */
 import { DEV } from 'esm-env';
 import {
 	PROPS_IS_BINDABLE,
@@ -250,6 +250,14 @@ export function spread_props(...props) {
 	return new Proxy({ props }, spread_props_handler);
 }
 
+/**
+ * @param {Derived} signal
+ * @returns {boolean}
+ */
+function in_destroyed_context(signal) {
+	return signal.ctx !== null && (signal.ctx.f & CTX_DESTROYED) !== 0;
+}
+
 /**
  * This function is responsible for synchronizing a possibly bound prop with the inner component state.
  * It is used whenever the compiler sees that the component writes to the prop, or when it has a default prop_value.
@@ -409,14 +417,17 @@ export function prop(props, key, flags, fallback) {
 				if (fallback_used && fallback_value !== undefined) {
 					fallback_value = new_value;
 				}
+				if (in_destroyed_context(current_value)) {
+					return value;
+				}
 				untrack(() => get(current_value)); // force a synchronisation immediately
 			}
 
 			return value;
 		}
 
 		// If the prop is read, we might need to return the stale value if component ctx has been destroyed
-		if (current_value.ctx !== null && (current_value.ctx.f & CTX_DESTROYED) !== 0) {
+		if (in_destroyed_context(current_value)) {
 			return current_value.v;
 		}