@marimo-team/islands 0.19.7-dev40 → 0.19.7-dev42

package/dist/main.js

@@ -61452,10 +61452,10 @@ ${r}
     }))).join("\n");
   }
   async function embedWebFonts(e, r) {
-    let c = r.fontEmbedCSS == null ? r.skipFonts ? null : await getWebFontCSS(e, r) : r.fontEmbedCSS;
-    if (c) {
-      let r2 = document.createElement("style"), d = document.createTextNode(c);
-      r2.appendChild(d), e.firstChild ? e.insertBefore(r2, e.firstChild) : e.appendChild(r2);
+    let c = r.fontEmbedCSS == null ? r.skipFonts ? null : await getWebFontCSS(e, r) : r.fontEmbedCSS, d = r.extraStyleContent == null ? c : r.extraStyleContent.concat(c || "");
+    if (d) {
+      let r2 = document.createElement("style"), c2 = document.createTextNode(d);
+      r2.appendChild(c2), e.firstChild ? e.insertBefore(r2, e.firstChild) : e.appendChild(r2);
     }
   }
   async function toSvg(e, r = {}) {
@@ -73168,7 +73168,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.7-dev40"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.7-dev42"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var import_compiler_runtime$88 = require_compiler_runtime();
   function useKeydownOnElement(e, r) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.19.7-dev40",
+  "version": "0.19.7-dev42",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/core/export/hooks.ts

@@ -194,10 +194,9 @@ export function useEnrichCellOutputs(): (
       inFlightWaiters.map(({ promise }) => promise),
     );
     for (const [i, { cellId }] of inFlightWaiters.entries()) {
-      const result =
-        settled[i].status === "fulfilled" ? settled[i].value : undefined;
-      if (result) {
-        results[cellId] = result;
+      const settledResult = settled[i];
+      if (settledResult.status === "fulfilled" && settledResult.value) {
+        results[cellId] = settledResult.value;
       }
     }
 

package/src/utils/__tests__/download.test.tsx

@@ -166,13 +166,63 @@ describe("getImageDataUrlForCell", () => {
     );
   });
 
-  it("should restore original overflow style after capture", async () => {
+  it("should pass style options to prevent clipping", async () => {
+    vi.mocked(toPng).mockResolvedValue(mockDataUrl);
+
+    await getImageDataUrlForCell("cell-1" as CellId);
+
+    expect(toPng).toHaveBeenCalledWith(
+      mockElement,
+      expect.objectContaining({
+        style: {
+          maxHeight: "none",
+          overflow: "visible",
+        },
+      }),
+    );
+  });
+
+  it("should pass scrollHeight as height option", async () => {
+    // Set up element with scrollHeight
+    Object.defineProperty(mockElement, "scrollHeight", {
+      value: 500,
+      configurable: true,
+    });
+    vi.mocked(toPng).mockResolvedValue(mockDataUrl);
+
+    await getImageDataUrlForCell("cell-1" as CellId);
+
+    expect(toPng).toHaveBeenCalledWith(
+      mockElement,
+      expect.objectContaining({
+        height: 500,
+      }),
+    );
+  });
+
+  it("should pass scrollbar hiding styles via extraStyleContent", async () => {
+    vi.mocked(toPng).mockResolvedValue(mockDataUrl);
+
+    await getImageDataUrlForCell("cell-1" as CellId);
+
+    expect(toPng).toHaveBeenCalledWith(
+      mockElement,
+      expect.objectContaining({
+        extraStyleContent: expect.stringContaining("scrollbar-width: none"),
+      }),
+    );
+  });
+
+  it("should not modify the live DOM element", async () => {
     mockElement.style.overflow = "hidden";
+    mockElement.style.maxHeight = "100px";
     vi.mocked(toPng).mockResolvedValue(mockDataUrl);
 
     await getImageDataUrlForCell("cell-1" as CellId);
 
+    // DOM should remain unchanged
     expect(mockElement.style.overflow).toBe("hidden");
+    expect(mockElement.style.maxHeight).toBe("100px");
   });
 
   it("should throw error on failure", async () => {
@@ -183,34 +233,20 @@ describe("getImageDataUrlForCell", () => {
     );
   });
 
-  it("should cleanup even on failure", async () => {
-    mockElement.style.overflow = "scroll";
-    vi.mocked(toPng).mockRejectedValue(new Error("Capture failed"));
-
-    await expect(getImageDataUrlForCell("cell-1" as CellId)).rejects.toThrow();
-
-    expect(document.body.classList.contains("printing")).toBe(false);
-    expect(mockElement.style.overflow).toBe("scroll");
-  });
-
   it("should handle concurrent captures correctly", async () => {
     // Create a second element
     const mockElement2 = document.createElement("div");
     mockElement2.id = CellOutputId.create("cell-2" as CellId);
     document.body.append(mockElement2);
 
-    vi.mocked(toPng).mockImplementation(async () => {
-      // body.printing should not be added during cell captures
-      expect(document.body.classList.contains("printing")).toBe(false);
-      return mockDataUrl;
-    });
+    vi.mocked(toPng).mockResolvedValue(mockDataUrl);
 
     const capture1 = getImageDataUrlForCell("cell-1" as CellId);
     const capture2 = getImageDataUrlForCell("cell-2" as CellId);
 
     await Promise.all([capture1, capture2]);
 
-    expect(document.body.classList.contains("printing")).toBe(false);
+    expect(toPng).toHaveBeenCalledTimes(2);
 
     mockElement2.remove();
   });
@@ -266,23 +302,6 @@ describe("downloadHTMLAsImage", () => {
     expect(mockAnchor.click).toHaveBeenCalled();
   });
 
-  it("should add body.printing class without prepare function", async () => {
-    vi.mocked(toPng).mockImplementation(async () => {
-      expect(document.body.classList.contains("printing")).toBe(true);
-      return mockDataUrl;
-    });
-
-    await downloadHTMLAsImage({ element: mockElement, filename: "test" });
-  });
-
-  it("should remove body.printing class after download without prepare", async () => {
-    vi.mocked(toPng).mockResolvedValue(mockDataUrl);
-
-    await downloadHTMLAsImage({ element: mockElement, filename: "test" });
-
-    expect(document.body.classList.contains("printing")).toBe(false);
-  });
-
   it("should use prepare function when provided", async () => {
     vi.mocked(toPng).mockResolvedValue(mockDataUrl);
     const cleanup = vi.fn();
@@ -406,24 +425,32 @@ describe("downloadCellOutputAsImage", () => {
     expect(mockAnchor.download).toBe("result.png");
   });
 
-  it("should apply cell-specific preparation", async () => {
-    vi.mocked(toPng).mockImplementation(async () => {
-      // Check that cell-specific classes are applied
-      expect(mockElement.style.overflow).toBe("visible");
-      return mockDataUrl;
-    });
+  it("should pass style options to toPng for full content capture", async () => {
+    vi.mocked(toPng).mockResolvedValue(mockDataUrl);
 
     await downloadCellOutputAsImage("cell-1" as CellId, "result");
+
+    expect(toPng).toHaveBeenCalledWith(
+      mockElement,
+      expect.objectContaining({
+        style: {
+          maxHeight: "none",
+          overflow: "visible",
+        },
+      }),
+    );
   });
 
-  it("should cleanup after download", async () => {
-    mockElement.style.overflow = "visible";
+  it("should not modify the live DOM element", async () => {
+    mockElement.style.overflow = "hidden";
+    mockElement.style.maxHeight = "100px";
     vi.mocked(toPng).mockResolvedValue(mockDataUrl);
 
     await downloadCellOutputAsImage("cell-1" as CellId, "result");
 
-    expect(document.body.classList.contains("printing")).toBe(false);
-    expect(mockElement.style.overflow).toBe("visible");
+    // DOM should remain unchanged
+    expect(mockElement.style.overflow).toBe("hidden");
+    expect(mockElement.style.maxHeight).toBe("100px");
   });
 });
 

package/src/utils/download.ts

@@ -46,25 +46,11 @@ function findElementForCell(cellId: CellId): HTMLElement | undefined {
   return element;
 }
 
-/**
- * Prepare a cell element for screenshot capture.
- *
- * @param element - The cell output element to prepare
- * @returns A cleanup function to restore the element's original state
- */
-function prepareCellElementForScreenshot(element: HTMLElement) {
-  const originalOverflow = element.style.overflow;
-  const maxHeight = element.style.maxHeight;
-  element.style.overflow = "visible";
-  element.style.maxHeight = "none";
-
-  return () => {
-    element.style.overflow = originalOverflow;
-    element.style.maxHeight = maxHeight;
-  };
-}
-
 const THRESHOLD_TIME_MS = 500;
+const HIDE_SCROLLBAR_STYLES = `
+  * { scrollbar-width: none; -ms-overflow-style: none; }
+  *::-webkit-scrollbar { display: none; }
+`;
 
 /**
  * Capture a cell output as a PNG data URL.
@@ -85,23 +71,26 @@ export async function getImageDataUrlForCell(
     return iframeDataUrl;
   }
 
-  const cleanup = prepareCellElementForScreenshot(element);
-
-  try {
-    const startTime = Date.now();
-    const dataUrl = await toPng(element);
-    const timeTaken = Date.now() - startTime;
-    if (timeTaken > THRESHOLD_TIME_MS) {
-      Logger.debug(
-        "toPng operation for element",
-        element,
-        `took ${timeTaken} ms (exceeds threshold)`,
-      );
-    }
-    return dataUrl;
-  } finally {
-    cleanup();
+  const startTime = Date.now();
+  const dataUrl = await toPng(element, {
+    extraStyleContent: HIDE_SCROLLBAR_STYLES,
+    // Add these styles so the element output is not clipped
+    // Width can be clipped since pdf has limited width
+    style: {
+      maxHeight: "none",
+      overflow: "visible",
+    },
+    height: element.scrollHeight,
+  });
+  const timeTaken = Date.now() - startTime;
+  if (timeTaken > THRESHOLD_TIME_MS) {
+    Logger.debug(
+      "toPng operation for element",
+      element,
+      `took ${timeTaken} ms (exceeds threshold)`,
+    );
   }
+  return dataUrl;
 }
 
 /**
@@ -115,7 +104,7 @@ export async function downloadCellOutputAsImage(
   if (!dataUrl) {
     return;
   }
-  return downloadByURL(dataUrl, Filenames.toPNG(filename));
+  downloadByURL(dataUrl, Filenames.toPNG(filename));
 }
 
 export const ADD_PRINTING_CLASS = (): (() => void) => {