ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix focus trap issue (#13960)

Browse Source
This commit is contained in:
Alan Ren
2021-01-14 10:35:36 -08:00
committed by GitHub
parent dd9d247950
commit c39c20cd4b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/base/browser/ui/panel/panel.ts
View File

@@ -87,7 +87,6 @@ export class TabbedPanel extends Disposable {
this._styleElement = DOM.createStyleSheet(this.parent); this._styleElement = DOM.createStyleSheet(this.parent);
container.appendChild(this.parent); container.appendChild(this.parent);
this.header = DOM.$('.composite.title'); this.header = DOM.$('.composite.title');
this.header.setAttribute('tabindex', '0');
this.tabList = DOM.$('.tabList'); this.tabList = DOM.$('.tabList');
this.tabList.setAttribute('role', 'tablist'); this.tabList.setAttribute('role', 'tablist');
this.tabList.style.height = this.headersize + 'px'; this.tabList.style.height = this.headersize + 'px';
@@ -104,7 +103,6 @@ export class TabbedPanel extends Disposable {
this.body = DOM.$('.tabBody'); this.body = DOM.$('.tabBody');
this.body.setAttribute('role', 'tabpanel'); this.body.setAttribute('role', 'tabpanel');
this.parent.appendChild(this.body); this.parent.appendChild(this.body);
this._register(DOM.addDisposableListener(this.header, DOM.EventType.FOCUS, e => this.focusCurrentTab()));
} }
public get element(): HTMLElement { public get element(): HTMLElement {
@@ -173,7 +171,7 @@ export class TabbedPanel extends Disposable {
tab.disposables.add(DOM.addDisposableListener(tabHeaderElement, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => { tab.disposables.add(DOM.addDisposableListener(tabHeaderElement, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
let event = new StandardKeyboardEvent(e); let event = new StandardKeyboardEvent(e);
if (event.equals(KeyCode.Enter)) { if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
this.showTab(tab.tab.identifier); this.showTab(tab.tab.identifier);
invokeTabSelectedHandler(); invokeTabSelectedHandler();
e.stopImmediatePropagation(); e.stopImmediatePropagation();
@@ -220,6 +218,7 @@ export class TabbedPanel extends Disposable {
shownTab.label.classList.remove('active'); shownTab.label.classList.remove('active');
shownTab.header.classList.remove('active'); shownTab.header.classList.remove('active');
shownTab.header.setAttribute('aria-selected', 'false'); shownTab.header.setAttribute('aria-selected', 'false');
shownTab.header.tabIndex = -1;
if (shownTab.body) { if (shownTab.body) {
shownTab.body.remove(); shownTab.body.remove();
if (shownTab.tab.view.onHide) { if (shownTab.tab.view.onHide) {
@@ -232,7 +231,7 @@ export class TabbedPanel extends Disposable {
this._shownTabId = id; this._shownTabId = id;
this.tabHistory.push(id); this.tabHistory.push(id);
const tab = this._tabMap.get(this._shownTabId)!; // @anthonydresser we know this can't be undefined since we check further up if the map contains the id const tab = this._tabMap.get(this._shownTabId)!; // @anthonydresser we know this can't be undefined since we check further up if the map contains the id
tab.header.tabIndex = 0;
if (tab.destroyTabBody && tab.body) { if (tab.destroyTabBody && tab.body) {
tab.body.remove(); tab.body.remove();
tab.body = undefined; tab.body = undefined;