Skip to content
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

reset scroll before resetting focus #9311

Merged
merged 1 commit into from
Mar 6, 2023
Merged

reset scroll before resetting focus #9311

Show file tree
Hide file tree
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: 5 additions & 0 deletions .changeset/silver-teachers-lick.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: scroll before resetting focus, to avoid flash of unscrolled content
23 changes: 12 additions & 11 deletions packages/kit/src/runtime/client/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,17 +379,7 @@ export function create_client(app, target) {
// need to render the DOM before we can scroll to the rendered elements and do focus management
await tick();

const changed_focus =
// reset focus only if any manual focus management didn't override it
document.activeElement !== activeElement &&
// also refocus when activeElement is body already because the
// focus event might not have been fired on it yet
document.activeElement !== document.body;

if (!keepfocus && !changed_focus) {
await reset_focus();
}

// we reset scroll before dealing with focus, to avoid a flash of unscrolled content
if (autoscroll) {
const deep_linked =
url.hash && document.getElementById(decodeURIComponent(url.hash.slice(1)));
Expand All @@ -404,6 +394,17 @@ export function create_client(app, target) {
scrollTo(0, 0);
}
}

const changed_focus =
// reset focus only if any manual focus management didn't override it
document.activeElement !== activeElement &&
// also refocus when activeElement is body already because the
// focus event might not have been fired on it yet
document.activeElement !== document.body;

if (!keepfocus && !changed_focus) {
await reset_focus();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this probably was introduced through this await which wasn't there before, but was needed to introduce to fix a focus bug

}
} else {
await tick();
}
Expand Down