diff --git a/src/sql/base/browser/ui/table/plugins/buttonColumn.plugin.ts b/src/sql/base/browser/ui/table/plugins/buttonColumn.plugin.ts index 3262eeb1e0..ca89a6cc40 100644 --- a/src/sql/base/browser/ui/table/plugins/buttonColumn.plugin.ts +++ b/src/sql/base/browser/ui/table/plugins/buttonColumn.plugin.ts @@ -29,7 +29,7 @@ export class ButtonColumn extends BaseClickableColumn public get definition(): Slick.Column { return { id: this.options.id || this.options.title || this.options.field, - width: this.options.showText === true ? this.options.width : 26, + width: this.options.width ?? 26, formatter: (row: number, cell: number, value: any, columnDef: Slick.Column, dataContext: T): string => { const iconValue = getIconCellValue(this.options, dataContext); const escapedTitle = escape(iconValue.title ?? ''); @@ -39,7 +39,7 @@ export class ButtonColumn extends BaseClickableColumn return ``; }, name: this.options.name, - resizable: this.options.showText === true, // Image only button has fixed width. + resizable: this.options.resizable, selectable: false }; } diff --git a/src/sql/workbench/browser/modal/optionsDialog.ts b/src/sql/workbench/browser/modal/optionsDialog.ts index dd03ce5cb4..cc7690e6a6 100644 --- a/src/sql/workbench/browser/modal/optionsDialog.ts +++ b/src/sql/workbench/browser/modal/optionsDialog.ts @@ -201,6 +201,7 @@ export class OptionsDialog extends Modal { let serviceOptions: azdata.ServiceOption[] = categoryMap[category]; let bodyContainer = $('table.optionsDialog-table'); + bodyContainer.setAttribute('role', 'presentation'); this.fillInOptions(bodyContainer, serviceOptions); append(this._optionGroupsContainer!, bodyContainer); } diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTable.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTable.ts index 9f1659a119..a5e175c22e 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTable.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTable.ts @@ -34,6 +34,8 @@ import { IEditorProgressService } from 'vs/platform/progress/common/progress'; import { IThemeService } from 'vs/platform/theme/common/themeService'; const ShowActionsText: string = nls.localize('dashboard.explorer.actions', "Show Actions"); +const LabelColoumnActions: string = nls.localize('dashboard.explorer.actionsColumn', "Actions"); +const ActionsColumnWidth: number = 50; const NameWithIconProperty: string = 'NameWithIcon'; export const ConnectionProfilePropertyName: string = 'connection_profile'; @@ -72,7 +74,10 @@ export class ExplorerTable extends Disposable { this._actionsColumn = new ButtonColumn({ id: 'actions', iconCssClass: 'toggle-more', - title: ShowActionsText + title: ShowActionsText, + name: LabelColoumnActions, + width: ActionsColumnWidth, + resizable: false }); this._table.registerPlugin(this._actionsColumn); this._register(this._actionsColumn.onClick((args) => {