fix(mWeb): Move focus to opened menu layout for screen readers by marufsharifi · Pull Request #83822 · Expensify/App

marufsharifi · 2026-03-02T06:15:13Z

Explanation of Change

Ensure screen reader focus shifts correctly when menus open across pages.

Fixed Issues

$ #74858
PROPOSAL: #74858 (comment)

Tests

Using TalkBack + Android + Chrome or VoiceOver + iOS + Safari, open the page settings > about
Swipe to navigate to the 'App download links', double-tap to activate
Using a swipe gesture, attempt to navigate through the newly opened menu
Observe the focus behavior
When users activate the 'App download links' button, focus is contained within the newly opened menu until the user manually closes it

Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

Same as Tests.

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

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android-native-bottom-tabs-not-announce.mp4

Android: mWeb Chrome

android-mweb-bottom-tabs-not-announce.mp4

iOS: Native

Screen.Recording.2026-02-08.at.3.16.57.PM.mov

iOS: mWeb Safari

Screen.Recording.1404-11-19.at.5.38.54.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-02-08.at.1.15.24.PM.mov

codecov · 2026-03-02T06:22:44Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
...ents/Navigation/TopLevelNavigationTabBar/index.tsx	`100.00% <ø> (ø)`
src/components/ScreenWrapper/index.tsx	`87.05% <100.00%> (-0.29%)`	⬇️
src/hooks/useAccessibilityFocus/index.native.ts	`100.00% <100.00%> (ø)`
...omponents/ScreenWrapper/ScreenWrapperContainer.tsx	`80.00% <0.00%> (-1.25%)`	⬇️
...gation/AppNavigator/ModalStackNavigators/index.tsx	`7.31% <0.00%> (-0.03%)`	⬇️
src/hooks/useAccessibilityFocus/index.ts	`0.00% <0.00%> (ø)`
... and 10 files with indirect coverage changes

melvin-bot · 2026-03-02T08:53:35Z

@suneox 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]

src/components/ScreenWrapper/index.tsx

src/components/ScreenWrapper/ScreenWrapperContainer.tsx

marufsharifi · 2026-03-02T10:06:33Z

1. On Settings - About - Keyboard Shortcuts

1.mov

2. On Settings - Save the world - I know a teacher

2.mov

3. On Settings - Save the world - I am a teacher

3.mov

5. On Settings - Preferences - Language

5.mov

6. On Settings - Preferences - Priority mode

6.mov

7. On Settings - Security

7.mov

9. On Settings - Security - Close account

9.mov

10. On Settings - Security - Two-factor authentication

10.mov

11. On Settings - Profile - Display name

11.mov

12. On Settings - Profile - Contact methods

12.mov

13. On Settings - Profile - Pronouns

13.mov

14. On Settings - Profile - Share Code

14.mov

15. On Settings - Profile - Legal Name

15.mov

16. On Settings - Profile - DOB

16.mov

17. On Settings - Profile - Phone number

17.mov

18. On Settings - Profile - Address

18.mov

20. On Workspaces - Duplicate Workspaces

20.mov

21. On Workspaces - Delete Workspace

21.mov

22. On Workspaces - Overview - Workspace Name

22.mov

24. On Workspace - Categories - Add Category

24.mov

25. On Workspace - Categories - Settings

25.mov

26. On Workspace - Workflows - Edit Approval Workflow

26.mov

28: On Workspace - Workflows - Approver

28.mov

28. On Workspace - Rules - Cash Expense Default

d28.mov

29. On Workspaces - Distance Rates - Rate Details

29.mov

30. On Workspaces - Expensify Card - Add bank account

30.mov

31. On Workspaces - Expensify Card - Bank info

31.mov

32. On Workspaces - Expensify Card - Confirm currency and country

32.mov

33. On Workspace - Company Card - Add Cards

33.mov

34. On Workspace - Create Workspace - Confirm Workspace

34.mov

35. On Workspace - Create Workspace - Invite new members

35.mov

36. On Workspace - Create Workspace - Default Currency

36.mov

40. On Track Distance

40.mov

41. On Track Distance - Choose Recipient

41.mov

42. On Send Invoice

42.mov

43. On Wallet - Add bank account

43.mov

44. On Create Expense flow

44.mov

45. On Paid Expense details flow

45.mov

46. On Reports flow

46.mov

47. On Chat flow

47.mov

marufsharifi · 2026-03-02T11:02:38Z

