@marimo-team/islands 0.19.10-dev4 → 0.19.10-dev41

package/src/core/codemirror/misc/__tests__/paste.test.ts

@@ -140,6 +140,24 @@ def _(
     expect(extractCells(input)).toEqual(["x = a + b + c"]);
   });
 
+  it("preserves return statements inside nested functions", () => {
+    const input = `
+@app.cell
+def _(mo, px):
+    def make_fig():
+        data = {'category': ['foo', 'bar'], 'value': [10, 20]}
+        fig = px.bar(data, x='category', y='value')
+        return fig
+
+    fig = make_fig()
+    mo.ui.plotly(fig)
+    return
+`;
+    expect(extractCells(input)).toEqual([
+      "def make_fig():\n    data = {'category': ['foo', 'bar'], 'value': [10, 20]}\n    fig = px.bar(data, x='category', y='value')\n    return fig\n\nfig = make_fig()\nmo.ui.plotly(fig)",
+    ]);
+  });
+
   it("handles cells with config", () => {
     const input = `
 @app.cell(hide_code=True, column=2)

package/src/core/codemirror/misc/paste.ts

@@ -42,6 +42,7 @@ export function extractCells(text: string): string[] {
   let inMultilineArgs = false;
   let inMultilineReturn = false;
   let parenCount = 0;
+  let cellBaseIndent: number | null = null;
 
   // Pre-compile regex patterns
   const leadingParenRegex = /\(/g;
@@ -55,19 +56,16 @@ export function extractCells(text: string): string[] {
     );
   }
 
+  function getIndent(line: string): number {
+    const match = line.match(/^\s*/);
+    return match ? match[0].length : 0;
+  }
+
   function finalizeCellIfNeeded() {
     if (currentCell.length === 0) {
       return;
     }
 
-    // Remove trailing returns
-    while (
-      currentCell.length > 0 &&
-      currentCell[currentCell.length - 1].trim().startsWith("return")
-    ) {
-      currentCell.pop();
-    }
-
     // Only add non-empty cells
     if (currentCell.some((l) => l.trim() !== "")) {
       cells.push(dedent(currentCell.join("\n")));
@@ -88,6 +86,7 @@ export function extractCells(text: string): string[] {
       finalizeCellIfNeeded();
       inCell = true;
       skipLines = 1; // Skip the def line
+      cellBaseIndent = null;
       continue;
     }
 
@@ -125,8 +124,13 @@ export function extractCells(text: string): string[] {
       continue;
     }
 
-    // Handle return statements
-    if (trimmed.startsWith("return")) {
+    // Detect base indentation of cell body from first content line
+    if (cellBaseIndent === null && trimmed) {
+      cellBaseIndent = getIndent(line);
+    }
+
+    // Handle return statements — only strip cell-level returns
+    if (trimmed.startsWith("return") && getIndent(line) === cellBaseIndent) {
       if (trimmed.includes("(") && !trimmed.endsWith(")")) {
         inMultilineReturn = true;
         parenCount = countParens(trimmed);

package/src/core/wasm/__tests__/store.test.ts

@@ -1,9 +1,13 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import { describe, expect, it, vi } from "vitest";
+import { codeAtom } from "../../saving/file-state";
+import { store } from "../../state/jotai";
 import {
   CompositeFileStore,
   domElementFileStore,
   localStorageFileStore,
+  mountConfigFileStore,
+  notebookFileStore,
 } from "../store";
 
 describe("localStorageFileStore", () => {
@@ -53,3 +57,32 @@ describe("CompositeFileStore", () => {
     expect(saved).toHaveBeenCalledTimes(3);
   });
 });
+
+describe("mountConfigFileStore", () => {
+  it("returns null when no code is set", () => {
+    store.set(codeAtom, undefined);
+    expect(mountConfigFileStore.readFile()).toBeNull();
+  });
+
+  it("returns code when set", () => {
+    store.set(codeAtom, "print('hello')");
+    expect(mountConfigFileStore.readFile()).toBe("print('hello')");
+  });
+
+  it("does not save files", () => {
+    store.set(codeAtom, "original");
+    mountConfigFileStore.saveFile("new content");
+    expect(mountConfigFileStore.readFile()).toBe("original");
+  });
+});
+
+describe("notebookFileStore priority", () => {
+  it("prefers mount config over marimo-code and URL", () => {
+    store.set(codeAtom, "mount config code");
+    const element = document.createElement("marimo-code");
+    element.textContent = "marimo-code element";
+    document.body.replaceChildren(element);
+
+    expect(notebookFileStore.readFile()).toBe("mount config code");
+  });
+});

package/src/core/wasm/bridge.ts

@@ -29,6 +29,7 @@ import type {
   SaveUserConfigurationRequest,
   Snippets,
 } from "../network/types";
+import { filenameAtom } from "../saving/file-state";
 import { store } from "../state/jotai";
 import { BasicTransport } from "../websocket/transports/basic";
 import type { IConnectionTransport } from "../websocket/transports/transport";
@@ -146,7 +147,7 @@ export class PyodideBridge implements RunRequests, EditRequests {
 
     const code = await notebookFileStore.readFile();
     const fallbackCode = await fallbackFileStore.readFile();
-    const filename = PyodideRouter.getFilename();
+    const filename = store.get(filenameAtom) ?? PyodideRouter.getFilename();
     const userConfig = store.get(userConfigAtom);
 
     const queryParameters: Record<string, string | string[]> = {};

package/src/core/wasm/store.ts

@@ -4,6 +4,8 @@ import {
   compressToEncodedURIComponent,
   decompressFromEncodedURIComponent,
 } from "lz-string";
+import { codeAtom } from "@/core/saving/file-state";
+import { store } from "@/core/state/jotai";
 import { TypedLocalStorage } from "@/utils/storage/typed";
 import { PyodideRouter } from "./router";
 
@@ -67,6 +69,15 @@ const remoteDefaultFileStore: FileStore = {
   },
 };
 
+export const mountConfigFileStore: FileStore = {
+  saveFile(_contents: string) {
+    // Read-only: mount config code is set via codeAtom
+  },
+  readFile() {
+    return store.get(codeAtom) ?? null;
+  },
+};
+
 const emptyFileStore: FileStore = {
   saveFile(contents: string) {
     // Do nothing
@@ -112,7 +123,8 @@ export class CompositeFileStore implements FileStore {
 }
 
 export const notebookFileStore = new CompositeFileStore([
-  // Prefer <marimo-code>, then URL
+  // Prefer mount config, then <marimo-code>, then URL
+  mountConfigFileStore,
   domElementFileStore,
   urlFileStore,
 ]);

package/src/plugins/impl/DataTablePlugin.tsx

@@ -195,6 +195,7 @@ interface Data<T> {
   hasStableRowId: boolean;
   lazy: boolean;
   cellHoverTexts?: Record<string, Record<string, string | null>> | null;
+  downloadFileName?: string;
 }
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
@@ -278,6 +279,7 @@ export const DataTablePlugin = createPlugin<S>("marimo-table")
       // If lazy, this will preload the first page of data
       // without user confirmation.
       preload: z.boolean().default(false),
+      downloadFileName: z.string().optional(),
     }),
   )
   .withFunctions<DataTableFunctions>({
@@ -752,6 +754,7 @@ const DataTableComponent = ({
   cellStyles,
   hoverTemplate,
   cellHoverTexts,
+  downloadFileName,
   toggleDisplayHeader,
   calculate_top_k_rows,
   preview_column,
@@ -981,6 +984,7 @@ const DataTableComponent = ({
             hoverTemplate={hoverTemplate}
             cellHoverTexts={cellHoverTexts}
             downloadAs={showDownload ? downloadAs : undefined}
+            downloadFileName={downloadFileName}
             enableSearch={enableSearch}
             searchQuery={searchQuery}
             onSearchQueryChange={setSearchQuery}

package/src/plugins/impl/chat/ChatPlugin.tsx

@@ -47,6 +47,7 @@ export const ChatPlugin = createPlugin<{ messages: UIMessage[] }>(
       maxHeight: z.number().optional(),
       config: configSchema,
       allowAttachments: z.union([z.boolean(), z.string().array()]),
+      disabled: z.boolean().default(false),
     }),
   )
   .withFunctions<PluginFunctions>({
@@ -76,6 +77,7 @@ export const ChatPlugin = createPlugin<{ messages: UIMessage[] }>(
           showConfigurationControls={props.data.showConfigurationControls}
           maxHeight={props.data.maxHeight}
           allowAttachments={props.data.allowAttachments}
+          disabled={props.data.disabled}
           config={props.data.config}
           get_chat_history={props.functions.get_chat_history}
           delete_chat_history={props.functions.delete_chat_history}

package/src/plugins/impl/chat/chat-ui.tsx

@@ -67,6 +67,7 @@ interface Props extends PluginFunctions {
   showConfigurationControls: boolean;
   maxHeight: number | undefined;
   allowAttachments: boolean | string[];
+  disabled: boolean;
   value: UIMessage[];
   setValue: (messages: UIMessage[]) => void;
   host: HTMLElement;
@@ -450,6 +451,9 @@ export const Chatbot: React.FC<Props> = (props) => {
       <form
         onSubmit={async (evt) => {
           evt.preventDefault();
+          if (props.disabled) {
+            return;
+          }
 
           const fileParts = files
             ? await convertToFileUIPart(files)
@@ -462,7 +466,12 @@ export const Chatbot: React.FC<Props> = (props) => {
           resetInput();
         }}
         ref={formRef}
-        className="flex w-full border-t border-(--slate-6) px-2 py-1 items-center"
+        // biome-ignore lint/a11y/useSemanticElements: inert is used to disable the entire form
+        inert={props.disabled || undefined}
+        className={cn(
+          "flex w-full border-t border-(--slate-6) px-2 py-1 items-center",
+          props.disabled && "opacity-50 cursor-not-allowed",
+        )}
       >
         {props.showConfigurationControls && (
           <ConfigPopup config={config} onChange={setConfig} />

package/src/plugins/impl/data-frames/DataFramePlugin.tsx

@@ -48,6 +48,7 @@ type TableData<T> = T[] | CsvURL;
 interface Data {
   label?: string | null;
   columns: ColumnDataTypes;
+  dataframeName?: string;
   pageSize: number;
   showDownload: boolean;
   lazy: boolean;
@@ -93,6 +94,7 @@ export const DataFramePlugin = createPlugin<S>("marimo-dataframe")
       label: z.string().nullish(),
       pageSize: z.number().default(5),
       showDownload: z.boolean().default(true),
+      dataframeName: z.string().optional(),
       columns: z
         .array(z.tuple([z.string().or(z.number()), z.string(), z.string()]))
         .transform((value) => {
@@ -176,6 +178,7 @@ const EMPTY: Transformations = {
 export const DataFrameComponent = memo(
   ({
     columns,
+    dataframeName,
     pageSize,
     showDownload,
     lazy,
@@ -326,6 +329,7 @@ export const DataFrameComponent = memo(
           fieldTypes={field_types}
           rowHeaders={row_headers || Arrays.EMPTY}
           showDownload={showDownload}
+          downloadFileName={dataframeName}
           download_as={download_as}
           enableSearch={false}
           showFilters={false}

package/src/plugins/impl/plotly/Plot.tsx

@@ -0,0 +1,173 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import type * as PlotlyTypes from "plotly.js";
+// Import the pre-built dist bundle, not the source entry point.
+// The source entry point requires Node.js polyfills (e.g. `buffer/`)
+// that are unavailable in the browser/bundler environment.
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-expect-error — no type declarations for dist path, we use PlotlyTypes above
+import Plotly from "plotly.js/dist/plotly";
+import { useEffect, useRef } from "react";
+
+// Plotly attaches `on` and `removeListener` to the DOM element at runtime.
+// The @types/plotly.js PlotlyHTMLElement type includes `on` and `removeAllListeners`
+// but not the per-handler `removeListener`. We extend the type to include it.
+interface PlotlyElement extends PlotlyTypes.PlotlyHTMLElement {
+  removeListener(event: string, handler: (...args: never[]) => void): void;
+}
+
+export interface Figure {
+  data: PlotlyTypes.Data[];
+  layout: Partial<PlotlyTypes.Layout>;
+  frames: PlotlyTypes.Frame[] | null;
+}
+
+export interface PlotProps {
+  data: PlotlyTypes.Data[];
+  layout: Partial<PlotlyTypes.Layout>;
+  frames?: PlotlyTypes.Frame[];
+  config?: Partial<PlotlyTypes.Config>;
+  className?: string;
+  style?: React.CSSProperties;
+  useResizeHandler?: boolean;
+  divId?: string;
+  onRelayout?: (event: PlotlyTypes.PlotRelayoutEvent) => void;
+  onRelayouting?: (event: PlotlyTypes.PlotRelayoutEvent) => void;
+  onSelected?: (event: PlotlyTypes.PlotSelectionEvent) => void;
+  onDeselect?: () => void;
+  onClick?: (event: PlotlyTypes.PlotMouseEvent) => void;
+  onSunburstClick?: (event: PlotlyTypes.PlotMouseEvent) => void;
+  onTreemapClick?: (event: PlotlyTypes.PlotMouseEvent) => void;
+  onError?: (err: Error) => void;
+}
+
+// Plotly event name convention:
+//   - events are attached as `'plotly_' + name.toLowerCase()`
+//   - react props are `'on' + name`
+const EVENT_NAMES = [
+  "Relayout",
+  "Relayouting",
+  "Selected",
+  "Deselect",
+  "Click",
+  "SunburstClick",
+  "TreemapClick",
+] as const;
+
+type EventName = (typeof EVENT_NAMES)[number];
+
+function propName(event: EventName): keyof PlotProps {
+  return `on${event}` as keyof PlotProps;
+}
+
+function plotlyEventName(event: EventName): string {
+  return `plotly_${event.toLowerCase()}`;
+}
+
+export const Plot = (props: PlotProps) => {
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  const {
+    data,
+    layout,
+    config,
+    frames,
+    className,
+    style,
+    useResizeHandler,
+    divId,
+    onError,
+  } = props;
+
+  // Render / update the plot
+  useEffect(() => {
+    const el = containerRef.current;
+    if (!el) {
+      return;
+    }
+
+    Plotly.react(el, data, layout, config)
+      .then(() => {
+        if (frames && frames.length > 0) {
+          return Plotly.addFrames(el as unknown as PlotlyTypes.Root, frames);
+        }
+      })
+      .catch((error: Error) => {
+        onError?.(error);
+      });
+  }, [data, layout, config, frames, onError]);
+
+  // Sync event handlers
+  useEffect(
+    () => {
+      const el = containerRef.current;
+      if (!el) {
+        return;
+      }
+
+      const plotlyEl = el as unknown as PlotlyElement;
+
+      // eslint-disable-next-line @typescript-eslint/ban-types -- Plotly's event API uses generic function references
+      const attached: {
+        plotlyName: string;
+        handler: (...args: never[]) => void;
+      }[] = [];
+
+      for (const name of EVENT_NAMES) {
+        const handler = props[propName(name)];
+        if (typeof handler === "function") {
+          const plotlyName = plotlyEventName(name);
+          plotlyEl.on(plotlyName as never, handler as never);
+          attached.push({
+            plotlyName,
+            handler: handler as (...args: never[]) => void,
+          });
+        }
+      }
+
+      return () => {
+        for (const { plotlyName, handler } of attached) {
+          plotlyEl.removeListener(plotlyName, handler as never);
+        }
+      };
+      // Re-sync whenever any event handler prop changes
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    },
+    EVENT_NAMES.map((name) => props[propName(name)]),
+  );
+
+  // Window resize handler
+  useEffect(() => {
+    if (!useResizeHandler) {
+      return;
+    }
+
+    const el = containerRef.current;
+    if (!el) {
+      return;
+    }
+
+    const handler = () => {
+      Plotly.Plots.resize(el as unknown as PlotlyTypes.Root);
+    };
+
+    window.addEventListener("resize", handler);
+    return () => {
+      window.removeEventListener("resize", handler);
+    };
+  }, [useResizeHandler]);
+
+  // Cleanup on unmount
+  useEffect(() => {
+    const el = containerRef.current;
+    return () => {
+      if (el) {
+        Plotly.purge(el as unknown as PlotlyTypes.Root);
+      }
+    };
+  }, []);
+
+  return (
+    <div id={divId} className={className} style={style} ref={containerRef} />
+  );
+};

package/src/plugins/impl/plotly/PlotlyPlugin.tsx

@@ -1,9 +1,10 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type { Figure, PlotParams } from "react-plotly.js";
+import type * as Plotly from "plotly.js";
 import { z } from "zod";
 import type { IPlugin, IPluginProps, Setter } from "@/plugins/types";
 import { Logger } from "@/utils/Logger";
+import type { Figure } from "./Plot";
 
 import "./plotly.css";
 import "./mapbox.css";
@@ -70,13 +71,8 @@ interface PlotlyPluginProps extends Data {
   host: HTMLElement;
 }
 
-// For whatever reason, the version of vite-rolldown that we are one is not exporting this default export correctly.
-export const LazyPlot = lazy(() =>
-  import("react-plotly.js").then((module) => {
-    return module.default as unknown as {
-      default: React.ComponentType<PlotParams>;
-    };
-  }),
+const LazyPlot = lazy(() =>
+  import("./Plot").then((mod) => ({ default: mod.Plot })),
 );
 
 const SUNBURST_DATA_KEYS: (keyof Plotly.SunburstPlotDatum)[] = [
@@ -176,7 +172,6 @@ export const PlotlyComponent = memo(
             };
           });
         })}
-        // @ts-expect-error We patched this prop here so it doesn't exist in the types
         onTreemapClick={useEvent((evt: Readonly<Plotly.PlotMouseEvent>) => {
           if (!evt) {
             return;
@@ -198,6 +193,24 @@ export const PlotlyComponent = memo(
           }));
         })}
         config={plotlyConfig}
+        onClick={useEvent((evt: Readonly<Plotly.PlotMouseEvent>) => {
+          if (!evt) {
+            return;
+          }
+          // Only handle clicks for chart types where box/lasso selection
+          // (onSelected) doesn't work, such as heatmaps.
+          const isHeatmap = evt.points.some(
+            (point) => point.data?.type === "heatmap",
+          );
+          if (!isHeatmap) {
+            return;
+          }
+          setValue((prev) => ({
+            ...prev,
+            points: extractPoints(evt.points),
+            indices: evt.points.map((point) => point.pointIndex),
+          }));
+        })}
         onSelected={useEvent((evt: Readonly<Plotly.PlotSelectionEvent>) => {
           if (!evt) {
             return;
@@ -215,7 +228,7 @@ export const PlotlyComponent = memo(
         className="w-full"
         useResizeHandler={true}
         frames={figure.frames ?? undefined}
-        onError={useEvent((err) => {
+        onError={useEvent((err: Error) => {
           Logger.error("PlotlyPlugin: ", err);
         })}
       />
@@ -229,6 +242,17 @@ PlotlyComponent.displayName = "PlotlyComponent";
  * instead of the ones that Plotly uses internally,
  * by using the hovertemplate.
  */
+const STANDARD_POINT_KEYS: string[] = [
+  "x",
+  "y",
+  "z",
+  "lat",
+  "lon",
+  "curveNumber",
+  "pointNumber",
+  "pointIndex",
+];
+
 function extractPoints(
   points: Plotly.PlotDatum[],
 ): Record<AxisName, AxisDatum>[] {
@@ -243,6 +267,13 @@ function extractPoints(
     const hovertemplate = Array.isArray(point.data.hovertemplate)
       ? point.data.hovertemplate[0]
       : point.data.hovertemplate;
+
+    // For chart types with standard point keys (e.g. heatmaps),
+    // or when there's no hovertemplate, pick keys directly from the point.
+    if (!hovertemplate || point.data?.type === "heatmap") {
+      return pick(point, STANDARD_POINT_KEYS);
+    }
+
     // Update or create a parser
     parser = parser
       ? parser.update(hovertemplate)

package/src/plugins/impl/plotly/__tests__/parse-from-template.test.ts

@@ -1,4 +1,5 @@
 /* Copyright 2026 Marimo. All rights reserved. */
+import type * as Plotly from "plotly.js";
 import { describe, expect, it } from "vitest";
 import { createParser } from "../parse-from-template";
 

package/src/plugins/impl/plotly/__tests__/usePlotlyLayout.test.ts

@@ -1,7 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type { Figure } from "react-plotly.js";
+import type * as Plotly from "plotly.js";
 import { describe, expect, it } from "vitest";
+import type { Figure } from "../Plot";
 import {
   computeLayoutOnFigureChange,
   computeLayoutUpdate,

package/src/plugins/impl/plotly/parse-from-template.ts

@@ -1,6 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { get } from "lodash-es";
+import type * as Plotly from "plotly.js";
 
 export interface PlotlyTemplateParser {
   /**

package/src/plugins/impl/plotly/usePlotlyLayout.ts

@@ -2,9 +2,10 @@
 
 import { usePrevious } from "@uidotdev/usehooks";
 import { isEqual, pick } from "lodash-es";
+import type * as Plotly from "plotly.js";
 import { useEffect, useState } from "react";
-import type { Figure } from "react-plotly.js";
 import { Objects } from "@/utils/objects";
+import type { Figure } from "./Plot";
 
 /**
  * Keys that are preserved across figure updates when set by user interaction.

package/src/theme/ThemeProvider.tsx

@@ -10,8 +10,10 @@ export const ThemeProvider: React.FC<PropsWithChildren> = memo(
     const { theme } = useTheme();
     useLayoutEffect(() => {
       document.body.classList.add(theme, `${theme}-theme`);
+      document.body.dataset.theme = theme;
       return () => {
         document.body.classList.remove(theme, `${theme}-theme`);
+        delete document.body.dataset.theme;
       };
     }, [theme]);
 

package/dist/apl-BuwKwesW.js

@@ -1,4 +0,0 @@
-import { t as apl } from "./apl-D9gTcP3Q.js";
-export {
-  apl
-};

package/dist/asciiarmor-zAEd_wtn.js

@@ -1,4 +0,0 @@
-import { t as asciiArmor } from "./asciiarmor-mLyg-Z5h.js";
-export {
-  asciiArmor
-};

package/dist/asn1-DWEA66J4.js

@@ -1,4 +0,0 @@
-import { t as asn1 } from "./asn1-AE7eHomk.js";
-export {
-  asn1
-};

package/dist/brainfuck-mIPR6Ong.js

@@ -1,4 +0,0 @@
-import { t as brainfuck } from "./brainfuck-Bdd6NcL6.js";
-export {
-  brainfuck
-};

package/dist/classDiagram-2ON5EDUG-B9pkKjjc.js

@@ -1,30 +0,0 @@
-import "./purify.es-Brw-U87Q.js";
-import "./chunk-S3R3BYOJ-CBkH6JZZ.js";
-import { r as __name } from "./src-szye8OCw.js";
-import "./chunk-ABZYJK2D-BXTC53mt.js";
-import "./chunk-HN2XXSSU-CqPwpolw.js";
-import "./chunk-CVBHYZKI-Dhc_e3rA.js";
-import "./chunk-ATLVNIR6-BJDjUR_c.js";
-import "./dist-BYznkC5E.js";
-import "./chunk-JA3XYJ7Z-BGnAIbOP.js";
-import "./chunk-JZLCHNYA-CIRgweVQ.js";
-import "./chunk-QXUST7PY-C7750n_u.js";
-import "./chunk-N4CR4FBY-DKSvXAIS.js";
-import "./chunk-FMBD7UC4-geNUIndh.js";
-import "./chunk-55IACEB6-C3BASkh4.js";
-import "./chunk-QN33PNHL-B6zC8BTi.js";
-import { i as styles_default, n as classDiagram_default, r as classRenderer_v3_unified_default, t as ClassDB } from "./chunk-B4BG7PRW-DzmUUpfH.js";
-var diagram = {
-  parser: classDiagram_default,
-  get db() {
-    return new ClassDB();
-  },
-  renderer: classRenderer_v3_unified_default,
-  styles: styles_default,
-  init: /* @__PURE__ */ __name((e) => {
-    e.class || (e.class = {}), e.class.arrowMarkerAbsolute = e.arrowMarkerAbsolute;
-  }, "init")
-};
-export {
-  diagram
-};