@marimo-team/islands 0.25.3-dev192 → 0.25.3-dev196

package/src/components/editor/renderers/cell-array.tsx

@@ -29,6 +29,7 @@ import { canInteractWithAppAtom } from "@/core/network/connection";
 import { useBoolean } from "@/hooks/useBoolean";
 import { cn } from "@/utils/cn";
 import { Functions } from "@/utils/functions";
+import { findColumn, useLayout } from "@/core/cells/layout";
 import type { CellColumnId } from "@/utils/id-tree";
 import { invariant } from "@/utils/invariant";
 import {
@@ -188,7 +189,7 @@ const CellColumn: React.FC<{
   hideControls,
 }) => {
   const cellIds = useCellIds();
-  const column = cellIds.get(columnId);
+  const column = findColumn(useLayout(), columnId);
   invariant(column, `Expected column for: ${columnId}`);
 
   const hasOnlyOneCell = cellIds.hasOnlyOneId();
@@ -218,7 +219,7 @@ const CellColumn: React.FC<{
     >
       <SortableContext
         id={`column-${index + 1}`}
-        items={column.topLevelIds}
+        items={[...column.visible]}
         strategy={verticalListSortingStrategy}
       >
         {/* Render the setup cell first, always */}
@@ -237,7 +238,7 @@ const CellColumn: React.FC<{
           />
         )}
 
-        {column.topLevelIds.map((cellId) => {
+        {column.visible.map((cellId) => {
           // Skip the setup cell later
           if (cellId === SETUP_CELL_ID) {
             return null;
@@ -252,8 +253,8 @@ const CellColumn: React.FC<{
               canDelete={!hasOnlyOneCell}
               mode={mode}
               userConfig={userConfig}
-              isCollapsed={column.isCollapsed(cellId)}
-              collapseCount={column.getCount(cellId)}
+              isCollapsed={column.folds.has(cellId)}
+              collapseCount={column.folds.get(cellId)?.length ?? 0}
               canMoveX={appConfig.width === "columns"}
             />
           );

package/src/components/editor/renderers/slides-layout/__tests__/plugin.test.ts

@@ -17,7 +17,6 @@ function makeCell(id: string, code = "print('hi')"): CellData {
     lastCodeRun: null,
     lastExecutionTime: null,
     config: { hide_code: false, disabled: false, column: null },
-    serializedEditorState: null,
   };
 }
 

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

@@ -81,7 +81,7 @@ const VerticalLayoutRenderer: React.FC<VerticalLayoutProps> = ({
     getInitialShowCode({ showCodeInRunModePreference, kioskMode }),
   );
 
-  const canShowCode = useNotebookCodeAvailable(cells);
+  const canShowCode = useNotebookCodeAvailable();
 
   const handleToggleShowCode = () => {
     setShowCode((currentShowCode) => {

package/src/components/pages/edit-page.tsx

@@ -1,14 +1,10 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import { useSetAtom, useStore } from "jotai";
-import { notebookAtom } from "@/core/cells/cells";
-import { notebookCells } from "@/core/cells/utils";
 import type { AppConfig, UserConfig } from "@/core/config/config-schema";
 import { KnownQueryParams } from "@/core/constants";
 import { EditApp } from "@/core/edit-app";
 import { getSessionId } from "@/core/kernel/session";
 import { DocumentProvider } from "@/core/notebook/document";
-import { lastSavedNotebookAtom } from "@/core/saving/state";
 import { useNotebookSession } from "@/core/session/useNotebookSession";
 import { AppChrome } from "../editor/chrome/wrapper/app-chrome";
 
@@ -24,17 +20,8 @@ const hideChrome = (() => {
 
 /** Own the notebook session and provide its document model to the editor and its chrome. */
 const EditPage = (props: Props) => {
-  const store = useStore();
-  const setLastSavedNotebook = useSetAtom(lastSavedNotebookAtom);
   const { connection, reconnect, documentModel } = useNotebookSession({
     autoInstantiate: props.userConfig.runtime.auto_instantiate,
-    onKernelReady: (layout) => {
-      const cells = notebookCells(store.get(notebookAtom));
-      const names = cells.map((cell) => cell.name);
-      const codes = cells.map((cell) => cell.code);
-      const configs = cells.map((cell) => cell.config);
-      setLastSavedNotebook({ names, codes, configs, layout });
-    },
     sessionId: getSessionId(),
   });
   const app = (

package/src/components/scratchpad/scratchpad.tsx

@@ -259,7 +259,6 @@ export const ScratchPad: React.FC = () => {
                 code={code}
                 config={scratchpadCellConfig}
                 status="idle"
-                serializedEditorState={null}
                 runCell={handleRun}
                 userConfig={userConfig}
                 editorViewRef={ref}

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

@@ -519,7 +519,7 @@ const RevealSlidesComponent = ({
   const [showCodeOverrides, setShowCodeOverrides] = useState<
     ReadonlySet<CellId>
   >(() => new Set());
-  const codeAvailable = useNotebookCodeAvailable(slideCells);
+  const codeAvailable = useNotebookCodeAvailable();
   const codeRenderingEnabled = !isIslands() && codeAvailable;
   const isSpeakerReceiver = isSpeakerViewReceiver(
     kioskMode,

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

@@ -149,7 +149,6 @@ export const SlideCellView = ({ cell }: { cell: RuntimeCell }) => {
         code={cell.code}
         config={cell.config}
         status={cell.status}
-        serializedEditorState={cell.serializedEditorState}
         runCell={runCell}
         setEditorView={(ev) => {
           editorViewRef.current = ev;

package/src/components/sort/SortableCellsProvider.tsx

@@ -25,6 +25,8 @@ import { Arrays } from "@/utils/arrays";
 import type { CellColumnId, MultiColumn } from "@/utils/id-tree";
 import { invariant } from "@/utils/invariant";
 import { getNotebook } from "../../core/cells/cells";
+import { findColumn, layoutAtom } from "../../core/cells/layout";
+import { store } from "../../core/state/jotai";
 import { useCellActions } from "../../core/cells/actions";
 import { useEvent } from "../../hooks/useEvent";
 
@@ -52,7 +54,7 @@ const SortableCellsProviderInternal = ({
     null,
   );
 
-  const [config] = useAppConfig();
+  const config = useAppConfig();
   const modifiers = useMemo(() => {
     if (config.width === "columns") {
       return Arrays.EMPTY;
@@ -136,16 +138,15 @@ const SortableCellsProviderInternal = ({
       invariant(isColumnId(overId), `Expected column id. Got: ${overId}`);
 
       // If column is empty, we can drop on it
-      const notebook = getNotebook();
-      const column = notebook.cellIds.get(overId);
+      const column = findColumn(store.get(layoutAtom), overId);
       invariant(column, `Expected column. Got: ${overId}`);
-      if (column && column.topLevelIds.length === 0) {
+      if (column.visible.length === 0) {
         // Return the column
         return [{ id: overId }];
       }
 
       // If the column is not empty, we only consider the cells in the same column
-      const cellIdSet = new Set(column.topLevelIds);
+      const cellIdSet = new Set(column.visible);
       const collisions = closestCenter({
         ...args,
         droppableContainers: args.droppableContainers.filter(

package/src/core/MarimoApp.tsx

@@ -59,7 +59,7 @@ export function preloadPage(mode: string) {
  */
 export const MarimoApp: React.FC = memo(() => {
   const [userConfig] = useResolvedMarimoConfig();
-  const [appConfig] = useAppConfig();
+  const appConfig = useAppConfig();
   const editorFontSize = toRem(userConfig.display.code_editor_font_size);
 
   const renderBody = () => {

package/src/core/cells/__tests__/__snapshots__/cells.test.ts.snap

@@ -23,7 +23,6 @@ exports[`cell reducer > can initialize stdin > initial state 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -53,7 +52,6 @@ exports[`cell reducer > can initialize stdin > prepared for run 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "queued",
   "stopped": false,
@@ -83,7 +81,6 @@ exports[`cell reducer > can initialize stdin > queued message received 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "queued",
   "stopped": false,
@@ -113,7 +110,6 @@ exports[`cell reducer > can initialize stdin > running message received 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": 20,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "running",
   "stopped": false,
@@ -165,7 +161,6 @@ exports[`cell reducer > can initialize stdin > second stdin requested 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": 20,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "running",
   "stopped": false,
@@ -210,7 +205,6 @@ exports[`cell reducer > can initialize stdin > stdin answered 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": 20,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "running",
   "stopped": false,
@@ -254,7 +248,6 @@ exports[`cell reducer > can initialize stdin > stdin requested 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": 20,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "running",
   "stopped": false,
@@ -291,7 +284,6 @@ exports[`cell reducer > can initialize stdin > stdout received 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": 20,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "running",
   "stopped": false,
@@ -328,7 +320,6 @@ exports[`cell reducer > can initialize stdin > stdout verified 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": 20,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "running",
   "stopped": false,
@@ -358,7 +349,6 @@ exports[`cell reducer > can receive console when the cell is idle and will clear
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": 20,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "running",
   "stopped": false,
@@ -395,7 +385,6 @@ exports[`cell reducer > can receive console when the cell is idle and will clear
   "output": null,
   "runElapsedTimeMs": 2000,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -425,7 +414,6 @@ exports[`cell reducer > can receive console when the cell is idle and will clear
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -462,7 +450,6 @@ exports[`cell reducer > can receive console when the cell is idle and will clear
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "queued",
   "stopped": false,
@@ -499,7 +486,6 @@ exports[`cell reducer > can receive console when the cell is idle and will clear
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "queued",
   "stopped": false,
@@ -529,7 +515,6 @@ exports[`cell reducer > can run a stale cell > queued message received 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "queued",
   "stopped": false,
@@ -559,7 +544,6 @@ exports[`cell reducer > can run a stale cell > stale inputs received 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": true,
   "status": "queued",
   "stopped": false,
@@ -600,7 +584,6 @@ exports[`cell reducer > can run a stopped cell > ancestor stopped 1`] = `
   },
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": true,
@@ -630,7 +613,6 @@ exports[`cell reducer > can run a stopped cell > idle message received 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -671,7 +653,6 @@ exports[`cell reducer > can run a stopped cell > queued after stop 1`] = `
   },
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "queued",
   "stopped": true,
@@ -701,7 +682,6 @@ exports[`cell reducer > can run a stopped cell > queued message received 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "queued",
   "stopped": false,
@@ -731,7 +711,6 @@ exports[`cell reducer > can run a stopped cell > running after stop 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": 40,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "running",
   "stopped": false,
@@ -774,7 +753,6 @@ import numpy",
   },
   "runElapsedTimeMs": 13000,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -804,7 +782,6 @@ exports[`cell reducer > can run cell and receive cell messages > code edited 1`]
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -847,7 +824,6 @@ import numpy",
   },
   "runElapsedTimeMs": 13000,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -889,7 +865,6 @@ exports[`cell reducer > can run cell and receive cell messages > code reverted 1
   },
   "runElapsedTimeMs": 13000,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -926,7 +901,6 @@ exports[`cell reducer > can run cell and receive cell messages > console message
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": 20,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "running",
   "stopped": false,
@@ -976,7 +950,6 @@ import numpy",
   },
   "runElapsedTimeMs": 11000,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -1006,7 +979,6 @@ exports[`cell reducer > can run cell and receive cell messages > initial state 1
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -1054,7 +1026,6 @@ import numpy",
   },
   "runElapsedTimeMs": 11000,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -1096,7 +1067,6 @@ exports[`cell reducer > can run cell and receive cell messages > output received
   },
   "runElapsedTimeMs": 13000,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -1126,7 +1096,6 @@ exports[`cell reducer > can run cell and receive cell messages > prepared for ru
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "queued",
   "stopped": false,
@@ -1156,7 +1125,6 @@ exports[`cell reducer > can run cell and receive cell messages > queued message
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "queued",
   "stopped": false,
@@ -1186,7 +1154,6 @@ exports[`cell reducer > can run cell and receive cell messages > running message
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": 20,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "running",
   "stopped": false,
@@ -1216,7 +1183,6 @@ exports[`cell reducer > errors reset status to idle > code edited 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -1257,7 +1223,6 @@ exports[`cell reducer > errors reset status to idle > error response received 1`
   },
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -1287,7 +1252,6 @@ exports[`cell reducer > errors reset status to idle > initial state 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "idle",
   "stopped": false,
@@ -1317,7 +1281,6 @@ exports[`cell reducer > errors reset status to idle > prepared for run 1`] = `
   "output": null,
   "runElapsedTimeMs": null,
   "runStartTimestamp": null,
-  "serializedEditorState": null,
   "staleInputs": false,
   "status": "queued",
   "stopped": false,