From 193cc37f7a9ec4148b1106f942c363cf41da85f6 Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <trueadm@users.noreply.github.com>
Date: Thu, 17 Oct 2024 16:43:39 +0100
Subject: [PATCH] fix: correctly applies autofocus to static elements (#13648)

* fix: correctly applies autofocus to static elements

* lint

* fix other case
---
 .changeset/healthy-poets-float.md                         | 5 +++++
 .../compiler/phases/2-analyze/visitors/RegularElement.js  | 8 ++++++++
 .../phases/3-transform/client/visitors/shared/fragment.js | 4 ++++
 .../tests/runtime-legacy/samples/autofocus-2/_config.js   | 7 +++++++
 .../tests/runtime-legacy/samples/autofocus-2/main.svelte  | 2 ++
 .../tests/runtime-legacy/samples/autofocus-3/_config.js   | 7 +++++++
 .../tests/runtime-legacy/samples/autofocus-3/main.svelte  | 3 +++
 7 files changed, 36 insertions(+)
 create mode 100644 .changeset/healthy-poets-float.md
 create mode 100644 packages/svelte/tests/runtime-legacy/samples/autofocus-2/_config.js
 create mode 100644 packages/svelte/tests/runtime-legacy/samples/autofocus-2/main.svelte
 create mode 100644 packages/svelte/tests/runtime-legacy/samples/autofocus-3/_config.js
 create mode 100644 packages/svelte/tests/runtime-legacy/samples/autofocus-3/main.svelte

diff --git a/.changeset/healthy-poets-float.md b/.changeset/healthy-poets-float.md
new file mode 100644
index 0000000000..4709b4495e
--- /dev/null
+++ b/.changeset/healthy-poets-float.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: correctly applies autofocus to static elements
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js
index 49a642eb49..dd8a594e61 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js
@@ -75,6 +75,14 @@ export function RegularElement(node, context) {
 		node.attributes.push(create_attribute('value', child.start, child.end, [child]));
 	}
 
+	if (
+		node.attributes.some(
+			(attribute) => attribute.type === 'Attribute' && attribute.name === 'autofocus'
+		)
+	) {
+		mark_subtree_dynamic(context.path);
+	}
+
 	const binding = context.state.scope.get(node.name);
 	if (
 		binding !== null &&
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
index 4008dbdfa3..4de1a11a97 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
@@ -142,6 +142,10 @@ function is_static_element(node) {
 			return false;
 		}
 
+		if (attribute.name === 'autofocus') {
+			return false;
+		}
+
 		if (node.name === 'option' && attribute.name === 'value') {
 			return false;
 		}
diff --git a/packages/svelte/tests/runtime-legacy/samples/autofocus-2/_config.js b/packages/svelte/tests/runtime-legacy/samples/autofocus-2/_config.js
new file mode 100644
index 0000000000..24b45b3761
--- /dev/null
+++ b/packages/svelte/tests/runtime-legacy/samples/autofocus-2/_config.js
@@ -0,0 +1,7 @@
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, window }) {
+		assert.equal(target.querySelector('input'), window.document.activeElement);
+	}
+});
diff --git a/packages/svelte/tests/runtime-legacy/samples/autofocus-2/main.svelte b/packages/svelte/tests/runtime-legacy/samples/autofocus-2/main.svelte
new file mode 100644
index 0000000000..e3ea9a76d4
--- /dev/null
+++ b/packages/svelte/tests/runtime-legacy/samples/autofocus-2/main.svelte
@@ -0,0 +1,2 @@
+<h1>wat</h1>
+<input autofocus />
diff --git a/packages/svelte/tests/runtime-legacy/samples/autofocus-3/_config.js b/packages/svelte/tests/runtime-legacy/samples/autofocus-3/_config.js
new file mode 100644
index 0000000000..24b45b3761
--- /dev/null
+++ b/packages/svelte/tests/runtime-legacy/samples/autofocus-3/_config.js
@@ -0,0 +1,7 @@
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, window }) {
+		assert.equal(target.querySelector('input'), window.document.activeElement);
+	}
+});
diff --git a/packages/svelte/tests/runtime-legacy/samples/autofocus-3/main.svelte b/packages/svelte/tests/runtime-legacy/samples/autofocus-3/main.svelte
new file mode 100644
index 0000000000..31d2cbc0ec
--- /dev/null
+++ b/packages/svelte/tests/runtime-legacy/samples/autofocus-3/main.svelte
@@ -0,0 +1,3 @@
+<div>
+	<input autofocus />
+</div>