Skip to content

Commit 74417d1

Browse files
committed
fix(app): size stacked review and terminal panels
1 parent 198777a commit 74417d1

3 files changed

Lines changed: 112 additions & 9 deletions

File tree

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
import { expect, test } from "@playwright/test"
2+
import { mockOpenCodeServer } from "../utils/mock-server"
3+
import { expectSessionTitle } from "../utils/waits"
4+
5+
const directory = "C:/OpenCode/ReviewTerminalStacked"
6+
const projectID = "proj_review_terminal_stacked"
7+
const sessionID = "ses_review_terminal_stacked"
8+
const title = "Review terminal stacked"
9+
10+
test("keeps the review tree and terminal sized when both panels are open", async ({ page }) => {
11+
await page.setViewportSize({ width: 1400, height: 900 })
12+
await mockOpenCodeServer(page, {
13+
directory,
14+
project: {
15+
id: projectID,
16+
worktree: directory,
17+
vcs: "git",
18+
name: "review-terminal-stacked",
19+
time: { created: 1700000000000, updated: 1700000000000 },
20+
sandboxes: [],
21+
},
22+
provider: {
23+
all: [
24+
{
25+
id: "opencode",
26+
name: "OpenCode",
27+
models: { test: { id: "test", name: "Test", limit: { context: 200_000 } } },
28+
},
29+
],
30+
connected: ["opencode"],
31+
default: { providerID: "opencode", modelID: "test" },
32+
},
33+
sessions: [
34+
{
35+
id: sessionID,
36+
slug: "review-terminal-stacked",
37+
projectID,
38+
directory,
39+
title,
40+
version: "dev",
41+
time: { created: 1700000000000, updated: 1700000000000 },
42+
},
43+
],
44+
vcsDiff: [
45+
{
46+
file: "src/example.ts",
47+
additions: 1,
48+
deletions: 1,
49+
status: "modified",
50+
patch:
51+
"diff --git a/src/example.ts b/src/example.ts\n--- a/src/example.ts\n+++ b/src/example.ts\n@@ -1 +1 @@\n-export const value = 'before'\n+export const value = 'after'\n",
52+
},
53+
],
54+
pageMessages: () => ({ items: [] }),
55+
})
56+
await page.route("**/pty", (route) =>
57+
route.fulfill({
58+
status: 200,
59+
contentType: "application/json",
60+
body: JSON.stringify({ id: "pty_review_terminal", title: "Terminal 1" }),
61+
}),
62+
)
63+
await page.route("**/pty/pty_review_terminal", (route) =>
64+
route.fulfill({ status: 200, contentType: "application/json", body: "{}" }),
65+
)
66+
await page.routeWebSocket("**/pty/pty_review_terminal/connect", () => undefined)
67+
await page.addInitScript(() => {
68+
localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
69+
})
70+
71+
await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
72+
await expectSessionTitle(page, title)
73+
await page.getByRole("button", { name: "Toggle review" }).click()
74+
await expect(page.getByRole("button", { name: "example.ts" })).toBeVisible()
75+
76+
await page.keyboard.press("Control+Backquote")
77+
await expect(page.locator("#terminal-panel")).toBeVisible()
78+
await expect(page.getByRole("button", { name: "example.ts" })).toBeVisible()
79+
80+
const geometry = await page.evaluate(() => {
81+
const review = document.querySelector<HTMLElement>("#review-panel")!
82+
const terminal = document.querySelector<HTMLElement>("#terminal-panel")!
83+
const reviewParent = review.parentElement!.getBoundingClientRect()
84+
const terminalParent = terminal.parentElement!.getBoundingClientRect()
85+
return {
86+
review: review.getBoundingClientRect().height,
87+
reviewParent: reviewParent.height,
88+
terminal: terminal.getBoundingClientRect().height,
89+
terminalParent: terminalParent.height,
90+
}
91+
})
92+
expect(Math.abs(geometry.review - geometry.reviewParent)).toBeLessThanOrEqual(1)
93+
expect(Math.abs(geometry.terminal - geometry.terminalParent)).toBeLessThanOrEqual(1)
94+
})
95+
96+
function base64Encode(value: string) {
97+
return Buffer.from(value, "utf8").toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "")
98+
}

packages/app/src/pages/session.tsx

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2175,10 +2175,10 @@ export default function Page() {
21752175
canReview={canReview}
21762176
diffs={reviewDiffs}
21772177
diffsReady={reviewReady}
2178-
empty={reviewEmptyText}
2179-
hasReview={hasReview}
2180-
reviewHasFocusableContent={() => hasReview() || reviewV2State.sidebarOpened()}
2181-
reviewCount={reviewCount}
2178+
empty={reviewEmptyText}
2179+
hasReview={hasReview}
2180+
reviewHasFocusableContent={() => hasReview() || reviewV2State.sidebarOpened()}
2181+
reviewCount={reviewCount}
21822182
reviewPanel={reviewPanelV2}
21832183
activeDiff={tree.activeDiff}
21842184
focusReviewDiff={focusReviewDiff}
@@ -2206,14 +2206,19 @@ export default function Page() {
22062206
</div>
22072207
</Show>
22082208
<Show when={terminalOpen()}>
2209-
<div class="min-h-0 flex-1">
2209+
<div
2210+
classList={{
2211+
"min-h-0 shrink-0": desktopV2PanelLayout().stacked,
2212+
"min-h-0 flex-1": !desktopV2PanelLayout().stacked,
2213+
}}
2214+
>
22102215
<TerminalPanelV2 stacked={desktopV2PanelLayout().stacked} />
22112216
</div>
22122217
</Show>
22132218
</div>
2214-
</Show>
2215-
</Show>
2216-
</div>
2219+
</Show>
2220+
</Show>
2221+
</div>
22172222

22182223
<Show when={!newSessionDesign()}>
22192224
<TerminalPanel />

packages/app/src/pages/session/session-side-panel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ export function SessionSidePanel(props: {
227227
class="relative min-w-0 flex overflow-hidden bg-background-base"
228228
classList={{
229229
"h-full shrink-0": !props.stacked,
230-
"min-h-0 flex-1": props.stacked,
230+
"h-full min-h-0": props.stacked,
231231
"pointer-events-none": !open(),
232232
"transition-[width] duration-[240ms] ease-[cubic-bezier(0.22,1,0.36,1)] will-change-[width] motion-reduce:transition-none":
233233
!props.size.active() && !props.reviewSnap,

0 commit comments

Comments
 (0)