@marimo-team/islands 0.24.1-dev79 → 0.24.1-dev80

package/src/plugins/impl/data-editor/__tests__/editor-state.test.ts

@@ -0,0 +1,113 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { describe, expect, it } from "vitest";
+import type { FieldTypes } from "@/components/data-table/types";
+import { applyEditorEdits } from "../editor-state";
+
+describe("applyEditorEdits", () => {
+  it("replays edits against an empty table", () => {
+    const result = applyEditorEdits(
+      { data: [], columnFields: new Map([["value", "unknown"]]) },
+      [{ rowIdx: 0, columnId: "value", value: "first" }],
+    );
+
+    expect(result.data).toEqual([{ value: "first" }]);
+  });
+
+  it("replays an append after deleting every row", () => {
+    const result = applyEditorEdits(
+      {
+        data: [{ A: 1, B: "a" }],
+        columnFields: new Map([
+          ["A", "number"],
+          ["B", "string"],
+        ]) as FieldTypes,
+      },
+      [
+        { rowIdx: 0, type: "remove" },
+        { rowIdx: 0, columnId: "A", value: 2 },
+        { rowIdx: 0, columnId: "B", value: "b" },
+      ],
+    );
+
+    expect(result.data).toEqual([{ A: 2, B: "b" }]);
+  });
+
+  it("uses the evolving column order", () => {
+    const result = applyEditorEdits(
+      {
+        data: [{ A: "a", B: "b" }],
+        columnFields: new Map([
+          ["A", "string"],
+          ["B", "string"],
+        ]) as FieldTypes,
+      },
+      [
+        { columnIdx: 0, type: "remove" },
+        { columnIdx: 0, type: "rename", newName: "D" },
+      ],
+    );
+
+    expect(result.data).toEqual([{ D: "b" }]);
+    expect([...result.columnFields]).toEqual([["D", "string"]]);
+  });
+
+  it("preserves inserted column order through later edits", () => {
+    const result = applyEditorEdits(
+      {
+        data: [{ A: "a", C: "c" }],
+        columnFields: new Map([
+          ["A", "string"],
+          ["C", "string"],
+        ]) as FieldTypes,
+      },
+      [
+        {
+          columnIdx: 1,
+          type: "insert",
+          newName: "B",
+          dataType: "boolean",
+        },
+        { columnIdx: 1, type: "rename", newName: "D" },
+        { columnIdx: 2, type: "remove" },
+      ],
+    );
+
+    expect(result.data).toEqual([{ A: "a", D: "" }]);
+    expect(Object.keys(result.data[0])).toEqual(["A", "D"]);
+    expect([...result.columnFields]).toEqual([
+      ["A", "string"],
+      ["D", "boolean"],
+    ]);
+  });
+
+  it("does not mutate the previous state", () => {
+    const state = {
+      data: [{ A: "before" }],
+      columnFields: new Map([["A", "string"]]) as FieldTypes,
+    };
+
+    const result = applyEditorEdits(state, [
+      { rowIdx: 0, columnId: "A", value: "after" },
+      { columnIdx: 1, type: "insert", newName: "B" },
+    ]);
+
+    expect(state.data).toEqual([{ A: "before" }]);
+    expect([...state.columnFields]).toEqual([["A", "string"]]);
+    expect(result.data).toEqual([{ A: "after", B: "" }]);
+  });
+
+  it("ignores negative row indices", () => {
+    const state = {
+      data: [{ A: "unchanged" }],
+      columnFields: new Map([["A", "string"]]) as FieldTypes,
+    };
+
+    expect(
+      applyEditorEdits(state, [
+        { rowIdx: -1, columnId: "A", value: "invalid" },
+        { rowIdx: -1, type: "remove" },
+      ]).data,
+    ).toEqual(state.data);
+  });
+});

package/src/plugins/impl/data-editor/__tests__/glide-data-editor.test.tsx

