@marimo-team/frontend 0.20.5-dev8 → 0.20.5-dev83

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
 

package/src/components/storage/storage-inspector.tsx

@@ -2,29 +2,38 @@
 
 import { CommandList } from "cmdk";
 import {
-  ChevronRightIcon,
   CopyIcon,
   DownloadIcon,
   FolderIcon,
   HardDriveIcon,
   HelpCircleIcon,
   LoaderCircle,
-  MoreVerticalIcon,
   PlusIcon,
-  RefreshCwIcon,
   ViewIcon,
   XIcon,
 } from "lucide-react";
 import React, { useCallback, useState } from "react";
 import { useLocale } from "react-aria";
 import { EngineVariable } from "@/components/databases/engine-variable";
+import { useAddCodeToNewCell } from "@/components/editor/cell/useAddCell";
 import { PanelEmptyState } from "@/components/editor/chrome/panels/empty-state";
 import { AddConnectionDialog } from "@/components/editor/connections/add-connection-dialog";
+import {
+  FILE_ICON_COLOR,
+  renderFileIcon,
+} from "@/components/editor/file-tree/file-icons";
+import {
+  MENU_ITEM_ICON_CLASS,
+  MoreActionsButton,
+  RefreshIconButton,
+  TreeChevron,
+} from "@/components/editor/file-tree/tree-actions";
 import { Command, CommandInput, CommandItem } from "@/components/ui/command";
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
+  DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { Tooltip } from "@/components/ui/tooltip";
@@ -40,7 +49,7 @@ import type {
   StorageNamespace,
   StoragePathKey,
 } from "@/core/storage/types";
-import { storagePathKey, storageUrl } from "@/core/storage/types";
+import { storagePathKey } from "@/core/storage/types";
 import type { VariableName } from "@/core/variables/types";
 import { cn } from "@/utils/cn";
 import { copyToClipboard } from "@/utils/copy";
@@ -49,8 +58,9 @@ import { formatBytes } from "@/utils/formatting";
 import { Logger } from "@/utils/Logger";
 import { ErrorState } from "../datasources/components";
 import { Button } from "../ui/button";
-import { ProtocolIcon, renderFileIcon } from "./components";
+import { ProtocolIcon } from "./components";
 import { StorageFileViewer } from "./storage-file-viewer";
