Skip to content

fix: prevent input focus stealing #412

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
Lexachoc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent input focus stealing #412

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
5 changes: 3 additions & 2 deletions cmdk/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ const Command = React.forwardRef<HTMLDivElement, CommandProps>((props, forwarded
const labelId = useId()
const inputId = useId()

const rootRef = React.useRef<HTMLDivElement>(null)
const listInnerRef = React.useRef<HTMLDivElement>(null)

const schedule = useScheduleLayoutEffect()
Expand Down Expand Up @@ -242,7 +243,7 @@ const Command = React.forwardRef<HTMLDivElement, CommandProps>((props, forwarded
schedule(1, selectFirstItem)
} else if (key === 'value') {
// Force focus input or root so accessibility works
if (document.activeElement.hasAttribute('cmdk-input') || document.activeElement.hasAttribute('cmdk-root')) {
if (document.activeElement === rootRef.current) {
const input = document.getElementById(inputId)
if (input) input.focus()
else document.getElementById(listId)?.focus()
Expand Down Expand Up @@ -572,7 +573,7 @@ const Command = React.forwardRef<HTMLDivElement, CommandProps>((props, forwarded

return (
<Primitive.div
ref={forwardedRef}
ref={composeRefs(rootRef, forwardedRef)}
tabIndex={-1}
{...etc}
cmdk-root=""
Expand Down