diff --git a/packages/app/e2e/regression/patch-sticky-header.spec.ts b/packages/app/e2e/regression/patch-sticky-header.spec.ts new file mode 100644 index 00000000000..5546289fca5 --- /dev/null +++ b/packages/app/e2e/regression/patch-sticky-header.spec.ts @@ -0,0 +1,212 @@ +import { expect, test } from "@playwright/test" +import { timelinePresets } from "@opencode/session-ui/timeline/detail" +import { createTwoFilesPatch } from "diff" +import { + assistantMessage, + setupTimeline, + textPart, + toolPart, + userMessage, +} from "../performance/timeline-stability/fixture" + +const before = Array.from({ length: 80 }, (_, index) => `export const value${index} = ${index}\n`).join("") +const after = before.replaceAll(" = ", " = 1 + ") +const files = ["src/a.ts", "src/b.ts"].map((file) => ({ + file, + status: "modified", + additions: 80, + deletions: 80, + patch: createTwoFilesPatch(file, file, before, after), +})) +const scenarios = [ + { + name: "grouped patch", + placement: "grouped", + tools: [toolPart("prt_sticky_patch", "patch", "completed", {}, { metadata: { files } })], + files: ["a", "b"], + title: false, + }, + { + name: "standalone patch", + placement: "separate", + tools: [toolPart("prt_sticky_patch", "patch", "completed", {}, { metadata: { files } })], + files: ["a", "b"], + title: false, + }, + { + name: "grouped edit with title", + placement: "grouped", + tools: [ + toolPart( + "prt_sticky_edit", + "edit", + "completed", + { path: "src/a.ts", oldString: before, newString: after }, + { metadata: { files: [files[0]] } }, + ), + ], + files: ["a"], + title: true, + }, + { + name: "running edit input fallback", + placement: "grouped", + tools: [toolPart("prt_sticky_edit", "edit", "running", { path: "src/a.ts", oldString: before, newString: after })], + files: ["a"], + title: true, + }, + { + name: "grouped write", + placement: "grouped", + tools: [toolPart("prt_sticky_write", "write", "completed", { path: "src/a.ts", content: after })], + files: ["a"], + title: false, + }, + { + name: "running write input fallback", + placement: "grouped", + tools: [toolPart("prt_sticky_write", "write", "running", { path: "src/a.ts", content: after })], + files: ["a"], + title: false, + }, + { + name: "merged edit write and patch", + placement: "separate", + tools: [ + toolPart("prt_sticky_edit", "edit", "completed", {}, { metadata: { files: [files[0]] } }), + toolPart("prt_sticky_write", "write", "completed", { path: "src/b.ts", content: after }), + toolPart( + "prt_sticky_patch", + "patch", + "completed", + {}, + { metadata: { files: [{ ...files[0], file: "src/c.ts" }] } }, + ), + ], + files: ["a", "b", "c"], + title: false, + }, + { + name: "created and deleted patch files", + placement: "grouped", + tools: [ + toolPart( + "prt_sticky_patch", + "patch", + "completed", + {}, + { + metadata: { + files: [ + { + file: "src/a.ts", + status: "added", + additions: 80, + deletions: 0, + patch: createTwoFilesPatch("src/a.ts", "src/a.ts", "", after), + }, + { + file: "src/b.ts", + status: "deleted", + additions: 0, + deletions: 80, + patch: createTwoFilesPatch("src/b.ts", "src/b.ts", before, ""), + }, + ], + }, + }, + ), + ], + files: ["a", "b"], + title: false, + }, +] as const + +for (const scenario of scenarios) { + for (const width of [1400, 390]) { + for (const direction of ["ltr", "rtl"]) { + test(`${scenario.name}: file headers stay flush at ${width}px in ${direction}`, async ({ page }, info) => { + await setupTimeline(page, { + messages: [ + userMessage(), + assistantMessage([...scenario.tools, textPart("prt_after_patch", "Following explanation.\n\n".repeat(60))]), + ], + settings: { + timelineDetail: { + ...timelinePresets[2].value, + edit: { placement: scenario.placement, details: "collapsed" }, + }, + }, + reducedMotion: true, + viewport: { width, height: 900 }, + }) + await page.evaluate((direction) => (document.documentElement.dir = direction), direction) + if (scenario.placement === "grouped") { + await page.locator('[data-component="context-tool-group-trigger"]').click() + } + const patch = page.locator('[data-scope="apply-patch"]') + await expect(patch).toHaveCount(1) + const scroller = page.locator('[data-slot="session-timeline-scroll"] .scroll-view__viewport') + const toolTitle = scroller.locator('[data-slot="collapsible-trigger"][data-locked]') + await expect(toolTitle).toHaveCount(scenario.title ? 1 : 0) + await expect(scroller.locator("[data-session-title]")).toHaveCount(width === 1400 ? 1 : 0) + + for (const file of scenario.files) { + const name = new RegExp(`${file}\\.ts`) + const trigger = patch.getByRole("button", { name }) + const header = patch.getByRole("heading", { name }) + await expect(trigger).toHaveAttribute("aria-expanded", "false") + await trigger.click() + await expect(trigger).toHaveAttribute("aria-expanded", "true") + const content = patch.getByRole("region", { name }) + await expect + .poll(() => content.evaluate((element) => element.getBoundingClientRect().height)) + .toBeGreaterThan(900) + + // Leave follow-latest mode before positioning the viewport inside this file. + await scroller.hover() + await page.mouse.wheel(0, -100) + await content.evaluate((element) => { + const viewport = element.closest(".scroll-view__viewport")! + viewport.scrollTop += element.getBoundingClientRect().top - viewport.getBoundingClientRect().top + 160 + }) + await expect + .poll(() => + content.evaluate((element) => { + const viewport = element.closest(".scroll-view__viewport")! + return element.getBoundingClientRect().top - viewport.getBoundingClientRect().top + }), + ) + .toBeLessThan(0) + await expect + .poll(() => + header.evaluate((element) => { + const viewport = element.closest(".scroll-view__viewport")! + const title = viewport.querySelector("[data-session-title]")?.firstElementChild + const toolTitle = element + .closest('[data-component="edit-tool"]') + ?.querySelector('[data-slot="collapsible-trigger"][data-locked]') + const top = viewport.getBoundingClientRect().top + (title?.getBoundingClientRect().height ?? 0) + const rect = element.getBoundingClientRect() + const trigger = element.querySelector("button")! + return { + gap: Math.abs(rect.top - top - (toolTitle?.getBoundingClientRect().height ?? 0)), + titleGap: toolTitle ? Math.abs(toolTitle.getBoundingClientRect().top - top) : 0, + clickable: trigger.contains( + document.elementFromPoint(rect.left + rect.width / 2, rect.top + rect.height / 2), + ), + } + }), + ) + .toEqual({ gap: 0, titleGap: 0, clickable: true }) + await page.screenshot({ path: info.outputPath(`${file}.png`) }) + } + + await scroller.evaluate((element) => (element.scrollTop = element.scrollHeight)) + await expect( + patch.getByRole("heading", { name: new RegExp(`${scenario.files.at(-1)}\\.ts`) }), + ).not.toBeInViewport() + }) + } + } +} diff --git a/packages/session-ui/src/components/message-part.css b/packages/session-ui/src/components/message-part.css index ed694fc2432..6b38f96a1e1 100644 --- a/packages/session-ui/src/components/message-part.css +++ b/packages/session-ui/src/components/message-part.css @@ -1264,6 +1264,8 @@ [data-component="write-tool"], [data-component="apply-patch-tool"] { > [data-component="collapsible"].tool-collapsible { + /* Only file lists with a tool title reserve space for its sticky row. */ + --sticky-accordion-offset: calc(32px + var(--tool-content-gap)); gap: 0px; } @@ -1285,7 +1287,7 @@ position: sticky; top: var(--sticky-accordion-top, 0px); z-index: 20; - height: calc(32px + var(--tool-content-gap)); + height: var(--sticky-accordion-offset); padding-bottom: var(--tool-content-gap); background-color: var(--v2-background-bg-base); } diff --git a/packages/session-ui/src/tools/tool-renderer.tsx b/packages/session-ui/src/tools/tool-renderer.tsx index 535dd2e222c..9ccea209e0f 100644 --- a/packages/session-ui/src/tools/tool-renderer.tsx +++ b/packages/session-ui/src/tools/tool-renderer.tsx @@ -1030,7 +1030,6 @@ function FileAccordionGroup(props: { children: JSX.Element }) {
{ if (event.defaultPrevented || event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) return if (!["ArrowUp", "ArrowDown", "Home", "End"].includes(event.key)) return