@marimo-team/islands 0.21.2-dev93 → 0.21.2-dev95

package/src/components/data-table/row-viewer-panel/row-viewer.tsx

@@ -12,16 +12,16 @@ import {
   ChevronsLeft,
   ChevronsRight,
   Info,
-  SearchIcon,
 } from "lucide-react";
-import { useRef, useState } from "react";
+import { type KeyboardEvent, useId, useRef, useState } from "react";
 import { useLocale } from "react-aria";
 import { ColumnName } from "@/components/datasources/components";
 import { CopyClipboardIcon } from "@/components/icons/copy-icon";
 import { Spinner } from "@/components/icons/spinner";
 import { KeyboardHotkeys } from "@/components/shortcuts/renderShortcut";
 import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Command, CommandInput } from "@/components/ui/command";
 import {
   Table,
   TableBody,
@@ -32,7 +32,6 @@ import {
 } from "@/components/ui/table";
 import { DelayMount } from "@/components/utils/delay-mount";
 import { useAsyncData } from "@/hooks/useAsyncData";
-import { useKeydownOnElement } from "@/hooks/useHotkey";
 import { Banner, ErrorBanner } from "@/plugins/impl/common/error-banner";
 import type { GetRowResult } from "@/plugins/impl/DataTablePlugin";
 import { NAMELESS_COLUMN_PREFIX, renderCellValue } from "../columns";
@@ -68,7 +67,7 @@ export const RowViewerPanel: React.FC<RowViewerPanelProps> = ({
 }: RowViewerPanelProps) => {
   const [searchQuery, setSearchQuery] = useState("");
   const panelRef = useRef<HTMLDivElement>(null);
-  const searchInputRef = useRef<HTMLInputElement>(null);
+  const checkboxId = useId();
   const { locale } = useLocale();
 
   const tooManyRows = totalRows === TOO_MANY_ROWS;
@@ -102,26 +101,29 @@ export const RowViewerPanel: React.FC<RowViewerPanelProps> = ({
     setRow(totalRows - 1);
   }
 
-  useKeydownOnElement(panelRef, {
-    ArrowLeft: (e) => {
-      if (e?.target === searchInputRef.current) {
-        return false;
-      }
-      setRow(rowIdx - 1);
-    },
-    ArrowRight: (e) => {
-      if (e?.target === searchInputRef.current) {
-        return false;
-      }
-      setRow(rowIdx + 1);
-    },
-    Space: (e) => {
-      if (e?.target === searchInputRef.current) {
-        return false;
-      }
-      toggleRowSelection();
-    },
-  });
+  const handleKeyDown = (e: KeyboardEvent) => {
+    // Don't intercept keys when typing in an input
+    if (e.target instanceof HTMLInputElement) {
+      return;
+    }
+    switch (e.key) {
+      case "ArrowLeft":
+        setRow(rowIdx - 1);
+
+        break;
+
+      case "ArrowRight":
+        setRow(rowIdx + 1);
+
+        break;
+
+      case " ":
+        e.preventDefault();
+        toggleRowSelection();
+
+        break;
+    }
+  };
 
   const buttonStyles = "h-6 w-6 p-0.5";
 
@@ -248,19 +250,29 @@ export const RowViewerPanel: React.FC<RowViewerPanelProps> = ({
       className="flex flex-col gap-3 mt-4 focus:outline-hidden"
       ref={panelRef}
       tabIndex={-1}
+      onKeyDown={handleKeyDown}
     >
-      <div className="flex flex-row gap-2 items-center mr-2">
+      <div className="flex flex-row gap-2 items-center mr-2 px-2">
         {isSelectable && (
-          <div className="flex flex-row gap-1 items-center">
-            <Button
-              variant="link"
-              size="xs"
-              className="pr-0"
-              onClick={toggleRowSelection}
-            >
-              {isRowSelected ? "Deselect row" : "Select row"}
-            </Button>
-            <KeyboardHotkeys shortcut="Space" />
+          <div
+            className="flex items-center"
+            title="Select/unselect the current row"
+          >
+            <div className="flex items-center gap-1.5">
+              <Checkbox
+                id={checkboxId}
+                checked={isRowSelected}
+                onCheckedChange={toggleRowSelection}
+                className="h-3.5 w-3.5"
+              />
+              <label
+                htmlFor={checkboxId}
+                className="text-xs text-muted-foreground cursor-pointer"
+              >
+                Select
+              </label>
+            </div>
+            <KeyboardHotkeys shortcut="Space" className="scale-75" />
           </div>
         )}
 
@@ -315,17 +327,14 @@ export const RowViewerPanel: React.FC<RowViewerPanelProps> = ({
         </Button>
       </div>
 
-      <div className="mx-2 -mb-1">
-        <Input
-          ref={searchInputRef}
-          type="text"
+      <Command className="bg-background" shouldFilter={false}>
+        <CommandInput
           placeholder="Search"
-          onChange={(e) => setSearchQuery(e.target.value)}
-          icon={<SearchIcon className="w-4 h-4" />}
-          className="mb-0 border-border"
+          value={searchQuery}
+          onValueChange={setSearchQuery}
           data-testid="selection-panel-search-input"
         />
-      </div>
+      </Command>
       {renderTable()}
     </div>
   );

package/src/components/data-table/schemas.ts

@@ -5,7 +5,7 @@ import { rpc } from "@/plugins/core/rpc";
 
 export type DownloadAsArgs = (req: {
   format: "csv" | "json" | "parquet";
-}) => Promise<string>;
+}) => Promise<{ url: string; filename: string }>;
 
 export const DownloadAsSchema = rpc
   .input(
@@ -13,4 +13,9 @@ export const DownloadAsSchema = rpc
       format: z.enum(["csv", "json", "parquet"]),
     }),
   )
-  .output(z.string());
+  .output(
+    z.object({
+      url: z.string(),
+      filename: z.string(),
+    }),
+  );

package/src/components/data-table/table-explorer-panel/table-explorer-panel.tsx

@@ -0,0 +1,161 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { Fill } from "@marimo-team/react-slotz";
+import type { OnChangeFn, RowSelectionState } from "@tanstack/react-table";
+import type React from "react";
+import { Button } from "@/components/ui/button";
+import { Tabs, TabsContent } from "@/components/ui/tabs";
+import { SlotNames } from "@/core/slots/slots";
+import type {
+  GetRowResult,
+  PreviewColumn,
+} from "@/plugins/impl/DataTablePlugin";
+import { cn } from "@/utils/cn";
+import {
+  PANEL_TYPES,
+  type PanelType,
+} from "../../editor/chrome/panels/context-aware-panel/context-aware-panel";
+import { ColumnExplorerPanel } from "../column-explorer-panel/column-explorer";
+import { RowViewerPanel } from "../row-viewer-panel/row-viewer";
+import type { FieldTypesWithExternalType, TooManyRows } from "../types";
+
+export interface TableExplorerPanelProps {
+  // Row viewer props
+  rowIdx: number;
+  setRowIdx: (rowIdx: number) => void;
+  totalRows: number | TooManyRows;
+  fieldTypes: FieldTypesWithExternalType | undefined | null;
+  getRow: (rowIdx: number) => Promise<GetRowResult>;
+  isSelectable: boolean;
+  isRowSelected: boolean;
+  handleRowSelectionChange?: OnChangeFn<RowSelectionState>;
+  // Column explorer props
+  previewColumn?: PreviewColumn;
+  totalColumns: number;
+  tableId: string;
+  // Visibility flags
+  showRowExplorer: boolean;
+  showColumnExplorer: boolean;
+  // Tab state (driven by contextAwarePanelType atom)
+  activeTab: PanelType | null;
+  onTabChange: (tab: PanelType) => void;
+}
+
+const tabTriggerClassName =
+  "text-xs uppercase tracking-wide font-semibold cursor-pointer transition-colors";
+const activeClassName = "text-primary";
+const inactiveClassName = "hover:text-foreground";
+
+export const TableExplorerPanel: React.FC<TableExplorerPanelProps> = ({
+  // Row viewer
+  rowIdx,
+  setRowIdx,
+  totalRows,
+  fieldTypes,
+  getRow,
+  isSelectable,
+  isRowSelected,
+  handleRowSelectionChange,
+  // Column explorer
+  previewColumn,
+  totalColumns,
+  tableId,
+  // Visibility
+  showRowExplorer,
+  showColumnExplorer,
+  // Tab state
+  activeTab,
+  onTabChange,
+}) => {
+  const showTabs = showRowExplorer && showColumnExplorer;
+
+  const rowViewer = (
+    <RowViewerPanel
+      rowIdx={rowIdx}
+      setRowIdx={setRowIdx}
+      totalRows={totalRows}
+      fieldTypes={fieldTypes}
+      getRow={getRow}
+      isSelectable={isSelectable}
+      isRowSelected={isRowSelected}
+      handleRowSelectionChange={handleRowSelectionChange}
+    />
+  );
+
+  const columnExplorer = previewColumn && (
+    <ColumnExplorerPanel
+      previewColumn={previewColumn}
+      fieldTypes={fieldTypes}
+      totalRows={totalRows}
+      totalColumns={totalColumns}
+      tableId={tableId}
+    />
+  );
+
+  // If only one panel is visible, don't show tabs
+  if (!showTabs) {
+    if (showRowExplorer) {
+      return rowViewer;
+    }
+    if (showColumnExplorer) {
+      return columnExplorer;
+    }
+    return null;
+  }
+
+  // Resolve active tab — fall back to first available
+  const resolvedTab = activeTab ?? PANEL_TYPES.ROW_VIEWER;
+
+  return (
+    <Tabs
+      value={resolvedTab}
+      onValueChange={(value) => onTabChange(value as PanelType)}
+      className="h-full flex flex-col min-w-[350px]"
+    >
+      <Fill name={SlotNames.CONTEXT_AWARE_PANEL_HEADER}>
+        <div className="flex items-center gap-1">
+          <Button
+            variant="text"
+            size="xs"
+            onClick={() => onTabChange(PANEL_TYPES.ROW_VIEWER)}
+            className={cn(
+              tabTriggerClassName,
+              resolvedTab === PANEL_TYPES.ROW_VIEWER
+                ? activeClassName
+                : inactiveClassName,
+            )}
+          >
+            Rows
+          </Button>
+          <span className="text-muted-foreground text-xs">|</span>
+          <Button
+            variant="text"
+            size="xs"
+            onClick={() => onTabChange(PANEL_TYPES.COLUMN_EXPLORER)}
+            className={cn(
+              tabTriggerClassName,
+              resolvedTab === PANEL_TYPES.COLUMN_EXPLORER
+                ? activeClassName
+                : inactiveClassName,
+            )}
+          >
+            Explorer
+          </Button>
+        </div>
+      </Fill>
+
+      <TabsContent
+        value={PANEL_TYPES.ROW_VIEWER}
+        className="flex-1 overflow-auto"
+      >
+        {rowViewer}
+      </TabsContent>
+      <TabsContent
+        value={PANEL_TYPES.COLUMN_EXPLORER}
+        className="flex-1 overflow-auto"
+      >
+        {columnExplorer}
+      </TabsContent>
+    </Tabs>
+  );
+};

package/src/components/editor/chrome/panels/context-aware-panel/context-aware-panel.tsx

@@ -21,7 +21,12 @@ import {
   isPinnedAtom,
 } from "./atoms";
 
-export type PanelType = "row-viewer" | "column-explorer";
+export const PANEL_TYPES = {
+  ROW_VIEWER: "row-viewer",
+  COLUMN_EXPLORER: "column-explorer",
+} as const;
+
+export type PanelType = (typeof PANEL_TYPES)[keyof typeof PANEL_TYPES];
 
 export const ContextAwarePanel: React.FC = () => {
   const [owner, setOwner] = useAtom(contextAwarePanelOwner);
@@ -51,7 +56,7 @@ export const ContextAwarePanel: React.FC = () => {
             aria-label={isPinned ? "Unpin panel" : "Pin panel"}
           >
             {isPinned ? (
-              <PinIcon className="w-4 h-4" />
+              <PinIcon className="w-4 h-4 text-primary" />
             ) : (
               <PinOffIcon className="w-4 h-4" />
             )}
@@ -95,16 +100,18 @@ export const ContextAwarePanel: React.FC = () => {
 
   const renderBody = () => {
     return (
-      <div className="mt-2 pb-7 mb-4 h-full overflow-auto">
-        <div className="flex flex-row justify-between items-center mx-2">
+      <div className="pb-7 mb-4 h-full overflow-auto">
+        <div className="p-3 border-b flex justify-between items-center">
           {renderModeToggle()}
+          <Slot name={SlotNames.CONTEXT_AWARE_PANEL_HEADER} />
           <Button
-            variant="linkDestructive"
-            size="icon"
+            variant="text"
+            size="xs"
+            className="m-0"
             onClick={closePanel}
             aria-label="Close selection panel"
           >
-            <XIcon className="w-4 h-4" />
+            <XIcon className="w-4 h-4 hover:text-destructive" />
           </Button>
         </div>
 
@@ -126,7 +133,7 @@ export const ContextAwarePanel: React.FC = () => {
         onDragging={handleDragging}
         className="resize-handle border-border z-20 print:hidden border-l"
       />
-      <Panel defaultSize={20} minSize={15} maxSize={80}>
+      <Panel defaultSize={25} minSize={25} maxSize={80}>
         {renderBody()}
       </Panel>
     </>
@@ -150,7 +157,7 @@ interface ResizableComponentProps {
 const ResizableComponent = ({ children }: ResizableComponentProps) => {
   const { resizableDivRef, handleRefs, style } = useResizeHandle({
     startingWidth: 400,
-    minWidth: 300,
+    minWidth: 400,
     maxWidth: 1500,
     onResize: () => {
       raf2(() => {

package/src/core/slots/slots.ts

@@ -6,4 +6,5 @@ export const slotsController = new SlotzController();
 export const SlotNames = {
   SIDEBAR: "sidebar",
   CONTEXT_AWARE_PANEL: "context-aware-panel",
+  CONTEXT_AWARE_PANEL_HEADER: "context-aware-panel-header",
 };

package/src/plugins/impl/DataTablePlugin.tsx

@@ -26,7 +26,6 @@ import type { CellSelectionState } from "@/components/data-table/cell-selection/
 import type { CellStyleState } from "@/components/data-table/cell-styling/types";
 import { TablePanel } from "@/components/data-table/charts/charts";
 import { hasChart } from "@/components/data-table/charts/storage";
-import { ColumnExplorerPanel } from "@/components/data-table/column-explorer-panel/column-explorer";
 import { ColumnChartSpecModel } from "@/components/data-table/column-summary/chart-spec-model";
 import { ColumnChartContext } from "@/components/data-table/column-summary/column-summary";
 import {
@@ -35,11 +34,11 @@ import {
 } from "@/components/data-table/filters";
 import { usePanelOwnership } from "@/components/data-table/hooks/use-panel-ownership";
 import { LoadingTable } from "@/components/data-table/loading-table";
-import { RowViewerPanel } from "@/components/data-table/row-viewer-panel/row-viewer";
 import {
   type DownloadAsArgs,
   DownloadAsSchema,
 } from "@/components/data-table/schemas";
+import { TableExplorerPanel } from "@/components/data-table/table-explorer-panel/table-explorer-panel";
 import {
   type BinValues,
   type ColumnHeaderStats,
@@ -201,7 +200,6 @@ interface Data<T> {
   hasStableRowId: boolean;
   lazy: boolean;
   cellHoverTexts?: Record<string, Record<string, string | null>> | null;
-  downloadFileName?: string;
 }
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
@@ -287,7 +285,6 @@ export const DataTablePlugin = createPlugin<S>("marimo-table")
       // If lazy, this will preload the first page of data
       // without user confirmation.
       preload: z.boolean().default(false),
-      downloadFileName: z.string().optional(),
     }),
   )
   .withFunctions<DataTableFunctions>({
@@ -823,7 +820,6 @@ const DataTableComponent = ({
   cellStyles,
   hoverTemplate,
   cellHoverTexts,
-  downloadFileName,
   toggleDisplayHeader,
   calculate_top_k_rows,
   preview_column,
@@ -839,7 +835,8 @@ const DataTableComponent = ({
   }): JSX.Element => {
   const id = useId();
   const [viewedRowIdx, setViewedRowIdx] = useState(0);
-  const { isPanelOpen, togglePanel } = usePanelOwnership(id, cellId);
+  const { isPanelOpen, isAnyPanelOpen, togglePanel, panelType, setPanelType } =
+    usePanelOwnership(id, cellId);
 
   const chartSpecModel = useMemo(() => {
     if (!columnSummaries) {
@@ -1002,8 +999,7 @@ const DataTableComponent = ({
   );
 
   const isSelectable = selection === "multi" || selection === "single";
-  const showColExplorer =
-    showColumnExplorer && preview_column && isPanelOpen("column-explorer");
+  const canShowColumnExplorer = showColumnExplorer && !!preview_column;
 
   const isInVscode = isInVscodeExtension();
 
@@ -1032,28 +1028,24 @@ const DataTableComponent = ({
         </Banner>
       )}
 
-      {isPanelOpen("row-viewer") && (
+      {isAnyPanelOpen && (showRowExplorer || canShowColumnExplorer) && (
         <ContextAwarePanelItem>
-          <RowViewerPanel
-            getRow={getRow}
-            fieldTypes={memoizedUnclampedFieldTypes}
-            totalRows={totalRows}
+          <TableExplorerPanel
             rowIdx={viewedRowIdx}
             setRowIdx={setViewedRow}
+            totalRows={totalRows}
+            fieldTypes={memoizedUnclampedFieldTypes}
+            getRow={getRow}
             isSelectable={isSelectable}
-            isRowSelected={rowSelection[viewedRowIdx]}
+            isRowSelected={Boolean(rowSelection[viewedRowIdx])}
             handleRowSelectionChange={handleRowSelectionChange}
-          />
-        </ContextAwarePanelItem>
-      )}
-      {showColExplorer && (
-        <ContextAwarePanelItem>
-          <ColumnExplorerPanel
             previewColumn={preview_column}
-            fieldTypes={memoizedUnclampedFieldTypes}
-            totalRows={totalRows}
             totalColumns={totalColumns}
             tableId={id}
+            showRowExplorer={showRowExplorer && !isInVscode}
+            showColumnExplorer={canShowColumnExplorer && !isInVscode}
+            activeTab={panelType}
+            onTabChange={setPanelType}
           />
         </ContextAwarePanelItem>
       )}
@@ -1082,7 +1074,6 @@ const DataTableComponent = ({
             hoverTemplate={hoverTemplate}
             cellHoverTexts={cellHoverTexts}
             downloadAs={showDownload ? downloadAs : undefined}
-            downloadFileName={downloadFileName}
             enableSearch={enableSearch}
             searchQuery={searchQuery}
             onSearchQueryChange={setSearchQuery}
@@ -1099,11 +1090,13 @@ const DataTableComponent = ({
             showChartBuilder={showChartBuilder}
             showPageSizeSelector={showPageSizeSelector}
             // Hidden in VSCode (for now) because we don't have a panel to show
-            // the column/row explorer.
-            showColumnExplorer={showColumnExplorer && !isInVscode}
-            showRowExplorer={showRowExplorer && !isInVscode}
+            // the table explorer.
+            showTableExplorer={
+              (showRowExplorer || canShowColumnExplorer) && !isInVscode
+            }
             togglePanel={togglePanel}
             isPanelOpen={isPanelOpen}
+            isAnyPanelOpen={isAnyPanelOpen}
             viewedRowIdx={viewedRowIdx}
             onViewedRowChange={(rowIdx) => setViewedRowIdx(rowIdx)}
           />

package/src/plugins/impl/data-frames/DataFramePlugin.tsx

@@ -329,7 +329,6 @@ export const DataFrameComponent = memo(
           fieldTypes={field_types}
           rowHeaders={row_headers || Arrays.EMPTY}
           showDownload={showDownload}
-          downloadFileName={dataframeName}
           download_as={download_as}
           enableSearch={false}
           showFilters={false}

package/src/stories/dataframe.stories.tsx

@@ -41,7 +41,7 @@ export const DataFrame: StoryObj = {
         search={Functions.THROW}
         host={document.body}
         showDownload={false}
-        download_as={async () => ""}
+        download_as={async () => ({ url: "", filename: "" })}
         lazy={false}
       />
     );