Skip to content

Reset focus after route navigation in Site Editor #37314

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

Closed
kevin940726 wants to merge 7 commits into from
Closed

Reset focus after route navigation in Site Editor #37314

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a88742
Refactor to use a common layout
kevin940726 Dec 10, 2021
d1f901d
Reset focus to navigation toggle button on route change
kevin940726 Dec 10, 2021
069a66e
Add missing shortcuts
kevin940726 Dec 10, 2021
e4029fd
Fix initial page redirection
kevin940726 Dec 13, 2021
3067f9a
Don't refocus if the activeElement is still on the page
kevin940726 Dec 14, 2021
46d1036
Remove temp hack
kevin940726 Feb 22, 2022
2157324
Fix GlobalStylesProvider's position
kevin940726 Feb 25, 2022
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
Prev Previous commit
Next Next commit
Don't refocus if the activeElement is still on the page
  • Loading branch information
@kevin940726
kevin940726 committed Mar 1, 2022
commit 3067f9abf1f0c8fc6f737a13616c32c495c0ac62
7 changes: 6 additions & 1 deletion packages/edit-site/src/components/routes/use-reset-focus-on-route-change.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ export default function useResetFocusOnRouteChange( targetRef ) {
}
}

targetRef.current?.focus();
const activeElement = targetRef.current?.ownerDocument.activeElement;

// Don't refocus if the activeElement is still on the page (like NavLink).
if ( ! activeElement || activeElement === document.body ) {
targetRef.current?.focus();
}
}, [ location, targetRef, history ] );
}