Skip to content

fix: Pressing Esc closes fullscreen video instead of 3 dot menu#92167

Open
TaduJR wants to merge 7 commits into
Expensify:mainfrom
TaduJR:refactor-decompose-popover-menu
Open

fix: Pressing Esc closes fullscreen video instead of 3 dot menu#92167
TaduJR wants to merge 7 commits into
Expensify:mainfrom
TaduJR:refactor-decompose-popover-menu

Conversation

@TaduJR
Copy link
Copy Markdown
Contributor

@TaduJR TaduJR commented Jun 1, 2026

Explanation of Change

When the video lightbox is open and you press Esc with the 3-dot menu open, both AttachmentModalBaseContent's useKeyboardShortcut(ESCAPE, onClose) and ReanimatedModal's keyup-Escape listener on document.body fire before the popover can react. The lightbox closes instead of the menu.

PopoverMenu doesn't claim Escape — it just relies on its inner modal's keyup listener, which races and loses. This PR makes both v1 (PopoverMenu/index.tsx) and v2 (PopoverMenu/v2) claim Escape while open:

  • useKeyboardShortcut(ESCAPE, …, { isActive: isVisible, shouldBubble: false }) — new subscriptions splice at index 0 so ours runs first; shouldBubble: false stops the rest of the shortcut stack
  • suppressNextEscapeKeyUp() — singleton one-shot capture-phase listener on document that swallows the matching keyup so ReanimatedModal's body-level keyup handler can't dismiss the parent on the same keystroke. Singleton because PopoverProvider's earlier document-capture keyup can stopImmediatePropagation before ours runs — each install evicts any pending listener so leaks can't accumulate. (web only; no-op on native)

v2 packages this as a useCloseOnEscape lifecycle hook alongside the existing useCloseOnScreenBlur / useCloseOnModalCover in useContentController. v1 gets the same call inline next to the existing ENTER/SPACE shortcuts, routed through a single handleClose so submenu state (currentMenuItems / enteredSubMenuIndexes) resets on every close path.

Per design: Esc closes the whole popover, including from inside a <Sub> — no "back one level" semantics.

Fixed Issues

$ #91146
PROPOSAL:

Tests

  1. Open a chat with a video attachment
  2. Click the expand icon on the video to open it in fullscreen
  3. Click the 3-dot menu in the video player
  4. Click Playback speed to open the sub-menu
  5. Press Esc
  6. Verify the menu closes and the video stays in fullscreen
  7. Reopen the 3-dot menu — verify it shows the root items (Download, Playback speed), not the Playback speed sub-menu from before
  8. With the root menu open (no sub), press Esc
  9. Verify the menu closes and the video stays in fullscreen
  10. After Esc closes the menu, a thin blue outline appears around the 3-dot button. This is expected — it shows where focus has returned for keyboard users from WCGA compliance
  11. Close the menu by clicking outside instead of pressing Esc. Verify no blue outline appears (expected — outline only shows for keyboard, not mouse)
  12. With no menu open, press Esc while still in fullscreen. Verify the fullscreen video closes (normal behavior)

Offline tests

Same as tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."
Same as tests

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-06-01.at.10.03.45.AM.mov

@TaduJR TaduJR requested review from a team as code owners June 1, 2026 07:05
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented Jun 1, 2026

@linhvovan29546 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot melvin-bot Bot removed request for a team June 1, 2026 07:05
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0c4c289c9f

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/components/PopoverMenu/index.tsx Outdated
@codecov
Copy link
Copy Markdown

codecov Bot commented Jun 1, 2026

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
...ponents/PopoverMenu/v2/content/useCloseOnEscape.ts 100.00% <100.00%> (ø)
...nts/PopoverMenu/v2/content/useContentController.ts 100.00% <ø> (ø)
src/libs/claimEscapeKeyDown/index.native.ts 100.00% <100.00%> (ø)
src/libs/claimEscapeKeyDown/index.ts 100.00% <100.00%> (ø)
src/libs/suppressNextEscapeKeyUp/index.native.ts 100.00% <100.00%> (ø)
src/libs/suppressNextEscapeKeyUp/index.ts 100.00% <100.00%> (ø)
src/components/PopoverMenu/index.tsx 80.09% <40.00%> (+0.55%) ⬆️
... and 526 files with indirect coverage changes

@TaduJR
Copy link
Copy Markdown
Contributor Author

TaduJR commented Jun 1, 2026

@codex review

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 39f3ec11d5

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/components/PopoverMenu/index.tsx Outdated
@TaduJR
Copy link
Copy Markdown
Contributor Author

TaduJR commented Jun 1, 2026

@codex review

@chatgpt-codex-connector
Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Chef's kiss.

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

trjExpensify
trjExpensify previously approved these changes Jun 1, 2026
Copy link
Copy Markdown
Contributor

@trjExpensify trjExpensify left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 for product

@linhvovan29546
Copy link
Copy Markdown
Contributor

Reviewing...

Comment thread src/components/PopoverMenu/index.tsx Outdated
Comment thread src/components/PopoverMenu/v2/content/useCloseOnEscape.ts
@linhvovan29546
Copy link
Copy Markdown
Contributor

@TaduJR The eslint failed

@linhvovan29546
Copy link
Copy Markdown
Contributor

Bug: Pressing Esc closes both the attachment modal and the RHP.

Screen.Recording.2026-06-04.at.21.39.59.mov

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants