Skip to content

Prevent loss of cursor position for message editor #10455

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

Prevent loss of cursor position for message editor #10455

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
21 changes: 14 additions & 7 deletions packages/ui/src/lib/focus/focusManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,15 +945,22 @@ export class FocusManager {
focusElement(element: HTMLElement): void {
if (!element || !element.isConnected) return;

if (element.tabIndex !== -1) {
element.focus();
} else {
// It seems reading `document.activeElement` while handling
// a click often yields `<body>`, so we delay this one tick.
setTimeout(() => {
const activeElement = document.activeElement;
if (activeElement instanceof HTMLElement && !element.contains(activeElement)) {
activeElement.blur();
const hasFocusedChild = element.contains(activeElement);
// Don't refocus if active element is a child of the focusable,
// it helps us maintain focus on input elements.
if (!hasFocusedChild) {
if (element.tabIndex !== -1) {
element.focus();
} else if (activeElement instanceof HTMLElement) {
activeElement.blur();
}
}
}
scrollIntoViewIfNeeded(element);
scrollIntoViewIfNeeded(element);
}, 0);
}

// ============================================
Expand Down
Loading