ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fire onDidSelect event when selecting event from code (#13691)

Browse Source 
* Fire onDidSelect event when selecting event from code

* Fix import tests

* fix typo
This commit is contained in:
Charles Gagnon
2020-12-14 09:04:16 -08:00
committed by GitHub
parent 9dcb7d4351
commit 63536eba9f
6 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/sql/base/browser/ui/selectBox/selectBox.ts
View File

@@ -16,6 +16,7 @@ import { renderFormattedText, renderText, FormattedTextRenderOptions } from 'vs/
import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode } from 'vs/base/common/keyCodes';
import { SelectBoxList } from 'vs/base/browser/ui/selectBox/selectBoxCustom';
import { Event, Emitter } from 'vs/base/common/event';
const $ = dom.$;
@@ -51,6 +52,7 @@ export class SelectBox extends vsSelectBox {
private disabledSelectBorder?: Color;
private contextViewProvider: IContextViewProvider;
private message?: IMessage;
private _onDidSelect: Emitter<ISelectData>;
private inputValidationInfoBorder?: Color;
private inputValidationInfoBackground?: Color;
@@ -68,6 +70,7 @@ export class SelectBox extends vsSelectBox {
let optionItems: SelectOptionItemSQL[] = SelectBox.createOptions(options);
super(optionItems, 0, contextViewProvider, undefined, selectBoxOptions);
this._onDidSelect = new Emitter<ISelectData>();
this._optionsDictionary = new Map<string, number>();
this.populateOptionsDictionary(optionItems);
this._dialogOptions = optionItems;
@@ -77,7 +80,8 @@ export class SelectBox extends vsSelectBox {
}
this._selectedOption = selectedOption;
this._register(this.onDidSelect(newSelect => {
this._register(super.onDidSelect(newSelect => {
this._onDidSelect.fire(newSelect);
this.onSelect(newSelect);
}));
@@ -121,6 +125,14 @@ export class SelectBox extends vsSelectBox {
}
}
public get onDidSelect(): Event<ISelectData> {
// We override the onDidSelect event here because the base onDidSelect event isn't fired when
// selecting an element via select - which means that we'll miss out on a selection made that way.
// So we expose our own event that's fired either when the base onDidSelect is called or when we
// manually select an item
return this._onDidSelect.event;
}
public onSelect(newInput: ISelectData) {
const selected = this._dialogOptions[newInput.index];
this._selectedOption = selected.value;
@@ -189,6 +201,10 @@ export class SelectBox extends vsSelectBox {
if (this._dialogOptions !== undefined) {
this._selectedOption = this._dialogOptions[index]?.value;
}
this._onDidSelect.fire({
selected: this._selectedOption,
index: index
});
}