Fixed #83313

Screen.Recording.2026-03-02.at.3.15.01.PM.mov

joekaufmanexpensify

Fine for product 👍

rushatgabhane · 2026-03-03T23:26:05Z

@suneox all yours! gentle bump ^^

suneox · 2026-03-05T06:38:37Z

@suneox all yours! gentle bump ^^

I should be able to finish the review today.

suneox · 2026-03-05T17:47:45Z

@marufsharifi Issue #83313 can not resolve in current PR

screen-20260306-004117.1.mp4

suneox · 2026-03-05T17:52:48Z

src/components/ScreenWrapper/index.tsx

    // This context allows us to disable the safe area padding offsetting the offline indicator in scrollable components like 'ScrollView', 'SelectionList' or 'FormProvider'.
    // This is useful e.g. for the RightModalNavigator, where we want to avoid the safe area padding offsetting the offline indicator because we only show the offline indicator on small screens.
    const {isInNarrowPane} = useContext(NarrowPaneContext);
+    const shouldMoveAccessibilityFocus = getPlatform() === CONST.PLATFORM.WEB && isMobile() && shouldUseNarrowLayout && isInNarrowPane;


Could you please explain the new update shouldUseNarrowLayout && isInNarrowPane from previous PR?

I added isInNarrowPane because shouldUseNarrowLayout alone is true for all narrow mobile screens, including normal app pages. We only want to move accessibility focus for the RHP/narrow-pane flow in this issue, so isInNarrowPane keeps the fix scoped to that context and avoids affecting other narrow-layout screens.

marufsharifi · 2026-03-06T02:59:24Z

@marufsharifi Issue #83313 can not resolve in current PR

screen-20260306-004117.1.mp4

@suneox, thanks for the review. Let me check, it was fixed on my end based on this comment

suneox · 2026-03-06T06:30:52Z

@marufsharifi Issue #83313 can not resolve in current PR

screen-20260306-004117.1.mp4

@suneox, thanks for the review. Let me check, it was fixed on my end based on this comment

It happens on real devices, not on simulators.

marufsharifi · 2026-03-06T07:15:12Z

@suneox Thanks for checking. I couldn’t reproduce this on either a real device or an emulator.

Real device record in current branch:

no-blue-line-on-real-device.mp4

marufsharifi · 2026-03-08T10:36:42Z

@suneox I re-verified the regression on real devices and I was not able to reproduce it on Samsung A50 (Android 11), Redmi Note 13 (Android 15), or on an emulator. I also kept the previous fix scope limited to the narrow-pane/RHP flow to avoid impacting regular narrow-layout screens. The latest updates are applied, and this PR should be ready for review.

Please do a recheck on your device again please, thanks.

regression-not-repro-on-note-13.mp4

