Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-22 23:05:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

ActionBar should not intercept escape unless needed

Browse Source 
Fix #107665
This commit is contained in:
Rob Lourens
2020-09-30 15:07:10 -07:00
parent e94761aaa0
commit 675deb4ebb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/base/browser/ui/actionbar/actionbar.ts
+3 -2
View File
@@ -64,8 +64,9 @@ export class ActionBar extends Disposable implements IActionRunner {
private _onDidBlur = this._register(new Emitter<void>());
readonly onDidBlur = this._onDidBlur.event;
private _onDidCancel = this._register(new Emitter<void>());
private _onDidCancel = this._register(new Emitter<void>({ onFirstListenerAdd: () => this.cancelHasListener = true }));
readonly onDidCancel = this._onDidCancel.event;
private cancelHasListener = false;
private _onDidRun = this._register(new Emitter<IRunEvent>());
readonly onDidRun = this._onDidRun.event;
@@ -138,7 +139,7 @@ export class ActionBar extends Disposable implements IActionRunner {
eventHandled = this.focusPrevious();
} else if (nextKeys && (event.equals(nextKeys[0]) || event.equals(nextKeys[1]))) {
eventHandled = this.focusNext();
} else if (event.equals(KeyCode.Escape)) {
} else if (event.equals(KeyCode.Escape) && this.cancelHasListener) {
this._onDidCancel.fire();
} else if (this.isTriggerKeyEvent(event)) {
// Staying out of the else branch even if not triggered