diff --git a/packages/app/component-tests/composer.spec.ts b/packages/app/component-tests/composer.spec.ts index cb2a0c7db6d..ef5fc0f6ba6 100644 --- a/packages/app/component-tests/composer.spec.ts +++ b/packages/app/component-tests/composer.spec.ts @@ -463,6 +463,40 @@ story("keeps toolbar focus rings whole and keyboard-only", async ({ mount, page await expect(variant).toHaveCSS("outline-style", "none") }) +story("keeps command selection on the keyboard until the pointer moves", async ({ mount, page }) => { + const component = await mount("opencode-composer-flow--slash-suggestions") + + const input = component.getByRole("textbox", { name: "Prompt", exact: true }) + + const menu = component.locator('[data-component="composer-suggestions"]') + + const test = menu.getByRole("button", { name: "/test", exact: true }) + + const review = menu.getByRole("button", { name: "/review", exact: true }) + + await page.evaluate(() => document.fonts.ready.then(() => undefined)) + await expect(test).toHaveAttribute("data-active", "") + + const box = await review.boundingBox() + + if (!box) throw new Error("Missing review command") + + await input.press("Escape") + await expect(menu).toHaveCount(0) + await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2) + await input.fill("/") + await expect(test).toHaveAttribute("data-active", "") + await expect(review).toHaveCSS("background-color", "rgba(0, 0, 0, 0)") + + // Layout changes can deliver pointer events without any actual mouse movement. + await review.dispatchEvent("pointermove", { movementX: 0, movementY: 0 }) + await expect(test).toHaveAttribute("data-active", "") + + await page.mouse.move(box.x + box.width / 2 + 2, box.y + box.height / 2) + await expect(review).toHaveAttribute("data-active", "") + await expect(test).not.toHaveAttribute("data-active") +}) + story("grows suggestions while preserving visible timeline context", async ({ mount }) => { const component = await mount("opencode-composer-flow--constrained-command-suggestions") const boundary = component.locator('[data-slot="composer-suggestion-boundary-story"]') diff --git a/packages/app/src/composer/editor/editor.tsx b/packages/app/src/composer/editor/editor.tsx index 7c7fad0f377..b9326a8c273 100644 --- a/packages/app/src/composer/editor/editor.tsx +++ b/packages/app/src/composer/editor/editor.tsx @@ -1323,9 +1323,11 @@ function ComposerEditorPopover(props: { type="button" data-suggestion-id={item.id} data-active={props.activeID === item.id ? "" : undefined} - class="flex h-7 w-full shrink-0 items-center gap-2 rounded-md px-2 py-1 text-start hover:bg-v2-overlay-simple-overlay-hover" + class="flex h-7 w-full shrink-0 items-center gap-2 rounded-md px-2 py-1 text-start" classList={{ "bg-v2-overlay-simple-overlay-hover": props.activeID === item.id }} - onPointerMove={() => props.onActiveChange(item)} + onPointerMove={(event) => { + if (event.movementX || event.movementY) props.onActiveChange(item) + }} onClick={() => props.onSelect(item)} >