@marimo-team/islands 0.23.5-dev4 → 0.23.5-dev6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.23.5-dev4",
+  "version": "0.23.5-dev6",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/components/editor/notebook-cell.tsx

@@ -48,7 +48,11 @@ import {
   useCellRuntime,
 } from "../../core/cells/cells";
 import { type CellId, SETUP_CELL_ID } from "../../core/cells/ids";
-import { isUninstantiated } from "../../core/cells/utils";
+import {
+  cellNeedsRun,
+  cellStatusClasses,
+  isUninstantiated,
+} from "../../core/cells/utils";
 import type { UserConfig } from "../../core/config/config-schema";
 import { isAppInteractionDisabled } from "../../core/websocket/connection-utils";
 import { useCellRenderCount } from "../../hooks/useCellRenderCount";
@@ -390,9 +394,6 @@ const EditableCellComponent = ({
 
   const [languageAdapter, setLanguageAdapter] = useState<LanguageAdapterType>();
 
-  const disabledOrAncestorDisabled =
-    cellData.config.disabled || cellRuntime.status === "disabled-transitively";
-
   const uninstantiated = isUninstantiated({
     executionTime: cellRuntime.runElapsedTimeMs ?? cellData.lastExecutionTime,
     status: cellRuntime.status,
@@ -401,10 +402,13 @@ const EditableCellComponent = ({
     stopped: cellRuntime.stopped,
   });
 
-  const needsRun =
-    cellData.edited ||
-    cellRuntime.interrupted ||
-    (cellRuntime.staleInputs && !disabledOrAncestorDisabled);
+  const needsRun = cellNeedsRun({
+    edited: cellData.edited,
+    interrupted: cellRuntime.interrupted,
+    staleInputs: cellRuntime.staleInputs,
+    disabled: cellData.config.disabled,
+    status: cellRuntime.status,
+  });
 
   const loading = outputIsLoading(cellRuntime.status);
 
@@ -532,11 +536,13 @@ const EditableCellComponent = ({
 
   const className = clsx("marimo-cell", "hover-actions-parent z-10", {
     interactive: true,
-    "needs-run": needsRun,
-    "has-error": cellRuntime.errored,
-    stopped: cellRuntime.stopped,
-    disabled: cellData.config.disabled,
-    stale: cellRuntime.status === "disabled-transitively",
+    ...cellStatusClasses({
+      needsRun,
+      errored: cellRuntime.errored,
+      stopped: cellRuntime.stopped,
+      disabled: cellData.config.disabled,
+      status: cellRuntime.status,
+    }),
     borderless:
       isMarkdownCodeHidden && hasOutput && !navigationProps["data-selected"],
   });
@@ -979,9 +985,6 @@ const SetupCellComponent = ({
   const setAiCompletionCell = useSetAtom(aiCompletionCellAtom);
   const runCell = useRunCell(cellId);
 
-  const disabledOrAncestorDisabled =
-    cellData.config.disabled || cellRuntime.status === "disabled-transitively";
-
   const uninstantiated = isUninstantiated({
     executionTime: cellRuntime.runElapsedTimeMs ?? cellData.lastExecutionTime,
     status: cellRuntime.status,
@@ -990,10 +993,13 @@ const SetupCellComponent = ({
     stopped: cellRuntime.stopped,
   });
 
-  const needsRun =
-    cellData.edited ||
-    cellRuntime.interrupted ||
-    (cellRuntime.staleInputs && !disabledOrAncestorDisabled);
+  const needsRun = cellNeedsRun({
+    edited: cellData.edited,
+    interrupted: cellRuntime.interrupted,
+    staleInputs: cellRuntime.staleInputs,
+    disabled: cellData.config.disabled,
+    status: cellRuntime.status,
+  });
   const loading =
     cellRuntime.status === "running" || cellRuntime.status === "queued";
 
@@ -1034,9 +1040,13 @@ const SetupCellComponent = ({
 
   const className = clsx("marimo-cell", "hover-actions-parent z-10", {
     interactive: true,
-    "needs-run": needsRun,
-    "has-error": cellRuntime.errored,
-    stopped: cellRuntime.stopped,
+    ...cellStatusClasses({
+      needsRun,
+      errored: cellRuntime.errored,
+      stopped: cellRuntime.stopped,
+      disabled: cellData.config.disabled,
+      status: cellRuntime.status,
+    }),
   });
 
   const handleRefactorWithAI: OnRefactorWithAI = useEvent(

package/src/components/editor/renderers/slides-layout/slides-layout.tsx

@@ -1,5 +1,5 @@
 /* Copyright 2026 Marimo. All rights reserved. */
-import React, { useMemo, useRef, useState } from "react";
+import React, { useMemo, useState } from "react";
 import { useAtomValue } from "jotai";
 import { numColumnsAtom } from "@/core/cells/cells";
 import type { CellId } from "@/core/cells/ids";
@@ -8,7 +8,6 @@ import type { SlidesLayout } from "./types";
 import { computeSlideCellsInfo } from "./compute-slide-cells";
 import { SlidesMinimap } from "@/components/slides/minimap";
 import useEvent from "react-use-event-hook";
-import type { RevealApi } from "reveal.js";
 
 type Props = ICellRendererProps<SlidesLayout>;
 
@@ -26,7 +25,6 @@ export const SlidesLayoutRenderer: React.FC<Props> = ({
   const numColumns = useAtomValue(numColumnsAtom);
   const isMultiColumn = numColumns > 1;
   const [activeCellId, setActiveCellId] = useState<CellId | null>(null);
-  const deckRef = useRef<RevealApi | null>(null);
 
   const { cellsWithOutput, skippedIds, slideTypes, startCellIndex } = useMemo(
     () => computeSlideCellsInfo(cells, layout),
@@ -53,9 +51,9 @@ export const SlidesLayoutRenderer: React.FC<Props> = ({
       setLayout={setLayout}
       activeIndex={resolvedIndex}
       onSlideChange={handleSlideChange}
-      deckRef={deckRef}
-      configWidth={250}
+      configWidth={300}
       mode={mode}
+      isEditable={mode !== "read"}
     />
   );
 

package/src/components/editor/renderers/vertical-layout/vertical-layout.tsx

@@ -34,6 +34,7 @@ import { useResolvedMarimoConfig } from "@/core/config/config";
 import { CSSClasses, KnownQueryParams } from "@/core/constants";
 import type { MarimoError, OutputMessage } from "@/core/kernel/messages";
 import { kernelStateAtom } from "@/core/kernel/state";
+import { useNotebookCodeAvailable } from "@/core/meta/code-visibility";
 import { showCodeInRunModeAtom } from "@/core/meta/state";
 import { isErrorMime } from "@/core/mime";
 import { type AppMode, kioskModeAtom } from "@/core/mode";
@@ -83,23 +84,7 @@ const VerticalLayoutRenderer: React.FC<VerticalLayoutProps> = ({
       : showCodeByQueryParam === "true";
   });
 
-  const evaluateCanShowCode = () => {
-    const cellsHaveCode = cells.some((cell) => Boolean(cell.code));
-
-    if (kioskMode) {
-      return true;
-    }
-
-    // Only show code if in read mode and there is at least one cell with code
-
-    // If it is a static-notebook or wasm-read-only-notebook, code is always included,
-    // but it can be turned it off via a query parameter (include-code=false)
-
-    const includeCode = urlParams.get(KnownQueryParams.includeCode);
-    return mode === "read" && includeCode !== "false" && cellsHaveCode;
-  };
-
-  const canShowCode = evaluateCanShowCode();
+  const canShowCode = useNotebookCodeAvailable(cells);
 
   const renderCell = (cell: CellRuntimeState & CellData) => {
     return (

package/src/components/slides/reveal-component.tsx

@@ -1,6 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import {
+  startTransition,
   useEffect,
   useMemo,
   useRef,
@@ -8,7 +9,7 @@ import {
   Fragment as ReactFragment,
 } from "react";
 import useEvent from "react-use-event-hook";
-import { ExpandIcon, EyeOffIcon } from "lucide-react";
+import { CodeIcon, ExpandIcon, EyeOffIcon } from "lucide-react";
 import { Deck, Fragment, Slide, Stack } from "@revealjs/react";
 import { Slide as CellOutputSlide } from "@/components/slides/slide";
 import { Button } from "@/components/ui/button";
@@ -34,6 +35,13 @@ import {
   DEFAULT_SLIDE_TYPE,
   SlideSidebar,
 } from "./slide-form";
+import {
+  SlideCellReadOnlyView,
+  SlideCellView,
+} from "@/components/slides/slide-cell-view";
+import { cn } from "@/utils/cn";
+import { isIslands } from "@/core/islands/utils";
+import { useNotebookCodeAvailable } from "@/core/meta/code-visibility";
 import type { AppMode } from "@/core/mode";
 
 const ASPECT_RATIO = 16 / 9;
@@ -118,21 +126,41 @@ function triggerResize(deck: RevealApi | null) {
 
 const SubslideView = ({
   subslide,
+  showCode,
+  isEditable,
 }: {
   subslide: ComposedSubslide<RuntimeCell>;
+  showCode: boolean;
+  isEditable: boolean;
 }) => (
   <Slide>
     <div className="h-full w-full overflow-auto flex">
-      <div className="mo-slide-content" style={{ margin: "auto 20px" }}>
+      <div
+        className={
+          showCode ? "mo-slide-content flex flex-col gap-3" : "mo-slide-content"
+        }
+        style={{
+          margin: "auto 20px",
+        }}
+      >
         {subslide.blocks.map((block, i) => {
-          const rendered = block.cells.map((cell) => (
-            <CellOutputSlide
-              key={cell.id}
-              cellId={cell.id}
-              status={cell.status}
-              output={cell.output}
-            />
-          ));
+          const rendered = block.cells.map((cell) => {
+            if (!showCode) {
+              return (
+                <CellOutputSlide
+                  key={cell.id}
+                  cellId={cell.id}
+                  status={cell.status}
+                  output={cell.output}
+                />
+              );
+            }
+            return isEditable ? (
+              <SlideCellView key={cell.id} cell={cell} />
+            ) : (
+              <SlideCellReadOnlyView key={cell.id} cell={cell} />
+            );
+          });
           if (block.isFragment) {
             return (
               <Fragment key={i} as="div">
@@ -147,27 +175,37 @@ const SubslideView = ({
   </Slide>
 );
 
+// There is an upstream react bug in dev mode (https://github.com/facebook/react/issues/34840)
+// Uncaught SecurityError: Failed to read a named property '$$typeof' from 'Window'
+// Happens with cells containing iframes / external content
 const RevealSlidesComponent = ({
   cellsWithOutput,
   layout,
   setLayout,
   activeIndex,
   onSlideChange,
-  deckRef,
   mode,
   configWidth = 300, // px
+  isEditable = false,
 }: {
   cellsWithOutput: RuntimeCell[];
   layout: SlidesLayout;
   setLayout: (layout: SlidesLayout) => void;
   activeIndex?: number;
   onSlideChange?: (index: number) => void;
-  deckRef: React.RefObject<RevealApi | null>;
   mode: AppMode;
   configWidth?: number;
+  isEditable?: boolean;
 }) => {
   const containerRef = useRef<HTMLDivElement>(null);
+  const deckRef = useRef<RevealApi | null>(null);
   const { width, height } = useSlideDimensions(containerRef);
+
+  const [showCode, setShowCode] = useState(false);
+  const codeAvailable = useNotebookCodeAvailable(cellsWithOutput);
+  const codeToggleEnabled = !isIslands() && codeAvailable;
+  const codeShown = codeToggleEnabled && showCode;
+
   const activeCell =
     activeIndex != null ? cellsWithOutput[activeIndex] : undefined;
   // Fall back to the first cell while the deck settles on an initial slide.
@@ -217,11 +255,7 @@ const RevealSlidesComponent = ({
     [width, height, deckTransition],
   );
 
-  useEffect(() => {
-    const deck = deckRef.current;
-    if (deck == null) {
-      return;
-    }
+  const navigateDeckToActiveCell = useEvent((deck: RevealApi) => {
     const target = resolveDeckNavigationTarget({
       activeIndex,
       cells: cellsWithOutput,
@@ -234,7 +268,43 @@ const RevealSlidesComponent = ({
     }
     deck.slide(next.h, next.v, next.f);
     clearPreviousVerticalIndices(deck);
-  }, [activeIndex, cellToTarget, cellsWithOutput, deckRef]);
+  });
+
+  useEffect(() => {
+    const deck = deckRef.current;
+    if (deck == null) {
+      return;
+    }
+    navigateDeckToActiveCell(deck);
+  }, [activeIndex, cellToTarget, cellsWithOutput, navigateDeckToActiveCell]);
+
+  // Toggling code (re)mounts a CodeMirror editor on the active slide. Defer
+  // the state update so the button/keypress paints first and the heavier mount
+  // can be interrupted by higher-priority work.
+  const toggleShowCode = useEvent(() => {
+    startTransition(() => setShowCode((value) => !value));
+  });
+
+  const handleDeckReady = useEvent((deck: RevealApi) => {
+    navigateDeckToActiveCell(deck);
+    if (codeToggleEnabled) {
+      deck.addKeyBinding(
+        { keyCode: 67, key: "C", description: "Toggle code editor" },
+        toggleShowCode,
+      );
+    }
+  });
+
+  const activeSubslide = useMemo(() => {
+    if (!activeCell) {
+      return null;
+    }
+    const target = cellToTarget.get(activeCell.id);
+    if (!target) {
+      return null;
+    }
+    return { h: target.h, v: target.v };
+  }, [activeCell, cellToTarget]);
 
   // Forward the deck's current cell to the parent, except while a skipped
   // preview is parked: every reveal.js event during that window is an echo
@@ -266,6 +336,7 @@ const RevealSlidesComponent = ({
     if (Events.fromInput(event)) {
       return;
     }
+
     const direction = classifyNavKey(event);
     if (direction === 0) {
       return;
@@ -279,6 +350,11 @@ const RevealSlidesComponent = ({
     onSlideChange?.(nextIndex);
   });
 
+  const handleSlideChange = useEvent(() => {
+    reportCurrentCell();
+    triggerResize(deckRef.current);
+  });
+
   useEventListener(document, "keydown", handleParkedNavKey, { capture: true });
 
   return (
@@ -292,23 +368,38 @@ const RevealSlidesComponent = ({
             deckRef={deckRef}
             className="aspect-video w-full overflow-hidden border rounded bg-background mo-slides-theme prose-slides"
             config={revealConfig}
-            onSlideChange={() => {
-              reportCurrentCell();
-              const deck = deckRef.current;
-              triggerResize(deck);
-            }}
+            onReady={handleDeckReady}
+            onSlideChange={handleSlideChange}
             onFragmentShown={reportCurrentCell}
             onFragmentHidden={reportCurrentCell}
           >
-            {composition.stacks.map((stack, i) => {
+            {composition.stacks.map((stack, h) => {
               if (stack.subslides.length === 1) {
-                return <SubslideView key={i} subslide={stack.subslides[0]} />;
+                const isActive =
+                  activeSubslide?.h === h && activeSubslide?.v === 0;
+                return (
+                  <SubslideView
+                    key={h}
+                    subslide={stack.subslides[0]}
+                    showCode={codeShown && isActive}
+                    isEditable={isEditable}
+                  />
+                );
               }
               return (
-                <Stack key={i}>
-                  {stack.subslides.map((sub, j) => (
-                    <SubslideView key={j} subslide={sub} />
-                  ))}
+                <Stack key={h}>
+                  {stack.subslides.map((sub, v) => {
+                    const isActive =
+                      activeSubslide?.h === h && activeSubslide?.v === v;
+                    return (
+                      <SubslideView
+                        key={v}
+                        subslide={sub}
+                        showCode={codeShown && isActive}
+                        isEditable={isEditable}
+                      />
+                    );
+                  })}
                 </Stack>
               );
             })}
@@ -336,24 +427,45 @@ const RevealSlidesComponent = ({
               </div>
             </div>
           )}
-          <Tooltip content="Fullscreen (F)">
-            <Button
-              data-testid="marimo-plugin-slides-fullscreen"
-              variant="ghost"
-              size="icon"
-              className="absolute top-2 right-2 z-20 opacity-0 group-hover:opacity-70 text-muted-foreground transition-opacity h-7 w-7"
-              onClick={() => {
-                deckRef.current
-                  ?.getViewportElement()
-                  ?.requestFullscreen()
-                  .catch((error) => {
-                    Logger.error("Failed to request fullscreen", error);
-                  });
-              }}
-            >
-              <ExpandIcon className="h-4 w-4" />
-            </Button>
-          </Tooltip>
+          <div className="absolute top-2 right-2 z-20 opacity-0 group-hover:opacity-70 text-muted-foreground transition-opacity">
+            {codeToggleEnabled && (
+              <Tooltip content={codeShown ? "Hide code (C)" : "Show code (C)"}>
+                <Button
+                  data-testid="marimo-plugin-slides-toggle-code"
+                  variant="ghost"
+                  size="icon"
+                  className={cn(
+                    "text-muted-foreground h-7 w-7",
+                    codeShown && "text-foreground bg-muted",
+                  )}
+                  aria-pressed={codeShown}
+                  aria-label={codeShown ? "Hide code" : "Show code"}
+                  onClick={toggleShowCode}
+                >
+                  <CodeIcon className="h-4 w-4" />
+                </Button>
+              </Tooltip>
+            )}
+            <Tooltip content="Fullscreen (F)">
+              <Button
+                data-testid="marimo-plugin-slides-fullscreen"
+                variant="ghost"
+                size="icon"
+                className="text-muted-foreground h-7 w-7"
+                aria-label="Enter fullscreen"
+                onClick={() => {
+                  deckRef.current
+                    ?.getViewportElement()
+                    ?.requestFullscreen()
+                    .catch((error) => {
+                      Logger.error("Failed to request fullscreen", error);
+                    });
+                }}
+              >
+                <ExpandIcon className="h-4 w-4" />
+              </Button>
+            </Tooltip>
+          </div>
         </div>
       </div>
 

package/src/components/slides/reveal-slides.css

@@ -72,3 +72,11 @@
 .reveal .mo-slide-content .output {
   margin: 0;
 }
+
+.reveal .marimo-cell .cm-editor {
+  border-radius: 8px;
+  padding-right: 10px;
+}
+.reveal .marimo-cell .cm-panels {
+  margin-right: 0;
+}

package/src/components/slides/slide-cell-view.tsx

@@ -0,0 +1,182 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { useMemo, useRef, useState } from "react";
+import type { EditorView } from "@codemirror/view";
+import { useAtomValue } from "jotai";
+import { CellEditor } from "@/components/editor/cell/code/cell-editor";
+import { CellStatusComponent } from "@/components/editor/cell/CellStatus";
+import { RunButton } from "@/components/editor/cell/RunButton";
+import { StopButton } from "@/components/editor/cell/StopButton";
+import { useRunCell } from "@/components/editor/cell/useRunCells";
+import { Slide as CellOutputSlide } from "@/components/slides/slide";
+import { useUserConfig } from "@/core/config/config";
+import {
+  cellNeedsRun,
+  cellStatusClasses,
+  isUninstantiated,
+} from "@/core/cells/utils";
+import type { CellData, CellRuntimeState } from "@/core/cells/types";
+import type { LanguageAdapterType } from "@/core/codemirror/language/types";
+import { connectionAtom } from "@/core/network/connection";
+import { useTheme } from "@/theme/useTheme";
+import { cn } from "@/utils/cn";
+import { ReadonlyCode } from "../editor/code/readonly-python-code";
+import { languageAdapterFromCode } from "@/core/codemirror/language/extension";
+
+type RuntimeCell = CellRuntimeState & CellData;
+
+/**
+ * Renders a single cell in the slides view as an editable CodeMirror editor
+ * stacked with its output, mirroring the notebook layout. Editing and
+ * Ctrl/Cmd+Enter run the cell against the live kernel so presenters can iterate
+ * without leaving the slide deck.
+ */
+export const SlideCellView = ({ cell }: { cell: RuntimeCell }) => {
+  const [userConfig] = useUserConfig();
+  const { theme } = useTheme();
+  const runCell = useRunCell(cell.id);
+  const connection = useAtomValue(connectionAtom);
+  const editorViewRef = useRef<EditorView | null>(null);
+  const editorViewParentRef = useRef<HTMLDivElement | null>(null);
+  const [languageAdapter, setLanguageAdapter] = useState<
+    LanguageAdapterType | undefined
+  >();
+
+  const cellOutputPosition = userConfig.display.cell_output;
+  const hasOutput = cell.output != null;
+
+  const uninstantiated = isUninstantiated({
+    executionTime: cell.runElapsedTimeMs ?? cell.lastExecutionTime,
+    status: cell.status,
+    errored: cell.errored,
+    interrupted: cell.interrupted,
+    stopped: cell.stopped,
+  });
+
+  const needsRun = cellNeedsRun({
+    edited: cell.edited,
+    interrupted: cell.interrupted,
+    staleInputs: cell.staleInputs,
+    disabled: cell.config.disabled,
+    status: cell.status,
+  });
+
+  const editorWrapperClassName = cn(
+    "marimo-cell",
+    "hover-actions-parent",
+    "interactive",
+    cellStatusClasses({
+      needsRun,
+      errored: cell.errored,
+      stopped: cell.stopped,
+      disabled: cell.config.disabled,
+      status: cell.status,
+    }),
+  );
+
+  const output = (
+    <CellOutputSlide
+      cellId={cell.id}
+      status={cell.status}
+      output={cell.output}
+    />
+  );
+
+  const toolbar = (
+    <div className="absolute top-1 right-2 z-10 flex items-center gap-1.5">
+      <CellStatusComponent
+        editing={true}
+        status={cell.status}
+        disabled={cell.config.disabled ?? false}
+        staleInputs={cell.staleInputs}
+        edited={cell.edited}
+        interrupted={cell.interrupted}
+        elapsedTime={cell.runElapsedTimeMs ?? cell.lastExecutionTime}
+        runStartTimestamp={cell.runStartTimestamp}
+        lastRunStartTimestamp={cell.lastRunStartTimestamp}
+        uninstantiated={uninstantiated}
+      />
+      <div className="flex items-center shadow-none gap-1">
+        <RunButton
+          edited={cell.edited}
+          status={cell.status}
+          needsRun={needsRun}
+          connectionState={connection.state}
+          config={cell.config}
+          onClick={runCell}
+        />
+        <StopButton status={cell.status} connectionState={connection.state} />
+      </div>
+    </div>
+  );
+
+  const editor = (
+    <div className={editorWrapperClassName}>
+      <CellEditor
+        theme={theme}
+        showPlaceholder={false}
+        id={cell.id}
+        code={cell.code}
+        config={cell.config}
+        status={cell.status}
+        serializedEditorState={cell.serializedEditorState}
+        runCell={runCell}
+        setEditorView={(ev) => {
+          editorViewRef.current = ev;
+        }}
+        userConfig={userConfig}
+        editorViewRef={editorViewRef}
+        editorViewParentRef={editorViewParentRef}
+        hasOutput={hasOutput}
+        // hide_code is intentionally overridden in the slide view; the editor
+        // is unmounted entirely when the user toggles code off.
+        showHiddenCode={() => undefined}
+        languageAdapter={languageAdapter}
+        setLanguageAdapter={setLanguageAdapter}
+        showLanguageToggles={false}
+        outputArea={cellOutputPosition}
+      />
+      {toolbar}
+    </div>
+  );
+
+  return (
+    <>
+      {cellOutputPosition === "above" && output}
+      {editor}
+      {cellOutputPosition === "below" && output}
+    </>
+  );
+};
+
+export const SlideCellReadOnlyView = ({ cell }: { cell: RuntimeCell }) => {
+  const [userConfig] = useUserConfig();
+  const cellOutputPosition = userConfig.display.cell_output;
+
+  const language = useMemo(() => {
+    const adapter = languageAdapterFromCode(cell.code.trim());
+    return adapter.type === "sql" ? "sql" : "python";
+  }, [cell.code]);
+
+  const output = (
+    <CellOutputSlide
+      cellId={cell.id}
+      status={cell.status}
+      output={cell.output}
+    />
+  );
+
+  const editor = (
+    <div className="marimo-cell">
+      <ReadonlyCode code={cell.code} language={language} showHideCode={false} />
+    </div>
+  );
+
+  return (
+    <>
+      {cellOutputPosition === "above" && output}
+      {editor}
+      {cellOutputPosition === "below" && output}
+    </>
+  );
+};