Skip to content

Correct what the activeElement branches actually cover #609

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
aaronbrethorst merged 1 commit into from
Sep 21, 2026
Merged

Correct what the activeElement branches actually cover #609

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
11 changes: 9 additions & 2 deletions src/components/favorites/FavoritesFloatingControl.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,15 @@
// The browser focuses a clicked element on mousedown, before this click
// reaches the window listener, so restoring focus here would yank the
// caret back out of whatever the user just clicked onto. Restore only
// when the click did not take focus itself: a click on the map leaves
// activeElement at <body>, and focus still inside the closing panel
// when the click did not take focus itself.
//
// The <body> branch is for genuinely non-focusable chrome. It does not
// cover the map: Leaflet's keyboard handler sets tabIndex on the map
// container and focuses it on mousedown, and initMap does not pass
// keyboard: false, so an OSM map click lands focus on the container.
// That skips the restore, which is what we want there anyway.
//
// The rootEl branch is separate: focus still inside the closing panel
// would be stranded when it unmounts.
const active = document.activeElement;
close({ restoreFocus: !active || active === document.body || rootEl.contains(active) });
Expand Down
Loading