Skip to content

Fix rendering of inline notebook content from ark #14150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thomasp85 wants to merge 6 commits into
base: main
Choose a base branch
from
+18 −31
Open

Fix rendering of inline notebook content from ark #14150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c7dd913
Fix rendering of inline notebook content from ark
thomasp85 Jun 10, 2026
17ff0e5
Merge commit '405090e8b6c08752a7bcdaebf58781daf2d1c689'
thomasp85 Jun 10, 2026
ec06c81
Apply upstream fix to tests
thomasp85 Jun 11, 2026
b226592
Apply Davis' approach to Quarto
thomasp85 Jun 12, 2026
23276f9
Bump ark to 512d2b
thomasp85 Jun 15, 2026
f5fa16c
Merge remote-tracking branch 'upstream' into fix/html-widget-output-r…
thomasp85 Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extensions/positron-r/ark
Open in desktop
Submodule ark updated 10 files
+1 −0 .github/workflows/test-linux.yml
+1 −0 .github/workflows/test-macos.yml
+1 −0 .github/workflows/test-windows.yml
+1 −0 AGENTS.md
+12 −0 crates/ark/src/console/console_repl.rs
+250 −13 crates/ark/src/modules/positron/html_widgets.R
+5 −0 crates/ark/src/modules/positron/utils.R
+50 −38 crates/ark/src/viewer.rs
+146 −0 crates/ark/tests/html_widgets.rs
+10 −0 doc/configuration.md
47 changes: 17 additions & 30 deletions src/vs/workbench/contrib/positronQuarto/browser/quartoOutputViewZone.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import { formatCellDuration, getRelativeTime } from '../../positronNotebook/brow
import { ThemeIcon } from '../../../../base/common/themables.js';
import { Event as VSEvent, Emitter } from '../../../../base/common/event.js';
import { URI } from '../../../../base/common/uri.js';
import { dirname } from '../../../../base/common/resources.js';
import { Schemas } from '../../../../base/common/network.js';
import { INotebookOutputWebview, IPositronNotebookOutputWebviewService } from '../../positronOutputWebview/browser/notebookOutputWebviewService.js';
import { isHTMLOutputWebviewMessage } from '../../positronWebviewPreloads/browser/notebookOutputUtils.js';
import { ILanguageRuntimeSession } from '../../../services/runtimeSession/common/runtimeSessionService.js';
Expand Down Expand Up @@ -2606,36 +2608,21 @@ export class QuartoOutputViewZone extends Disposable implements IViewZone {
container.appendChild(loadingIndicator);

try {
// Create a runtime message for the HTML content
const runtimeMessage: ILanguageRuntimeMessageWebOutput = {
id: output.outputId,
parent_id: '',
when: new Date().toISOString(),
type: LanguageRuntimeMessageType.Output,
event_clock: 0,
kind: RuntimeOutputKind.ViewerWidget,
data: { 'text/html': content },
output_location: PositronOutputLocation.Console,
resource_roots: undefined,
};

// Create the webview
const webview = await this._webviewService.createNotebookOutputWebview({
id: output.outputId,
runtime: this._session,
output: runtimeMessage,
viewType: 'jupyter-notebook',
});

if (!webview) {
// No renderer available - show the HTML escaped
container.removeChild(loadingIndicator);
const pre = document.createElement('pre');
pre.className = 'quarto-output-html-escaped';
pre.textContent = content.substring(0, 1000) + (content.length > 1000 ? '...' : '');
container.appendChild(pre);
return;
}
// Resolve relative assets against the document's directory when it
// lives on disk (untitled documents have no meaningful base).
const baseUri = this._documentUri && this._documentUri.scheme !== Schemas.untitled
? dirname(this._documentUri)
: undefined;

// Render raw HTML content as a self-contained document (i.e. an R
// leaflet map). Using `createNotebookOutputWebview()` would find the
// built-in renderer for `text/html` and flatten the self-contained
// document, dropping `<head>` and scripts.
const webview = await this._webviewService.createRawHtmlOutputWebview(
output.outputId,
content,
baseUri,
);

// Store the webview and container for later cleanup and scroll updates
this._webviewsByOutputId.set(output.outputId, webview);
Expand Down
Loading