diff --git a/extensions/mssql/config.json b/extensions/mssql/config.json index 97c72f710b..d1774aabd5 100644 --- a/extensions/mssql/config.json +++ b/extensions/mssql/config.json @@ -1,6 +1,6 @@ { "downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}", - "version": "3.0.0-release.227", + "version": "3.0.0-release.229", "downloadFileNames": { "Windows_86": "win-x86-net6.0.zip", "Windows_64": "win-x64-net6.0.zip", diff --git a/src/sql/base/browser/ui/editableDropdown/browser/dropdown.ts b/src/sql/base/browser/ui/editableDropdown/browser/dropdown.ts index 61f1904e49..d0d298288a 100644 --- a/src/sql/base/browser/ui/editableDropdown/browser/dropdown.ts +++ b/src/sql/base/browser/ui/editableDropdown/browser/dropdown.ts @@ -101,9 +101,11 @@ export class Dropdown extends Disposable implements IListVirtualDelegate this._el = DOM.append(container, DOM.$('.monaco-dropdown')); this._el.style.width = '100%'; + this._el.style.height = '100%'; this._inputContainer = DOM.append(this._el, DOM.$('.dropdown-input.select-container')); this._inputContainer.style.width = '100%'; + this._inputContainer.style.height = '100%'; this._selectListContainer = DOM.$('div'); this._input = new InputBox(this._inputContainer, contextViewService, { @@ -166,7 +168,6 @@ export class Dropdown extends Disposable implements IListVirtualDelegate this._input.validate(); this._onBlur.fire(); this._hideList(); - e.stopPropagation(); break; case KeyCode.DownArrow: if (!this._isDropDownVisible) { diff --git a/src/sql/base/browser/ui/editableDropdown/browser/media/dropdownList.css b/src/sql/base/browser/ui/editableDropdown/browser/media/dropdownList.css index ae2b359586..68606db9ff 100644 --- a/src/sql/base/browser/ui/editableDropdown/browser/media/dropdownList.css +++ b/src/sql/base/browser/ui/editableDropdown/browser/media/dropdownList.css @@ -17,3 +17,8 @@ width: 100%; overflow: hidden; } + +.monaco-dropdown .monaco-inputbox { + width: 100%; + height: 100%; +} diff --git a/src/sql/base/browser/ui/table/tableCellEditorFactory.ts b/src/sql/base/browser/ui/table/tableCellEditorFactory.ts index f9fbf68bc5..26533df753 100644 --- a/src/sql/base/browser/ui/table/tableCellEditorFactory.ts +++ b/src/sql/base/browser/ui/table/tableCellEditorFactory.ts @@ -152,6 +152,9 @@ export class TableCellEditorFactory { this._component.onValueChange(async () => { await this.commitEdit(); }); + this._component.onBlur(async () => { + await this.commitEdit(); + }); } else { this._component = new SelectBox([], undefined, self._contextViewProvider); this._component.render(container); diff --git a/src/sql/workbench/services/tableDesigner/browser/tableDesignerMetadata.ts b/src/sql/workbench/services/tableDesigner/browser/tableDesignerMetadata.ts index b251710480..09bf2b51c7 100644 --- a/src/sql/workbench/services/tableDesigner/browser/tableDesignerMetadata.ts +++ b/src/sql/workbench/services/tableDesigner/browser/tableDesignerMetadata.ts @@ -20,8 +20,8 @@ export class TableDesignerMetadata { * @returns filtered telemetry info with only allowed metadata points */ public static getTelemetryInfo(providerId: string, metadata: { [key: string]: string }): { [key: string]: string } { - if (!TableDesignerMetadata.providerMetadataMap.has(providerId)) { - return undefined; + if (!TableDesignerMetadata.providerMetadataMap.has(providerId) || !metadata) { + return {}; } const allowedSet = TableDesignerMetadata.providerMetadataMap.get(providerId); for (const key of Object.keys(metadata)) { @@ -31,5 +31,4 @@ export class TableDesignerMetadata { } return metadata; } - }