@cueloop/client 0.1.0-alpha.11 → 0.1.0-alpha.111

package/src/workbench/components/EditorGrid.tabs.test.tsx

@@ -0,0 +1,118 @@
+/**
+ * Regression: file tabs keep the width of their name and the strip scrolls horizontally
+ * behind the header controls when the row overflows, revealing the active tab - instead of
+ * squeezing every tab and truncating its label.
+ */
+
+import { describe, expect, test } from "bun:test";
+import { testRender } from "@opentui/react/test-utils";
+import React from "react";
+import { EditorGrid, visibleTabWindow } from "./EditorGrid";
+import { changesTab, fileTab, makeGroup, type EditorTab } from "./editor-grid";
+import { NERD } from "../../ui/components/primitives/icons";
+import { allowEventLoopUpdates } from "../../testing/test-support";
+
+describe("visibleTabWindow", () => {
+  const tabs: EditorTab[] = ["aaaa", "bbbb", "cccc", "dddd", "eeee"].map((name) =>
+    fileTab(name, name, "diff"),
+  );
+
+  test("an unmeasured strip shows every tab", () => {
+    // Arrange / Act / Assert - width 0 means the header clips until it is measured
+    expect(visibleTabWindow(tabs, 0, 0, 0)).toEqual({ first: 0, end: tabs.length });
+  });
+
+  test("only the run that fits renders, and the active tab pulls the window to it", () => {
+    // Arrange - each tab is 9 cells (4 label + 5 chrome); a 30-cell strip fits about three
+    // Act - the last tab is active
+    const window = visibleTabWindow(tabs, 0, tabs.length - 1, 30);
+
+    // Assert - the window ends on the active tab and dropped earlier tabs
+    expect(window.end).toBe(tabs.length);
+    expect(window.first).toBeGreaterThan(0);
+  });
+
+  test("a tab wider than the strip still shows on its own", () => {
+    // Arrange
+    const wide = [fileTab("a-very-long-file-name.tsx", "x", "diff")];
+
+    // Act / Assert
+    expect(visibleTabWindow(wide, 0, 0, 10)).toEqual({ first: 0, end: 1 });
+  });
+
+  test("the comment badge counts toward a tab's width, so a commented run does not overflow", () => {
+    // Arrange - three 9-cell tabs fit a 27-cell strip exactly with no badge
+    const three = ["aaaa", "bbbb", "cccc"].map((name) => fileTab(name, name, "diff"));
+
+    // Act - without badges all three fit; a ` ● 2` badge on each widens them past the strip
+    const bare = visibleTabWindow(three, 0, 0, 27);
+    const badged = visibleTabWindow(three, 0, 0, 27, () => 2);
+
+    // Assert - the badge width narrows the window rather than clipping the last tab
+    expect(bare.end).toBe(3);
+    expect(badged.end).toBeLessThan(3);
+  });
+});
+
+const NAMES = [
+  "AppShell.tsx",
+  "DiffContentView.tsx",
+  "IconButton.tsx",
+  "EditorGrid.zoom.test.tsx",
+  "ThreadView.tsx",
+];
+
+async function headerRow(activeIndex: number): Promise<string> {
+  const group = makeGroup([
+    changesTab(),
+    ...NAMES.map((name) => fileTab(name, `src/${name}`, "diff")),
+  ]);
+  const tree = { ...group, activeTabId: group.tabs[activeIndex]!.id };
+  const setup = await testRender(
+    <EditorGrid
+      tree={tree}
+      focusedGroupId={tree.id}
+      onFocusGroup={() => {}}
+      onActivateTab={() => {}}
+      onCloseTab={() => {}}
+      onSplit={() => {}}
+      onZoom={() => {}}
+      zoomed={false}
+      renderTab={() => <text>body</text>}
+    />,
+    { width: 70, height: 4 },
+  );
+
+  allowEventLoopUpdates();
+  await setup.waitForVisualIdle();
+  // the strip reveals the active tab on the frame after layout
+  await setup.waitForVisualIdle();
+  const row = setup.captureCharFrame().split("\n")[0]!;
+
+  setup.renderer.destroy();
+
+  return row;
+}
+
+describe("editor tab strip", () => {
+  test("tabs keep their full names and the controls stay pinned when the row overflows", async () => {
+    // Act
+    const row = await headerRow(0);
+
+    // Assert - no squeezed labels: every visible tab reads in full up to the clip edge
+    expect(row).toContain("Changes ");
+    expect(row).toContain("AppShell.tsx ");
+    expect(row).toContain("DiffContentView.tsx ");
+    // and the header controls sit at the right edge, past the clipped strip (search is out for now)
+    expect(row.trimEnd().endsWith(NERD.zoom)).toBe(true);
+  });
+
+  test("the strip scrolls to reveal the active tab", async () => {
+    // Act
+    const row = await headerRow(NAMES.length);
+
+    // Assert - the last tab is on screen, the first has scrolled out behind the left edge
+    expect(row).toContain("ThreadView.tsx ");
+    expect(row).not.toContain("Changes ");
+  });
+});

