Hand focus to a rail entry when a panel folds it away

- When F or a panel's collapse button folds a panel that holds the focus,
  the focus moves to that panel's visible rail entry. The same happens when
  opening Data Layers folds a peer panel that held it, and in Cockpit the
  focus moves to Contact's expand button when that card folds.
- The `shownBy: 'active'` rail gate is gone: nothing removes `.active` from
  Data Layers any more, so a rail entry now follows `panel.hidden`.
- CURRENT-STATE says what F does, and the panel catalog comment no longer
  says F toggles `.active`.
This commit is contained in:
German Khokhlov committed 2026-11-19 15:00:17 +04:00
1 parent 3a24768a2d
commit c7df3c6798
9 files changed
+179 -40

No files matched your search

+41 -16
View File
@@ -204,22 +204,7 @@ export class PanelChrome {
beforeCollapse: () => {
if (panelId === 'location-bar') this._closeLocationSearch?.();
},
// A desktop side panel hides entirely once collapsed; its rail item
// takes the focus its own disclosure can no longer hold.
returnFocusTo: () => {
const panel = document.getElementById(panelId);
if (!panel?.getClientRects || panel.getClientRects().length > 0)
return null;
const item = document.querySelector?.(
`.ui-rail [data-rail-item="${panelId}"]`,
);
return item &&
!item.disabled &&
item.getClientRects().length > 0 &&
getComputedStyle(item).visibility === 'visible'
? item
: null;
},
returnFocusTo: () => this._railFocusStand(panelId),
});
}
@@ -228,9 +213,49 @@ export class PanelChrome {
if (this._disposed || !this._disclosurePanelIds?.has(panelId)) return;
const panel = document.getElementById(panelId);
if (!panel) return;
// Opening a panel folds others too (the side accordion, Cockpit's
// Contact card): note which open ones hold the focus.
const focused = document.activeElement;
const holders = [...this._disclosurePanelIds]
.map((id) => document.getElementById(id))
.filter((el) => el?.contains(focused) && !this._shownPanel(el).collapsed);
const cockpit = this.cockpitView;
const contactHeld =
cockpit?.active &&
!cockpit.contextCollapsed &&
document.getElementById('cockpit-context')?.contains(focused);
this.setPanelCollapsed(panelId, !this._shownPanel(panel).collapsed, {
explicit: true,
});
const stand =
contactHeld && cockpit.contextCollapsed
? document.getElementById('cockpit-context-toggle')
: holders
.filter((el) => this._shownPanel(el).collapsed)
.map((el) => this._railFocusStand(el.id))
.find(Boolean);
stand?.focus({ preventScroll: true });
}
/**
* A desktop side panel hides entirely once collapsed; its rail item takes
* the focus its own disclosure can no longer hold. Null while the panel or
* the item is not shown.
* @param {string} panelId Panel element id.
*/
_railFocusStand(panelId) {
const panel = document.getElementById(panelId);
if (!panel?.getClientRects || panel.getClientRects().length > 0)
return null;
const item = document.querySelector?.(
`.ui-rail [data-rail-item="${panelId}"]`,
);
return item &&
!item.disabled &&
item.getClientRects().length > 0 &&
getComputedStyle(item).visibility === 'visible'
? item
: null;
}
_setCommandDockPanelPinState(