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

update modal.ts (#16736)

Browse Source
This commit is contained in:
Alan Ren
2021-08-11 23:11:33 -07:00
committed by GitHub
parent 1e761bc159
commit 491297be82
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/workbench/browser/modal/modal.ts
View File

@@ -598,13 +598,17 @@ export abstract class Modal extends Disposable implements IThemable {
DOM.prepend(this._modalContent!, this._messageElement!); DOM.prepend(this._modalContent!, this._messageElement!);
} }
} else { } else {
DOM.removeNode(this._messageElement!); // only do the removal when the messageElement has parent element.
// Set the focus to first focus element if the focus is not within the dialog if (this._messageElement!.parentElement) {
if (!DOM.isAncestor(document.activeElement, this._bodyContainer!)) { // Reset the focus if keyboard focus is currently in the message area.
const resetFocus = DOM.isAncestor(document.activeElement, this._messageElement!);
this._messageElement!.remove();
if (resetFocus) {
this.setInitialFocusedElement(); this.setInitialFocusedElement();
} }
} }
} }
}
/** /**
* Set spinner element to show or hide * Set spinner element to show or hide