From 12d53e52326ca6b28bff7e362a834a3516e63834 Mon Sep 17 00:00:00 2001
From: Chirag6722 <chiraghonnyal6722@gmail.com>
Date: Mon, 14 Sep 2026 11:00:06 +0530
Subject: [PATCH 1/2] fix: focus the search input through the owning component
 instead of a DOM query

The '/' shortcut in app.vue and the ArrowUp handler on the search page
located the search input with a selector that depended on markup in
Header/SearchBox.vue and pages/index.vue. Add a useSearchInputFocus
composable: app.vue provides a registry, both search inputs register
their focus method, and the shortcut handlers call it.

resolves #3216
---
 app/app.vue                                   |  10 +-
 app/components/Header/SearchBox.vue           |   6 +-
 app/composables/useSearchInputFocus.ts        |  54 ++++++
 app/pages/index.vue                           |   9 +
 app/pages/search.vue                          |  10 +-
 .../use-search-input-focus.spec.ts            | 163 ++++++++++++++++++
 6 files changed, 234 insertions(+), 18 deletions(-)
 create mode 100644 app/composables/useSearchInputFocus.ts
 create mode 100644 test/nuxt/composables/use-search-input-focus.spec.ts

diff --git a/app/app.vue b/app/app.vue
index 738d278529..61109846ec 100644
--- a/app/app.vue
+++ b/app/app.vue
@@ -48,6 +48,7 @@ if (import.meta.server) {
 }
 
 const keyboardShortcuts = useKeyboardShortcuts()
+const focusSearchInput = provideSearchInputFocus().focus
 const { settings } = useSettings()
 
 initKeyShortcuts()
@@ -64,14 +65,7 @@ onKeyDown(
     if (!keyboardShortcuts.value || isEditableElement(e.target)) return
     e.preventDefault()
 
-    const searchInput = document.querySelector<HTMLInputElement>(
-      'input[type="search"], input[name="q"]',
-    )
-
-    if (searchInput) {
-      searchInput.focus()
-      return
-    }
+    if (focusSearchInput()) return
 
     router.push({ name: 'search' })
   },
diff --git a/app/components/Header/SearchBox.vue b/app/components/Header/SearchBox.vue
index e416735a58..6ae3a23b9d 100644
--- a/app/components/Header/SearchBox.vue
+++ b/app/components/Header/SearchBox.vue
@@ -39,11 +39,15 @@ function handleBlur() {
   emit('blur')
 }
 function focus() {
-  inputRef.value?.focus()
+  const input = inputRef.value
+  if (!input) return false
+  input.focus()
+  return true
 }
 function blur() {
   inputRef.value?.blur()
 }
+useSearchInputFocusTarget(focus)
 defineExpose({ focus, blur })
 </script>
 <template>
diff --git a/app/composables/useSearchInputFocus.ts b/app/composables/useSearchInputFocus.ts
new file mode 100644
index 0000000000..2b0d31ac08
--- /dev/null
+++ b/app/composables/useSearchInputFocus.ts
@@ -0,0 +1,54 @@
+import type { InjectionKey } from 'vue'
+
+/** Focuses a mounted search input. Returns `false` when the input is not rendered. */
+type SearchInputFocusTarget = () => boolean
+
+interface SearchInputFocusContext {
+  /** Registers a search input for the lifetime of the current component scope. */
+  register: (target: SearchInputFocusTarget) => void
+  /** Focuses the first search input that is currently rendered. */
+  focus: () => boolean
+}
+
+const SEARCH_INPUT_FOCUS_KEY: InjectionKey<SearchInputFocusContext> = Symbol('search-input-focus')
+
+/**
+ * Provides the search input focus context. Call once from the app root so both
+ * the header search box and the homepage search input can register themselves.
+ */
+export function provideSearchInputFocus(): SearchInputFocusContext {
+  const targets = new Set<SearchInputFocusTarget>()
+
+  const context: SearchInputFocusContext = {
+    register(target) {
+      targets.add(target)
+      onScopeDispose(() => targets.delete(target))
+    },
+    focus() {
+      for (const target of targets) {
+        if (target()) return true
+      }
+      return false
+    },
+  }
+
+  provide(SEARCH_INPUT_FOCUS_KEY, context)
+  return context
+}
+
+/**
+ * Registers the calling component's search input so keyboard shortcuts can focus it
+ * without querying the DOM. The target should return `false` while its input is not rendered.
+ */
+export function useSearchInputFocusTarget(target: SearchInputFocusTarget) {
+  inject(SEARCH_INPUT_FOCUS_KEY, null)?.register(target)
+}
+
+/**
+ * Returns a function that focuses the currently rendered search input.
+ * The returned function resolves to `false` when no search input is on the page.
+ */
+export function useSearchInputFocus(): () => boolean {
+  const context = inject(SEARCH_INPUT_FOCUS_KEY, null)
+  return () => context?.focus() ?? false
+}
diff --git a/app/pages/index.vue b/app/pages/index.vue
index 9f81a477f2..d555233b4f 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -3,6 +3,14 @@ import { SHOWCASED_FRAMEWORKS } from '~/utils/frameworks'
 
 const { model: searchQuery, startSearch } = useGlobalSearch()
 const isSearchFocused = shallowRef(false)
