From d5f0b6cf22372eb1bdc41d9c8cb380d1a7675853 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 24 Jul 2025 10:01:31 -0400
Subject: [PATCH] fix

---
 .../src/internal/client/dom/elements/bindings/input.js |  9 +++++++--
 .../svelte/src/internal/client/reactivity/batch.js     | 10 ++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/svelte/src/internal/client/dom/elements/bindings/input.js b/packages/svelte/src/internal/client/dom/elements/bindings/input.js
index 6fbdca5879..7c73280dd6 100644
--- a/packages/svelte/src/internal/client/dom/elements/bindings/input.js
+++ b/packages/svelte/src/internal/client/dom/elements/bindings/input.js
@@ -76,13 +76,18 @@ export function bind_value(input, get, set = get) {
 
 		var value = get();
 
-		if (input === document.activeElement && batches.has(/** @type {Batch} */ (previous_batch))) {
+		if (input === document.activeElement) {
+			// we need both, because in non-async mode, render effects run before previous_batch is set
+			var batch = /** @type {Batch} */ (previous_batch ?? current_batch);
+
 			// Never rewrite the contents of a focused input. We can get here if, for example,
 			// an update is deferred because of async work depending on the input:
 			//
 			// <input bind:value={query}>
 			// <p>{await find(query)}</p>
-			return;
+			if (batches.has(batch)) {
+				return;
+			}
 		}
 
 		if (is_numberlike_input(input) && value === to_number(input.value)) {
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 0bfca49e91..123bc95d16 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -38,8 +38,12 @@ const batches = new Set();
 /** @type {Batch | null} */
 export let current_batch = null;
 
-/** @type {Batch | null} */
-export let previous_batch = current_batch;
+/**
+ * This is needed to avoid overwriting inputs in non-async mode
+ * TODO 6.0 remove this, as non-async mode will go away
+ * @type {Batch | null}
+ */
+export let previous_batch = null;
 
 /**
  * When time travelling, we re-evaluate deriveds based on the temporary
@@ -175,6 +179,8 @@ export class Batch {
 	process(root_effects) {
 		queued_root_effects = [];
 
+		previous_batch = null;
+
 		/** @type {Map<Source, { v: unknown, wv: number }> | null} */
 		var current_values = null;