@marimo-team/islands 0.19.10-dev12 → 0.19.10-dev15

package/dist/main.js

@@ -73304,7 +73304,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.10-dev12"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.10-dev15"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var import_compiler_runtime$88 = require_compiler_runtime();
   function useKeydownOnElement(e, r) {
@@ -74313,9 +74313,9 @@ Image URL: ${r.imageUrl}`)), contextToXml({
           ]
         }),
         (0, import_jsx_runtime.jsxs)("form", {
-          onSubmit: async (e2) => {
-            e2.preventDefault();
-            let c2 = y ? await convertToFileUIPart(y) : void 0;
+          onSubmit: async (c2) => {
+            if (c2.preventDefault(), e.disabled) return;
+            let d2 = y ? await convertToFileUIPart(y) : void 0;
             RY({
               role: "user",
               parts: [
@@ -74323,12 +74323,13 @@ Image URL: ${r.imageUrl}`)), contextToXml({
                   type: "text",
                   text: r
                 },
-                ...c2 ?? []
+                ...d2 ?? []
               ]
             }), ZY();
           },
           ref: E,
-          className: "flex w-full border-t border-(--slate-6) px-2 py-1 items-center",
+          inert: e.disabled || void 0,
+          className: cn("flex w-full border-t border-(--slate-6) px-2 py-1 items-center", e.disabled && "opacity-50 cursor-not-allowed"),
           children: [
             e.showConfigurationControls && (0, import_jsx_runtime.jsx)(ConfigPopup, {
               config: d,
@@ -74745,7 +74746,8 @@ Image URL: ${r.imageUrl}`)), contextToXml({
     allowAttachments: union([
       boolean$2(),
       string$2().array()
-    ])
+    ]),
+    disabled: boolean$2().default(false)
   })).withFunctions({
     get_chat_history: rpc.input(object$1({})).output(object$1({
       messages: messageSchema
@@ -74767,6 +74769,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
           showConfigurationControls: e.data.showConfigurationControls,
           maxHeight: e.data.maxHeight,
           allowAttachments: e.data.allowAttachments,
+          disabled: e.data.disabled,
           config: e.data.config,
           get_chat_history: e.functions.get_chat_history,
           delete_chat_history: e.functions.delete_chat_history,

package/package.json

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

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/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} />