move output height calculation internal

rebornix · rebornix · commit e6fd2cf4a401 · 2020-03-16T09:15:57.000-07:00
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
@@ -266,11 +266,9 @@ export class BackLayerWebView extends Disposable {
 				let outputHeight = height === 0 ? 0 : height + 16;
 
 				if (cell) {
-					let editorHeight = cell.editorHeight;
 					let outputIndex = cell.outputs.indexOf(output);
 					cell.updateOutputHeight(outputIndex, outputHeight);
-					let totalOutputHeight = cell.getOutputTotalHeight();
-					this.notebookEditor.layoutNotebookCell(cell, editorHeight + 32 /* code cell padding */ + totalOutputHeight);
+					this.notebookEditor.layoutNotebookCell(cell, cell.getCellTotalHeight());
 				}
 			} else if (data.type === 'scroll-ack') {
 				// const date = new Date();
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts
@@ -125,13 +125,7 @@ export class CodeCell extends Disposable {
 
 					this.viewCell.editorHeight = e.contentHeight;
 
-					if (this.viewCell.outputs.length) {
-						let outputHeight = this.viewCell.getOutputTotalHeight();
-						notebookEditor.layoutNotebookCell(this.viewCell, viewCell.editorHeight + EDITOR_TOP_PADDING + EDITOR_BOTTOM_PADDING + 16 /** padding between input and output */ + outputHeight);
-					} else {
-						notebookEditor.layoutNotebookCell(this.viewCell, viewCell.editorHeight + EDITOR_TOP_PADDING + EDITOR_BOTTOM_PADDING);
-					}
-
+					notebookEditor.layoutNotebookCell(this.viewCell, viewCell.getCellTotalHeight());
 				}
 
 			}
@@ -198,8 +192,7 @@ export class CodeCell extends Disposable {
 
 			let editorHeight = templateData.editor!.getContentHeight();
 			viewCell.editorHeight = editorHeight;
-			let totalOutputHeight = viewCell.getOutputTotalHeight();
-			notebookEditor.layoutNotebookCell(viewCell, viewCell.editorHeight + 32 + totalOutputHeight);
+			notebookEditor.layoutNotebookCell(viewCell, viewCell.getCellTotalHeight());
 		}));
 
 		if (viewCell.outputs.length > 0) {
@@ -213,9 +206,8 @@ export class CodeCell extends Disposable {
 				this.renderOutput(currOutput, index, undefined);
 			}
 
-			let totalOutputHeight = viewCell.getOutputTotalHeight();
 			viewCell.editorHeight = totalHeight;
-			this.notebookEditor.layoutNotebookCell(viewCell, viewCell.editorHeight + 32 + totalOutputHeight);
+			this.notebookEditor.layoutNotebookCell(viewCell, viewCell.getCellTotalHeight());
 		} else {
 			// noop
 			this.templateData.outputContainer!.style.display = 'none';
@@ -302,9 +294,7 @@ export class CodeCell extends Disposable {
 					}
 
 					this.viewCell.updateOutputHeight(currIndex, height);
-					const editorHeight = this.viewCell.editorHeight;
-					const totalOutputHeight = this.viewCell.getOutputTotalHeight();
-					this.notebookEditor.layoutNotebookCell(this.viewCell, editorHeight + 32 + totalOutputHeight);
+					this.notebookEditor.layoutNotebookCell(this.viewCell, this.viewCell.getCellTotalHeight());
 				}
 			});
 			elementSizeObserver.startObserving();
@@ -382,9 +372,7 @@ export class CodeCell extends Disposable {
 			output.pickedMimeTypeIndex = pick;
 
 			this.renderOutput(output, index, nextElement);
-
-			let totalOutputHeight = this.viewCell.getOutputTotalHeight();
-			this.notebookEditor.layoutNotebookCell(this.viewCell, this.viewCell.editorHeight + 32 + totalOutputHeight);
+			this.notebookEditor.layoutNotebookCell(this.viewCell, this.viewCell.getCellTotalHeight());
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookCellViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookCellViewModel.ts
@@ -459,7 +459,7 @@ export class CellViewModel extends Disposable implements ICellViewModel {
 		return undefined;
 	}
 
-	getOutputTotalHeight(): number {
+	private getOutputTotalHeight(): number {
 		this._ensureOutputsTop();
 
 		return this._outputsTop!.getTotalValue();
@@ -479,6 +479,14 @@ export class CellViewModel extends Disposable implements ICellViewModel {
 		}
 	}
 
+	getCellTotalHeight(): number {
+		if (this.outputs.length) {
+			return this.editorHeight + EDITOR_TOP_PADDING + EDITOR_BOTTOM_PADDING + 16 + this.getOutputTotalHeight();
+		} else {
+			return this.editorHeight + EDITOR_TOP_PADDING + EDITOR_BOTTOM_PADDING + this.getOutputTotalHeight();
+		}
+	}
+
 	protected _ensureOutputsTop(): void {
 		if (!this._outputsTop) {
 			const values = new Uint32Array(this._outputCollection.length);
