ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added code to enable disable split cell icon (#17331)

Browse Source 
* Added code to enable diable split cell icon

* adding back the deleted code

* refactored

* minimized lines

* simplified code

* minor change

* minor change

* Addressed PR

* Addressed PR

* removing unused enum value
This commit is contained in:
rajeshka
2021-10-11 09:47:25 -07:00
committed by GitHub
parent af58a52004
commit f5331e3d69
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/workbench/contrib/notebook/browser/cellToolbarActions.ts
View File

@@ -17,7 +17,7 @@ import Severity from 'vs/base/common/severity';
import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { MoveDirection } from 'sql/workbench/services/notebook/browser/models/modelInterfaces'; import { CellEditModes, MoveDirection } from 'sql/workbench/services/notebook/browser/models/modelInterfaces';
const moreActionsLabel = localize('moreActionsLabel', "More"); const moreActionsLabel = localize('moreActionsLabel', "More");
export class EditCellAction extends ToggleableAction { export class EditCellAction extends ToggleableAction {
@@ -78,6 +78,11 @@ export class SplitCellAction extends CellActionBase {
context.model?.splitCell(context.cell.cellType, this.notebookService, index); context.model?.splitCell(context.cell.cellType, this.notebookService, index);
return Promise.resolve(); return Promise.resolve();
} }
public setListener(context: CellContext) {
this._register(context.cell.onCurrentEditModeChanged(currentMode => {
this.enabled = currentMode === CellEditModes.WYSIWYG ? false : true;
}));
}
} }
export class MoveCellAction extends CellActionBase { export class MoveCellAction extends CellActionBase {

2
src/sql/workbench/contrib/notebook/browser/cellViews/cellToolbar.component.ts
View File

@@ -60,6 +60,8 @@ export class CellToolbarComponent {
this._actionBar.context = context; this._actionBar.context = context;
let splitCellButton = this.instantiationService.createInstance(SplitCellAction, 'notebook.SplitCellAtCursor', this.buttonSplitCell, 'masked-icon icon-split-cell'); let splitCellButton = this.instantiationService.createInstance(SplitCellAction, 'notebook.SplitCellAtCursor', this.buttonSplitCell, 'masked-icon icon-split-cell');
splitCellButton.setListener(context);
splitCellButton.enabled = this.cellModel.cellType !== 'markdown';
let addCellsButton = this.instantiationService.createInstance(AddCellAction, 'notebook.AddCodeCell', localize('codeCellsPreview', "Add cell"), 'masked-pseudo code'); let addCellsButton = this.instantiationService.createInstance(AddCellAction, 'notebook.AddCodeCell', localize('codeCellsPreview', "Add cell"), 'masked-pseudo code');

7
src/sql/workbench/services/notebook/browser/models/cell.ts
View File

@@ -58,6 +58,7 @@ export class CellModel extends Disposable implements ICellModel {
private _onTableUpdated = new Emitter<ITableUpdatedEvent>(); private _onTableUpdated = new Emitter<ITableUpdatedEvent>();
private _onCellModeChanged = new Emitter<boolean>(); private _onCellModeChanged = new Emitter<boolean>();
private _onExecutionStateChanged = new Emitter<CellExecutionState>(); private _onExecutionStateChanged = new Emitter<CellExecutionState>();
private _onCurrentEditModeChanged = new Emitter<CellEditModes>();
private _isTrusted: boolean; private _isTrusted: boolean;
private _active: boolean; private _active: boolean;
private _hover: boolean; private _hover: boolean;
@@ -382,6 +383,10 @@ export class CellModel extends Disposable implements ICellModel {
return this._onExecutionStateChanged.event; return this._onExecutionStateChanged.event;
} }
public get onCurrentEditModeChanged(): Event<CellEditModes> {
return this._onCurrentEditModeChanged.event;
}
private fireExecutionStateChanged(): void { private fireExecutionStateChanged(): void {
this._onExecutionStateChanged.fire(this.executionState); this._onExecutionStateChanged.fire(this.executionState);
} }
@@ -416,6 +421,7 @@ export class CellModel extends Disposable implements ICellModel {
public set showPreview(val: boolean) { public set showPreview(val: boolean) {
this._showPreview = val; this._showPreview = val;
this._onCellPreviewChanged.fire(this._showPreview); this._onCellPreviewChanged.fire(this._showPreview);
this._onCurrentEditModeChanged.fire(this.currentMode);
} }
public get showMarkdown(): boolean { public get showMarkdown(): boolean {
@@ -425,6 +431,7 @@ export class CellModel extends Disposable implements ICellModel {
public set showMarkdown(val: boolean) { public set showMarkdown(val: boolean) {
this._showMarkdown = val; this._showMarkdown = val;
this._onCellMarkdownChanged.fire(this._showMarkdown); this._onCellMarkdownChanged.fire(this._showMarkdown);
this._onCurrentEditModeChanged.fire(this.currentMode);
} }
public get defaultTextEditMode(): string { public get defaultTextEditMode(): string {

1
src/sql/workbench/services/notebook/browser/models/modelInterfaces.ts
View File

@@ -540,6 +540,7 @@ export interface ICellModel {
cellSourceChanged: boolean; cellSourceChanged: boolean;
readonly savedConnectionName: string | undefined; readonly savedConnectionName: string | undefined;
attachments: nb.ICellAttachments | undefined; attachments: nb.ICellAttachments | undefined;
readonly onCurrentEditModeChanged: Event<CellEditModes>;
readonly currentMode: CellEditModes; readonly currentMode: CellEditModes;
/** /**
* Adds image as an attachment to cell metadata * Adds image as an attachment to cell metadata