Skip to content

UI: Use correct selector for addon panel focus check #34164

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
Sidnioulz merged 2 commits into from
Mar 17, 2026
Merged

UI: Use correct selector for addon panel focus check #34164

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c22afbb
UI: Use correct selector for addon panel focus check
Sidnioulz Mar 16, 2026
8e90c6e
Merge branch 'next' into sidnioulz/10-3-fix-focus-in-addon-panel-root
Sidnioulz Mar 17, 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
13 changes: 7 additions & 6 deletions code/core/src/manager-api/modules/shortcuts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ import { focusableUIElements } from './layout';

const { navigator, document } = global;

function wasFocusInElement(element: HTMLElement | null) {
return document.activeElement && element?.contains(document.activeElement);
}

export const isMacLike = () =>
navigator && navigator.platform ? !!navigator.platform.match(/(Mac|iPhone|iPod|iPad)/i) : false;
export const controlOrMetaKey = () => (isMacLike() ? 'meta' : 'control');
Expand Down Expand Up @@ -359,13 +363,11 @@ export const init: ModuleFn = ({ store, fullAPI, provider }) => {

case 'togglePanel': {
const wasPanelShown = fullAPI.getIsPanelShown();
const panelElement = document.getElementById(focusableUIElements.storyPanelRoot);
const wasFocusInPanel =
panelElement && document.activeElement && panelElement.contains(document.activeElement);
const panelElement = document.getElementById(focusableUIElements.addonPanel);

fullAPI.togglePanel();

if (wasPanelShown && wasFocusInPanel) {
if (wasPanelShown && wasFocusInElement(panelElement)) {
// poll: true always returns a Promise.
(
fullAPI.focusOnUIElement(focusableUIElements.showAddonPanel, {
Expand All @@ -384,11 +386,10 @@ export const init: ModuleFn = ({ store, fullAPI, provider }) => {
case 'toggleNav': {
const wasNavShown = fullAPI.getIsNavShown();
const sidebarElement = document.getElementById(focusableUIElements.sidebarRegion);
const wasFocusInSidebar = sidebarElement?.contains(document?.activeElement);

fullAPI.toggleNav();

if (wasNavShown && wasFocusInSidebar) {
if (wasNavShown && wasFocusInElement(sidebarElement)) {
// poll: true always returns a Promise.
(
fullAPI.focusOnUIElement(focusableUIElements.showSidebar, {
Expand Down
Loading