+const searchInputRef = useTemplateRef('searchInputRef')
+
+useSearchInputFocusTarget(() => {
+  const input = searchInputRef.value
+  if (!input) return false
+  input.focus()
+  return true
+})
 
 async function search() {
   startSearch()
@@ -56,6 +64,7 @@ defineOgImage('Splash.takumi', {}, { alt: () => $t('seo.home.description') })
 
                 <InputBase
                   id="home-search"
+                  ref="searchInputRef"
                   v-model="searchQuery"
                   type="search"
                   name="q"
diff --git a/app/pages/search.vue b/app/pages/search.vue
index 9010734a57..aea1cdedfa 100644
--- a/app/pages/search.vue
+++ b/app/pages/search.vue
@@ -477,15 +477,7 @@ watch(displayResults, newResults => {
   }
 })
 
-/**
- * Focus the header search input
- */
-function focusSearchInput() {
-  const searchInput = document.querySelector<HTMLInputElement>(
-    'input[type="search"], input[name="q"]',
-  )
-  searchInput?.focus()
-}
+const focusSearchInput = useSearchInputFocus()
 
 const keyboardShortcuts = useKeyboardShortcuts()
 
diff --git a/test/nuxt/composables/use-search-input-focus.spec.ts b/test/nuxt/composables/use-search-input-focus.spec.ts
new file mode 100644
index 0000000000..cf7b6be609
--- /dev/null
+++ b/test/nuxt/composables/use-search-input-focus.spec.ts
@@ -0,0 +1,163 @@
+import { describe, expect, it, vi } from 'vitest'
+import { mountSuspended } from '@nuxt/test-utils/runtime'
+import { defineComponent, h, nextTick, shallowRef } from 'vue'
+import { HeaderSearchBox } from '#components'
+
+const notProvided = (): boolean => {
+  throw new Error('focus function was not captured')
+}
+
+const Target = defineComponent({
+  props: { id: { type: String, required: true } },
+  setup(props) {
+    const input = shallowRef<HTMLInputElement | null>(null)
+    useSearchInputFocusTarget(() => {
+      if (!input.value) return false
+      input.value.focus()
+      return true
+    })
+    return () => h('input', { id: props.id, ref: input, type: 'search' })
+  },
+})
+
+async function mountProvider(children: () => ReturnType<typeof h>[], route?: string) {
+  let focusSearchInput = notProvided
+  const Provider = defineComponent({
+    setup() {
+      focusSearchInput = provideSearchInputFocus().focus
+      return () => h('div', children())
+    },
+  })
+  const wrapper = await mountSuspended(Provider, { attachTo: document.body, route })
+  return { wrapper, focusSearchInput: () => focusSearchInput() }
+}
+
+describe('useSearchInputFocus', () => {
+  it('focuses a registered search input', async () => {
+    const { wrapper, focusSearchInput } = await mountProvider(() => [h(Target, { id: 'target' })])
+    try {
+      expect(focusSearchInput()).toBe(true)
+      expect(document.activeElement?.id).toBe('target')
+    } finally {
+      wrapper.unmount()
+    }
+  })
+
+  it('returns false when no search input is registered', async () => {
+    const { wrapper, focusSearchInput } = await mountProvider(() => [])
+    try {
+      expect(focusSearchInput()).toBe(false)
+    } finally {
+      wrapper.unmount()
+    }
+  })
+
+  it('skips targets that are not rendered and stops after the first success', async () => {
+    const hidden = vi.fn(() => false)
+    const HiddenTarget = defineComponent({
+      setup() {
+        useSearchInputFocusTarget(hidden)
+        return () => null
+      },
+    })
+    const focused = vi.fn(() => true)
+    const FocusedTarget = defineComponent({
+      setup() {
+        useSearchInputFocusTarget(focused)
+        return () => null
+      },
+    })
+    const spare = vi.fn(() => true)
+    const SpareTarget = defineComponent({
+      setup() {
+        useSearchInputFocusTarget(spare)
+        return () => null
+      },
+    })
+    const { wrapper, focusSearchInput } = await mountProvider(() => [
+      h(HiddenTarget),
+      h(FocusedTarget),
+      h(SpareTarget),
+    ])
+    try {
+      expect(focusSearchInput()).toBe(true)
+      expect(hidden).toHaveBeenCalledTimes(1)
+      expect(focused).toHaveBeenCalledTimes(1)
+      expect(spare).not.toHaveBeenCalled()
+    } finally {
+      wrapper.unmount()
+    }
+  })
+
+  it('unregisters a target when its component unmounts', async () => {
+    const target = vi.fn(() => true)
+    const StaleTarget = defineComponent({
+      setup() {
+        useSearchInputFocusTarget(target)
+        return () => null
+      },
+    })
+    const show = shallowRef(true)
+    const { wrapper, focusSearchInput } = await mountProvider(() =>
+      show.value ? [h(StaleTarget)] : [],
+    )
+    try {
+      expect(focusSearchInput()).toBe(true)
+      show.value = false
+      await nextTick()
+      expect(focusSearchInput()).toBe(false)
+      expect(target).toHaveBeenCalledTimes(1)
+    } finally {
+      wrapper.unmount()
+    }
+  })
+
+  it('uses the injected focus function when one is provided', async () => {
+    let focusSearchInput = notProvided
+    const Consumer = defineComponent({
+      setup() {
+        focusSearchInput = useSearchInputFocus()
+        return () => null
+      },
+    })
+    const { wrapper } = await mountProvider(() => [h(Target, { id: 'target' }), h(Consumer)])
+    try {
+      expect(focusSearchInput()).toBe(true)
+      expect(document.activeElement?.id).toBe('target')
+    } finally {
+      wrapper.unmount()
+    }
+  })
+
+  it('returns false without a provider', async () => {
+    let focusSearchInput = notProvided
+    const Consumer = defineComponent({
+      setup() {
+        focusSearchInput = useSearchInputFocus()
+        return () => null
+      },
+    })
+    const wrapper = await mountSuspended(Consumer)
+    try {
+      expect(focusSearchInput()).toBe(false)
+    } finally {
+      wrapper.unmount()
+    }
+  })
+
+  it('registers the header search box and reports when its input is not rendered', async () => {
+    const { wrapper, focusSearchInput } = await mountProvider(() => [h(HeaderSearchBox)], '/search')
+    try {
+      expect(focusSearchInput()).toBe(true)
+      expect(document.activeElement?.id).toBe('header-search')
+
+      // The header search box hides its input on the homepage
+      await useRouter().push('/')
+      await nextTick()
+      expect(wrapper.find('#header-search').exists()).toBe(false)
+      expect(focusSearchInput()).toBe(false)
+    } finally {
+      wrapper.unmount()
+    }
+  })
+})

