Merge pull request microsoft#104416 from microsoft/isidorn/fix-dropdown

isidorn · web-flow · commit 8fe4193ab09b · 2020-08-11T10:33:16.000+02:00
Revert "custom select box: react on KEY_UP to be aligned with actionBar
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -215,8 +215,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 
 		// Intercept keyboard handling
 
-		// React on KEY_UP since the actionBar also reacts on KEY_UP so that appropriate events get canceled
-		this._register(dom.addDisposableListener(this.selectElement, dom.EventType.KEY_UP, (e: KeyboardEvent) => {
+		this._register(dom.addDisposableListener(this.selectElement, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
 			const event = new StandardKeyboardEvent(e);
 			let showDropDown = false;
 
@@ -233,7 +232,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 
 			if (showDropDown) {
 				this.showSelectDropDown();
-				dom.EventHelper.stop(e, true);
+				dom.EventHelper.stop(e);
 			}
 		}));
 	}

Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi`
`215`	`215`
`216`	`216`	`// Intercept keyboard handling`
`217`	`217`
`218`		`- // React on KEY_UP since the actionBar also reacts on KEY_UP so that appropriate events get canceled`
`219`		`- this._register(dom.addDisposableListener(this.selectElement, dom.EventType.KEY_UP, (e: KeyboardEvent) => {`
	`218`	`+ this._register(dom.addDisposableListener(this.selectElement, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {`
`220`	`219`	`const event = new StandardKeyboardEvent(e);`
`221`	`220`	`let showDropDown = false;`
`222`	`221`
`@@ -233,7 +232,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi`
`233`	`232`
`234`	`233`	`if (showDropDown) {`
`235`	`234`	`this.showSelectDropDown();`
`236`		`- dom.EventHelper.stop(e, true);`
	`235`	`+ dom.EventHelper.stop(e);`
`237`	`236`	`}`
`238`	`237`	`}));`
`239`	`238`	`}`