styling

Author: amunger

extensions/notebook-renderers/src/index.ts

@@ -231,8 +231,10 @@ export const activate: ActivationFunction<void> = (ctx) => {
 	span.output-stream {
 		display: inline-block;
 		width: 100%;
-		overflow-y: var(--notebook-output-overflow-y);
-		max-height: 500px;
+	}
+	span.output-stream.scrollable {
+		overflow-y: scroll;
+		max-height: 400px;
 	}
 	.output-plaintext .code-bold,
 	.output-stream .code-bold,

extensions/notebook-renderers/src/textHelper.ts

@@ -51,6 +51,7 @@ export function truncatedArrayOfString(id: string, outputs: string[], linesLimit
 }
 
 function scrollableArrayOfString(outputs: string[], container: HTMLElement) {
+	container.classList.add('scrollable');
 	const buffer = outputs.join('\n').split(/\r\n|\r|\n/g);
 	const spanElement = handleANSIOutput(buffer.slice(0, 5000).join('\n'));
 	container.appendChild(spanElement);

src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts

@@ -234,7 +234,6 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 				key: 'notebook.error.rendererNotFound',
 				comment: ['$0 is a placeholder for the mime type']
 			}, "No renderer found for '$0' a"),
-			'notebook-output-overflow-y': this.options.outputScrolling ? 'scroll' : 'visible',
 		};
 	}
 
@@ -243,7 +242,7 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 		const preloadsData = this.getStaticPreloadsData();
 		const renderOptions = {
 			lineLimit: this.configurationService.getValue<number>(NotebookSetting.textOutputLineLimit) ?? 30,
-			outputScrolling: this.configurationService.getValue<boolean>(NotebookSetting.outputScrolling) ?? true
+			outputScrolling: this.options.outputScrolling
 		};
 		const preloadScript = preloadsScriptStr(
 			this.options,

src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts

@@ -88,6 +88,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 	let currentOptions = ctx.options;
 	let isWorkspaceTrusted = ctx.isWorkspaceTrusted;
 	const lineLimit = ctx.renderOptions.lineLimit;
+	const outputScrolling = ctx.renderOptions.outputScrolling;
 
 	const acquireVsCodeApi = globalThis.acquireVsCodeApi;
 	const vscode = acquireVsCodeApi();
@@ -216,7 +217,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 	}
 
 	interface RendererContext extends rendererApi.RendererContext<unknown> {
-		readonly settings: { readonly lineLimit: number };
+		readonly settings: RenderOptions;
 	}
 
 	interface RendererModule {
@@ -1384,6 +1385,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 				},
 				settings: {
 					get lineLimit() { return lineLimit; },
+					get outputScrolling() { return outputScrolling; },
 				}
 			};