Skip to content

Commit 516c190

Browse files
committed
feat(review): add Git tree selection context menus
1 parent 19850f3 commit 516c190

2 files changed

Lines changed: 253 additions & 6 deletions

File tree

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
import { Fragment, type ComponentProps, type ReactNode } from "react";
2+
import { act, create, type ReactTestRenderer } from "react-test-renderer";
3+
import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
4+
5+
import { WorkingChangesTree } from "./WorkingChangesTree";
6+
7+
// Exercise selection and context actions without a virtual viewport or portal positioning.
8+
vi.mock("@legendapp/list/react", () => ({
9+
LegendList: ({
10+
data,
11+
renderItem,
12+
}: {
13+
data: ReadonlyArray<{ scope: string; kind: string; path: string }>;
14+
renderItem: (input: { item: (typeof data)[number] }) => ReactNode;
15+
}) => (
16+
<>
17+
{data.map((item) => (
18+
<Fragment key={`${item.scope}:${item.kind}:${item.path}`}>{renderItem({ item })}</Fragment>
19+
))}
20+
</>
21+
),
22+
}));
23+
vi.mock("../../hooks/useTheme", () => ({ useTheme: () => ({ resolvedTheme: "dark" }) }));
24+
vi.mock("../chat/PierreEntryIcon", () => ({ PierreEntryIcon: () => null }));
25+
vi.mock("../MorphIcon", () => ({ MorphIcon: () => null }));
26+
vi.mock("../ui/tooltip", () => ({
27+
Tooltip: ({ children }: { children: ReactNode }) => children,
28+
TooltipTrigger: ({ render, children }: { render: ReactNode; children: ReactNode }) => (
29+
<>
30+
{render}
31+
{children}
32+
</>
33+
),
34+
TooltipPopup: () => null,
35+
}));
36+
vi.mock("../ui/menu", () => ({
37+
Menu: ({ open, children }: { open: boolean; children: ReactNode }) => (open ? children : null),
38+
MenuPopup: ({ children }: { children: ReactNode }) => children,
39+
MenuItem: ({
40+
children,
41+
disabled,
42+
onClick,
43+
}: {
44+
children: ReactNode;
45+
disabled: boolean;
46+
onClick: () => void;
47+
}) => (
48+
<button role="menuitem" disabled={disabled} onClick={onClick}>
49+
{children}
50+
</button>
51+
),
52+
}));
53+
54+
type Props = ComponentProps<typeof WorkingChangesTree>;
55+
type Scope = "staged" | "unstaged";
56+
const unstaged: Props["unstaged"] = [
57+
{ path: "src/lib/a.ts", status: "modified" },
58+
{ path: "src/lib/deep/b.ts", status: "modified" },
59+
{ path: "src/library/neighbor.ts", status: "modified" },
60+
{ path: "tests/a.test.ts", status: "modified" },
61+
];
62+
const staged: Props["staged"] = [
63+
{ path: "src/lib/a.ts", status: "modified" },
64+
{ path: "staged/old.ts", status: "modified" },
65+
];
66+
67+
describe("working changes context actions", () => {
68+
let renderer: ReactTestRenderer | undefined;
69+
const onStage = vi.fn<Props["onStage"]>();
70+
const onRevert = vi.fn<Props["onRevert"]>();
71+
const onSelect = vi.fn<Props["onSelect"]>();
72+
73+
async function mount(overrides: Partial<Props> = {}) {
74+
await act(async () => {
75+
renderer = create(
76+
<WorkingChangesTree
77+
staged={staged}
78+
unstaged={unstaged}
79+
selected={null}
80+
disabled={false}
81+
revertDisabled={false}
82+
onSelect={onSelect}
83+
onStage={onStage}
84+
onRevert={onRevert}
85+
onViewAll={() => {}}
86+
{...overrides}
87+
/>,
88+
);
89+
});
90+
}
91+
92+
async function select(scope: Scope, path: string, toggle = false) {
93+
await act(async () => {
94+
renderer!.root.findByProps({ "aria-label": `${scope}: ${path}` }).props.onClick({
95+
metaKey: toggle,
96+
ctrlKey: false,
97+
shiftKey: false,
98+
});
99+
});
100+
}
101+
102+
async function rightClick(scope: Scope, path: string) {
103+
await act(async () => {
104+
renderer!.root
105+
.findByProps({ "data-git-scope": scope, "data-git-path": path })
106+
.props.onContextMenu({
107+
preventDefault: vi.fn(),
108+
stopPropagation: vi.fn(),
109+
clientX: 241,
110+
clientY: 173,
111+
});
112+
});
113+
}
114+
115+
const menuItems = () => renderer!.root.findAllByProps({ role: "menuitem" });
116+
const item = (label: string) => menuItems().find((node) => node.children.includes(label))!;
117+
async function choose(label: string) {
118+
await act(async () => item(label).props.onClick());
119+
}
120+
121+
beforeEach(() => {
122+
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
123+
onStage.mockClear();
124+
onRevert.mockClear();
125+
onSelect.mockClear();
126+
});
127+
afterEach(async () => {
128+
await act(async () => renderer?.unmount());
129+
renderer = undefined;
130+
vi.unstubAllGlobals();
131+
});
132+
133+
it("stages or reverts all selected files and collapsed folders", async () => {
134+
await mount();
135+
await select("unstaged", "src/lib");
136+
await select("unstaged", "tests/a.test.ts", true);
137+
await rightClick("unstaged", "src/lib");
138+
expect(menuItems()).toHaveLength(2);
139+
await choose("Stage changes");
140+
const paths = ["src/lib/a.ts", "src/lib/deep/b.ts", "tests/a.test.ts"];
141+
expect(onStage).toHaveBeenCalledWith("unstaged", paths);
142+
143+
await rightClick("unstaged", "tests/a.test.ts");
144+
await choose("Revert changes");
145+
expect(onRevert).toHaveBeenCalledWith(paths);
146+
});
147+
148+
it("keeps the selection when right-clicking a descendant of a selected folder", async () => {
149+
await mount();
150+
await select("unstaged", "src/lib", true);
151+
await select("unstaged", "tests/a.test.ts", true);
152+
await rightClick("unstaged", "src/lib/a.ts");
153+
await choose("Stage changes");
154+
expect(onStage).toHaveBeenCalledWith("unstaged", [
155+
"src/lib/a.ts",
156+
"src/lib/deep/b.ts",
157+
"tests/a.test.ts",
158+
]);
159+
expect(onSelect).not.toHaveBeenCalled();
160+
});
161+
162+
it("targets an unselected row instead of applying its menu to an unrelated selection", async () => {
163+
await mount();
164+
await select("unstaged", "src/lib");
165+
await select("unstaged", "tests/a.test.ts", true);
166+
await rightClick("unstaged", "src/library/neighbor.ts");
167+
await choose("Revert changes");
168+
expect(onRevert).toHaveBeenCalledWith(["src/library/neighbor.ts"]);
169+
});
170+
171+
it("offers only Unstage for staged rows and excludes selected unstaged files", async () => {
172+
await mount();
173+
await select("staged", "src/lib");
174+
await select("staged", "staged/old.ts", true);
175+
await select("unstaged", "tests/a.test.ts", true);
176+
await rightClick("staged", "src/lib");
177+
expect(menuItems()).toHaveLength(1);
178+
await choose("Unstage changes");
179+
expect(onStage).toHaveBeenCalledWith("staged", ["src/lib/a.ts", "staged/old.ts"]);
180+
expect(onRevert).not.toHaveBeenCalled();
181+
});
182+
183+
it("keeps staging and revert availability independent", async () => {
184+
await mount({ disabled: true });
185+
await rightClick("unstaged", "tests/a.test.ts");
186+
expect(item("Stage changes").props.disabled).toBe(true);
187+
expect(item("Revert changes").props.disabled).toBe(false);
188+
});
189+
});

