From cc3554e987c489ca67bdaad96c83bb98e6f0d0bb Mon Sep 17 00:00:00 2001 From: Chris LaFreniere <40371649+chlafreniere@users.noreply.github.com> Date: Thu, 4 Jun 2020 10:20:47 -0700 Subject: [PATCH] Only show edit cell action for markdown cells (#10719) --- .../browser/cellViews/cellToolbar.component.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/sql/workbench/contrib/notebook/browser/cellViews/cellToolbar.component.ts b/src/sql/workbench/contrib/notebook/browser/cellViews/cellToolbar.component.ts index cf6a87fef1..a82a354f8e 100644 --- a/src/sql/workbench/contrib/notebook/browser/cellViews/cellToolbar.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/cellViews/cellToolbar.component.ts @@ -7,7 +7,7 @@ import 'vs/css!./cellToolbar'; import * as DOM from 'vs/base/browser/dom'; import { Component, Inject, ViewChild, ElementRef, Input } from '@angular/core'; import { localize } from 'vs/nls'; -import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; +import { Taskbar, ITaskbarContent } from 'sql/base/browser/ui/taskbar/taskbar'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { DeleteCellAction, EditCellAction, CellToggleMoreActions } from 'sql/workbench/contrib/notebook/browser/cellToolbarActions'; @@ -87,11 +87,14 @@ export class CellToolbarComponent { dropdownMenuActionViewItem.render(buttonDropdownContainer); dropdownMenuActionViewItem.setActionContext(context); - this._actionBar.setContent([ - { action: this._editCellAction }, - { element: buttonDropdownContainer }, + let taskbarContent: ITaskbarContent[] = []; + if (this.cellModel?.cellType === CellTypes.Markdown) { + taskbarContent.push({ action: this._editCellAction }); + } + taskbarContent.push({ element: buttonDropdownContainer }, { action: deleteButton }, - { element: moreActionsContainer } - ]); + { element: moreActionsContainer }); + + this._actionBar.setContent(taskbarContent); } }