@marimo-team/islands 0.25.3-dev24 → 0.25.3-dev245

package/src/components/editor/cell/code/__tests__/rtc-editor-config.test.ts

@@ -1,50 +0,0 @@
-/* Copyright 2026 Marimo. All rights reserved. */
-
-import { EditorState } from "@codemirror/state";
-import { describe, expect, it } from "vitest";
-import { composeRtcEditorConfig } from "../cell-editor";
-
-describe("composeRtcEditorConfig", () => {
-  it("does not accumulate RTC extensions across reconfigurations", () => {
-    const baseExtension = EditorState.readOnly.of(false);
-    const baseExtensions = [baseExtension];
-    const firstRtc = {
-      code: "first RTC code",
-      extension: EditorState.tabSize.of(2),
-    };
-    const secondRtc = {
-      code: "second RTC code",
-      extension: EditorState.tabSize.of(4),
-    };
-
-    const firstConfig = composeRtcEditorConfig(
-      "local code",
-      baseExtensions,
-      firstRtc,
-    );
-    const secondConfig = composeRtcEditorConfig(
-      "local code",
-      baseExtensions,
-      secondRtc,
-    );
-
-    expect(baseExtensions).toEqual([baseExtension]);
-    expect(firstConfig).toEqual({
-      code: firstRtc.code,
-      extensions: [baseExtension, firstRtc.extension],
-    });
-    expect(secondConfig).toEqual({
-      code: secondRtc.code,
-      extensions: [baseExtension, secondRtc.extension],
-    });
-  });
-
-  it("reuses the base configuration when RTC is disabled", () => {
-    const extensions = [EditorState.readOnly.of(false)];
-
-    const config = composeRtcEditorConfig("local code", extensions, undefined);
-
-    expect(config).toEqual({ code: "local code", extensions });
-    expect(config.extensions).toBe(extensions);
-  });
-});

package/src/components/editor/chrome/wrapper/footer-items/rtc-status.tsx

@@ -1,65 +0,0 @@
-/* Copyright 2026 Marimo. All rights reserved. */
-
-import { useAtom, useAtomValue } from "jotai";
-import { UsersIcon } from "lucide-react";
-import type React from "react";
-import { useState } from "react";
-import { Input } from "@/components/ui/input";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
-import { connectedDocAtom } from "@/core/codemirror/rtc/extension";
-import { isRtcEnabled, usernameAtom } from "@/core/rtc/state";
-import { FooterItem } from "../footer-item";
-
-export const RTCStatus: React.FC = () => {
-  const connectedDoc = useAtomValue(connectedDocAtom);
-  const [username, setUsername] = useAtom(usernameAtom);
-  const [open, setOpen] = useState(false);
-
-  if (!isRtcEnabled()) {
-    return null;
-  }
-
-  if (connectedDoc === "disabled") {
-    return null;
-  }
-
-  const tooltip = connectedDoc
-    ? "Real-time collaboration active"
-    : "Connecting to real-time collaboration";
-
-  return (
-    <Popover open={open} onOpenChange={setOpen}>
-      <PopoverTrigger asChild={true}>
-        <FooterItem
-          tooltip={tooltip}
-          selected={false}
-          data-testid="footer-rtc-status"
-        >
-          <UsersIcon className="w-4 h-4" />
-        </FooterItem>
-      </PopoverTrigger>
-      <PopoverContent className="w-80">
-        <div className="space-y-4">
-          <div className="space-y-2">
-            <h4 className="font-medium leading-none">Username</h4>
-            <p className="text-sm text-muted-foreground">
-              Set your username for real-time collaboration
-            </p>
-          </div>
-          <Input
-            value={username}
-            autoCapitalize="off"
-            autoComplete="off"
-            autoCorrect="off"
-            onChange={(e) => setUsername(e.target.value)}
-            placeholder="Enter your username"
-          />
-        </div>
-      </PopoverContent>
-    </Popover>
-  );
-};

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

