From 509332627cc682a23ad21fc707f97737a9976e27 Mon Sep 17 00:00:00 2001 From: usrnk1 <7547651+usrnk1@users.noreply.github.com> Date: Thu, 29 Oct 2026 09:58:03 +0100 Subject: [PATCH] fix(app): focus the matching review navigation arrow (#59920) --- packages/app/e2e/regression/review.spec.ts | 43 +++++++++++++++++++ .../src/v2/components/session-review-v2.tsx | 12 +++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/packages/app/e2e/regression/review.spec.ts b/packages/app/e2e/regression/review.spec.ts index 47e0261f6b1..00141a7a520 100644 --- a/packages/app/e2e/regression/review.spec.ts +++ b/packages/app/e2e/regression/review.spec.ts @@ -1351,6 +1351,49 @@ test("video files stream into the viewer behind a loading state, open into the p expect(await page.evaluate(() => document.fullscreenElement)).toBeNull() }) +test("review file navigation focuses the arrow for the keyboard direction", async ({ page }) => { + await openSession(page, { + name: "ReviewArrowFocus", + vcsDiff: [fileDiff("src/alpha.ts"), fileDiff("src/beta.ts"), fileDiff("src/gamma.ts")], + seed: { + panes: { ses_reviewarrowfocus: { review: true } }, + storage: { + ...reviewTabs("C:/OpenCode/ReviewArrowFocus", "ses_reviewarrowfocus"), + "opencode.global.dat:review-panel-v2": { sidebarOpened: false }, + }, + }, + }) + + const panel = page.locator("#review-panel") + const file = panel.locator('[data-slot="session-review-v2-file-name"]') + const previous = panel.getByRole("button", { name: "Previous file", exact: true }) + const next = panel.getByRole("button", { name: "Next file", exact: true }) + + await expect(file).toHaveText("alpha.ts") + await previous.click() + await expect(file).toHaveText("gamma.ts") + await page.keyboard.press("ArrowRight") + await expect(file).toHaveText("alpha.ts") + await expect(next).toBeFocused() + await page.keyboard.press("Enter") + await expect(file).toHaveText("beta.ts") + await page.keyboard.press("ArrowLeft") + await expect(file).toHaveText("alpha.ts") + await expect(previous).toBeFocused() + await next.click() + await expect(file).toHaveText("beta.ts") + await expect(next).toBeFocused() + + const home = page.getByRole("button", { name: "Home", exact: true }) + await home.focus() + await page.keyboard.press("ArrowRight") + await expect(file).toHaveText("gamma.ts") + await expect(home).toBeFocused() + await page.keyboard.press("ArrowLeft") + await expect(file).toHaveText("beta.ts") + await expect(home).toBeFocused() +}) + test("restores review state and the side-panel tab per session", async ({ page }) => { const sessions = [ { id: "ses_review_state_a", title: "Alpha review state" }, diff --git a/packages/session-ui/src/v2/components/session-review-v2.tsx b/packages/session-ui/src/v2/components/session-review-v2.tsx index 48cf9c7c9a8..d53980c7034 100644 --- a/packages/session-ui/src/v2/components/session-review-v2.tsx +++ b/packages/session-ui/src/v2/components/session-review-v2.tsx @@ -154,6 +154,8 @@ export function SessionReviewV2Sidebar(props: SessionReviewV2SidebarProps) { export function SessionReviewV2(props: SessionReviewV2Props) { const i18n = useI18n() const locale = useLocale() + let previousButton: HTMLButtonElement | undefined + let nextButton: HTMLButtonElement | undefined createEffect(() => { getWorkerPool() @@ -208,11 +210,17 @@ export function SessionReviewV2(props: SessionReviewV2Props) { if (target instanceof HTMLElement && (target.isContentEditable || target.closest("input, textarea, select"))) return if (!props.hasDiffs || !canCycle()) return - const file = event.key === previousKey() ? prev() : next() + const previous = event.key === previousKey() + const file = previous ? prev() : next() if (!file) return + const active = document.activeElement + event.preventDefault() cycle(file) + + if (active !== previousButton && active !== nextButton) return + ;(previous ? previousButton : nextButton)?.focus({ preventScroll: true }) }) const toolbarStart = () => ( @@ -242,6 +250,7 @@ export function SessionReviewV2(props: SessionReviewV2Props) { } > } variant="ghost" size="small" @@ -262,6 +271,7 @@ export function SessionReviewV2(props: SessionReviewV2Props) { } > } variant="ghost" size="small"