Skip to content

fix: resolving first focus on elements is incorrect #735

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
luozz1994 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: resolving first focus on elements is incorrect #735

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e133f1
fix: resolving first focus on elements is incorrect
Feb 13, 2026
e3b7285
test: add tests for lockFocus
Feb 14, 2026
323a65c
fix: change lastElement's judge when exec syncFocus
Feb 24, 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
5 changes: 5 additions & 0 deletions src/Dom/focus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,11 @@ export function lockFocus(element: HTMLElement, id: string): VoidFunction {
// Just add event since it will de-duplicate
window.addEventListener('focusin', syncFocus);
window.addEventListener('keydown', onWindowKeyDown, true);
// If the element is not focused, focus it
// https://github.com/ant-design/ant-design/issues/56963
if (!hasFocus(element)) {
element.focus({ preventScroll: true });
}
Comment thread
luozz1994 marked this conversation as resolved.
Outdated
syncFocus();
}

Expand Down