From 7020944359f9d6500d743ad7ba03d5d441e475bf Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" <219766164+opencode-agent[bot]@users.noreply.github.com> Date: Sat, 19 Sep 2026 21:00:45 +0800 Subject: [PATCH] fix(app): restore mobile tab interactions (#49964) Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com> --- .../mobile-tab-interactions.spec.ts | 110 ++++++++++++++++++ .../src/shell/titlebar/tab-gesture.test.ts | 8 +- .../app/src/shell/titlebar/tab-gesture.ts | 4 - packages/app/src/shell/titlebar/tab-nav.tsx | 1 + packages/app/src/shell/titlebar/tab-strip.tsx | 9 +- 5 files changed, 118 insertions(+), 14 deletions(-) create mode 100644 packages/app/e2e/regression/mobile-tab-interactions.spec.ts diff --git a/packages/app/e2e/regression/mobile-tab-interactions.spec.ts b/packages/app/e2e/regression/mobile-tab-interactions.spec.ts new file mode 100644 index 00000000000..66cc0ec3e47 --- /dev/null +++ b/packages/app/e2e/regression/mobile-tab-interactions.spec.ts @@ -0,0 +1,110 @@ +import { expect, test, type Locator, type Page } from "@playwright/test" +import { fixture, pageMessages } from "../smoke/session-timeline.fixture" +import { mockOpenCodeServer } from "../utils/mock-server" + +test.use({ viewport: { width: 390, height: 844 }, hasTouch: true, isMobile: true }) + +test.beforeEach(async ({ page }) => { + await mockOpenCodeServer(page, { + sessions: fixture.sessions, + provider: fixture.provider, + directory: fixture.directory, + project: fixture.project, + pageMessages, + }) + await page.addInitScript( + ({ directory, server, sessions }) => { + localStorage.setItem( + "opencode.global.dat:server", + JSON.stringify({ projects: { local: [{ worktree: directory, expanded: true }] } }), + ) + localStorage.setItem( + "opencode.window.browser.dat:tabs", + JSON.stringify(sessions.map((session) => ({ type: "session", server, sessionId: session.id }))), + ) + }, + { directory: fixture.directory, server: fixture.serverKey, sessions: fixture.sessions }, + ) + await page.goto("/") + await page.locator('[data-slot="mobile-tabs-trigger"]').click() + await expect(page.locator('[data-slot="mobile-tabs-drawer"]')).toBeVisible() + const drawer = page.locator('[data-slot="mobile-drawer-content"]') + await expect + .poll(() => drawer.evaluate((element) => new DOMMatrixReadOnly(getComputedStyle(element).transform).m42)) + .toBe(0) + await expect(drawer).not.toHaveAttribute("data-transitioning") +}) + +test("reorders session tabs with touch", async ({ page }) => { + const tabs = page.locator('[data-slot="vertical-tabs"] a') + await expect(tabs).toContainText([fixture.expected.sourceTitle, fixture.expected.targetTitle]) + + const target = tabs.filter({ hasText: fixture.expected.targetTitle }) + const source = tabs.filter({ hasText: fixture.expected.sourceTitle }) + const targetBox = await target.boundingBox() + const sourceBox = await source.boundingBox() + expect(targetBox).not.toBeNull() + expect(sourceBox).not.toBeNull() + + await touchDrag(page, source, { + from: { x: sourceBox!.x + sourceBox!.width / 2, y: sourceBox!.y + sourceBox!.height / 2 }, + to: { x: targetBox!.x + targetBox!.width / 2, y: targetBox!.y + targetBox!.height / 2 }, + }) + + await expect(tabs).toContainText([fixture.expected.targetTitle, fixture.expected.sourceTitle]) +}) + +test("dismisses a touch context menu by tapping outside", async ({ page }) => { + const drawer = page.locator('[data-slot="mobile-tabs-drawer"]') + const tab = drawer.locator('[data-slot="tab-link"]').filter({ hasText: fixture.expected.sourceTitle }) + const home = drawer.getByRole("button", { name: "Home", exact: true }) + const homeBox = await home.boundingBox() + const box = await tab.boundingBox() + expect(homeBox).not.toBeNull() + expect(box).not.toBeNull() + const point = { x: box!.x + box!.width / 2, y: box!.y + box!.height / 2 } + + await tab.dispatchEvent("pointerdown", { + pointerType: "touch", + pointerId: 1, + isPrimary: true, + clientX: point.x, + clientY: point.y, + }) + const rename = page.getByRole("menuitem", { name: "Rename", exact: true }) + await expect(rename).toBeVisible() + await expect(drawer).toBeVisible() + await tab.filter({ visible: true }).dispatchEvent("pointerup", { + pointerType: "touch", + pointerId: 1, + isPrimary: true, + clientX: point.x, + clientY: point.y, + }) + + await page.touchscreen.tap(homeBox!.x + homeBox!.width / 2, homeBox!.y + homeBox!.height / 2) + await expect(rename).toBeHidden() + await expect(drawer).toBeVisible() +}) + +async function touchDrag( + page: Page, + source: Locator, + input: { from: { x: number; y: number }; to: { x: number; y: number } }, +) { + const client = await page.context().newCDPSession(page) + await client.send("Input.dispatchTouchEvent", { + type: "touchStart", + touchPoints: [{ ...input.from, id: 1 }], + }) + await client.send("Input.dispatchTouchEvent", { + type: "touchMove", + touchPoints: [{ x: (input.from.x + input.to.x) / 2, y: (input.from.y + input.to.y) / 2, id: 1 }], + }) + await expect(source).toHaveCount(2) + await client.send("Input.dispatchTouchEvent", { + type: "touchMove", + touchPoints: [{ ...input.to, id: 1 }], + }) + await client.send("Input.dispatchTouchEvent", { type: "touchEnd", touchPoints: [] }) +} diff --git a/packages/app/src/shell/titlebar/tab-gesture.test.ts b/packages/app/src/shell/titlebar/tab-gesture.test.ts index c848e395b74..ed3ad593f1c 100644 --- a/packages/app/src/shell/titlebar/tab-gesture.test.ts +++ b/packages/app/src/shell/titlebar/tab-gesture.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from "bun:test" -import { canOpenTabRename, canStartTabDrag, forwardTabRef, isTabCloseTarget } from "./tab-gesture" +import { canOpenTabRename, forwardTabRef, isTabCloseTarget } from "./tab-gesture" describe("titlebar tab gestures", () => { test("excludes close controls from tab gestures", () => { @@ -24,10 +24,4 @@ describe("titlebar tab gestures", () => { expect(canOpenTabRename(false, false, false)).toBe(true) expect(canOpenTabRename(false, false, true)).toBe(false) }) - - test("preserves native panning for touch pointers", () => { - expect(canStartTabDrag("mouse")).toBe(true) - expect(canStartTabDrag("pen")).toBe(true) - expect(canStartTabDrag("touch")).toBe(false) - }) }) diff --git a/packages/app/src/shell/titlebar/tab-gesture.ts b/packages/app/src/shell/titlebar/tab-gesture.ts index 0aa51189363..5fe52b35061 100644 --- a/packages/app/src/shell/titlebar/tab-gesture.ts +++ b/packages/app/src/shell/titlebar/tab-gesture.ts @@ -4,10 +4,6 @@ export function isTabCloseTarget(target: EventTarget | null) { return target instanceof Element && !!target.closest('[data-slot="tab-close"]') } -export function canStartTabDrag(pointerType: string) { - return pointerType !== "touch" -} - export function forwardTabRef(ref: Ref | undefined, element: HTMLDivElement) { if (typeof ref === "function") ref(element) } diff --git a/packages/app/src/shell/titlebar/tab-nav.tsx b/packages/app/src/shell/titlebar/tab-nav.tsx index e6479e0e5ee..365cbd15727 100644 --- a/packages/app/src/shell/titlebar/tab-nav.tsx +++ b/packages/app/src/shell/titlebar/tab-nav.tsx @@ -328,6 +328,7 @@ export function TabNavItem(props: { return ( { setMenu("open", open) if (open) setPopoverOpen(false) diff --git a/packages/app/src/shell/titlebar/tab-strip.tsx b/packages/app/src/shell/titlebar/tab-strip.tsx index 28ca9c504e6..8383665a0c1 100644 --- a/packages/app/src/shell/titlebar/tab-strip.tsx +++ b/packages/app/src/shell/titlebar/tab-strip.tsx @@ -16,7 +16,7 @@ import { useTabs } from "@/shell/tabs/tabs" import { createTabComposerState } from "@/composer/persistence" import { base64Encode } from "@opencode/util/encode" import { showToast } from "@/shell/notifications/toast" -import { canStartTabDrag, isTabCloseTarget } from "./tab-gesture" +import { isTabCloseTarget } from "./tab-gesture" import { adjacentTabKey, mergeVisibleTabOrder } from "./tab-order" import type { SessionInfo } from "@opencode/client/promise" @@ -292,9 +292,11 @@ export function TitlebarTabStrip(props: { + event.pointerType === "touch" + ? [new PointerActivationConstraints.Distance({ value: 8 })] + : [new PointerActivationConstraints.Distance({ value: 4 })], preventActivation: (event) => - !canStartTabDrag(event.pointerType) || isTabCloseTarget(event.target) || (event.target instanceof Element && !!event.target.closest('[contenteditable="true"]')), }), @@ -313,6 +315,7 @@ export function TitlebarTabStrip(props: { if (!source) return const tab = props.tabs.find((item) => tabKey(item) === source.id.toString()) if (!tab) return + if (vertical()) return const tabEl = source.element?.querySelector("[data-titlebar-tab]") props.onNavigate(tab, tabEl ?? undefined) }}