@@ -6,18 +6,31 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { GlideDataEditor } from "../glide-data-editor";
 
-const capturedPortalRef = vi.hoisted(() => ({
+const capturedDataEditor = vi.hoisted(() => ({
   ref: undefined as React.RefObject<HTMLElement> | undefined,
+  onCellEdited: undefined as
+    | ((cell: [number, number], value: { data: unknown }) => void)
+    | undefined,
+  onRowAppended: undefined as (() => void) | undefined,
 }));
 
 vi.mock("@glideapps/glide-data-grid", async () => {
   const React = await import("react");
   return {
     default: React.forwardRef(function MockDataEditor(
-      props: { portalElementRef?: React.RefObject<HTMLElement> },
+      props: {
+        portalElementRef?: React.RefObject<HTMLElement>;
+        onCellEdited?: (
+          cell: [number, number],
+          value: { data: unknown },
+        ) => void;
+        onRowAppended?: () => void;
+      },
       _ref: React.Ref<HTMLDivElement>,
     ) {
-      capturedPortalRef.ref = props.portalElementRef;
+      capturedDataEditor.ref = props.portalElementRef;
+      capturedDataEditor.onCellEdited = props.onCellEdited;
+      capturedDataEditor.onRowAppended = props.onRowAppended;
       return <div data-testid="mock-data-editor" />;
     }),
     CompactSelection: {
@@ -40,23 +53,16 @@ vi.mock("@/theme/useTheme", () => ({
 
 const editorProps = {
   data: [{ name: "alice" }],
-  setData: vi.fn(),
   columnFields: new Map([["name", "string"]]) as Map<string, "string">,
-  setColumnFields: vi.fn(),
   editableColumns: "all" as const,
-  edits: [],
   onAddEdits: vi.fn(),
-  onAddRows: vi.fn(),
-  onDeleteRows: vi.fn(),
-  onRenameColumn: vi.fn(),
-  onDeleteColumn: vi.fn(),
-  onAddColumn: vi.fn(),
 };
 
 describe("GlideDataEditor portal", () => {
   let fullscreenElement: Element | null;
 
   beforeEach(() => {
+    vi.clearAllMocks();
     fullscreenElement = null;
     Object.defineProperty(document, "fullscreenElement", {
       get: () => fullscreenElement,
@@ -79,12 +85,42 @@ describe("GlideDataEditor portal", () => {
     const portal = screen.getByTestId("glide-data-editor-portal");
     expect(portal.parentElement).toBe(document.body);
     expect(container.contains(portal)).toBe(false);
-    expect(capturedPortalRef.ref).toBeDefined();
+    expect(capturedDataEditor.ref).toBeDefined();
     await waitFor(() => {
-      expect(capturedPortalRef.ref?.current).toBe(portal);
+      expect(capturedDataEditor.ref?.current).toBe(portal);
     });
   });
 
+  it("emits cell edits", () => {
+    const onAddEdits = vi.fn();
+    render(
+      <TooltipProvider>
+        <GlideDataEditor {...editorProps} onAddEdits={onAddEdits} />
+      </TooltipProvider>,
+    );
+
+    act(() => capturedDataEditor.onCellEdited?.([0, 0], { data: "bob" }));
+
+    expect(onAddEdits).toHaveBeenCalledWith([
+      { rowIdx: 0, columnId: "name", value: "bob" },
+    ]);
+  });
+
+  it("emits one positional edit per cell when appending a row", () => {
+    const onAddEdits = vi.fn();
+    render(
+      <TooltipProvider>
+        <GlideDataEditor {...editorProps} onAddEdits={onAddEdits} />
+      </TooltipProvider>,
+    );
+
+    act(() => capturedDataEditor.onRowAppended?.());
+
+    expect(onAddEdits).toHaveBeenCalledWith([
+      { rowIdx: 1, columnId: "name", value: "" },
+    ]);
+  });
+
   it("mounts into the fullscreen element when fullscreen is already active", () => {
     const fullscreenContainer = document.createElement("div");
     document.body.appendChild(fullscreenContainer);

package/src/plugins/impl/data-editor/__tests__/glide-utils.test.ts

@@ -3,7 +3,7 @@
 import type { GridSelection } from "@glideapps/glide-data-grid";
 import { CompactSelection, GridCellKind } from "@glideapps/glide-data-grid";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { pasteCells } from "../glide-utils";
+import { isValidCellValue, pasteCells } from "../glide-utils";
 import type { ModifiedGridColumn } from "../types";
 
 // Mock navigator.clipboard
@@ -16,6 +16,26 @@ Object.defineProperty(navigator, "clipboard", {
   writable: true,
 });
 
+describe("isValidCellValue", () => {
+  it("accepts only finite numbers", () => {
+    expect(isValidCellValue("number", 3.5)).toBe(true);
+    expect(isValidCellValue("number", Number.POSITIVE_INFINITY)).toBe(false);
+    expect(isValidCellValue("number", Number.NEGATIVE_INFINITY)).toBe(false);
+    expect(isValidCellValue("number", "Infinity")).toBe(false);
+    expect(isValidCellValue("number", Number.NaN)).toBe(false);
+  });
+
+  it("preserves integer precision", () => {
+    expect(isValidCellValue("integer", 3)).toBe(true);
+    expect(isValidCellValue("integer", 3.5)).toBe(false);
+    expect(isValidCellValue("integer", "9007199254740993")).toBe(true);
+    expect(isValidCellValue("integer", "9007199254740993.0")).toBe(true);
+    expect(isValidCellValue("integer", "9007199254740993.1")).toBe(false);
+    expect(isValidCellValue("integer", "1.0000000000000001")).toBe(false);
+    expect(isValidCellValue("integer", "1e-324")).toBe(false);
+  });
+});
+
 describe("pasteCells", () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -76,13 +96,11 @@ describe("pasteCells", () => {
   it("should handle empty clipboard text", async () => {
     mockClipboard.readText.mockResolvedValue("");
 
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
 
     pasteCells({
       selection: createMockSelection(0, 0),
       data: createMockData(),
-      setData: mockSetLocalData,
       columns: createMockColumns(),
       editableColumns: "all",
       onAddEdits: mockOnAddEdits,
@@ -91,20 +109,17 @@ describe("pasteCells", () => {
     // Wait for the async operation
     await vi.waitFor(() => {
       expect(mockOnAddEdits).not.toHaveBeenCalled();
-      expect(mockSetLocalData).not.toHaveBeenCalled();
     });
   });
 
   it("should handle whitespace-only clipboard text", async () => {
     mockClipboard.readText.mockResolvedValue("   \n\t  ");
 
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
 
     pasteCells({
       selection: createMockSelection(0, 0),
       data: createMockData(),
-      setData: mockSetLocalData,
       columns: createMockColumns(),
       editableColumns: "all",
       onAddEdits: mockOnAddEdits,
@@ -112,20 +127,17 @@ describe("pasteCells", () => {
 
     await vi.waitFor(() => {
       expect(mockOnAddEdits).not.toHaveBeenCalled();
-      expect(mockSetLocalData).not.toHaveBeenCalled();
     });
   });
 
   it("should paste string data correctly", async () => {
     mockClipboard.readText.mockResolvedValue("David\t40\ttrue");
 
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
 
     pasteCells({
       selection: createMockSelection(0, 0),
       data: createMockData(),
-      setData: mockSetLocalData,
       columns: createMockColumns(),
       editableColumns: "all",
       onAddEdits: mockOnAddEdits,
@@ -140,16 +152,14 @@ describe("pasteCells", () => {
     });
   });
 
-  it("should convert number values correctly", async () => {
+  it("should skip fractional values for integer columns", async () => {
     mockClipboard.readText.mockResolvedValue("Eve\t25.5\tfalse");
 
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
 
     pasteCells({
       selection: createMockSelection(0, 0),
       data: createMockData(),
-      setData: mockSetLocalData,
       columns: createMockColumns(),
       editableColumns: "all",
       onAddEdits: mockOnAddEdits,
@@ -158,7 +168,6 @@ describe("pasteCells", () => {
     await vi.waitFor(() => {
       expect(mockOnAddEdits).toHaveBeenCalledWith([
         { rowIdx: 0, columnId: "name", value: "Eve" },
-        { rowIdx: 0, columnId: "age", value: 25.5 },
         { rowIdx: 0, columnId: "active", value: false },
       ]);
     });
@@ -167,13 +176,11 @@ describe("pasteCells", () => {
   it("should handle boolean conversion with different values", async () => {
     mockClipboard.readText.mockResolvedValue("Frank\t30\t1");
 
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
 
     pasteCells({
       selection: createMockSelection(0, 0),
       data: createMockData(),
-      setData: mockSetLocalData,
       columns: createMockColumns(),
       editableColumns: "all",
       onAddEdits: mockOnAddEdits,
@@ -191,13 +198,11 @@ describe("pasteCells", () => {
   it("should skip invalid number values", async () => {
     mockClipboard.readText.mockResolvedValue("Grace\tinvalid\tfalse");
 
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
 
     pasteCells({
       selection: createMockSelection(0, 0),
       data: createMockData(),
-      setData: mockSetLocalData,
       columns: createMockColumns(),
       editableColumns: "all",
       onAddEdits: mockOnAddEdits,
@@ -211,16 +216,36 @@ describe("pasteCells", () => {
     });
   });
 
+  it("should preserve unsafe integer precision", async () => {
+    mockClipboard.readText.mockResolvedValue("Grace\t9007199254740993\tfalse");
+
+    const mockOnAddEdits = vi.fn();
+
+    pasteCells({
+      selection: createMockSelection(0, 0),
+      data: createMockData(),
+      columns: createMockColumns(),
+      editableColumns: "all",
+      onAddEdits: mockOnAddEdits,
+    });
+
+    await vi.waitFor(() => {
+      expect(mockOnAddEdits).toHaveBeenCalledWith([
+        { rowIdx: 0, columnId: "name", value: "Grace" },
+        { rowIdx: 0, columnId: "age", value: "9007199254740993" },
+        { rowIdx: 0, columnId: "active", value: false },
+      ]);
+    });
+  });
+
   it("should handle multiple rows", async () => {
     mockClipboard.readText.mockResolvedValue("Hank\t40\ttrue\nIvy\t35\tfalse");
 
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
 
     pasteCells({
       selection: createMockSelection(0, 0),
       data: createMockData(),
-      setData: mockSetLocalData,
       columns: createMockColumns(),
       editableColumns: "all",
       onAddEdits: mockOnAddEdits,
@@ -243,13 +268,11 @@ describe("pasteCells", () => {
       "Jack\t45\ttrue\nKate\t50\tfalse\nLiam\t55\ttrue",
     );
 
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
 
     pasteCells({
       selection: createMockSelection(0, 0),
       data: createMockData(), // Only 3 rows
-      setData: mockSetLocalData,
       columns: createMockColumns(),
       editableColumns: "all",
       onAddEdits: mockOnAddEdits,
@@ -273,13 +296,11 @@ describe("pasteCells", () => {
   it("should respect column bounds - not exceed column count", async () => {
     mockClipboard.readText.mockResolvedValue("Mia\t30\ttrue\textra");
 
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
 
     pasteCells({
       selection: createMockSelection(0, 0),
       data: createMockData(),
-      setData: mockSetLocalData,
       columns: createMockColumns(), // Only 3 columns
       editableColumns: "all",
       onAddEdits: mockOnAddEdits,
@@ -297,13 +318,11 @@ describe("pasteCells", () => {
   it("should handle starting position offset", async () => {
     mockClipboard.readText.mockResolvedValue("Noah\t25\ttrue");
 
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
 
     pasteCells({
       selection: createMockSelection(1, 1), // Start at column 1, row 1
       data: createMockData(),
-      setData: mockSetLocalData,
       columns: createMockColumns(),
       editableColumns: "all",
       onAddEdits: mockOnAddEdits,
@@ -317,7 +336,6 @@ describe("pasteCells", () => {
   });
 
   it("should handle no selection", async () => {
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
 
     pasteCells({
@@ -327,7 +345,6 @@ describe("pasteCells", () => {
         columns: CompactSelection.empty(),
       },
       data: createMockData(),
-      setData: mockSetLocalData,
       columns: createMockColumns(),
       editableColumns: "all",
       onAddEdits: mockOnAddEdits,
@@ -335,7 +352,6 @@ describe("pasteCells", () => {
 
     await vi.waitFor(() => {
       expect(mockOnAddEdits).not.toHaveBeenCalled();
-      expect(mockSetLocalData).not.toHaveBeenCalled();
     });
   });
 
@@ -344,7 +360,6 @@ describe("pasteCells", () => {
       new Error("Clipboard access denied"),
     );
 
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
     const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {
       // Do nothing
@@ -353,7 +368,6 @@ describe("pasteCells", () => {
     pasteCells({
       selection: createMockSelection(0, 0),
       data: createMockData(),
-      setData: mockSetLocalData,
       columns: createMockColumns(),
       editableColumns: "all",
       onAddEdits: mockOnAddEdits,
@@ -361,53 +375,21 @@ describe("pasteCells", () => {
 
     await vi.waitFor(() => {
       expect(mockOnAddEdits).not.toHaveBeenCalled();
-      expect(mockSetLocalData).not.toHaveBeenCalled();
     });
 
     consoleSpy.mockRestore();
   });
 
-  it("should update local data when edits are applied", async () => {
-    mockClipboard.readText.mockResolvedValue("Olivia\t28\ttrue");
-
-    const mockSetLocalData = vi.fn();
-    const mockOnAddEdits = vi.fn();
-
-    pasteCells({
-      selection: createMockSelection(0, 0),
-      data: createMockData(),
-      setData: mockSetLocalData,
-      columns: createMockColumns(),
-      editableColumns: "all",
-      onAddEdits: mockOnAddEdits,
-    });
-
-    await vi.waitFor(() => {
-      expect(mockSetLocalData).toHaveBeenCalled();
-
-      // Verify the updater function is called
-      const updater = mockSetLocalData.mock.calls[0][0];
-      const originalData = createMockData();
-      const updatedData = updater(originalData);
-
-      expect(updatedData[0].name).toBe("Olivia");
-      expect(updatedData[0].age).toBe(28);
-      expect(updatedData[0].active).toBe(true);
-    });
-  });
-
   it("should handle empty rows in clipboard data", async () => {
     mockClipboard.readText.mockResolvedValue(
       "Paul\t30\ttrue\n\nRachel\t25\tfalse",
     );
 
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
 
     pasteCells({
       selection: createMockSelection(0, 0),
       data: createMockData(),
-      setData: mockSetLocalData,
       columns: createMockColumns(),
       editableColumns: "all",
       onAddEdits: mockOnAddEdits,
@@ -430,13 +412,11 @@ describe("pasteCells", () => {
       "Olivia\t28\ttrue\nWilliams\t35\tfalse",
     );
 
-    const mockSetLocalData = vi.fn();
     const mockOnAddEdits = vi.fn();
 
     pasteCells({
       selection: createMockSelection(0, 0),
       data: createMockData(),
-      setData: mockSetLocalData,
       columns: createMockColumns(),
       editableColumns: ["age"],
       onAddEdits: mockOnAddEdits,