@@ -1,81 +0,0 @@
-/* Copyright 2026 Marimo. All rights reserved. */
-
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { cellId } from "@/__tests__/branded";
-import { type CellId, HTMLCellId } from "@/core/cells/ids";
-
-const mockScrollCellIntoView = vi.fn();
-const mockRaf2 = vi.fn((callback: () => void) => callback());
-
-vi.mock("../focus-utils", () => ({
-  scrollCellIntoView: mockScrollCellIntoView,
-  raf2: mockRaf2,
-}));
-
-type TemporarilyShownCodeState = Set<CellId>;
-
-describe("temporarilyShownCodeActions", () => {
-  const cid = cellId("cell-1");
-  let cellElement: HTMLElement;
-
-  beforeEach(() => {
-    cellElement = document.createElement("div");
-    cellElement.id = HTMLCellId.create(cid);
-    document.body.append(cellElement);
-    cellElement.focus();
-
-    vi.spyOn(HTMLCellId, "findElementThroughShadowDOMs").mockReturnValue(
-      cellElement as HTMLElement & { id: HTMLCellId },
-    );
-
-    mockScrollCellIntoView.mockClear();
-    mockRaf2.mockClear();
-  });
-
-  afterEach(() => {
-    cellElement.remove();
-    vi.restoreAllMocks();
-  });
-
-  it("should scroll cell into view when removing cell causes layout shift", () => {
-    const state = new Set<CellId>([cid]);
-    removeCell(state, cid);
-
-    expect(mockScrollCellIntoView).toHaveBeenCalledWith(cid);
-  });
-
-  it("should not scroll when focused cell is not found", () => {
-    vi.spyOn(HTMLCellId, "findElementThroughShadowDOMs").mockReturnValue(null);
-
-    const state = new Set<CellId>([cid]);
-    removeCell(state, cid);
-
-    expect(mockScrollCellIntoView).not.toHaveBeenCalled();
-  });
-});
-
-// Helper function that replicates the remove reducer logic
-function removeCell(
-  state: TemporarilyShownCodeState,
-  cellId: CellId,
-): TemporarilyShownCodeState {
-  if (!state.has(cellId)) {
-    return state;
-  }
-  const newState = new Set(state);
-  newState.delete(cellId);
-
-  mockRaf2(() => {
-    const activeElement = document.activeElement;
-    if (!activeElement) {
-      return;
-    }
-    const focusedCell = HTMLCellId.findElementThroughShadowDOMs(activeElement);
-    if (!focusedCell) {
-      return;
-    }
-    mockScrollCellIntoView(HTMLCellId.parse(focusedCell.id));
-  });
-
-  return newState;
-}

package/src/components/editor/navigation/state.ts

@@ -1,65 +0,0 @@
-/* Copyright 2026 Marimo. All rights reserved. */
-
-import { atom, useAtomValue } from "jotai";
-import { useMemo } from "react";
-import { type CellId, HTMLCellId } from "@/core/cells/ids";
-import { scrollCellIntoView } from "@/core/cells/scrollCellIntoView";
-import { createReducerAndAtoms } from "@/utils/createReducer";
-import { raf2 } from "./focus-utils";
-
-type TemporarilyShownCodeState = Set<CellId>;
-
-// This previously used jotai-scope, but unfortunately this bug creates unnecessary work:
-// https://github.com/jotaijs/jotai-scope/issues/25
-
-const {
-  valueAtom: temporarilyShownCodeAtom,
-  useActions: useTemporarilyShownCodeActions,
-} = createReducerAndAtoms(() => new Set<CellId>(), {
-  add: (state: TemporarilyShownCodeState, cellId: CellId) => {
-    if (state.has(cellId)) {
-      // no-op
-      return state;
-    }
-    const newState = new Set(state);
-    newState.add(cellId);
-    return newState;
-  },
-  remove: (state: TemporarilyShownCodeState, cellId: CellId) => {
-    if (!state.has(cellId)) {
-      // no-op
-      return state;
-    }
-    const newState = new Set(state);
-    newState.delete(cellId);
-
-    // If we are hiding the code, this will cause a layout shift
-    // so we need to scroll cursor/activeElement into view.
-    raf2(() => {
-      // Get the active
-      const activeElement = document.activeElement;
-      if (!activeElement) {
-        return;
-      }
-      // Get the current focused cell id
-      const focusedCell =
-        HTMLCellId.findElementThroughShadowDOMs(activeElement);
-      if (!focusedCell) {
-        return;
-      }
-      scrollCellIntoView(HTMLCellId.parse(focusedCell.id));
-    });
-
-    return newState;
-  },
-});
-
-const createTemporarilyShownCodeAtom = (cellId: CellId) =>
-  atom((get) => get(temporarilyShownCodeAtom).has(cellId));
-
-export function useTemporarilyShownCode(cellId: CellId) {
-  const atom = useMemo(() => createTemporarilyShownCodeAtom(cellId), [cellId]);
-  return useAtomValue(atom);
-}
-
-export { temporarilyShownCodeAtom, useTemporarilyShownCodeActions };