diff --git a/apps/web/src/components/ChatView.logic.browser.test.ts b/apps/web/src/components/ChatView.logic.browser.test.ts index 724c77538d315..fc285baf2a0f5 100644 --- a/apps/web/src/components/ChatView.logic.browser.test.ts +++ b/apps/web/src/components/ChatView.logic.browser.test.ts @@ -65,6 +65,31 @@ it("keeps focus in a region with its own keys on window return", async () => { ); }); +it("keeps focus on a trigger whose menu just opened on window return", () => { + const trigger = document.createElement("button"); + trigger.setAttribute("aria-haspopup", "menu"); + trigger.setAttribute("aria-expanded", "true"); + const disclosure = document.createElement("button"); + disclosure.setAttribute("aria-expanded", "true"); + document.body.append(trigger, disclosure); + using _buttons = { + [Symbol.dispose]: () => { + trigger.remove(); + disclosure.remove(); + }, + }; + + trigger.focus(); + expect(shouldRefocusComposerOnWindowFocus(document.activeElement, null)).toBe(false); + trigger.setAttribute("aria-expanded", "false"); + expect(shouldRefocusComposerOnWindowFocus(document.activeElement, null)).toBe(true); + disclosure.focus(); + expect( + shouldRefocusComposerOnWindowFocus(document.activeElement, null), + "an expanded fold or folder toggle opens no popup", + ).toBe(true); +}); + it("refocuses the composer on window return from a clicked area after a bare key press", async () => { const controller = createWorkspaceFocusController(document); const root = document.createElement("div"); diff --git a/apps/web/src/components/ChatView.logic.ts b/apps/web/src/components/ChatView.logic.ts index 1f8bb8e10043c..50e25b828bb85 100644 --- a/apps/web/src/components/ChatView.logic.ts +++ b/apps/web/src/components/ChatView.logic.ts @@ -1165,7 +1165,7 @@ export function shouldRefocusComposerOnWindowFocus( } return ( activeElement.closest( - '[data-workspace-keyboard-focus], [data-sidebar-row]:focus-visible, [role="dialog"], [role="alertdialog"], [role="application"], [role="menu"], [role="listbox"], [data-slot$="-popup"], [data-terminal-owner], [aria-keyshortcuts]', + '[data-workspace-keyboard-focus], [data-sidebar-row]:focus-visible, [role="dialog"], [role="alertdialog"], [role="application"], [role="menu"], [role="listbox"], [data-slot$="-popup"], [data-terminal-owner], [aria-keyshortcuts], [aria-haspopup][aria-expanded="true"]', ) === null ); }