@marimo-team/islands 0.20.5-dev8 → 0.20.5-dev87

package/src/components/editor/file-tree/types.ts

@@ -1,105 +1,11 @@
 /* Copyright 2026 Marimo. All rights reserved. */
-import {
-  DatabaseIcon,
-  FileAudioIcon,
-  FileCodeIcon,
-  FileIcon,
-  FileImageIcon,
-  FileJsonIcon,
-  FileTextIcon,
-  FileVideo2Icon,
-  FolderArchiveIcon,
-  FolderIcon,
-  type LucideIcon,
-} from "lucide-react";
 
-/* Copyright 2026 Marimo. All rights reserved. */
-export type FileType =
-  | "directory"
-  | "python"
-  | "code"
-  | "json"
-  | "text"
-  | "image"
-  | "audio"
-  | "video"
-  | "data"
-  | "pdf"
-  | "zip"
-  | "unknown";
-
-export function guessFileType(name: string): FileType {
-  const ext = name.split(".").pop();
-  if (ext === undefined) {
-    return "unknown";
-  }
-  switch (ext.toLowerCase()) {
-    case "py":
-      return "python";
-    case "txt":
-    case "md":
-    case "qmd":
-      return "text";
-    case "png":
-    case "jpg":
-    case "jpeg":
-    case "gif":
-      return "image";
-    case "csv":
-      return "data";
-    case "json":
-      return "json";
-    // Non-exhaustive list of code file extensions
-    case "js":
-    case "ts":
-    case "tsx":
-    case "html":
-    case "css":
-    case "toml":
-    case "yaml":
-    case "yml":
-    case "wasm":
-      return "code";
-    case "mp3":
-    case "m4a":
-    case "m4v":
-    case "ogg":
-    case "wav":
-      return "audio";
-    case "mp4":
-    case "webm":
-    case "mkv":
-      return "video";
-    case "pdf":
-      return "pdf";
-    case "zip":
-    case "tar":
-    case "gz":
-      return "zip";
-    default:
-      return "unknown";
-  }
-}
-
-export const FILE_TYPE_ICONS: Record<FileType, LucideIcon> = {
-  directory: FolderIcon,
-  python: FileCodeIcon,
-  json: FileJsonIcon,
-  code: FileCodeIcon,
-  text: FileTextIcon,
-  image: FileImageIcon,
-  audio: FileAudioIcon,
-  video: FileVideo2Icon,
-  pdf: FileCodeIcon,
-  zip: FolderArchiveIcon,
-  data: DatabaseIcon,
-  unknown: FileIcon,
-};
+import type { FileIconType } from "@/components/editor/file-tree/file-icons";
 
 const TAB = "    ";
 
 export const PYTHON_CODE_FOR_FILE_TYPE: Record<
