diff --git a/packages/app/e2e/regression/tab-navigate-mousedown.spec.ts b/packages/app/e2e/regression/tab-navigate-mousedown.spec.ts index 09b457acb1f..254bdbb2bc6 100644 --- a/packages/app/e2e/regression/tab-navigate-mousedown.spec.ts +++ b/packages/app/e2e/regression/tab-navigate-mousedown.spec.ts @@ -184,7 +184,9 @@ test("vertical tabs show project details, resize, and navigate", async ({ page } await expect(tabA).toContainText(sessionA.title) await expect(tabB).toContainText(sessionB.title) await expect(tabB.locator('[data-slot="tab-project"]')).toHaveText("tab-project") - await expect(sidebar.getByRole("button", { name: "Home", exact: true })).toHaveText("Home") + await expect( + sidebar.getByRole("button", { name: "Home", exact: true }).getByText("Home", { exact: true }), + ).toBeVisible() await expect(sidebar.getByRole("button", { name: "New session" })).toBeVisible() await expect(sidebar.locator('[data-slot="vertical-tabs-footer"]')).toBeVisible() const status = sidebar.getByRole("button", { name: "Status", exact: true }) @@ -230,6 +232,76 @@ test("vertical tabs show project details, resize, and navigate", async ({ page } await expect(tabB).toBeVisible() }) +for (const profile of [ + { locale: "en", direction: "ltr" }, + { locale: "en", direction: "rtl" }, + { locale: "ar", direction: "rtl" }, +]) { + test(`vertical shortcut hints align at the row end: ${profile.locale} ${profile.direction}`, async ({ page }) => { + await mockServer(page) + await page.addInitScript( + ({ server, sessionID, locale }) => { + localStorage.setItem("opencode.global.dat:language", JSON.stringify({ locale })) + localStorage.setItem( + "settings.v3", + JSON.stringify({ + appearance: { tabLayout: "vertical" }, + keybinds: { "home.toggle": "ctrl+alt+h", "tab.new": "ctrl+shift+n" }, + }), + ) + localStorage.setItem( + "opencode.window.browser.dat:tabs", + JSON.stringify([{ type: "session", server, sessionId: sessionID }]), + ) + }, + { server, sessionID: sessionA.id, locale: profile.locale }, + ) + await page.goto(`/server/${base64Encode(server)}/session/${sessionA.id}`) + + const sidebar = page.locator('[data-slot="vertical-tabs-sidebar"]') + await expect(sidebar).toHaveCSS("width", "260px") + await page + .locator("html") + .evaluate((element, direction) => element.setAttribute("dir", direction), profile.direction) + await expect(sidebar).toHaveCSS("direction", profile.direction) + + for (const row of [ + { action: "home", shortcut: "Ctrl+Alt+H" }, + { action: "new-session", shortcut: "Ctrl+Shift+N" }, + ]) { + const button = sidebar.locator(`[data-action="vertical-tabs-${row.action}"]`) + const hint = button.locator('span[aria-hidden="true"]') + await expect(hint).toHaveText(row.shortcut) + await expect(hint.getByText(row.shortcut, { exact: true })).toHaveCSS("direction", "ltr") + await expect(hint).toHaveCSS("opacity", "0") + await button.hover() + await expect(hint).toHaveCSS("opacity", "1") + await expect + .poll(() => + hint.evaluate((element) => { + const button = element.closest("button")! + const row = button.getBoundingClientRect() + const hint = element.getBoundingClientRect() + return getComputedStyle(button).direction === "rtl" ? hint.left - row.left : row.right - hint.right + }), + ) + .toBeCloseTo(8, 1) + await page.getByRole("main").hover() + await expect(hint).toHaveCSS("opacity", "0") + } + + const home = sidebar.locator('[data-action="vertical-tabs-home"]') + const newSession = sidebar.locator('[data-action="vertical-tabs-new-session"]') + await home.focus() + await page.keyboard.press("Tab") + await expect(newSession).toBeFocused() + await expect(newSession.locator('span[aria-hidden="true"]')).toHaveCSS("opacity", "1") + await page.keyboard.press("Shift+Tab") + await expect(home).toBeFocused() + await expect(home.locator('span[aria-hidden="true"]')).toHaveCSS("opacity", "1") + }) +} + test("dedicated experimental settings control vertical tab details", async ({ page }) => { await mockServer(page) await page.addInitScript( diff --git a/packages/app/src/shell/titlebar/titlebar.tsx b/packages/app/src/shell/titlebar/titlebar.tsx index 84a67511b32..68567bd80ee 100644 --- a/packages/app/src/shell/titlebar/titlebar.tsx +++ b/packages/app/src/shell/titlebar/titlebar.tsx @@ -348,13 +348,19 @@ export function Titlebar(props: { type="button" data-action="vertical-tabs-home" data-state={layout.route().type === "home" ? "pressed" : undefined} - class="mb-1 flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] px-1.5 text-[13px] leading-4 text-v2-text-text-faint hover:bg-v2-background-bg-layer-02 hover:text-v2-text-text-base data-[state=pressed]:bg-v2-background-bg-layer-02 data-[state=pressed]:text-v2-text-text-base" + class="group mb-1 flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] ps-1.5 pe-2 text-[13px] leading-4 text-v2-text-text-faint hover:bg-v2-background-bg-layer-02 hover:text-v2-text-text-base data-[state=pressed]:bg-v2-background-bg-layer-02 data-[state=pressed]:text-v2-text-text-base" onClick={toggleHome} aria-label={language.t("home.title")} aria-pressed={layout.route().type === "home"} > - {language.t("home.title")} + {language.t("home.title")} + ) @@ -646,12 +652,18 @@ export function Titlebar(props: {