-
Notifications
You must be signed in to change notification settings - Fork 29k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move collapse-related code out of cellRenderer to a cell part #131808
- Loading branch information
1 parent
e2d1be5
commit c79072c
Showing
7 changed files
with
161 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellInput.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.txt in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import * as DOM from 'vs/base/browser/dom'; | ||
| import { ICellViewModel, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser'; | ||
| import { CellViewModelStateChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents'; | ||
| import { CellPart } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellPart'; | ||
| import { BaseCellRenderTemplate } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon'; | ||
|
|
||
| export class CollapsedCellInput extends CellPart { | ||
| private currentCell: ICellViewModel | undefined; | ||
|
|
||
| constructor( | ||
| private readonly notebookEditor: INotebookEditor, | ||
| cellInputCollapsedContainer: HTMLElement, | ||
| ) { | ||
| super(); | ||
|
|
||
| this._register(DOM.addDisposableListener(cellInputCollapsedContainer, DOM.EventType.DBLCLICK, e => { | ||
| if (!this.currentCell || !this.notebookEditor.hasModel()) { | ||
| return; | ||
| } | ||
|
|
||
| if (this.currentCell.isInputCollapsed) { | ||
| this.currentCell.isInputCollapsed = false; | ||
| } else { | ||
| this.currentCell.isOutputCollapsed = false; | ||
| } | ||
| })); | ||
|
|
||
| this._register(DOM.addDisposableListener(cellInputCollapsedContainer, DOM.EventType.CLICK, e => { | ||
| if (!this.currentCell || !this.notebookEditor.hasModel()) { | ||
| return; | ||
| } | ||
|
|
||
| const element = e.target as HTMLElement; | ||
|
|
||
| if (element && element.classList && element.classList.contains('expandInputIcon')) { | ||
| // clicked on the expand icon | ||
| this.currentCell.isInputCollapsed = false; | ||
| } | ||
| })); | ||
| } | ||
|
|
||
| renderCell(element: ICellViewModel, templateData: BaseCellRenderTemplate): void { | ||
| this.currentCell = element; | ||
| } | ||
|
|
||
| prepareLayout(): void { | ||
| } | ||
|
|
||
| updateInternalLayoutNow(element: ICellViewModel): void { | ||
| } | ||
|
|
||
| updateState(element: ICellViewModel, e: CellViewModelStateChangeEvent): void { | ||
| } | ||
| } | ||
|
|
75 changes: 75 additions & 0 deletions
75
src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.txt in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import * as DOM from 'vs/base/browser/dom'; | ||
| import { Codicon, CSSIcon } from 'vs/base/common/codicons'; | ||
| import { localize } from 'vs/nls'; | ||
| import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; | ||
| import { EXPAND_CELL_OUTPUT_COMMAND_ID, ICellViewModel, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser'; | ||
| import { CellViewModelStateChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents'; | ||
| import { CellPart } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellPart'; | ||
| import { BaseCellRenderTemplate } from 'vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon'; | ||
|
|
||
| const $ = DOM.$; | ||
|
|
||
| export class CollapsedCellOutput extends CellPart { | ||
| private currentCell: ICellViewModel | undefined; | ||
|
|
||
| constructor( | ||
| private readonly notebookEditor: INotebookEditor, | ||
| cellOutputCollapseContainer: HTMLElement, | ||
| @IKeybindingService keybindingService: IKeybindingService | ||
| ) { | ||
| super(); | ||
|
|
||
| const placeholder = DOM.append(cellOutputCollapseContainer, $('span.expandOutputPlaceholder')) as HTMLElement; | ||
| placeholder.textContent = localize('cellOutputsCollapsedMsg', "Outputs are collapsed"); | ||
| const expandIcon = DOM.append(cellOutputCollapseContainer, $('span.expandOutputIcon')); | ||
| expandIcon.classList.add(...CSSIcon.asClassNameArray(Codicon.more)); | ||
|
|
||
| const keybinding = keybindingService.lookupKeybinding(EXPAND_CELL_OUTPUT_COMMAND_ID); | ||
| if (keybinding) { | ||
| placeholder.title = localize('cellExpandOutputButtonLabelWithDoubleClick', "Double click to expand cell output ({0})", keybinding.getLabel()); | ||
| cellOutputCollapseContainer.title = localize('cellExpandOutputButtonLabel', "Expand Cell Output (${0})", keybinding.getLabel()); | ||
| } | ||
|
|
||
| DOM.hide(cellOutputCollapseContainer); | ||
|
|
||
| this._register(DOM.addDisposableListener(expandIcon, DOM.EventType.CLICK, () => this.expand())); | ||
| this._register(DOM.addDisposableListener(cellOutputCollapseContainer, DOM.EventType.DBLCLICK, () => this.expand())); | ||
| } | ||
|
|
||
| private expand() { | ||
| if (!this.currentCell) { | ||
| return; | ||
| } | ||
|
|
||
| if (!this.currentCell) { | ||
| return; | ||
| } | ||
|
|
||
| const textModel = this.notebookEditor.textModel!; | ||
| const index = textModel.cells.indexOf(this.currentCell.model); | ||
|
|
||
| if (index < 0) { | ||
| return; | ||
| } | ||
|
|
||
| this.currentCell.isOutputCollapsed = !this.currentCell.isOutputCollapsed; | ||
| } | ||
|
|
||
| renderCell(element: ICellViewModel, templateData: BaseCellRenderTemplate): void { | ||
| this.currentCell = element; | ||
| } | ||
|
|
||
| prepareLayout(): void { | ||
| } | ||
|
|
||
| updateInternalLayoutNow(element: ICellViewModel): void { | ||
| } | ||
|
|
||
| updateState(element: ICellViewModel, e: CellViewModelStateChangeEvent): void { | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.