Skip to content

fix(search): restore cmd+k autofocus on the search input #6347

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

Merged
waleedlatif1 merged 1 commit into from
Aug 6, 2026
Merged

fix(search): restore cmd+k autofocus on the search input #6347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions ...app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ export function SearchModal({
const atomicBrowserOcclusion = supportsAtomicBrowserPanelOcclusion()
const nativeSurfaceReady = useNativeSurfaceOcclusionReady(open, 'modal')
const visuallyOpen = open && nativeSurfaceReady
const focusReady = atomicBrowserOcclusion ? visuallyOpen : open
const [retainNativeSurfaceOcclusion, setRetainNativeSurfaceOcclusion] = useState(open)
const nativeSurfaceOcclusionActive =
open || (atomicBrowserOcclusion && retainNativeSurfaceOcclusion)
Expand Down Expand Up @@ -326,8 +325,12 @@ export function SearchModal({
if (open) setSearch('')
}

/**
* Focus only once the dialog is actually visible: `.focus()` is a no-op while
* the surface still carries `invisible`, and nothing re-focuses afterwards.
*/
useEffect(() => {
if (!focusReady || !inputRef.current) return
if (!visuallyOpen || !inputRef.current) return
const nativeInputValueSetter = Object.getOwnPropertyDescriptor(
window.HTMLInputElement.prototype,
'value'
Expand All @@ -337,7 +340,7 @@ export function SearchModal({
inputRef.current.dispatchEvent(new Event('input', { bubbles: true }))
}
inputRef.current.focus()
}, [focusReady])
}, [visuallyOpen])

const deferredSearch = useDeferredValue(search)
const deferredSearchRef = useRef(deferredSearch)
Expand Down
Loading