From 50e77f66fd2210da57e17b54aa794227b95ed3ad Mon Sep 17 00:00:00 2001 From: Luke Parker <10430890+Hona@users.noreply.github.com> Date: Mon, 31 Aug 2026 14:38:00 +1000 Subject: [PATCH] fix(app): keep composer select all scoped to the editor (#46338) --- packages/app/component-tests/composer.spec.ts | 29 +++++++++++++++++++ .../src/shell/titlebar/windows-menu.test.ts | 5 ++++ 2 files changed, 34 insertions(+) diff --git a/packages/app/component-tests/composer.spec.ts b/packages/app/component-tests/composer.spec.ts index d4945c08b3e..d332ca32acc 100644 --- a/packages/app/component-tests/composer.spec.ts +++ b/packages/app/component-tests/composer.spec.ts @@ -1,5 +1,34 @@ import { expect, story } from "../../storybook/playwright/story" +for (const draft of ["empty-draft", "multiline-draft", "mixed-attachments"]) { + story(`select all stays inside the composer with ${draft}`, async ({ mount, page }) => { + const component = await mount(`opencode-composer-flow--${draft}`) + const input = component.getByRole("textbox", { name: "Prompt", exact: true }) + const text = await input.textContent() + + for (let count = 0; count < 2; count++) { + await input.press("ControlOrMeta+a") + expect( + await input.evaluate((editor) => { + const selection = window.getSelection() + return { + text: selection?.toString(), + inside: editor.contains(selection?.anchorNode ?? null) && editor.contains(selection?.focusNode ?? null), + } + }), + ).toEqual({ text, inside: true }) + } + + await page.keyboard.type("Replacement draft") + await expect(input).toHaveText("Replacement draft") + await expect(component.getByRole("status")).toHaveText("Ready") + if (draft === "mixed-attachments") { + await expect(component.getByAltText("layout.png")).toBeVisible() + await expect(component.getByText("Keep the normal flow flat", { exact: true })).toBeVisible() + } + }) +} + story("renders a draft once and supports editing, caret restoration, and failure recovery", async ({ mount, page }) => { await page.addInitScript(() => { const replace = Element.prototype.replaceChildren diff --git a/packages/app/src/shell/titlebar/windows-menu.test.ts b/packages/app/src/shell/titlebar/windows-menu.test.ts index e0cbf025751..9b9b9d13f93 100644 --- a/packages/app/src/shell/titlebar/windows-menu.test.ts +++ b/packages/app/src/shell/titlebar/windows-menu.test.ts @@ -9,6 +9,11 @@ describe("Windows app menu", () => { ) }) + test("leaves select all to the focused browser editor", () => { + expect(windowsMenuAccelerator(new KeyboardEvent("keydown", { key: "a", ctrlKey: true }))).toBeUndefined() + expect(windowsMenuAccelerator(new KeyboardEvent("keydown", { key: "A", ctrlKey: true }))).toBeUndefined() + }) + test("ignores the accelerator without its modifiers", () => { expect(windowsMenuAccelerator(new KeyboardEvent("keydown", { key: "N" }))).toBeUndefined() })