From dfbc19978626824eb5c6386f45edbb5f2de3eea2 Mon Sep 17 00:00:00 2001
From: Chirag6722 <chiraghonnyal6722@gmail.com>
Date: Mon, 14 Sep 2026 11:11:32 +0530
Subject: [PATCH 2/2] test: cover the homepage search shortcut end to end

---
 test/e2e/interactions.spec.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/test/e2e/interactions.spec.ts b/test/e2e/interactions.spec.ts
index 2ac88c05fc..80f01c5e04 100644
--- a/test/e2e/interactions.spec.ts
+++ b/test/e2e/interactions.spec.ts
@@ -254,6 +254,20 @@ test.describe('Search Pages', () => {
     await expect(page.locator('input[type="search"]')).toBeFocused()
   })
 
+  test('/ (homepage) → "/" focuses the homepage search input', async ({ page, goto }) => {
+    await goto('/', { waitUntil: 'hydration' })
+
+    const homeSearchInput = page.locator('#home-search')
+    await expect(homeSearchInput).toBeVisible()
+
+    // Move focus away from the autofocused input, then press the shortcut
+    await page.locator('body').click({ position: { x: 5, y: 5 } })
+    await expect(homeSearchInput).not.toBeFocused()
+
+    await page.keyboard.press('/')
+    await expect(homeSearchInput).toBeFocused()
+  })
+
   test('/ (homepage) → search, keeps focus on search input', async ({ page, goto }) => {
     await goto('/', { waitUntil: 'hydration' })