‎apps/web/src/components/diffs/WorkingChangesTree.tsx‎

Lines changed: 64 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { PierreEntryIcon } from "../chat/PierreEntryIcon";
1414
import { MorphIcon } from "../MorphIcon";
1515
import { Button } from "../ui/button";
1616
import { Badge } from "../ui/badge";
17+
import { Menu, MenuItem, MenuPopup } from "../ui/menu";
1718
import { ReviewPath } from "./ReviewPath";
1819
import type { DiffFileTreeEntry } from "./diffFileTree.logic";
1920

@@ -52,6 +53,18 @@ export function WorkingChangesTree({
5253
rows: selected ? [{ ...selected, kind: "file" }] : [],
5354
anchor: selected ? { ...selected, kind: "file" } : null,
5455
}));
56+
const [contextMenu, setContextMenu] = useState<{
57+
row: ReviewTreeRow;
58+
x: number;
59+
y: number;
60+
} | null>(null);
61+
const menuAnchor = useMemo(
62+
() =>
63+
contextMenu
64+
? { getBoundingClientRect: () => new DOMRect(contextMenu.x, contextMenu.y, 0, 0) }
65+
: undefined,
66+
[contextMenu],
67+
);
5568
const lastRevealed = useRef<string | null>(null);
5669
const sections = { staged, unstaged };
5770
const sectionPaths = useMemo(
@@ -88,6 +101,14 @@ export function WorkingChangesTree({
88101
() => selection.rows.filter((row) => row.kind === "folder"),
89102
[selection.rows],
90103
);
104+
const isInSelection = (row: ReviewTreeRow) =>
105+
selectedKeys.has(reviewTreeRowKey(row)) ||
106+
selectedFolders.some(
107+
(folder) => folder.scope === row.scope && reviewFolderContains(folder.path, row.path),
108+
);
109+
const contextPaths = contextMenu
110+
? reviewTreeActionFiles(sectionPaths[contextMenu.row.scope], selection.rows, contextMenu.row)
111+
: [];
91112
const revealScope = selected?.scope;
92113
const revealPath = selected?.path;
93114
const revealKey = selected ? reviewTreeRowKey(selected) : null;
@@ -112,12 +133,7 @@ export function WorkingChangesTree({
112133
});
113134
const actions = (scope: Scope, row: ReviewTreeRow | null) => {
114135
const path = row?.path ?? null;
115-
const groupTarget =
116-
row &&
117-
(selectedKeys.has(reviewTreeRowKey(row)) ||
118-
selectedFolders.some(
119-
(folder) => folder.scope === scope && reviewFolderContains(folder.path, row.path),
120-
));
136+
const groupTarget = row && isInSelection(row);
121137
const label =
122138
groupTarget && (selection.rows.length > 1 || row.kind === "folder")
123139
? "selected files"
@@ -221,6 +237,12 @@ export function WorkingChangesTree({
221237
style={{
222238
paddingLeft: `calc(6.4px + min(${row.depth * 18.7}px, max(0px, 100% - 180px)))`,
223239
}}
240+
onContextMenu={(event) => {
241+
event.preventDefault();
242+
event.stopPropagation();
243+
if (!isInSelection(row)) setSelection({ rows: [row], anchor: row });
244+
setContextMenu({ row, x: event.clientX, y: event.clientY });
245+
}}
224246
>
225247
{folder ? (
226248
<button
@@ -292,6 +314,42 @@ export function WorkingChangesTree({
292314
);
293315
}}
294316
/>
317+
<Menu
318+
open={contextMenu !== null}
319+
onOpenChange={(open) => {
320+
if (!open) setContextMenu(null);
321+
}}
322+
>
323+
<MenuPopup anchor={menuAnchor} align="start">
324+
{contextMenu ? (
325+
<>
326+
<MenuItem
327+
disabled={disabled || contextPaths.length === 0}
328+
onClick={() => {
329+
onStage(contextMenu.row.scope, contextPaths);
330+
setContextMenu(null);
331+
}}
332+
>
333+
<MorphIcon icon={contextMenu.row.scope === "staged" ? Minus : Plus} />
334+
{contextMenu.row.scope === "staged" ? "Unstage changes" : "Stage changes"}
335+
</MenuItem>
336+
{contextMenu.row.scope === "unstaged" ? (
337+
<MenuItem
338+
variant="destructive"
339+
disabled={revertDisabled || contextPaths.length === 0}
340+
onClick={() => {
341+
onRevert(contextPaths);
342+
setContextMenu(null);
343+
}}
344+
>
345+
<MorphIcon icon={Undo2} />
346+
Revert changes
347+
</MenuItem>
348+
) : null}
349+
</>
350+
) : null}
351+
</MenuPopup>
352+
</Menu>
295353
</div>
296354
);
297355
}

0 commit comments

Comments
 (0)