fix microsoft#104110.

rebornix · rebornix · commit c74b0c2ae435 · 2020-08-05T17:57:58.000-07:00
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -864,7 +864,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 				return;
 			}
 
-			this._webview?.updateViewScrollTop(-e.scrollTop, []);
+			this._webview?.updateViewScrollTop(-e.scrollTop, true, []);
 			this._webviewTransparentCover!.style.top = `${e.scrollTop}px`;
 		}));
 
@@ -912,7 +912,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 					removedItems.forEach(output => this._webview?.removeInset(output));
 
 					if (updateItems.length) {
-						this._webview?.updateViewScrollTop(-scrollTop, updateItems);
+						this._webview?.updateViewScrollTop(-scrollTop, false, updateItems);
 					}
 				}
 			});
@@ -1535,7 +1535,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 			const cellTop = this._list?.getAbsoluteTopOfElement(cell) || 0;
 			const scrollTop = this._list?.scrollTop || 0;
 
-			this._webview!.updateViewScrollTop(-scrollTop, [{ cell: cell, output: output, cellTop: cellTop }]);
+			this._webview!.updateViewScrollTop(-scrollTop, true, [{ cell: cell, output: output, cellTop: cellTop }]);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
@@ -107,6 +107,7 @@ export interface IContentWidgetTopRequest {
 export interface IViewScrollTopRequestMessage {
 	type: 'view-scroll';
 	top?: number;
+	forceDisplay: boolean;
 	widgets: IContentWidgetTopRequest[];
 	version: number;
 }
@@ -591,7 +592,7 @@ ${loaderJs}
 		return true;
 	}
 
-	updateViewScrollTop(top: number, items: { cell: CodeCellViewModel, output: IProcessedOutput, cellTop: number }[]) {
+	updateViewScrollTop(top: number, forceDisplay: boolean, items: { cell: CodeCellViewModel, output: IProcessedOutput, cellTop: number }[]) {
 		if (this._disposed) {
 			return;
 		}
@@ -616,6 +617,7 @@ ${loaderJs}
 			top,
 			type: 'view-scroll',
 			version: version++,
+			forceDisplay,
 			widgets: widgets
 		});
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
@@ -413,7 +413,9 @@ function webviewPreloads() {
 					for (let i = 0; i < event.data.widgets.length; i++) {
 						const widget = document.getElementById(event.data.widgets[i].id)!;
 						widget.style.top = event.data.widgets[i].top + 'px';
-						widget.parentElement!.style.display = 'block';
+						if (event.data.forceDisplay) {
+							widget.parentElement!.style.display = 'block';
+						}
 					}
 					break;
 				}

Original file line number	Diff line number	Diff line change
`@@ -864,7 +864,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor`
`864`	`864`	`return;`
`865`	`865`	`}`
`866`	`866`
`867`		`- this._webview?.updateViewScrollTop(-e.scrollTop, []);`
	`867`	`+ this._webview?.updateViewScrollTop(-e.scrollTop, true, []);`
`868`	`868`	this._webviewTransparentCover!.style.top = `${e.scrollTop}px`;
`869`	`869`	`}));`
`870`	`870`
`@@ -912,7 +912,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor`
`912`	`912`	`removedItems.forEach(output => this._webview?.removeInset(output));`
`913`	`913`
`914`	`914`	`if (updateItems.length) {`
`915`		`- this._webview?.updateViewScrollTop(-scrollTop, updateItems);`
	`915`	`+ this._webview?.updateViewScrollTop(-scrollTop, false, updateItems);`
`916`	`916`	`}`
`917`	`917`	`}`
`918`	`918`	`});`
`@@ -1535,7 +1535,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor`
`1535`	`1535`	`const cellTop = this._list?.getAbsoluteTopOfElement(cell) \|\| 0;`
`1536`	`1536`	`const scrollTop = this._list?.scrollTop \|\| 0;`
`1537`	`1537`
`1538`		`- this._webview!.updateViewScrollTop(-scrollTop, [{ cell: cell, output: output, cellTop: cellTop }]);`
	`1538`	`+ this._webview!.updateViewScrollTop(-scrollTop, true, [{ cell: cell, output: output, cellTop: cellTop }]);`
`1539`	`1539`	`}`
`1540`	`1540`	`}`
`1541`	`1541`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ export interface IContentWidgetTopRequest {`
`107`	`107`	`export interface IViewScrollTopRequestMessage {`
`108`	`108`	`type: 'view-scroll';`
`109`	`109`	`top?: number;`
	`110`	`+ forceDisplay: boolean;`
`110`	`111`	`widgets: IContentWidgetTopRequest[];`
`111`	`112`	`version: number;`
`112`	`113`	`}`
`@@ -591,7 +592,7 @@ ${loaderJs}`
`591`	`592`	`return true;`
`592`	`593`	`}`
`593`	`594`
`594`		`- updateViewScrollTop(top: number, items: { cell: CodeCellViewModel, output: IProcessedOutput, cellTop: number }[]) {`
	`595`	`+ updateViewScrollTop(top: number, forceDisplay: boolean, items: { cell: CodeCellViewModel, output: IProcessedOutput, cellTop: number }[]) {`
`595`	`596`	`if (this._disposed) {`
`596`	`597`	`return;`
`597`	`598`	`}`
`@@ -616,6 +617,7 @@ ${loaderJs}`
`616`	`617`	`top,`
`617`	`618`	`type: 'view-scroll',`
`618`	`619`	`version: version++,`
	`620`	`+ forceDisplay,`
`619`	`621`	`widgets: widgets`
`620`	`622`	`});`
`621`	`623`	`}`
Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,9 @@ function webviewPreloads() {`
`413`	`413`	`for (let i = 0; i < event.data.widgets.length; i++) {`
`414`	`414`	`const widget = document.getElementById(event.data.widgets[i].id)!;`
`415`	`415`	`widget.style.top = event.data.widgets[i].top + 'px';`
`416`		`- widget.parentElement!.style.display = 'block';`
	`416`	`+ if (event.data.forceDisplay) {`
	`417`	`+ widget.parentElement!.style.display = 'block';`
	`418`	`+ }`
`417`	`419`	`}`
`418`	`420`	`break;`
`419`	`421`	`}`