package/src/workbench/components/EditorGrid.tsx

@@ -0,0 +1,552 @@
+// Renders the Changes pane's editor grid: recursive branches split into rows/columns, each leaf an
+// editor group with its own tab strip and header controls. The caller supplies renderTab so the grid
+// stays layout-only - a tab becomes a diff, a file's contents, or the aggregate Changes view upstream.
+
+import React, { useEffect, useRef, useState } from "react";
+import type { BoxRenderable } from "@opentui/core";
+import { isDoubleClick, type ClickStamp } from "../../annotations/thread-selection";
+import { DARK, type Theme } from "../../appearance/theme";
+import { useFrameMeasure } from "../../ui/use-frame-measure";
+import { useSharedKeyboard } from "../../keyboard/use-shared-keyboard";
+import { useRootOverlay } from "../../ui/components/RootOverlay";
+import { useMenuControl } from "../../ui/components/menu-control";
+import { IconButton } from "../../ui/components/primitives/IconButton";
+import { NERD, HEADER_UNDERLINE_CHARS } from "../../ui/components/primitives/icons";
+import {
+  countEditorGroups,
+  MAX_EDITOR_GROUPS,
+  type EditorBranch,
+  type EditorGroup,
+  type EditorNode,
+  type EditorTab,
+  type SplitDirection,
+} from "./editor-grid";
+
+export interface EditorGridProps {
+  tree: EditorNode;
+  focusedGroupId: string | null;
+  onFocusGroup: (groupId: string) => void;
+  onActivateTab: (groupId: string, tabId: string) => void;
+  onKeepTab?: (groupId: string, tabId: string) => void;
+  onCloseTab: (groupId: string, tabId: string) => void;
+  onSplit: (groupId: string, direction: SplitDirection) => void;
+  onZoom: () => void;
+  zoomed: boolean;
+  renderTab: (tab: EditorTab, groupFocused: boolean) => React.ReactNode;
+  commentCounts?: ReadonlyMap<string, number>;
+  theme?: Theme;
+}
+
+const SPLIT_ITEMS: ReadonlyArray<{ label: string; direction: SplitDirection; arrow: string }> = [
+  { label: "left", direction: "left", arrow: "←" },
+  { label: "right", direction: "right", arrow: "→" },
+  { label: "up", direction: "up", arrow: "↑" },
+  { label: "down", direction: "down", arrow: "↓" },
+];
+
+const MENU_WIDTH = 12;
+const MIN_GROUP_WIDTH = 24;
+const MIN_GROUP_HEIGHT = 8;
+
+function canSplitGroup(width: number, height: number, direction: SplitDirection): boolean {
+  return direction === "left" || direction === "right"
+    ? width >= MIN_GROUP_WIDTH * 2 + 1
+    : height >= MIN_GROUP_HEIGHT * 2 + 1;
+}
+
+/** An arrow key maps straight to its split direction; other keys leave the menu untouched. */
+function splitDirectionForKey(name: string): SplitDirection | null {
+  const item = SPLIT_ITEMS.find((entry) => entry.direction === name);
+
+  return item ? item.direction : null;
+}
+
+function EditorTabButton({
+  tab,
+  active,
+  commentCount,
+  onSelect,
+  onKeep,
+  onClose,
+  tokens,
+}: {
+  tab: EditorTab;
+  active: boolean;
+  /** Comments on this tab's file, shown as a dot-and-count badge; 0 shows nothing. */
+  commentCount: number;
+  onSelect: () => void;
+  onKeep?: () => void;
+  onClose: () => void;
+  tokens: Theme;
+}): React.ReactNode {
+  const [hovered, setHovered] = useState(false);
+  const lastClick = useRef<ClickStamp | null>(null);
+
+  return (
+    <box
+      id={tab.id}
+      onMouseUp={(event) => {
+        const stamp = { time: Date.now(), x: event.x, y: event.y };
+        const doubleClick = isDoubleClick(lastClick.current, stamp);
+
+        lastClick.current = stamp;
+        onSelect();
+
+        if (doubleClick && tab.preview) onKeep?.();
+      }}
+      onMouseOver={() => setHovered(true)}
+      onMouseOut={() => setHovered(false)}
+      style={{
+        flexDirection: "row",
+        // a tab keeps the width of its name; the strip scrolls when the row overflows
+        flexShrink: 0,
+        paddingLeft: 1,
+        paddingRight: 1,
+        backgroundColor: active ? tokens.background : undefined,
+        borderStyle: "single",
+        border: ["right"],
+        borderColor: tokens.border,
+      }}
+    >
+      <text fg={active ? tokens.textMuted : tokens.textDim} style={{ wrapMode: "none" }}>
+        {tab.label}
+      </text>
+      {commentCount > 0 ? (
+        <text
+          fg={tokens.textDim}
+          style={{ flexShrink: 0, wrapMode: "none" }}
+        >{` ● ${commentCount}`}</text>
+      ) : null}
+      <box
+        onMouseUp={(event) => {
+          event.stopPropagation();
+          onClose();
+        }}
+        style={{ paddingLeft: 1 }}
+      >
+        <text fg={tokens.textDim}>{hovered ? NERD.close : " "}</text>
+      </box>
+    </box>
+  );
+}
+
+/** Cells a tab occupies: padding, label, the ` ● N` comment badge when present, the close cell, the right rule. */
+export function tabCellWidth(tab: EditorTab, commentCount = 0): number {
+  const badge = commentCount > 0 ? 3 + String(commentCount).length : 0;
+
+  return tab.label.length + 5 + badge;
+}
+
+/** The run of tabs `[first, end)` the strip shows. */
+export interface TabWindow {
+  first: number;
+  end: number;
+}
+
+/** The run of tabs that fits the strip and contains the active tab; markers take a cell each side. */
+export function visibleTabWindow(
+  tabs: EditorTab[],
+  firstVisible: number,
+  activeIndex: number,
+  stripWidth: number,
+  commentCount: (tab: EditorTab) => number = () => 0,
+): TabWindow {
+  // unmeasured strip: show everything, the header clips until the width is known
+  if (stripWidth <= 0) return { first: 0, end: tabs.length };
+
+  const width = (index: number): number => tabCellWidth(tabs[index]!, commentCount(tabs[index]!));
+  const fitEnd = (first: number): number => {
+    let used = first > 0 ? 1 : 0;
+    let end = first;
+
+    while (end < tabs.length) {
+      const remaining = end + 1 < tabs.length ? 1 : 0;
+
+      if (used + width(end) + remaining > stripWidth) break;
+
+      used += width(end);
+      end++;
+    }
+
+    // always show at least the tab the window starts on, even when it is wider than the strip
+    return Math.max(end, Math.min(first + 1, tabs.length));
+  };
+  let first = Math.min(Math.max(0, firstVisible), Math.max(0, activeIndex));
+  let end = fitEnd(first);
+
+  // the active tab past the right edge pulls the window along until it fits
+  while (activeIndex >= end && first < activeIndex) {
+    first++;
+    end = fitEnd(first);
+  }
+
+  return { first, end };
+}
+
+function SplitMenu({
+  onPick,
+  canPick,
+  tokens,
+}: {
+  onPick: (direction: SplitDirection) => void;
+  canPick: (direction: SplitDirection) => boolean;
+  tokens: Theme;
+}): React.ReactNode {
+  return (
+    <box
+      onMouseUp={(event) => event.stopPropagation()}
+      style={{
+        width: MENU_WIDTH,
+        flexDirection: "column",
+        borderStyle: "single",
+        borderColor: tokens.border,
+        backgroundColor: tokens.elevated,
+      }}
+    >
+      {SPLIT_ITEMS.map((item) => (
+        <box
+          key={item.direction}
+          onMouseUp={canPick(item.direction) ? () => onPick(item.direction) : undefined}
+          style={{ flexDirection: "row", paddingLeft: 1, paddingRight: 1 }}
+        >
+          <text fg={canPick(item.direction) ? tokens.text : tokens.textDim}>{item.label}</text>
+          <box style={{ flexGrow: 1 }} />
+          <text fg={tokens.textDim}>{item.arrow}</text>
+        </box>
+      ))}
+    </box>
+  );
+}
+
+function EditorGroupPane({
+  group,
+  props,
+  showZoom,
+  splitDisabled,
+}: {
+  group: EditorGroup;
+  props: EditorGridProps;
+  showZoom: boolean;
+  splitDisabled: boolean;
+}): React.ReactNode {
+  const tokens = props.theme ?? DARK;
+  const menuControl = useMenuControl();
+  const { setOverlay, clearOverlay } = useRootOverlay();
+  const menuId = `split:${group.id}`;
+  const menuOpen = menuControl.openMenuId === menuId;
+  const groupRef = useRef<BoxRenderable | null>(null);
+  const groupSize = useFrameMeasure(
+    () => ({ width: groupRef.current?.width ?? 0, height: groupRef.current?.height ?? 0 }),
+    (left, right) => left.width === right.width && left.height === right.height,
+    { width: 0, height: 0 },
+  );
+  const canSplit = (direction: SplitDirection): boolean =>
+    !splitDisabled && canSplitGroup(groupSize.width, groupSize.height, direction);
+  const cannotSplit = !SPLIT_ITEMS.some((item) => canSplit(item.direction));
+  const splitRef = useRef<BoxRenderable | null>(null);
+  const anchor = useFrameMeasure(
+    () => ({
+      x: splitRef.current?.x ?? 0,
+      y: splitRef.current?.y ?? 0,
+      width: splitRef.current?.width ?? 0,
+    }),
+    (left, right) => left.x === right.x && left.y === right.y && left.width === right.width,
+    { x: 0, y: 0, width: 0 },
+    menuOpen,
+  );
+  const active = group.tabs.find((tab) => tab.id === group.activeTabId) ?? group.tabs[0];
+
+  useSharedKeyboard((key) => {
+    if (!menuOpen) return;
+
+    if (key.name === "escape") return menuControl.closeMenu();
+
+    const direction = splitDirectionForKey(key.name);
+
+    if (direction && canSplit(direction)) {
+      props.onSplit(group.id, direction);
+      menuControl.closeMenu();
+    }
+  });
+
+  useEffect(() => {
+    if (!menuOpen) return;
+
+    setOverlay(
+      "split-menu",
+      <box
+        onMouseUp={menuControl.closeMenu}
+        style={{ position: "absolute", left: 0, top: 0, width: "100%", height: "100%" }}
+      >
+        <box
+          style={{
+            position: "absolute",
+            top: anchor.y + 1,
+            left: Math.max(0, anchor.x + anchor.width - MENU_WIDTH),
+          }}
+        >
+          <SplitMenu
+            onPick={(direction) => {
+              if (!canSplit(direction)) return;
+
+              props.onSplit(group.id, direction);
+              menuControl.closeMenu();
+            }}
+            canPick={canSplit}
+            tokens={tokens}
+          />
+        </box>
+      </box>,
+    );
+
+    return () => clearOverlay("split-menu");
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [menuOpen, anchor, tokens, groupSize.width, groupSize.height, splitDisabled]);
+  // The strip windows its tabs rather than scrolling a nested scrollbox (which stalls the
+  // renderer inside this header): tabs keep the width of their names, only the run that fits
+  // renders, and the window follows the active tab so a tab opened past the edge is never hidden.
+  const stripRef = useRef<BoxRenderable | null>(null);
+  const stripWidth = useFrameMeasure(
+    () => stripRef.current?.width ?? 0,
+    (left, right) => left === right,
+    0,
+  );
+  const [firstVisible, setFirstVisible] = useState(0);
+  // a zoom re-anchors the strip to the leftmost tab, so the new width fills from the left
+  // and the step markers disappear when every tab now fits
+  const [wasZoomed, setWasZoomed] = useState(props.zoomed);
+
+  if (wasZoomed !== props.zoomed) {
+    setWasZoomed(props.zoomed);
+    setFirstVisible(0);
+  }
+
+  const activeIndex = Math.max(
+    0,
+    group.tabs.findIndex((tab) => tab.id === active?.id),
+  );
+  // derived every render: the manual offset is a floor the active tab can pull the window past
+  const tabWindow = visibleTabWindow(group.tabs, firstVisible, activeIndex, stripWidth, (tab) =>
+    tab.path ? (props.commentCounts?.get(tab.path) ?? 0) : 0,
+  );
+
+  return (
+    <box
+      id={`editor-group:${group.id}`}
+      ref={groupRef}
+      onMouseDown={() => props.onFocusGroup(group.id)}
+      style={{ flexDirection: "column", flexGrow: 1, flexBasis: 0, minWidth: 0, minHeight: 0 }}
+    >
+      <box
+        customBorderChars={HEADER_UNDERLINE_CHARS}
+        style={{
+          flexDirection: "row",
+          // pin the controls to the right edge so their column never shifts with the container
+          // width parity; a lone flexGrow tab strip would drag them a cell on zoom
+          justifyContent: "space-between",
+          height: 2,
+          // match the pane headers: the panel token is transparent in the branded theme, so the
+          // header reads as terminal-through rather than a raised box
+          backgroundColor: tokens.panel,
+          borderStyle: "single",
+          border: ["bottom"],
+          borderColor: tokens.border,
+        }}
+      >
+        {/* the tab strip windows its tabs: the run that fits renders in full, edge markers step
+            the window, and the controls stay pinned on the right */}
+        <box
+          ref={stripRef}
+          style={{ flexDirection: "row", flexGrow: 1, flexShrink: 1, flexBasis: 0, minWidth: 0 }}
+        >
+          {tabWindow.first > 0 ? (
+            <box
+              onMouseUp={(event) => {
+                event.stopPropagation();
+                setFirstVisible(tabWindow.first - 1);
+              }}
+              style={{ flexShrink: 0 }}
+            >
+              <text fg={tokens.textDim} selectable={false}>
+                {"‹"}
+              </text>
+            </box>
+          ) : null}
+          {group.tabs.slice(tabWindow.first, tabWindow.end).map((tab) => (
+            <EditorTabButton
+              key={tab.id}
+              tab={tab}
+              active={tab.id === active?.id}
+              commentCount={tab.path ? (props.commentCounts?.get(tab.path) ?? 0) : 0}
+              onSelect={() => props.onActivateTab(group.id, tab.id)}
+              onKeep={() => props.onKeepTab?.(group.id, tab.id)}
+              onClose={() => props.onCloseTab(group.id, tab.id)}
+              tokens={tokens}
+            />
+          ))}
+          {tabWindow.end < group.tabs.length ? (
+            <box
+              onMouseUp={(event) => {
+                event.stopPropagation();
+                setFirstVisible(tabWindow.first + 1);
+              }}
+              style={{ flexShrink: 0 }}
+            >
+              <text fg={tokens.textDim} selectable={false}>
+                {"›"}
+              </text>
+            </box>
+          ) : null}
+        </box>
+        <box style={{ flexDirection: "row", flexShrink: 0, paddingLeft: 1, paddingRight: 1 }}>
+          {/* search sits out until it does something; split takes its place */}
+          <box
+            id={`split-button:${group.id}`}
+            ref={splitRef}
+            style={{ flexShrink: 0, marginRight: showZoom ? 2 : 0 }}
+          >
+            <IconButton
+              glyph="split"
+              active={menuOpen}
+              disabled={cannotSplit}
+              onPress={() => menuControl.toggleMenu(menuId)}
+              tip={
+                splitDisabled
+                  ? "Maximum 8 editor groups"
+                  : cannotSplit
+                    ? "Tile too small to split"
+                    : undefined
+              }
+              theme={tokens}
+            />
+          </box>
+          {showZoom ? (
+            <IconButton
+              glyph={NERD.zoom}
+              active={props.zoomed}
+              onPress={props.onZoom}
+              tip={props.zoomed ? "Zoom Out" : "Zoom In"}
+              theme={tokens}
+            />
+          ) : null}
+        </box>
+      </box>
+      <box
+        style={{ flexGrow: 1, flexBasis: 0, minHeight: 0, minWidth: 0, flexDirection: "column" }}
+      >
+        {active ? props.renderTab(active, props.focusedGroupId === group.id) : null}
+      </box>
+    </box>
+  );
+}
+
+function GridNode({
+  node,
+  props,
+  showZoom,
+  splitDisabled,
+}: {
+  node: EditorNode;
+  props: EditorGridProps;
+  showZoom: boolean;
+  splitDisabled: boolean;
+}): React.ReactNode {
+  if (node.type === "group") {
+    return (
+      <EditorGroupPane
+        group={node}
+        props={props}
+        showZoom={showZoom}
+        splitDisabled={splitDisabled}
+      />
+    );
+  }
+
+  return (
+    <GridBranchPane node={node} props={props} showZoom={showZoom} splitDisabled={splitDisabled} />
+  );
+}
+
+function GridBranchPane({
+  node,
+  props,
+  showZoom,
+  splitDisabled,
+}: {
+  node: EditorBranch;
+  props: EditorGridProps;
+  showZoom: boolean;
+  splitDisabled: boolean;
+}): React.ReactNode {
+  const tokens = props.theme ?? DARK;
+  const horizontal = node.orientation === "horizontal";
+  const branchRef = useRef<BoxRenderable | null>(null);
+  const branchWidth = useFrameMeasure(
+    () => branchRef.current?.width ?? 0,
+    (left, right) => left === right,
+    0,
+  );
+  const leadingWidth = Math.floor((branchWidth - node.children.length + 1) / node.children.length);
+
+  return (
+    <box
+      ref={branchRef}
+      style={{
+        flexDirection: horizontal ? "row" : "column",
+        flexGrow: 1,
+        flexBasis: 0,
+        minWidth: 0,
+        minHeight: 0,
+      }}
+    >
+      {node.children.map((child, index) => {
+        const fixedWidth = horizontal && index < node.children.length - 1 && leadingWidth > 0;
+
+        return (
+          <React.Fragment key={child.id}>
+            {index > 0 ? (
+              <box
+                style={{
+                  borderStyle: "single",
+                  border: [horizontal ? "left" : "top"],
+                  borderColor: tokens.border,
+                }}
+              />
+            ) : null}
+            <box
+              style={{
+                flexDirection: "column",
+                // A fixed whole-cell share for leading horizontal groups leaves the last group
+                // the exact remainder. Equal fractional flex shares can overflow the right edge.
+                width: fixedWidth ? leadingWidth : undefined,
+                flexGrow: fixedWidth ? 0 : 1,
+                flexBasis: fixedWidth ? undefined : 0,
+                flexShrink: fixedWidth ? 0 : 1,
+                minWidth: 0,
+                minHeight: 0,
+              }}
+            >
+              <GridNode
+                node={child}
+                props={props}
+                showZoom={showZoom && index === (horizontal ? node.children.length - 1 : 0)}
+                splitDisabled={splitDisabled}
+              />
+            </box>
+          </React.Fragment>
+        );
+      })}
+    </box>
+  );
+}
+
+/** The Changes pane body: the editor grid of groups and splits, each rendering its active tab. */
+export function EditorGrid(props: EditorGridProps): React.ReactNode {
+  const splitDisabled = countEditorGroups(props.tree) >= MAX_EDITOR_GROUPS;
+
+  return (
+    <box style={{ flexDirection: "column", flexGrow: 1, minWidth: 0, minHeight: 0 }}>
+      <GridNode node={props.tree} props={props} showZoom splitDisabled={splitDisabled} />
+    </box>
+  );
+}