+import { STORAGE_SNIPPETS } from "./storage-snippets";
 
 interface OpenFileInfo {
   entry: StorageEntry;
@@ -138,6 +148,7 @@ const StorageEntryChildren: React.FC<{
   namespace: string;
   protocol: string;
   rootPath: string;
+  backendType: StorageNamespace["backendType"];
   prefix: string;
   depth: number;
   locale: string;
@@ -147,6 +158,7 @@ const StorageEntryChildren: React.FC<{
   namespace,
   protocol,
   rootPath,
+  backendType,
   prefix,
   depth,
   locale,
@@ -207,6 +219,7 @@ const StorageEntryChildren: React.FC<{
           namespace={namespace}
           protocol={protocol}
           rootPath={rootPath}
+          backendType={backendType}
           depth={depth}
           locale={locale}
           searchValue={searchValue}
@@ -222,6 +235,7 @@ const StorageEntryRow: React.FC<{
   namespace: string;
   protocol: string;
   rootPath: string;
+  backendType: StorageNamespace["backendType"];
   depth: number;
   locale: string;
   searchValue: string;
@@ -231,6 +245,7 @@ const StorageEntryRow: React.FC<{
   namespace,
   protocol,
   rootPath,
+  backendType,
   depth,
   locale,
   searchValue,
@@ -238,6 +253,7 @@ const StorageEntryRow: React.FC<{
 }) => {
   const [isExpanded, setIsExpanded] = useState(false);
   const { entriesByPath } = useStorage();
+  const addCodeToNewCell = useAddCodeToNewCell();
   const isDir = entry.kind === "directory";
   const name = displayName(entry.path);
   const hasSearch = !!searchValue.trim();
@@ -305,17 +321,14 @@ const StorageEntryRow: React.FC<{
         }}
       >
         {isDir ? (
-          <ChevronRightIcon
-            className={cn(
-              "h-3 w-3 shrink-0 transition-transform",
-              effectiveExpanded && "rotate-90",
-            )}
-          />
+          <TreeChevron isExpanded={effectiveExpanded} className="h-3 w-3" />
         ) : (
           <span className="w-3 shrink-0" />
         )}
         {isDir ? (
-          <FolderIcon className="h-3.5 w-3.5 text-amber-500 shrink-0" />
+          <FolderIcon
+            className={cn("h-3.5 w-3.5 shrink-0", FILE_ICON_COLOR.directory)}
+          />
         ) : (
           renderFileIcon(name)
         )}
@@ -337,14 +350,10 @@ const StorageEntryRow: React.FC<{
           )}
           <DropdownMenu>
             <DropdownMenuTrigger asChild={true}>
-              <Button
-                variant="text"
-                size="icon"
-                className="opacity-0 group-hover:opacity-100 transition-opacity hover:shadow-none hover:text-link text-muted-foreground"
+              <MoreActionsButton
+                iconClassName="h-3 w-3"
                 onClick={(e) => e.stopPropagation()}
-              >
-                <MoreVerticalIcon className="h-3 w-3" />
-              </Button>
+              />
             </DropdownMenuTrigger>
             <DropdownMenuContent
               align="end"
@@ -355,26 +364,47 @@ const StorageEntryRow: React.FC<{
                 <DropdownMenuItem
                   onSelect={() => onOpenFile({ entry, namespace })}
                 >
-                  <ViewIcon className="h-3.5 w-3.5 mr-2" />
+                  <ViewIcon className={MENU_ITEM_ICON_CLASS} />
                   View
                 </DropdownMenuItem>
               )}
               <DropdownMenuItem
                 onSelect={async () => {
-                  const url = storageUrl(protocol, rootPath, entry.path);
-                  await copyToClipboard(url.toString());
+                  await copyToClipboard(entry.path);
                   toast({ title: "Copied to clipboard" });
                 }}
               >
-                <CopyIcon className="h-3.5 w-3.5 mr-2" />
-                Copy URL
+                <CopyIcon className={MENU_ITEM_ICON_CLASS} />
+                Copy path
               </DropdownMenuItem>
               {!isDir && (
                 <DropdownMenuItem onSelect={() => handleDownload()}>
-                  <DownloadIcon className="h-3.5 w-3.5 mr-2" />
+                  <DownloadIcon className={MENU_ITEM_ICON_CLASS} />
                   Download
                 </DropdownMenuItem>
               )}
+              <DropdownMenuSeparator />
+              {STORAGE_SNIPPETS.map((snippet) => {
+                const code = snippet.getCode({
+                  variableName: namespace,
+                  protocol,
+                  entry,
+                  backendType,
+                });
+                if (code === null) {
+                  return null;
+                }
+                const Icon = snippet.icon;
+                return (
+                  <DropdownMenuItem
+                    key={snippet.id}
+                    onSelect={() => addCodeToNewCell(code)}
+                  >
+                    <Icon className={MENU_ITEM_ICON_CLASS} />
+                    {snippet.label}
+                  </DropdownMenuItem>
+                );
+              })}
             </DropdownMenuContent>
           </DropdownMenu>
         </div>
@@ -384,6 +414,7 @@ const StorageEntryRow: React.FC<{
           namespace={namespace}
           protocol={protocol}
           rootPath={rootPath}
+          backendType={backendType}
           prefix={entry.path}
           depth={depth + 1}
           locale={locale}
@@ -402,7 +433,6 @@ const StorageNamespaceSection: React.FC<{
   onOpenFile: (info: OpenFileInfo) => void;
 }> = ({ namespace, locale, searchValue, onOpenFile }) => {
   const [isExpanded, setIsExpanded] = useState(true);
-  const [isSpinning, setIsSpinning] = useState(false);
   const { entriesByPath } = useStorage();
   const { clearNamespaceCache } = useStorageActions();
   const namespaceName = namespace.name ?? namespace.displayName;
@@ -417,10 +447,8 @@ const StorageNamespaceSection: React.FC<{
   const handleRefresh = useCallback(
     (e: React.MouseEvent) => {
       e.stopPropagation();
-      setIsSpinning(true);
       clearNamespaceCache(namespaceName);
       refetch();
-      setTimeout(() => setIsSpinning(false), 500);
     },
     [namespaceName, clearNamespaceCache, refetch],
   );
@@ -441,12 +469,7 @@ const StorageNamespaceSection: React.FC<{
         onSelect={() => setIsExpanded(!isExpanded)}
         className="flex flex-row font-semibold h-7 text-xs gap-1.5 bg-(--slate-2) text-muted-foreground rounded-none"
       >
-        <ChevronRightIcon
-          className={cn(
-            "h-3 w-3 shrink-0 transition-transform",
-            isExpanded && "rotate-90",
-          )}
-        />
+        <TreeChevron isExpanded={isExpanded} className="h-3 w-3" />
         <ProtocolIcon protocol={namespace.protocol} />
         <span>{namespace.displayName}</span>
         {namespace.name && (
@@ -454,21 +477,12 @@ const StorageNamespaceSection: React.FC<{
             (<EngineVariable variableName={namespace.name as VariableName} />)
           </span>
         )}
-        <Tooltip content="Refresh storage connection">
-          <Button
-            variant="ghost"
-            size="icon"
-            className="hover:bg-transparent hover:shadow-none"
-            onClick={handleRefresh}
-          >
-            <RefreshCwIcon
-              className={cn(
-                "h-3 w-3 text-muted-foreground hover:text-foreground",
-                isSpinning && "animate-[spin_0.5s]",
-              )}
-            />
-          </Button>
-        </Tooltip>
+        <RefreshIconButton
+          onClick={handleRefresh}
+          tooltip="Refresh storage connection"
+          className="p-0"
+          iconClassName="h-3 w-3"
+        />
         <span className="text-[10px] text-muted-foreground font-normal tabular-nums ml-auto">
           {namespace.rootPath || "(root)"}
         </span>
@@ -488,7 +502,7 @@ const StorageNamespaceSection: React.FC<{
             <ErrorState
               error={error}
               style={indentStyle(1)}
-              className="py-1 text-xs h-auto"
+              className="py-1 text-xs h-auto overflow-auto max-h-32 items-start"
               showIcon={false}
             />
           )}
@@ -515,6 +529,7 @@ const StorageNamespaceSection: React.FC<{
               namespace={namespaceName}
               protocol={namespace.protocol}
               rootPath={namespace.rootPath}
+              backendType={namespace.backendType}
               depth={1}
               locale={locale}
               searchValue={searchValue}
@@ -540,7 +555,7 @@ export const StorageInspector: React.FC = () => {
         title="No storage connected"
         description={
           <span>
-            Create an Obstore or fsspec connection in your notebook. See the{" "}
+            Create an obstore or fsspec connection in your notebook. See the{" "}
             <a
               className="text-link"
               href="https://docs.marimo.io/guides/working_with_data/remote_storage/#quick-start"