-  FileType,
+  FileIconType,
   (path: string) => string
 > = {
   directory: (path) => `os.listdir("${path}")`,

package/src/components/editor/header/filename-input.tsx

@@ -3,6 +3,10 @@
 import { PopoverAnchor } from "@radix-ui/react-popover";
 import { FilePenIcon } from "lucide-react";
 import { type JSX, useEffect, useRef, useState } from "react";
+import {
+  FILE_ICON as FILE_TYPE_ICONS,
+  guessFileIconType as guessFileType,
+} from "@/components/editor/file-tree/file-icons";
 import type { FileInfo } from "@/core/network/types";
 import { useAsyncData } from "@/hooks/useAsyncData";
 import { Paths } from "@/utils/paths";
@@ -15,7 +19,6 @@ import {
   CommandList,
 } from "../../ui/command";
 import { Popover, PopoverContent } from "../../ui/popover";
-import { FILE_TYPE_ICONS, guessFileType } from "../file-tree/types";
 
 import "./filename-input.css";
 import { getFeatureFlag } from "@/core/config/feature-flag";

package/src/components/editor/navigation/__tests__/clipboard.test.ts

@@ -3,15 +3,13 @@
 
 import { act, renderHook } from "@testing-library/react";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { asMock, Mocks, SetupMocks } from "@/__mocks__/common";
+import { asMock, MockModules, Mocks, SetupMocks } from "@/__mocks__/common";
 import type { CellActions, NotebookState } from "@/core/cells/cells";
 import type { CellId } from "@/core/cells/ids";
 import { useCellClipboard } from "../clipboard";
 
 // Mock dependencies
-vi.mock("@/components/ui/use-toast", () => ({
-  toast: vi.fn(),
-}));
+vi.mock("@/components/ui/use-toast", () => MockModules.toast());
 
 vi.mock("@/core/cells/cells", () => ({
   getNotebook: vi.fn(),

package/src/components/editor/output/console/ConsoleOutput.tsx

@@ -6,7 +6,7 @@ import {
   ChevronsUpDownIcon,
   WrapTextIcon,
 } from "lucide-react";
-import React, { useLayoutEffect } from "react";
+import React, { useEffect, useLayoutEffect, useRef, useState } from "react";
 import { ToggleButton } from "react-aria-components";
 import { DebuggerControls } from "@/components/debugger/debugger-code";
 import { CopyClipboardIcon } from "@/components/icons/copy-icon";
@@ -33,6 +33,52 @@ import { useWrapText } from "../useWrapText";
 import { processOutput } from "./process-output";
 import { RenderTextWithLinks } from "./text-rendering";
 
+/**
+ * Delay in ms before clearing console outputs.
+ * This prevents flickering when a cell re-runs and outputs are briefly cleared
+ * before new outputs arrive (e.g., plt.show() with a slider).
+ */
+export const CONSOLE_CLEAR_DEBOUNCE_MS = 200;
+
+/**
+ * Debounces the clearing of console outputs.
+ * - Non-empty updates are applied immediately.
+ * - Transitions to empty are delayed by CONSOLE_CLEAR_DEBOUNCE_MS,
+ *   giving new outputs a chance to arrive and replace the old ones
+ *   without a visible flicker.
+ */
+function useDebouncedConsoleOutputs<T>(outputs: T[]): T[] {
+  const [debouncedOutputs, setDebouncedOutputs] = useState(outputs);
+  const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  // Non-empty outputs: apply immediately and cancel any pending clear
+  if (outputs.length > 0 && debouncedOutputs !== outputs) {
+    if (timerRef.current !== null) {
+      clearTimeout(timerRef.current);
+      timerRef.current = null;
+    }
+    setDebouncedOutputs(outputs);
+  }
+
+  // Empty outputs: delay the clear so new outputs can arrive first
+  useEffect(() => {
+    if (outputs.length === 0 && timerRef.current === null) {
+      timerRef.current = setTimeout(() => {
+        timerRef.current = null;
+        setDebouncedOutputs([]);
+      }, CONSOLE_CLEAR_DEBOUNCE_MS);
+    }
+    return () => {
+      if (timerRef.current !== null) {
+        clearTimeout(timerRef.current);
+        timerRef.current = null;
+      }
+    };
+  }, [outputs]);
+
+  return debouncedOutputs;
+}
+
 interface Props {
   cellId: CellId;
   cellName: string;
@@ -63,7 +109,7 @@ const ConsoleOutputInternal = (props: Props): React.ReactNode => {
     setValue: setStdinValue,
   });
   const {
-    consoleOutputs,
+    consoleOutputs: rawConsoleOutputs,
     stale,
     cellName,
     cellId,
@@ -73,6 +119,9 @@ const ConsoleOutputInternal = (props: Props): React.ReactNode => {
     className,
   } = props;
 
+  // Debounce clearing to prevent flickering when cells re-run
+  const consoleOutputs = useDebouncedConsoleOutputs(rawConsoleOutputs);
+
   /* The debugger UI needs some work. For now just use the regular
   /* console output. */
   /* if (debuggerActive) {

package/src/components/editor/output/console/__tests__/ConsoleOutput.test.tsx

@@ -1,25 +1,15 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import { fireEvent, render, screen } from "@testing-library/react";
-import { describe, expect, it, vi } from "vitest";
+import { act, fireEvent, render, screen } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { SetupMocks } from "@/__mocks__/common";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import type { CellId } from "@/core/cells/ids";
 import type { WithResponse } from "@/core/cells/types";
 import type { OutputMessage } from "@/core/kernel/messages";
-import { ConsoleOutput } from "../ConsoleOutput";
-
-// Mock ResizeObserver for tests
-global.ResizeObserver = class ResizeObserver {
-  observe() {
-    // noop
-  }
-  unobserve() {
-    // noop
-  }
-  disconnect() {
-    // noop
-  }
-};
+import { CONSOLE_CLEAR_DEBOUNCE_MS, ConsoleOutput } from "../ConsoleOutput";
+
+SetupMocks.resizeObserver();
 
 const renderWithProvider = (ui: React.ReactElement) => {
   return render(<TooltipProvider>{ui}</TooltipProvider>);
@@ -203,3 +193,94 @@ describe("ConsoleOutput pdb history", () => {
     expect(input).toHaveValue("");
   });
 });
+
+describe("ConsoleOutput debounced clearing", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  const createOutput = (
+    data: string,
+    channel = "stdout",
+  ): WithResponse<OutputMessage> => ({
+    channel: channel as "stdout" | "stderr",
+    mimetype: "text/plain",
+    data,
+    timestamp: 0,
+    response: undefined,
+  });
+
+  const defaultProps = {
+    cellId: "cell-1" as CellId,
+    cellName: "test_cell",
+    consoleOutputs: [] as WithResponse<OutputMessage>[],
+    stale: false,
+    debuggerActive: false,
+    onSubmitDebugger: vi.fn(),
+  };
+
+  it("should keep old outputs visible when cleared, then show new outputs immediately", () => {
+    const outputs1 = [createOutput("hello world")];
+
+    const { rerender } = renderWithProvider(
+      <ConsoleOutput {...defaultProps} consoleOutputs={outputs1} />,
+    );
+
+    // Old output is visible
+    expect(screen.getByText("hello world")).toBeInTheDocument();
+
+    // Clear outputs (simulates cell re-run)
+    rerender(
+      <TooltipProvider>
+        <ConsoleOutput {...defaultProps} consoleOutputs={[]} />
+      </TooltipProvider>,
+    );
+
+    // Old output should still be visible during debounce period
+    expect(screen.getByText("hello world")).toBeInTheDocument();
+
+    // New outputs arrive before debounce fires
+    const outputs2 = [createOutput("new output")];
+    rerender(
+      <TooltipProvider>
+        <ConsoleOutput {...defaultProps} consoleOutputs={outputs2} />
+      </TooltipProvider>,
+    );
+
+    // New output should be shown immediately
+    expect(screen.getByText("new output")).toBeInTheDocument();
+    expect(screen.queryByText("hello world")).not.toBeInTheDocument();
+  });
+
+  it("should clear outputs after debounce period if no new outputs arrive", () => {
+    const outputs1 = [createOutput("old output")];
+
+    const { rerender } = renderWithProvider(
+      <ConsoleOutput {...defaultProps} consoleOutputs={outputs1} />,
+    );
+
+    expect(screen.getByText("old output")).toBeInTheDocument();
+
+    // Clear outputs
+    rerender(
+      <TooltipProvider>
+        <ConsoleOutput {...defaultProps} consoleOutputs={[]} />
+      </TooltipProvider>,
+    );
+
+    // Still visible during debounce
+    expect(screen.getByText("old output")).toBeInTheDocument();
+
+    // Advance past debounce period
+    act(() => {
+      vi.advanceTimersByTime(CONSOLE_CLEAR_DEBOUNCE_MS + 1);
+    });
+
+    // Now the output should be cleared
+    expect(screen.queryByText("old output")).not.toBeInTheDocument();
+  });
+});

package/src/components/icons/marimo-icons.tsx

@@ -81,9 +81,9 @@ export const MarimoIcon = ({
       width={width ?? size}
       height={height ?? size}
       viewBox={viewBox}
+      aria-hidden={true}
       {...props}
     >
-      <title>marimo icon</title>
       <MarimoCirclePaths
         fill={fill}
         stroke={stroke ?? "currentColor"}
@@ -119,9 +119,9 @@ const MarimoMultiIcon = ({
       width={width ?? size}
       height={height ?? size}
       viewBox={viewBox}
+      aria-hidden={true}
       {...props}
     >
-      <title>marimo multi icon</title>
       <defs>
         <mask id={maskId}>
           <rect width="100%" height="100%" fill="white" />

package/src/components/pages/home-page.tsx

@@ -23,6 +23,11 @@ import {
 } from "react-arborist";
 import { useLocale } from "react-aria";
 import { MarkdownIcon } from "@/components/editor/cell/code/icons";
+import {
+  FILE_ICON as FILE_TYPE_ICONS,
+  type FileIconType as FileType,
+  guessFileIconType as guessFileType,
+} from "@/components/editor/file-tree/file-icons";
 import { useImperativeModal } from "@/components/modal/ImperativeModal";
 import { AlertDialogDestructiveAction } from "@/components/ui/alert-dialog";
 import { Button } from "@/components/ui/button";
@@ -47,11 +52,6 @@ import { newNotebookURL } from "@/utils/urls";
 import { ConfigButton } from "../app-config/app-config-button";
 import { ErrorBoundary } from "../editor/boundary/ErrorBoundary";
 import { ShutdownButton } from "../editor/controls/shutdown-button";
-import {
-  FILE_TYPE_ICONS,
-  type FileType,
-  guessFileType,
-} from "../editor/file-tree/types";
 import {
   Header,
   OpenTutorialDropDown,

package/src/components/storage/__tests__/storage-snippets.test.ts

@@ -0,0 +1,253 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+import { describe, expect, it } from "vitest";
+import {
+  STORAGE_SNIPPETS,
+  type StorageSnippetContext,
+} from "../storage-snippets";
+
+const readSnippet = STORAGE_SNIPPETS.find((s) => s.id === "read-file")!;
+const downloadSnippet = STORAGE_SNIPPETS.find((s) => s.id === "download-file")!;
+
+function makeCtx(
+  overrides: Partial<StorageSnippetContext> = {},
+): StorageSnippetContext {
+  return {
+    variableName: "store",
+    protocol: "s3",
+    entry: {
+      path: "data/file.csv",
+      kind: "object",
+      size: 1024,
+      lastModified: null,
+    },
+    backendType: "obstore",
+    ...overrides,
+  };
+}
+
+describe("read-file snippet", () => {
+  it("obstore backend", () => {
+    expect(readSnippet.getCode(makeCtx())).toMatchInlineSnapshot(`
+      "_data = store.get("data/file.csv").bytes()
+      _data"
+    `);
+  });
+
+  it("fsspec backend", () => {
+    expect(
+      readSnippet.getCode(
+        makeCtx({ backendType: "fsspec", variableName: "fs" }),
+      ),
+    ).toMatchInlineSnapshot(`
+      "_data = fs.cat_file("data/file.csv")
+      _data"
+    `);
+  });
+
+  it("returns null for directories", () => {
+    expect(
+      readSnippet.getCode(
+        makeCtx({
+          entry: {
+            path: "data/",
+            kind: "directory",
+            size: 0,
+            lastModified: null,
+          },
+        }),
+      ),
+    ).toBeNull();
+  });
+
+  it("escapes double quotes in paths", () => {
+    expect(
+      readSnippet.getCode(
+        makeCtx({
+          entry: {
+            path: 'data/"file".csv',
+            kind: "object",
+            size: 100,
+            lastModified: null,
+          },
+        }),
+      ),
+    ).toMatchInlineSnapshot(`
+      "_data = store.get("data/\\"file\\".csv").bytes()
+      _data"
+    `);
+  });
+
+  it("escapes backslashes in paths", () => {
+    expect(
+      readSnippet.getCode(
+        makeCtx({
+          entry: {
+            path: "data\\file.csv",
+            kind: "object",
+            size: 100,
+            lastModified: null,
+          },
+        }),
+      ),
+    ).toMatchInlineSnapshot(`
+      "_data = store.get("data\\\\file.csv").bytes()
+      _data"
+    `);
+  });
+
+  it("escapes newlines and tabs in paths", () => {
+    expect(
+      readSnippet.getCode(
+        makeCtx({
+          entry: {
+            path: "data/file\nname\there.csv",
+            kind: "object",
+            size: 100,
+            lastModified: null,
+          },
+        }),
+      ),
+    ).toMatchInlineSnapshot(`
+      "_data = store.get("data/file\\nname\\there.csv").bytes()
+      _data"
+    `);
+  });
+
+  it("escapes control characters in paths", () => {
+    expect(
+      readSnippet.getCode(
+        makeCtx({
+          entry: {
+            path: "data/\u0000\u001F.csv",
+            kind: "object",
+            size: 100,
+            lastModified: null,
+          },
+        }),
+      ),
+    ).toMatchInlineSnapshot(`
+      "_data = store.get("data/\\u0000\\u001f.csv").bytes()
+      _data"
+    `);
+  });
+});
+
+describe("download-file snippet", () => {
+  it("obstore s3 backend", () => {
+    expect(downloadSnippet.getCode(makeCtx())).toMatchInlineSnapshot(`
+      "from datetime import timedelta
+      from obstore import sign
+
+      signed_url = sign(
+          store, "GET", "data/file.csv",
+          expires_in=timedelta(hours=1),
+      )
+      signed_url"
+    `);
+  });
+
+  it("obstore gcs backend", () => {
+    expect(
+      downloadSnippet.getCode(makeCtx({ protocol: "gcs" })),
+    ).toMatchInlineSnapshot(`
+      "from datetime import timedelta
+      from obstore import sign
+
+      signed_url = sign(
+          store, "GET", "data/file.csv",
+          expires_in=timedelta(hours=1),
+      )
+      signed_url"
+    `);
+  });
+
+  it("obstore cloudflare backend", () => {
+    expect(
+      downloadSnippet.getCode(makeCtx({ protocol: "cloudflare" })),
+    ).toMatchInlineSnapshot(`
+      "from datetime import timedelta
+      from obstore import sign
+
+      signed_url = sign(
+          store, "GET", "data/file.csv",
+          expires_in=timedelta(hours=1),
+      )
+      signed_url"
+    `);
+  });
+
+  it("returns null for http obstore (not signable)", () => {
+    expect(downloadSnippet.getCode(makeCtx({ protocol: "http" }))).toBeNull();
+  });
+
+  it("returns null for file obstore (not signable)", () => {
+    expect(downloadSnippet.getCode(makeCtx({ protocol: "file" }))).toBeNull();
+  });
+
+  it("returns null for in-memory obstore (not signable)", () => {
+    expect(
+      downloadSnippet.getCode(makeCtx({ protocol: "in-memory" })),
+    ).toBeNull();
+  });
+
+  it("fsspec backend", () => {
+    expect(
+      downloadSnippet.getCode(
+        makeCtx({ backendType: "fsspec", variableName: "fs" }),
+      ),
+    ).toMatchInlineSnapshot(`"fs.get("data/file.csv", "file.csv")"`);
+  });
+
+  it("fsspec backend with nested path", () => {
+    expect(
+      downloadSnippet.getCode(
+        makeCtx({
+          backendType: "fsspec",
+          variableName: "fs",
+          entry: {
+            path: "nested/dir/report.parquet",
+            kind: "file",
+            size: 500,
+            lastModified: null,
+          },
+        }),
+      ),
+    ).toMatchInlineSnapshot(
+      `"fs.get("nested/dir/report.parquet", "report.parquet")"`,
+    );
+  });
+
+  it("returns null for directories", () => {
+    expect(
+      downloadSnippet.getCode(
+        makeCtx({
+          entry: {
+            path: "data/",
+            kind: "directory",
+            size: 0,
+            lastModified: null,
+          },
+        }),
+      ),
+    ).toBeNull();
+  });
+});
+
+describe("all snippets return null for directories", () => {
+  for (const snippet of STORAGE_SNIPPETS) {
+    it(`${snippet.id} returns null for directory entries`, () => {
+      expect(
+        snippet.getCode(
+          makeCtx({
+            entry: {
+              path: "some-dir/",
+              kind: "directory",
+              size: 0,
+              lastModified: null,
+            },
+          }),
+        ),
+      ).toBeNull();
+    });
+  }
+});