Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion apps/web/src/navigator-workspace-cards.css
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
.workspace-card-wrap:hover .workspace-card-collapse[aria-label^="Add worktree"],
.workspace-card-wrap:hover .workspace-card-collapse[aria-controls^="nav-workspace-checkouts-"],
.workspace-card-wrap:focus-within .workspace-card-collapse[aria-label^="Add worktree"],
.workspace-card-wrap:focus-within .workspace-card-collapse[aria-controls^="nav-workspace-checkouts-"] {
.workspace-card-wrap:focus-within .workspace-card-collapse[aria-controls^="nav-workspace-checkouts-"],
.workspace-card-wrap.is-active .workspace-card-collapse[aria-label^="Add worktree"],
.workspace-card-wrap.is-active .workspace-card-collapse[aria-controls^="nav-workspace-checkouts-"] {
opacity: 1;
pointer-events: auto;
}
43 changes: 42 additions & 1 deletion apps/web/src/navigator-workspace-cards.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import type { AgentSession, PullRequestSummary, Repo, Workspace, WorktreeCheckout } from "@citadel/contracts";
import { QueryClientProvider } from "@tanstack/react-query";
import { createElement } from "react";
import { type ReactNode, createElement } from "react";
import { flushSync } from "react-dom";
import { type Root, createRoot } from "react-dom/client";
import { afterEach, describe, expect, it, vi } from "vitest";
Expand All @@ -22,6 +22,7 @@ import {
workspaceCheckoutRows,
} from "./navigator-workspace-cards.js";
import { ToastProvider } from "./toast.js";
import { WorkspaceCard } from "./workspace-card.js";

const ts = "2026-06-01T00:00:00.000Z";
const roots: Root[] = [];
Expand Down Expand Up @@ -255,6 +256,21 @@ describe("navigator workspace checkout cards", () => {
expect(prIcon?.getAttribute("title")).toBe("No PR yet");
});

it("marks active workspace card wrappers so hover-gated controls stay available", () => {
const container = renderWorkspaceCard({
active: true,
rightControl: createElement(
"button",
{ type: "button", className: "workspace-card-collapse", "aria-controls": "nav-workspace-checkouts-ws_1" },
"Toggle",
),
});

const wrap = container.querySelector(".workspace-card-wrap");
expect(wrap?.classList.contains("is-active")).toBe(true);
expect(wrap?.querySelector(".workspace-card-collapse")).toBeTruthy();
});

it("shows repo name before branch and keeps the stable git worktree name in hover text", () => {
const co = checkout("co_api", {
name: "api-stable",
Expand Down Expand Up @@ -532,6 +548,31 @@ function renderCheckoutCard(input: {
return rootElement;
}

function renderWorkspaceCard(input: { active: boolean; rightControl?: ReactNode }) {
const rootElement = document.createElement("div");
document.body.appendChild(rootElement);
const root = createRoot(rootElement);
roots.push(root);
flushSync(() => {
root.render(
createElement(
QueryClientProvider,
{ client: queryClient },
createElement(WorkspaceCard, {
workspace: workspace(),
sessions: [],
namespace: null,
namespaces: [],
active: input.active,
onSelect: () => undefined,
rightControl: input.rightControl,
}),
),
);
});
return rootElement;
}

function stateFixture(input: { workspaces: Workspace[]; checkouts?: WorktreeCheckout[] }): StateResponse {
return {
repos: [],
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/workspace-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ export function WorkspaceCard(

const wrapClassName = [
"workspace-card-wrap",
props.active ? "is-active" : null,
props.rightControl ? "has-right-control" : null,
reorderIndicator === "above" ? "is-drop-above" : null,
reorderIndicator === "below" ? "is-drop-below" : null,
Expand Down
Loading