@marimo-team/islands 0.20.5-dev6 → 0.20.5-dev61

package/src/components/editor/file-tree/tree-actions.tsx

@@ -0,0 +1,107 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import {
+  ChevronRightIcon,
+  MoreVerticalIcon,
+  RefreshCwIcon,
+} from "lucide-react";
+import React, { useCallback, useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Tooltip } from "@/components/ui/tooltip";
+import { cn } from "@/utils/cn";
+
+/**
+ * Animated chevron for tree expand/collapse.
+ * Rotates 90° when `isExpanded` is true.
+ */
+export const TreeChevron: React.FC<{
+  isExpanded: boolean;
+  className?: string;
+}> = ({ isExpanded, className }) => (
+  <ChevronRightIcon
+    className={cn(
+      "shrink-0 transition-transform",
+      isExpanded && "rotate-90",
+      className,
+    )}
+  />
+);
+
+/**
+ * Refresh button that briefly spins its icon when clicked.
+ * Keeps spinning for at least 500ms, or until the onClick Promise resolves.
+ */
+export const RefreshIconButton: React.FC<{
+  onClick: (e: React.MouseEvent) => void | Promise<void>;
+  tooltip?: string;
+  className?: string;
+  iconClassName?: string;
+}> = ({ onClick, tooltip = "Refresh", className, iconClassName }) => {
+  const [isSpinning, setIsSpinning] = useState(false);
+
+  const handleClick = useCallback(
+    async (e: React.MouseEvent) => {
+      setIsSpinning(true);
+      // Artificially spin for 500ms to show the user that the button is working.
+      const minDelay = new Promise<void>((r) => setTimeout(r, 500));
+      try {
+        await Promise.all([onClick(e), minDelay]);
+      } finally {
+        setIsSpinning(false);
+      }
+    },
+    [onClick],
+  );
+
+  const button = (
+    <Button
+      variant="text"
+      size="xs"
+      className={className}
+      onClick={handleClick}
+    >
+      <RefreshCwIcon
+        className={cn(
+          "h-4 w-4",
+          iconClassName,
+          isSpinning && "animate-[spin_0.5s]",
+        )}
+      />
+    </Button>
+  );
+
+  return <Tooltip content={tooltip}>{button}</Tooltip>;
+};
+
+/**
+ * Three-dot menu trigger that fades in on row hover.
+ * Must be inside a `group` container.
+ * Forwards ref so it works with Radix `asChild`.
+ */
+export const MoreActionsButton = React.forwardRef<
+  HTMLButtonElement,
+  {
+    onClick?: (e: React.MouseEvent) => void;
+    className?: string;
+    iconClassName?: string;
+  } & Omit<React.ComponentPropsWithoutRef<typeof Button>, "variant" | "size">
+>(({ className, iconClassName, ...props }, ref) => (
+  <Button
+    ref={ref}
+    variant="text"
+    tabIndex={-1}
+    size="xs"
+    className={cn(
+      "mb-0 opacity-0 group-hover:opacity-100 transition-opacity",
+      className,
+    )}
+    aria-label="More options"
+    {...props}
+  >
+    <MoreVerticalIcon className={cn("w-4 h-4", iconClassName)} />
+  </Button>
+));
+MoreActionsButton.displayName = "MoreActionsButton";
+
+/** Standard class string for icons inside dropdown menu items. */
+export const MENU_ITEM_ICON_CLASS = "h-3.5 w-3.5 mr-2";

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/__tests__/ConsoleOutput.test.tsx

@@ -2,24 +2,14 @@
 
 import { fireEvent, render, screen } from "@testing-library/react";
 import { 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
-  }
-};
+SetupMocks.resizeObserver();
 
 const renderWithProvider = (ui: React.ReactElement) => {
   return render(<TooltipProvider>{ui}</TooltipProvider>);

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();
+    });
+  }
+});

package/src/components/storage/components.tsx

@@ -8,15 +8,9 @@ import CoreweaveIcon from "@marimo-team/llm-info/icons/coreweave.svg?inline";
 import CoreweaveDarkIcon from "@marimo-team/llm-info/icons/coreweave-dark.svg?inline";
 import {
   DatabaseZapIcon,
-  FileCodeIcon,
-  FileIcon,
-  FileSpreadsheetIcon,
-  FileTextIcon,
-  FileVideoIcon,
   GithubIcon,
   GlobeIcon,
   HardDriveIcon,
-  ImageIcon,
 } from "lucide-react";
 import GoogleCloudIcon from "@/components/databases/icons/google-cloud-storage.svg?inline";
 import GoogleDriveIcon from "@/components/databases/icons/google-drive.svg?inline";
@@ -24,38 +18,6 @@ import type { KnownStorageProtocol } from "@/core/storage/types";
 import { useTheme } from "@/theme/useTheme";
 import { cn } from "@/utils/cn";
 
-export function renderFileIcon(name: string): React.ReactNode {
-  const ext = name.split(".").pop()?.toLowerCase();
-  switch (ext) {
-    case "png":
-    case "jpg":
-    case "jpeg":
-    case "gif":
-    case "svg":
-    case "webp":
-      return <ImageIcon className="h-3.5 w-3.5 text-purple-500" />;
-    case "csv":
-    case "parquet":
-    case "arrow":
-    case "xlsx":
-      return <FileSpreadsheetIcon className="h-3.5 w-3.5 text-green-500" />;
-    case "py":
-    case "js":
-    case "ts":
-    case "json":
-      return <FileCodeIcon className="h-3.5 w-3.5 text-blue-500" />;
-    case "mp4":
-    case "mpeg":
-      return <FileVideoIcon className="h-3.5 w-3.5 text-orange-500" />;
-    case "txt":
-    case "md":
-    case "log":
-      return <FileTextIcon className="h-3.5 w-3.5 text-muted-foreground" />;
-    default:
-      return <FileIcon className="h-3.5 w-3.5 text-muted-foreground" />;
-  }
-}
-
 type IconEntry =
   | { src: string; dark?: string }
   | React.ComponentType<{ className?: string }>;

package/src/components/storage/storage-file-viewer.tsx

@@ -5,6 +5,7 @@ import type React from "react";
 import { useCallback } from "react";
 import { useLocale } from "react-aria";
 import { FilePreviewHeader } from "@/components/editor/file-tree/file-header";
+import { renderFileIcon } from "@/components/editor/file-tree/file-icons";
 import {
   FileContentRenderer,
   isMediaMime,
@@ -18,7 +19,6 @@ import { formatBytes } from "@/utils/formatting";
 import { Logger } from "@/utils/Logger";
 import { CopyClipboardIcon } from "../icons/copy-icon";
 import { Button } from "../ui/button";
-import { renderFileIcon } from "./components";
 
 const MAX_MEDIA_PREVIEW_SIZE = 100 * 1024 * 1024; // 100 MB