properly focus dropdowns in toolbars

Benjamin Pasero · Benjamin Pasero · commit b8540dede5dc · 2016-01-18T10:59:06.000+01:00
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -137,13 +137,12 @@ export class BaseActionItem extends EventEmitter implements IActionItem {
 	public focus(): void {
 		if (this.builder) {
 			this.builder.domFocus();
-			this.builder.addClass('focused');
 		}
 	}
 
 	public blur(): void {
 		if (this.builder) {
-			this.builder.removeClass('focused');
+			this.builder.domBlur();
 		}
 	}
 
@@ -475,7 +474,7 @@ export class ActionBar extends EventEmitter implements IActionRunner {
 			}
 
 			// Recompute focused item
-			else if (event.equals(CommonKeybindings.TAB)) {
+			else if (event.equals(CommonKeybindings.TAB) || event.equals(CommonKeybindings.SHIFT_TAB)) {
 				this.updateFocusedItem();
 			}
 		});
@@ -743,6 +742,18 @@ export class SelectActionItem extends BaseActionItem {
 		}));
 	}
 
+	public focus(): void {
+		if (this.select) {
+			this.select.focus();
+		}
+	}
+
+	public blur(): void {
+		if (this.select) {
+			this.select.blur();
+		}
+	}
+
 	public render(container: HTMLElement): void {
 		DOM.addClass(container, 'select-container');
 		container.appendChild(this.select);
diff --git a/src/vs/workbench/parts/debug/browser/debugActionItems.ts b/src/vs/workbench/parts/debug/browser/debugActionItems.ts
@@ -49,6 +49,18 @@ export class SelectConfigActionItem extends BaseActionItem {
 		this.setOptions().done(null, errors.onUnexpectedError);
 	}
 
+	public focus(): void {
+		if (this.select) {
+			this.select.focus();
+		}
+	}
+
+	public blur(): void {
+		if (this.select) {
+			this.select.blur();
+		}
+	}
+
 	private setOptions(): Promise {
 		let previousSelectedIndex = this.select.selectedIndex;
 		this.select.options.length = 0;

Original file line number	Diff line number	Diff line change
`@@ -137,13 +137,12 @@ export class BaseActionItem extends EventEmitter implements IActionItem {`
`137`	`137`	`public focus(): void {`
`138`	`138`	`if (this.builder) {`
`139`	`139`	`this.builder.domFocus();`
`140`		`- this.builder.addClass('focused');`
`141`	`140`	`}`
`142`	`141`	`}`
`143`	`142`
`144`	`143`	`public blur(): void {`
`145`	`144`	`if (this.builder) {`
`146`		`- this.builder.removeClass('focused');`
	`145`	`+ this.builder.domBlur();`
`147`	`146`	`}`
`148`	`147`	`}`
`149`	`148`
`@@ -475,7 +474,7 @@ export class ActionBar extends EventEmitter implements IActionRunner {`
`475`	`474`	`}`
`476`	`475`
`477`	`476`	`// Recompute focused item`
`478`		`- else if (event.equals(CommonKeybindings.TAB)) {`
	`477`	`+ else if (event.equals(CommonKeybindings.TAB) \|\| event.equals(CommonKeybindings.SHIFT_TAB)) {`
`479`	`478`	`this.updateFocusedItem();`
`480`	`479`	`}`
`481`	`480`	`});`
`@@ -743,6 +742,18 @@ export class SelectActionItem extends BaseActionItem {`
`743`	`742`	`}));`
`744`	`743`	`}`
`745`	`744`
	`745`	`+ public focus(): void {`
	`746`	`+ if (this.select) {`
	`747`	`+ this.select.focus();`
	`748`	`+ }`
	`749`	`+ }`
	`750`	`+`
	`751`	`+ public blur(): void {`
	`752`	`+ if (this.select) {`
	`753`	`+ this.select.blur();`
	`754`	`+ }`
	`755`	`+ }`
	`756`	`+`
`746`	`757`	`public render(container: HTMLElement): void {`
`747`	`758`	`DOM.addClass(container, 'select-container');`
`748`	`759`	`container.appendChild(this.select);`