@marimo-team/islands 0.23.12-dev2 → 0.23.12-dev21

package/src/plugins/impl/FileBrowserPlugin.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { type LucideIcon, CornerLeftUp } from "lucide-react";
-import { type JSX, useEffect, useState } from "react";
+import { type JSX, useEffect, useLayoutEffect, useRef, useState } from "react";
 import { z } from "zod";
 import {
   FILE_ICON as FILE_TYPE_ICONS,
@@ -129,6 +129,7 @@ interface FileBrowserProps extends Data, PluginFunctions {
 }
 
 interface CheckboxOrIconProps {
+  name: string;
   isSelected: boolean;
   canSelect: boolean;
   Icon: LucideIcon;
@@ -136,6 +137,7 @@ interface CheckboxOrIconProps {
 }
 
 function CheckboxOrIcon({
+  name,
   isSelected,
   canSelect,
   Icon,
@@ -146,17 +148,21 @@ function CheckboxOrIcon({
       <>
         <Checkbox
           checked={isSelected}
+          aria-label={`Select ${name}`}
+          tabIndex={-1}
           onClick={(e) => {
             onSelect();
             e.stopPropagation();
           }}
-          className={cn({ "hidden group-hover:flex": !isSelected })}
+          className={cn({
+            "hidden group-hover:flex group-focus:flex": !isSelected,
+          })}
         />
         <Icon
           size={16}
           className={cn("mr-2", {
             hidden: isSelected,
-            "group-hover:hidden": !isSelected,
+            "group-hover:hidden group-focus:hidden": !isSelected,
           })}
         />
       </>
@@ -165,6 +171,18 @@ function CheckboxOrIcon({
   return <Icon size={16} className="mr-2" />;
 }
 
+interface RowModel {
+  key: string;
+  name: string;
+  Icon: LucideIcon;
+  isSelected: boolean;
+  canSelect: boolean;
+  /** Enter and mouse-click action. */
+  onPrimary: () => void;
+  /** Space action; null when the row has nothing to toggle. */
+  onToggleSelect: (() => void) | null;
+}
+
 /**
  * File browser component.
  *
@@ -184,6 +202,13 @@ export const FileBrowser = ({
   const [path, setPath] = useInternalStateWithSync(initialPath);
   const [isUpdatingPath, setIsUpdatingPath] = useState(false);
   const [showLoadingOverlay, setShowLoadingOverlay] = useState(false);
+  const [activeIndex, setActiveIndex] = useState(0);
+  const rowRefs = useRef<(HTMLTableRowElement | null)[]>([]);
+  const gridRef = useRef<HTMLTableElement | null>(null);
+  // Set when navigation is triggered from within the grid, so focus can follow
+  // to the parent row after the new listing renders instead of falling to the
+  // body when the previously focused row unmounts.
+  const refocusParentRef = useRef(false);
 
   // HACK: use the random-id of the host element to force a re-render
   // when the random-id changes, this means the cell was re-rendered
@@ -210,6 +235,22 @@ export const FileBrowser = ({
     };
   }, [isPending]);
 
+  // Reset the roving tabindex whenever the listing reloads (a new path or a
+  // same-path refresh) so activeIndex never points past the current rows.
+  const listingKey = `${path}::${randomId}`;
+  const [prevListingKey, setPrevListingKey] = useState(listingKey);
+  if (prevListingKey !== listingKey) {
+    setPrevListingKey(listingKey);
+    setActiveIndex(0);
+  }
+
+  useLayoutEffect(() => {
+    if (refocusParentRef.current) {
+      refocusParentRef.current = false;
+      rowRefs.current[0]?.focus();
+    }
+  }, [listingKey]);
+
   const files = data?.files ?? [];
   const selectedPaths = new Set(value.map((x) => x.path));
   const canSelectDirectories =
@@ -269,6 +310,8 @@ export const FileBrowser = ({
       return;
     }
 
+    refocusParentRef.current =
+      gridRef.current?.contains(document.activeElement) ?? false;
     setPath(newPath);
     setIsUpdatingPath(false);
   }
@@ -333,78 +376,90 @@ export const FileBrowser = ({
     setValue([...value, ...filesInView]);
   }
 
-  // Create rows for directories and files
-  const fileRows: React.ReactNode[] = [];
-
-  // Parent directory ".." row button
-  fileRows.push(
-    <TableRow
-      className="hover:bg-accent select-none"
-      key={"Parent directory"}
-      onClick={() => setNewPath(PARENT_DIRECTORY)}
-    >
-      <TableCell className="w-[50px] pl-4">
-        <CornerLeftUp size={16} />
-      </TableCell>
-      <TableCell>{PARENT_DIRECTORY}</TableCell>
-    </TableRow>,
-  );
+  const rowModels: RowModel[] = [
+    {
+      key: "parent",
+      name: PARENT_DIRECTORY,
+      Icon: CornerLeftUp,
+      isSelected: false,
+      canSelect: false,
+      onPrimary: () => setNewPath(PARENT_DIRECTORY),
+      onToggleSelect: null,
+    },
+    ...files.map((file): RowModel => {
+      let filePath = file.path;
+      if (filePath.startsWith("//")) {
+        filePath = filePath.slice(1) as FilePath;
+      }
 
-  for (const file of files) {
-    let filePath = file.path;
+      const canSelect =
+        (canSelectDirectories && file.is_directory) ||
+        (canSelectFiles && !file.is_directory);
+      const isSelected = selectedPaths.has(filePath);
+      const fileType: FileType = file.is_directory
+        ? "directory"
+        : guessFileType(file.name);
+
+      const toggle = () =>
+        handleSelection({
+          path: filePath,
+          name: file.name,
+          isDirectory: file.is_directory,
+        });
+
+      return {
+        key: file.id,
+        name: file.name,
+        Icon: FILE_TYPE_ICONS[fileType],
+        isSelected,
+        canSelect,
+        onPrimary: file.is_directory
+          ? () => setNewPath(filePath)
+          : canSelect
+            ? toggle
+            : () => {},
+        onToggleSelect: canSelect ? toggle : null,
+      };
+    }),
+  ];
 
-    if (filePath.startsWith("//")) {
-      filePath = filePath.slice(1) as FilePath;
-    }
+  function focusRow(index: number) {
+    setActiveIndex(index);
+    rowRefs.current[index]?.focus();
+  }
 
-    // Click handler
-    const handleClick = file.is_directory
-      ? ({ path }: { path: string }) => setNewPath(path)
-      : handleSelection;
-
-    // Icon
-    const fileType: FileType = file.is_directory
-      ? "directory"
-      : guessFileType(file.name);
-
-    const Icon = FILE_TYPE_ICONS[fileType];
-
-    const isSelected = selectedPaths.has(filePath);
-
-    fileRows.push(
-      <TableRow
-        key={file.id}
-        className={cn("hover:bg-accent group select-none", {
-          "bg-primary/25 hover:bg-primary/35": isSelected,
-        })}
-        onClick={() =>
-          handleClick({
-            path: filePath,
-            name: file.name,
-            isDirectory: file.is_directory,
-          })
-        }
-      >
-        <TableCell className="w-[50px] pl-4">
-          <CheckboxOrIcon
-            isSelected={isSelected}
-            canSelect={
-              (canSelectDirectories && file.is_directory) ||
-              (canSelectFiles && !file.is_directory)
-            }
-            Icon={Icon}
-            onSelect={() =>
-              handleSelection({
-                path: filePath,
-                name: file.name,
-                isDirectory: file.is_directory,
-              })
-            }
-          />
-        </TableCell>
-        <TableCell>{file.name}</TableCell>
-      </TableRow>,
-    );
+  function handleRowKeyDown(
+    e: React.KeyboardEvent<HTMLTableRowElement>,
+    index: number,
+  ) {
+    const lastIndex = rowModels.length - 1;
+    switch (e.key) {
+      case "ArrowDown":
+        e.preventDefault();
+        focusRow(Math.min(index + 1, lastIndex));
+        break;
+      case "ArrowUp":
+        e.preventDefault();
+        focusRow(Math.max(index - 1, 0));
+        break;
+      case "Home":
+        e.preventDefault();
+        focusRow(0);
+        break;
+      case "End":
+        e.preventDefault();
+        focusRow(lastIndex);
+        break;
+      case "Enter":
+        e.preventDefault();
+        rowModels[index].onPrimary();
+        break;
+      // Space is select-only; preventDefault stops the list from scrolling.
+      case " ":
+        e.preventDefault();
+        rowModels[index].onToggleSelect?.();
+        break;
+    }
   }
 
   // Get list of parent directories.
@@ -490,8 +545,44 @@ export const FileBrowser = ({
             <span>Listing files...</span>
           </div>
         )}
-        <Table className="cursor-pointer table-fixed">
-          <TableBody>{fileRows}</TableBody>
+        <Table
+          ref={gridRef}
+          className="cursor-pointer table-fixed"
+          role="grid"
+          aria-label="File browser"
+          aria-multiselectable={multiple}
+        >
+          <TableBody>
+            {rowModels.map((row, index) => (
+              <TableRow
+                key={row.key}
+                role="row"
+                ref={(el) => {
+                  rowRefs.current[index] = el;
+                }}
+                tabIndex={index === activeIndex ? 0 : -1}
+                onFocus={() => setActiveIndex(index)}
+                onKeyDown={(e) => handleRowKeyDown(e, index)}
+                className={cn(
+                  "hover:bg-accent group select-none focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-inset",
+                  { "bg-primary/25 hover:bg-primary/35": row.isSelected },
+                )}
+                aria-selected={row.canSelect ? row.isSelected : undefined}
+                onClick={row.onPrimary}
+              >
+                <TableCell role="gridcell" className="w-[50px] pl-4">
+                  <CheckboxOrIcon
+                    name={row.name}
+                    isSelected={row.isSelected}
+                    canSelect={row.canSelect}
+                    Icon={row.Icon}
+                    onSelect={() => row.onToggleSelect?.()}
+                  />
+                </TableCell>
+                <TableCell role="gridcell">{row.name}</TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
         </Table>
       </div>
       <div className="mt-4">

package/src/plugins/impl/MatrixPlugin.tsx

@@ -244,10 +244,10 @@ const MatrixComponent = ({
                     <td
                       key={j}
                       className={cn(
-                        "relative text-center min-w-14 h-8 px-2 transition-colors touch-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none",
+                        "relative text-center min-w-14 h-8 px-2 transition-colors touch-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-hidden",
                         isDisabled
                           ? "cursor-default text-muted-foreground"
-                          : "cursor-ew-resize text-[var(--link)] hover:bg-accent",
+                          : "cursor-ew-resize text-link hover:bg-accent",
                         isActive && "bg-accent",
                         j === 0 && "bracket-l",
                         j === numCols - 1 && "bracket-r",

package/src/plugins/impl/TabsPlugin.tsx

@@ -90,7 +90,7 @@ const TabComponent = ({
           className={cn(
             "scrollbar-thin",
             isVertical
-              ? "flex flex-col items-stretch justify-start h-auto max-h-none shrink-0 min-w-[10rem] overflow-y-auto"
+              ? "flex flex-col items-stretch justify-start h-auto max-h-none shrink-0 min-w-40 overflow-y-auto"
               : "max-w-full overflow-x-auto justify-start",
           )}
         >

package/src/plugins/impl/__tests__/DataTablePlugin.test.tsx

@@ -6,7 +6,7 @@ const TooltipProvider = Tooltip.Provider;
 
 import { act, render, screen, waitFor } from "@testing-library/react";
 import { Provider } from "jotai";
-import { beforeAll, describe, expect, it, vi } from "vitest";
+import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { SetupMocks } from "@/__mocks__/common";
 import type { DownloadAsArgs } from "@/components/data-table/schemas";
 import type { FieldTypesWithExternalType } from "@/components/data-table/types";
@@ -17,6 +17,14 @@ import {
   LoadingDataTableComponent,
 } from "../DataTablePlugin";
 
+// Default to normal (non-static) mode; individual tests flip this on.
+const mockIsStatic = vi.fn().mockReturnValue(false);
+vi.mock("@/core/static/static-state", async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import("@/core/static/static-state")>();
+  return { ...actual, isStaticNotebook: () => mockIsStatic() };
+});
+
 beforeAll(() => {
   SetupMocks.resizeObserver();
 });
@@ -157,3 +165,135 @@ describe("LoadingDataTableComponent", () => {
     });
   });
 });
+
+describe("static notebook control suppression", () => {
+  const fieldTypes: FieldTypesWithExternalType = [
+    ["id", ["integer", "integer"]],
+    ["name", ["string", "string"]],
+  ];
+
+  // Only the first page is embedded in a static export; the total is larger.
+  const TOTAL_ROWS = 50;
+  const PAGE_SIZE = 10;
+  const firstPage = JSON.stringify(
+    Array.from({ length: PAGE_SIZE }, (_, i) => ({
+      id: i + 1,
+      name: `item-${i + 1}`,
+    })),
+  );
+
+  const Wrapper = ({ children }: { children: React.ReactNode }) => (
+    <Provider store={store}>
+      <TooltipProvider>{children}</TooltipProvider>
+    </Provider>
+  );
+
+  const makeProps = () => {
+    const host = document.createElement("div");
+    return {
+      label: null,
+      totalRows: TOTAL_ROWS,
+      pagination: true,
+      pageSize: PAGE_SIZE,
+      selection: "multi" as const,
+      showDownload: true,
+      showFilters: true,
+      showColumnSummaries: true as const,
+      showDataTypes: true,
+      showPageSizeSelector: true,
+      showColumnExplorer: false,
+      showRowExplorer: false,
+      showChartBuilder: false,
+      rowHeaders: [] as FieldTypesWithExternalType,
+      fieldTypes,
+      totalColumns: 2,
+      maxColumns: "all" as const,
+      hasStableRowId: true,
+      lazy: false,
+      host,
+      showSearch: true,
+      value: [] as (number | string | { rowId: string; columnName?: string })[],
+      setValue: vi.fn(),
+      data: firstPage,
+      search: vi.fn().mockResolvedValue({
+        data: firstPage,
+        total_rows: TOTAL_ROWS,
+        cell_styles: null,
+        cell_hover_texts: null,
+      }),
+      download_as: vi.fn() as DownloadAsArgs,
+      get_column_summaries: vi.fn().mockResolvedValue({
+        data: null,
+        stats: {},
+        bin_values: {},
+        value_counts: {},
+        show_charts: false,
+      }),
+      get_data_url: vi.fn() as GetDataUrl,
+      get_row_ids: vi.fn() as GetRowIds,
+      get_size_bytes: vi.fn().mockResolvedValue({ size_bytes: null }),
+    };
+  };
+
+  beforeEach(() => {
+    mockIsStatic.mockReturnValue(false);
+  });
+
+  it("renders kernel-dependent controls in normal mode", async () => {
+    const props = makeProps();
+    render(
+      <Wrapper>
+        <LoadingDataTableComponent {...props} />
+      </Wrapper>,
+    );
+
+    await waitFor(() => {
+      expect(screen.getAllByRole("row").length).toBeGreaterThan(1);
+    });
+
+    expect(screen.getByPlaceholderText("Search...")).toBeInTheDocument();
+    expect(screen.getByTestId("next-page-button")).toBeInTheDocument();
+    expect(screen.getByTestId("select-all-checkbox")).toBeInTheDocument();
+    expect(props.get_column_summaries).toHaveBeenCalled();
+    expect(screen.queryByText(/Showing the first/)).not.toBeInTheDocument();
+  });
+
+  it("suppresses kernel-dependent controls in static mode", async () => {
+    mockIsStatic.mockReturnValue(true);
+    const props = makeProps();
+    render(
+      <Wrapper>
+        <LoadingDataTableComponent {...props} />
+      </Wrapper>,
+    );
+
+    await waitFor(() => {
+      expect(screen.getAllByRole("row").length).toBeGreaterThan(1);
+    });
+
+    // Top bar (search), pagination, and the selection column are gone.
+    expect(screen.queryByPlaceholderText("Search...")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("next-page-button")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("select-all-checkbox")).not.toBeInTheDocument();
+    // Column summaries never hit the kernel.
+    expect(props.get_column_summaries).not.toHaveBeenCalled();
+    // The truncation banner explains the missing rows.
+    expect(screen.getByText(/Showing the first/)).toBeInTheDocument();
+  });
+
+  it("suppresses search even when the author opts in via showSearch", async () => {
+    mockIsStatic.mockReturnValue(true);
+    const props = makeProps();
+    render(
+      <Wrapper>
+        <LoadingDataTableComponent {...props} showSearch={true} />
+      </Wrapper>,
+    );
+
+    await waitFor(() => {
+      expect(screen.getAllByRole("row").length).toBeGreaterThan(1);
+    });
+
+    expect(screen.queryByPlaceholderText("Search...")).not.toBeInTheDocument();
+  });
+});