@marimo-team/islands 0.25.3-dev173 → 0.25.3-dev175

package/src/components/editor/chrome/wrapper/__tests__/pending-ai-cells.test.tsx

@@ -15,8 +15,10 @@ vi.mock("@/components/editor/cell/useDeleteCell", () => ({
 
 vi.mock("@/core/cells/cells", () => ({
   getCellEditorView: vi.fn(),
+}));
+vi.mock("@/core/cells/actions", () => ({
   useCellActions: () => ({
-    createNewCell: vi.fn(),
+    createCell: vi.fn(),
     updateCellCode: vi.fn(),
   }),
 }));

package/src/components/editor/columns/sortable-column.tsx

@@ -19,7 +19,7 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { Tooltip } from "@/components/ui/tooltip";
-import { useCellActions } from "@/core/cells/cells";
+import { useCellActions } from "@/core/cells/actions";
 import { cn } from "@/utils/cn";
 import type { CellColumnId } from "@/utils/id-tree";
 import { mergeRefs } from "../../../utils/mergeRefs";

package/src/components/editor/connections/components.tsx

@@ -18,7 +18,7 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { maybeAddMarimoImport } from "@/core/cells/add-missing-import";
-import { useCellActions } from "@/core/cells/cells";
+import { useCellActions } from "@/core/cells/actions";
 import { useLastFocusedCellId } from "@/core/cells/focus";
 import { autoInstantiateAtom } from "@/core/config/config";
 import type { DetectedDataSource } from "@/core/datasets/data-source-discovery";
@@ -112,7 +112,7 @@ export const ConnectionFormFooter = <L extends string>({
  * Returns a callback that inserts code into a new cell after the last focused cell.
  */
 export function useInsertCode() {
-  const { createNewCell } = useCellActions();
+  const { createCell } = useCellActions();
   const lastFocusedCellId = useLastFocusedCellId();
   const autoInstantiate = useAtomValue(autoInstantiateAtom);
 
@@ -121,17 +121,12 @@ export function useInsertCode() {
     if (/\bmo\./.test(code)) {
       maybeAddMarimoImport({
         autoInstantiate,
-        createNewCell,
+        createCell,
         fromCellId: lastFocusedCellId,
       });
     }
 
-    createNewCell({
-      code,
-      before: false,
-      cellId: lastFocusedCellId ?? "__end__",
-      skipIfCodeExists: true,
-    });
+    createCell({ after: lastFocusedCellId, code, skipIfCodeExists: true });
   };
 }
 

package/src/components/editor/controls/Controls.tsx

@@ -28,8 +28,8 @@ import {
   canUndoDeletesAtom,
   needsRunAtom,
   undoLabelAtom,
-  useCellActions,
 } from "../../../core/cells/cells";
+import { useCellActions } from "../../../core/cells/actions";
 import { ConfigButton } from "../../app-config/app-config-button";
 import { renderShortcut } from "../../shortcuts/renderShortcut";
 import { Tooltip } from "../../ui/tooltip";

package/src/components/editor/controls/__tests__/notebook-menu-dropdown.test.tsx

@@ -11,6 +11,7 @@ import { Provider } from "jotai";
 import type React from "react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { requestId } from "@/__tests__/branded";
+import { mockDocumentModel } from "@/__mocks__/document";
 import { MockRequestClient } from "@/__mocks__/requests";
 import { ModalProvider } from "@/components/modal/ImperativeModal";
 import { TooltipProvider } from "@/components/ui/tooltip";
@@ -19,6 +20,7 @@ import {
   invalidateDataSourceDiscovery,
 } from "@/core/datasets/data-source-discovery";
 import { DiscoverDataSources } from "@/core/datasets/request-registry";
+import { DocumentProvider } from "@/core/notebook/document";
 import { layoutStateAtom } from "@/core/layout/state";
 import { kioskModeAtom, viewStateAtom } from "@/core/mode";
 import { connectionAtom } from "@/core/network/connection";
@@ -73,12 +75,16 @@ global.HTMLElement.prototype.scrollIntoView = () => {
   // jsdom does not implement scrollIntoView; cmdk calls it on selection.
 };
 
+const { model } = mockDocumentModel(store, null);
+
 function wrapper({ children }: { children: React.ReactNode }) {
   return (
     <Provider store={store}>
-      <TooltipProvider>
-        <ModalProvider>{children}</ModalProvider>
-      </TooltipProvider>
+      <DocumentProvider model={model}>
+        <TooltipProvider>
+          <ModalProvider>{children}</ModalProvider>
+        </TooltipProvider>
+      </DocumentProvider>
     </Provider>
   );
 }

package/src/components/editor/documentation.css

@@ -157,18 +157,41 @@
 /* Syntax highlighting for LSP hover code blocks (lezer classHighlighter tok-* classes) */
 .docs-documentation,
 .cm-tooltip .documentation {
-  .tok-keyword { color: light-dark(#708, #c678dd); font-weight: 500; }
+  .tok-keyword {
+    color: light-dark(#708, #c678dd);
+    font-weight: 500;
+  }
   .tok-string,
-  .tok-string2 { color: light-dark(#a11, #98c379); }
-  .tok-number { color: light-dark(#164, #d19a66); }
+  .tok-string2 {
+    color: light-dark(#a11, #98c379);
+  }
+  .tok-number {
+    color: light-dark(#164, #d19a66);
+  }
   .tok-bool,
-  .tok-atom { color: light-dark(#219, #d19a66); }
-  .tok-comment { color: var(--cm-comment); }
-  .tok-className { color: light-dark(#00f, #61afef); }
+  .tok-atom {
+    color: light-dark(#219, #d19a66);
+  }
+  .tok-comment {
+    color: var(--cm-comment);
+  }
+  .tok-className {
+    color: light-dark(#00f, #61afef);
+  }
   .tok-typeName,
-  .tok-namespace { color: light-dark(#085, #56b6c2); }
-  .tok-operator { color: light-dark(#a2f, #56b6c2); }
-  .tok-propertyName { color: light-dark(#05a, #e5c07b); }
-  .tok-variableName { color: light-dark(#000, #abb2bf); }
-  .tok-punctuation { color: light-dark(#000, #abb2bf); }
+  .tok-namespace {
+    color: light-dark(#085, #56b6c2);
+  }
+  .tok-operator {
+    color: light-dark(#a2f, #56b6c2);
+  }
+  .tok-propertyName {
+    color: light-dark(#05a, #e5c07b);
+  }
+  .tok-variableName {
+    color: light-dark(#000, #abb2bf);
+  }
+  .tok-punctuation {
+    color: light-dark(#000, #abb2bf);
+  }
 }

package/src/components/editor/errors/auto-fix.tsx

@@ -18,7 +18,8 @@ import {
 } from "@/components/ui/dropdown-menu";
 import { Tooltip } from "@/components/ui/tooltip";
 import { aiCompletionCellAtom } from "@/core/ai/state";
-import { notebookAtom, useCellActions } from "@/core/cells/cells";
+import { notebookAtom } from "@/core/cells/cells";
+import { useCellActions } from "@/core/cells/actions";
 import type { CellId } from "@/core/cells/ids";
 import { aiFeaturesEnabledAtom } from "@/core/config/config";
 import { getAutoFixes } from "@/core/errors/errors";
@@ -51,7 +52,7 @@ export const AutoFixButton = ({
   className?: string;
 }) => {
   const store = useStore();
-  const { createNewCell } = useCellActions();
+  const { createCell } = useCellActions();
   const aiFeaturesEnabled = useAtomValue(aiFeaturesEnabledAtom);
   const autoFixes = errors.flatMap((error) =>
     getAutoFixes(error, { aiEnabled: aiFeaturesEnabled }),
@@ -72,12 +73,7 @@ export const AutoFixButton = ({
       store.get(notebookAtom).cellHandles[cellId].current?.editorView;
     firstFix.onFix({
       addCodeBelow: (code: string) => {
-        createNewCell({
-          cellId: cellId,
-          autoFocus: false,
-          before: false,
-          code: code,
-        });
+        createCell({ after: cellId, code, focus: false });
       },
       editor: editorView,
       cellId: cellId,

package/src/components/editor/file-tree/file-explorer.tsx

@@ -59,7 +59,7 @@ import {
 import { Tooltip } from "@/components/ui/tooltip";
 import { SearchInput } from "@/components/ui/input";
 import { toast } from "@/components/ui/use-toast";
-import { useCellActions } from "@/core/cells/cells";
+import { useCellActions } from "@/core/cells/actions";
 import { useLastFocusedCellId } from "@/core/cells/focus";
 import { disableFileDownloadsAtom } from "@/core/config/config";
 import { useRequestClient } from "@/core/network/requests";
@@ -697,15 +697,11 @@ const Node = ({ node, style, dragHandle }: NodeRendererProps<FileTreeNode>) => {
 
   const Icon = FILE_ICON[fileType];
   const { openPrompt } = useImperativeModal();
-  const { createNewCell } = useCellActions();
+  const { createCell } = useCellActions();
   const lastFocusedCellId = useLastFocusedCellId();
 
   const handleInsertCode = (code: string) => {
-    createNewCell({
-      code,
-      before: false,
-      cellId: lastFocusedCellId ?? "__end__",
-    });
+    createCell({ after: lastFocusedCellId, code });
   };
 
   const fileExplorer = use(RequestingTreeContext);

package/src/components/editor/links/__tests__/cell-link.test.tsx

@@ -11,8 +11,10 @@ import { CellLink, CellLinkTraceback } from "../cell-link";
 const showCellIfHidden = vi.hoisted(() => vi.fn());
 const targetId = cellId("target");
 
-vi.mock("@/core/cells/cells", () => ({
+vi.mock("@/core/cells/actions", () => ({
   useCellActions: () => ({ showCellIfHidden }),
+}));
+vi.mock("@/core/cells/cells", () => ({
   useCellIds: () => ({ inOrderIds: [targetId] }),
   useCellNames: () => ({ [targetId]: "Target" }),
 }));

package/src/components/editor/links/cell-link.tsx

@@ -1,7 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import type { JSX } from "react"; /* Copyright 2026 Marimo. All rights reserved. */
-import { useCellActions, useCellIds, useCellNames } from "@/core/cells/cells";
+import { useCellIds, useCellNames } from "@/core/cells/cells";
+import { useCellActions } from "@/core/cells/actions";
 import { type CellId, HTMLCellId, SCRATCH_CELL_ID } from "@/core/cells/ids";
 import { displayCellName } from "@/core/cells/names";
 import { goToCellLine } from "@/core/codemirror/go-to-definition/utils";

package/src/components/editor/navigation/__tests__/clipboard.test.ts

@@ -5,15 +5,18 @@ import { act, renderHook } from "@testing-library/react";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { asMock, MockModules, Mocks, SetupMocks } from "@/__mocks__/common";
 import { cellId } from "@/__tests__/branded";
-import type { CellActions, NotebookState } from "@/core/cells/cells";
+import type { CellActions } from "@/core/cells/actions";
+import type { NotebookState } from "@/core/cells/cells";
 import { useCellClipboard } from "../clipboard";
 
 // Mock dependencies
 vi.mock("@/components/ui/use-toast", () => MockModules.toast());
 
+vi.mock("@/core/cells/actions", () => ({
+  useCellActions: vi.fn(),
+}));
 vi.mock("@/core/cells/cells", () => ({
   getNotebook: vi.fn(),
-  useCellActions: vi.fn(),
 }));
 
 vi.mock("@/utils/Logger", () => ({
@@ -33,14 +36,15 @@ vi.mock("@/core/cells/pending-cut-service", () => ({
 
 import { MockNotebook } from "@/__mocks__/notebook";
 import { toast } from "@/components/ui/use-toast";
-import { getNotebook, useCellActions } from "@/core/cells/cells";
+import { useCellActions } from "@/core/cells/actions";
+import { getNotebook } from "@/core/cells/cells";
 import { Logger } from "@/utils/Logger";
 
 describe("useCellClipboard", () => {
   const [mockCellId1, mockCellId2] = MockNotebook.cellIds();
   const mockCellCode1 = "print('hello world')";
   const mockCellCode2 = "x = 42";
-  const mockCreateNewCell = vi.fn();
+  const mockCreateCell = vi.fn();
 
   const mockClipboard = Mocks.clipboard();
 
@@ -70,7 +74,7 @@ describe("useCellClipboard", () => {
     } as NotebookState);
 
     asMock(useCellActions).mockReturnValue({
-      createNewCell: mockCreateNewCell,
+      createCell: mockCreateCell,
     } as unknown as CellActions);
   });
 
@@ -330,11 +334,40 @@ describe("useCellClipboard", () => {
         await result.current.pasteAtCell(mockCellId1);
       });
 
-      expect(mockCreateNewCell).toHaveBeenCalledWith({
-        cellId: mockCellId1,
-        before: false,
+      expect(mockCreateCell).toHaveBeenCalledWith({
+        after: mockCellId1,
+        code: "x = 42",
+        config: {},
+      });
+    });
+
+    it("drops the copied column so the cell joins the column it is pasted into", async () => {
+      const clipboardData = {
+        cells: [{ code: "x = 42", config: { column: 1, hide_code: true } }],
+        version: "1.0",
+      };
+
+      const mockItem = {
+        types: ["web application/x-marimo-cell"],
+        getType: vi.fn().mockResolvedValue(
+          new Blob([JSON.stringify(clipboardData)], {
+            type: "web application/x-marimo-cell",
+          }),
+        ),
+      };
+
+      mockClipboard.read.mockResolvedValue([mockItem]);
+
+      const { result } = renderHook(() => useCellClipboard());
+
+      await act(async () => {
+        await result.current.pasteAtCell(mockCellId1);
+      });
+
+      expect(mockCreateCell).toHaveBeenCalledWith({
+        after: mockCellId1,
         code: "x = 42",
-        autoFocus: true,
+        config: { hide_code: true },
       });
     });
 
@@ -365,24 +398,21 @@ describe("useCellClipboard", () => {
         await result.current.pasteAtCell(mockCellId1);
       });
 
-      expect(mockCreateNewCell).toHaveBeenCalledTimes(3);
-      expect(mockCreateNewCell).toHaveBeenNthCalledWith(3, {
-        cellId: mockCellId1,
-        before: false,
+      expect(mockCreateCell).toHaveBeenCalledTimes(3);
+      expect(mockCreateCell).toHaveBeenNthCalledWith(3, {
+        after: mockCellId1,
         code: "x = 42",
-        autoFocus: true,
+        config: {},
       });
-      expect(mockCreateNewCell).toHaveBeenNthCalledWith(2, {
-        cellId: mockCellId1,
-        before: false,
+      expect(mockCreateCell).toHaveBeenNthCalledWith(2, {
+        after: mockCellId1,
         code: "y = x * 2",
-        autoFocus: true,
+        config: {},
       });
-      expect(mockCreateNewCell).toHaveBeenNthCalledWith(1, {
-        cellId: mockCellId1,
-        before: false,
+      expect(mockCreateCell).toHaveBeenNthCalledWith(1, {
+        after: mockCellId1,
         code: "print(y)",
-        autoFocus: true,
+        config: {},
       });
     });
 
@@ -401,11 +431,9 @@ describe("useCellClipboard", () => {
         await result.current.pasteAtCell(mockCellId1);
       });
 
-      expect(mockCreateNewCell).toHaveBeenCalledWith({
-        cellId: mockCellId1,
-        before: false,
+      expect(mockCreateCell).toHaveBeenCalledWith({
+        after: mockCellId1,
         code: "plain text code",
-        autoFocus: true,
       });
     });
 
@@ -432,11 +460,9 @@ describe("useCellClipboard", () => {
         "Failed to parse clipboard cell data",
         expect.any(Error),
       );
-      expect(mockCreateNewCell).toHaveBeenCalledWith({
-        cellId: mockCellId1,
-        before: false,
+      expect(mockCreateCell).toHaveBeenCalledWith({
+        after: mockCellId1,
         code: "fallback text",
-        autoFocus: true,
       });
     });
 
@@ -522,11 +548,9 @@ describe("useCellClipboard", () => {
         "Failed to parse clipboard cell data",
         expect.any(Error),
       );
-      expect(mockCreateNewCell).toHaveBeenCalledWith({
-        cellId: mockCellId1,
-        before: false,
+      expect(mockCreateCell).toHaveBeenCalledWith({
+        after: mockCellId1,
         code: "fallback text",
-        autoFocus: true,
       });
     });
 
@@ -554,11 +578,9 @@ describe("useCellClipboard", () => {
         await result.current.pasteAtCell(mockCellId1);
       });
 
-      expect(mockCreateNewCell).toHaveBeenCalledWith({
-        cellId: mockCellId1,
-        before: false,
+      expect(mockCreateCell).toHaveBeenCalledWith({
+        after: mockCellId1,
         code: "fallback text",
-        autoFocus: true,
       });
     });
   });