Skip to content

fix(search): focus cmdk input on first modal open #1021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
whizzkid1452 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix(search): focus cmdk input on first modal open #1021

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6645681
fix(search): focus cmdk input on first modal open
Jul 1, 2026
bfab1a9
fix(search): cancel scheduled search focus
Jul 1, 2026
c27c993
fix(search): merge latest main and restore search focus
whizzkid1452 Oct 15, 2026
fa9b6aa
Merge branch 'main' into bug/search-modal-first-focus
whizzkid1452 Oct 20, 2026
0c33e22
fix(search): preserve focus after AI handoff
Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions src/components/SearchModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,21 @@ function CommandSearchInput({
isFullHeight: boolean
onToggleFullHeight: () => void
}) {
const { closeSearch } = useSearchContext()
const { isOpen, closeSearch } = useSearchContext()
const { refine } = useSearchBox()
const { searchQuery, setSearchQuery } = useSearchFilters()
const hasQuery = searchQuery.trim().length > 0
const inputRef = React.useRef<HTMLInputElement>(null)

React.useEffect(() => {
if (!isOpen) return

const frame = requestAnimationFrame(() => {
inputRef.current?.focus({ preventScroll: true })
})

return () => cancelAnimationFrame(frame)
}, [])
}, [isOpen])

const clearSearch = React.useCallback(() => {
setSearchQuery('')
Expand Down Expand Up @@ -295,7 +297,7 @@ const searchModalTransitionMs = 140

export function SearchModal() {
const { isOpen, closeSearch } = useSearchContext()
const contentRef = React.useRef<HTMLDivElement>(null)
const returnFocusRef = React.useRef<HTMLElement | null>(null)
const bodyPointerEventsRef = React.useRef('')
const [shouldRenderSearch, setShouldRenderSearch] = React.useState(isOpen)
const [isFullHeight, setIsFullHeight] = React.useState(() => {
Expand Down Expand Up @@ -327,20 +329,6 @@ export function SearchModal() {
return () => window.clearTimeout(timeout)
}, [isOpen])

React.useEffect(() => {
if (!isOpen) {
return
}

const frame = requestAnimationFrame(() => {
contentRef.current
?.querySelector<HTMLInputElement>('input[type="search"]')
?.focus({ preventScroll: true })
})

return () => cancelAnimationFrame(frame)
}, [isOpen])

React.useEffect(() => {
if (typeof document === 'undefined') {
return
Expand Down Expand Up @@ -398,11 +386,27 @@ export function SearchModal() {
/>
<DialogPrimitive.Content
forceMount
ref={contentRef}
className={twMerge(
'search-modal-content fixed z-[calc(var(--z-overlay)+2)] inset-0 sm:inset-auto sm:top-4 sm:left-1/2 sm:-translate-x-1/2 sm:w-[96%] xl:w-full sm:max-w-4xl text-left outline-none',
isFullHeight && 'sm:bottom-4',
)}
onOpenAutoFocus={(event) => {
// The input owns focus; the dialog has no Radix Trigger to restore.
returnFocusRef.current =
document.activeElement instanceof HTMLElement
? document.activeElement
: null
event.preventDefault()
}}
onCloseAutoFocus={(event) => {
event.preventDefault()
if (
document.activeElement === document.body &&
returnFocusRef.current?.isConnected
) {
returnFocusRef.current.focus({ preventScroll: true })
}
}}
onInteractOutside={(event) => {
if (isSearchModalPortalTarget(event.target)) {
event.preventDefault()
Expand Down