suneox · 2026-03-08T16:28:10Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible 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 checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (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
- 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 verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
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
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
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 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

screen-20260212-000015.mp4

screen-20260211-232034.mp4

Android: mWeb Chrome

screen-20260212-000618.mp4

screen-20260212-000427.mp4

iOS: HybridApp

ScreenRecording_02-11-2026.18-24-29_1.mp4

iOS: mWeb Safari

ScreenRecording_02-11-2026.18-59-12_1.mp4

MacOS: Chrome / Safari

Not available modal overlay navigation bar

suneox · 2026-03-08T16:28:31Z

@suneox I re-verified the regression on real devices and I was not able to reproduce it on Samsung A50 (Android 11), Redmi Note 13 (Android 15), or on an emulator. I also kept the previous fix scope limited to the narrow-pane/RHP flow to avoid impacting regular narrow-layout screens. The latest updates are applied, and this PR should be ready for review.

Please do a recheck on your device again please, thanks.

regression-not-repro-on-note-13.mp4

@marufsharifi I'd like to confirm the remaining issue has been fixed on pixel 8 (Android 16)

screen-20260308-231612-1772986390343.1.mp4

src/components/ScreenWrapper/index.tsx

marufsharifi · 2026-03-09T07:01:27Z

@suneox I addressed the latest comment. The PR should now be ready for your final review.

suneox

The border issue when accessibility mode is enabled also occurs on the latest staging, so it should be tracked as a separate issue along with this issue & #83313

ScreenRecording_03-09-2026.19-41-59_1.1.mp4

OSBotify · 2026-03-09T17:34:09Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-03-09T18:27:47Z

🚧 @madmax330 has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-03-09T18:32:18Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #83822.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-7788284-58fa64b-c647a2faa4a1a9e42345234520851ea19f938f3e/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-7788284-58fa64b-15579a4e88ee32f75349139e4e23d69a9c2a12b7/index.html

Web 🕸️
https://83822.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-09T21:26:55Z

🚀 Deployed to staging by https://github.com/madmax330 in version: 9.3.34-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

OSBotify · 2026-03-10T18:49:01Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.34-2 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

fix(mweb): move focus to opened menu layout for screen readers

62e154c

melvin-bot bot assigned marufsharifi Mar 2, 2026

marufsharifi marked this pull request as ready for review March 2, 2026 08:53

marufsharifi requested review from a team as code owners March 2, 2026 08:53

melvin-bot bot requested review from suneox and removed request for a team March 2, 2026 08:53

melvin-bot bot requested review from joekaufmanexpensify and removed request for a team March 2, 2026 08:53

github-actions bot reviewed Mar 2, 2026

View reviewed changes

src/components/ScreenWrapper/index.tsx Outdated Show resolved Hide resolved

github-actions bot reviewed Mar 2, 2026

View reviewed changes

src/components/ScreenWrapper/ScreenWrapperContainer.tsx Show resolved Hide resolved

joekaufmanexpensify previously approved these changes Mar 2, 2026

View reviewed changes

marufsharifi mentioned this pull request Mar 4, 2026

[$250] Screen Reader: Many Pages: The focus is not trapped inside opened layout #76940

Closed

suneox reviewed Mar 5, 2026

View reviewed changes

suneox mentioned this pull request Mar 5, 2026

[$250] Screen Reader: Many Pages: Focus does not move to opened menu layout (mWeb) #74858

Open

Merge branch 'main' into fix/mweb-screen-reader-menu-focus

3f72726

marufsharifi dismissed joekaufmanexpensify’s stale review via 3f72726 March 6, 2026 06:23

marufsharifi added 2 commits March 8, 2026 14:26

Merge branch 'main' into fix/mweb-screen-reader-menu-focus

ef00c47

Refactor mWeb accessibility focus guards

39479e5

suneox reviewed Mar 8, 2026

View reviewed changes

src/components/ScreenWrapper/index.tsx Outdated Show resolved Hide resolved

marufsharifi added 2 commits March 9, 2026 10:49

Merge branch 'main' into fix/mweb-screen-reader-menu-focus

c7b5072

Refactor screen wrapper accessibility focus into hook

9d8273c

suneox approved these changes Mar 9, 2026

View reviewed changes

melvin-bot bot requested a review from madmax330 March 9, 2026 12:49

madmax330 approved these changes Mar 9, 2026

View reviewed changes

madmax330 merged commit 7788284 into Expensify:main Mar 9, 2026
31 checks passed

OSBotify mentioned this pull request Mar 9, 2026

Deploy Checklist: New Expensify 2026-03-09 #84634

Closed

75 tasks

Conversation

marufsharifi commented Mar 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov bot commented Mar 2, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot bot commented Mar 2, 2026

Uh oh!

Uh oh!

Uh oh!

marufsharifi commented Mar 2, 2026

Uh oh!

marufsharifi commented Mar 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

rushatgabhane commented Mar 3, 2026

Uh oh!

suneox commented Mar 5, 2026

Uh oh!

suneox commented Mar 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

suneox Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

marufsharifi Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

marufsharifi commented Mar 6, 2026

Uh oh!

suneox commented Mar 6, 2026

Uh oh!

marufsharifi commented Mar 6, 2026

Uh oh!

marufsharifi commented Mar 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

suneox commented Mar 8, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

suneox commented Mar 8, 2026

Uh oh!

Uh oh!

marufsharifi commented Mar 9, 2026

Uh oh!

suneox left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 9, 2026

Uh oh!

github-actions bot commented Mar 9, 2026

Uh oh!

github-actions bot commented Mar 9, 2026

Uh oh!

OSBotify commented Mar 9, 2026

Uh oh!

OSBotify commented Mar 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

marufsharifi commented Mar 2, 2026 •

edited

Loading

codecov bot commented Mar 2, 2026 •

edited by github-actions bot

Loading

marufsharifi commented Mar 2, 2026 •

edited

Loading

suneox commented Mar 5, 2026 •

edited

Loading

marufsharifi commented Mar 8, 2026 •

edited

Loading