diff --git a/src/renderer/src/components/orca-cloud-setup/use-escape-exits-setup.test.tsx b/src/renderer/src/components/orca-cloud-setup/use-escape-exits-setup.test.tsx index da2462f6380..5c8f2f8e87e 100644 --- a/src/renderer/src/components/orca-cloud-setup/use-escape-exits-setup.test.tsx +++ b/src/renderer/src/components/orca-cloud-setup/use-escape-exits-setup.test.tsx @@ -37,6 +37,16 @@ describe('Escape on the Orca Cloud setup page (RR-b)', () => { expect(onExit).toHaveBeenCalledOnce() }) + it('an always-mounted list (the sidebar listbox) does not swallow Escape', () => { + const onExit = vi.fn() + const sidebar = document.createElement('div') + sidebar.setAttribute('role', 'listbox') + document.body.appendChild(sidebar) + renderHook(() => useEscapeExitsSetup(true, onExit)) + pressEscape() + expect(onExit).toHaveBeenCalledOnce() + }) + it('leaves Escape to a menu, popover or dialog on top, and does nothing while hidden', () => { const onExit = vi.fn() const { rerender } = renderHook(({ visible }) => useEscapeExitsSetup(visible, onExit), { diff --git a/src/renderer/src/components/orca-cloud-setup/use-escape-exits-setup.ts b/src/renderer/src/components/orca-cloud-setup/use-escape-exits-setup.ts index 79736ee9366..c260a7d58ad 100644 --- a/src/renderer/src/components/orca-cloud-setup/use-escape-exits-setup.ts +++ b/src/renderer/src/components/orca-cloud-setup/use-escape-exits-setup.ts @@ -1,10 +1,13 @@ import { useEffect } from 'react' -/** Something on top of the page owns Escape (a menu, popover or dialog): leave it to that. */ +/** + * Something open on top of the page owns Escape (a menu, a popover or popper list, a dialog): leave + * it to that. Always-mounted lists (the sidebar's worktree listbox) don't count. + */ function escapeBelongsToOverlay(): boolean { return ( document.querySelector( - '[role="dialog"], [role="menu"], [role="listbox"], [data-radix-popper-content-wrapper]' + '[role="dialog"][data-state="open"], [role="alertdialog"], [role="menu"], [data-radix-popper-content-wrapper]' ) !== null ) }