fix: Copying a message with a reply doesn't refocus on the composer #44399

gijoe0295 · 2024-06-25T17:16:15Z

Details

Context menu actions do not refocus composer for highlighted messages (r/:reportID/:reportActionID).

Fixed Issues

$ #44078
PROPOSAL: #44078 (comment)

Tests

Reply a message in thread
Press report header subtitle to navigate to parent report action
Right/Long press the highlighted message >> Copy to clipboard
Verify the composer is refocused
Go to Search expenses
Press an expense to view report
Right/Long press any message >> Copy to clipboard
Verify the composer is refocused
Refresh the page
Verify step 7 - 8
[Web & Desktop only]
Right/Long press the highlighted message's sender >> Copy to clipboard
Verify the composer is refocused

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

video_2024-06-26_04-58-56.mp4

video_2024-06-26_04-58-52.mp4

iOS: Native

Screen.Recording.2024-06-26.at.03.36.07-source.mov

iOS: mWeb Safari

Screen.Recording.2024-06-26.at.03.37.48-source.mov

Screen.Recording.2024-06-26.at.04.56.56-source.mov

MacOS: Chrome / Safari

Screen.Recording.2024-06-26.at.03.25.59-source.mov

MacOS: Desktop

Screen.Recording.2024-06-26.at.03.29.44-source.mov

melvin-bot · 2024-06-25T22:45:37Z

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

rushatgabhane · 2024-06-25T22:47:55Z

@gijoe0295 can you please make sure @nkdengineer's points are also addressed and in the test steps

gijoe0295 · 2024-06-25T22:54:18Z

@rushatgabhane Yes I did. They are steps 5 - 10.

gijoe0295 · 2024-06-25T22:56:12Z

src/components/FocusTrap/FocusTrapForModal/index.web.tsx

@@ -12,6 +13,12 @@ function FocusTrapForModal({children, active}: FocusTrapForModalProps) {
                clickOutsideDeactivates: true,
                initialFocus: false,
                fallbackFocus: document.body,
+                setReturnFocus: (element) => {


Problem

Right press the message sender/report preview/money request preview/task checkbox or any Pressable within a ReportActionItem

Press any context menu item

The composer gains focus briefly then loses it

RCA

The context menu activates a focus trap that would return focus to to the element that was previously focused when it unmounts, which can be any of the above Pressables. So when the context menu closes, the composer would gain focus first, then the focus trap moves the focus to the Pressable right after.

This doesn't happen when you right click the ReportActionItem background thanks to the withoutFocusOnSecondaryInteraction prop.

App/src/pages/home/report/ReportActionItem.tsx

Line 874 in 6f22937

withoutFocusOnSecondaryInteraction

Solution

If the composer is already focused, we won't allow the focus trap to return focus.

sounds good

gijoe0295 · 2024-06-25T22:58:16Z

src/libs/Navigation/isReportOpenInRHP.ts

+        return true;
+    }
+    return !!(lastRoute.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR && lastRoute.state?.routes?.some((route) => route?.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT));
+};


The params check mentioned by the other proposal only solves the issue when we navigate to report RHP from the search expenses page but not when we navigate to this page by direct URL. In the latter case, we should use state.routes check.

Reference:

App/src/libs/Navigation/linkTo/index.ts

Line 71 in 6f22937

const isReportInRhpOpened = lastRoute?.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR && lastRoute?.state?.routes?.some((route) => route?.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT);

luacmartins · 2024-06-27T15:37:05Z

@gijoe0295 lint check is failing

luacmartins · 2024-07-02T20:19:55Z

src/libs/Navigation/isReportOpenInRHP.ts

+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+const isReportOpenInRHP = (state: NavigationState | undefined): boolean => {


Can we use the useIsReportOpenInRHP hook?

No we couldn't. I'm not sure why the activeRoute returned by that hook is always RightModalNavigator when used in ReportActionComposeFocusManager but should be Search_Report_RHP instead.

@WojtekBoman could you check on this please? I'd rather not have two ways of checking if a report is open on RHP

luacmartins · 2024-07-04T16:37:47Z

Bump @rushatgabhane for review

luacmartins · 2024-07-08T16:15:56Z

Bump for review!

rushatgabhane · 2024-07-08T21:24:03Z

reviewing

rushatgabhane · 2024-07-09T04:02:33Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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: Native

Screen.Recording.2024-07-09.at.07.15.19.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2024-07-09.at.07.13.27.mov

iOS: mWeb Safari

Uploading Screen Recording 2024-07-09 at 07.20.42.mov…

MacOS: Chrome / Safari

Screen.Recording.2024-07-09.at.07.10.04.mov

MacOS: Desktop

Screen.Recording.2024-07-09.at.07.08.43.mov

OSBotify · 2024-07-09T22:19:22Z

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

OSBotify · 2024-07-10T11:19:35Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.0.6-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	failure ❌
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2024-07-10T11:36:49Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.0.6-0 🚀

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

OSBotify · 2024-07-11T10:17:04Z

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.0.6-1 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	failure ❌
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-11T10:36:40Z

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.0.6-1 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-15T20:20:53Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.6-8 🚀

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

OSBotify · 2024-07-17T00:18:40Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.7-8 🚀

platform	result
🤖 android 🤖	failure ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

gijoe0295 added 6 commits June 26, 2024 00:12

fix: context menu actions do not refocus composer for comment linking

7597ba7

Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/44078

14e6623

do not return focus on focus trap deactivate when composer is refocused

45ed4c9

Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/44078

22b28dd

handle search report case

43d6d8c

fix perf-test

a12f442

gijoe0295 marked this pull request as ready for review June 25, 2024 22:45

gijoe0295 requested a review from a team as a code owner June 25, 2024 22:45

melvin-bot bot requested review from rushatgabhane and removed request for a team June 25, 2024 22:45

gijoe0295 commented Jun 25, 2024

View reviewed changes

luacmartins self-requested a review June 27, 2024 15:37

Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/44078

546ab06

luacmartins requested changes Jul 2, 2024

View reviewed changes

rushatgabhane approved these changes Jul 9, 2024

View reviewed changes

melvin-bot bot requested a review from luacmartins July 9, 2024 04:22

luacmartins approved these changes Jul 9, 2024

View reviewed changes

luacmartins merged commit d576e28 into Expensify:main Jul 9, 2024
15 of 20 checks passed

This was referenced Jul 9, 2024

Investigate workflow job failing on main: e2ePerformanceTests / Build apk from delta ref #45129

Closed

Deploy Checklist: New Expensify 2024-07-10 #45144

Closed

lanitochka17 mentioned this pull request Jul 10, 2024

[$250] Composer - Composer box is refocused when Copying Link on Web and Desktop #45204

Closed

6 tasks

ishpaul777 mentioned this pull request Jul 14, 2024

Revert "fix: Copying a message with a reply doesn't refocus on the composer" #45381

Closed

gijoe0295 mentioned this pull request Jul 24, 2024

[HOLD for payment 2024-07-24] [$250] Chat - Copying a message with a reply doesn't refocus on the composer #44078

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Copying a message with a reply doesn't refocus on the composer #44399

fix: Copying a message with a reply doesn't refocus on the composer #44399

gijoe0295 commented Jun 25, 2024 •

edited

Loading

melvin-bot bot commented Jun 25, 2024

rushatgabhane commented Jun 25, 2024

gijoe0295 commented Jun 25, 2024

gijoe0295 Jun 25, 2024 •

edited

Loading

rushatgabhane Jun 27, 2024

gijoe0295 Jun 25, 2024 •

edited

Loading

luacmartins commented Jun 27, 2024 •

edited

Loading

luacmartins Jul 2, 2024

gijoe0295 Jul 3, 2024

luacmartins Jul 3, 2024

luacmartins commented Jul 4, 2024

luacmartins commented Jul 8, 2024

rushatgabhane commented Jul 8, 2024

rushatgabhane commented Jul 9, 2024 •

edited

Loading

OSBotify commented Jul 9, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 11, 2024

OSBotify commented Jul 11, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 17, 2024

fix: Copying a message with a reply doesn't refocus on the composer #44399

fix: Copying a message with a reply doesn't refocus on the composer #44399

Conversation

gijoe0295 commented Jun 25, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 25, 2024

rushatgabhane commented Jun 25, 2024

gijoe0295 commented Jun 25, 2024

gijoe0295 Jun 25, 2024 • edited Loading

Choose a reason for hiding this comment

Problem

RCA

Solution

rushatgabhane Jun 27, 2024

Choose a reason for hiding this comment

gijoe0295 Jun 25, 2024 • edited Loading

Choose a reason for hiding this comment

luacmartins commented Jun 27, 2024 • edited Loading

luacmartins Jul 2, 2024

Choose a reason for hiding this comment

gijoe0295 Jul 3, 2024

Choose a reason for hiding this comment

luacmartins Jul 3, 2024

Choose a reason for hiding this comment

luacmartins commented Jul 4, 2024

luacmartins commented Jul 8, 2024

rushatgabhane commented Jul 8, 2024

rushatgabhane commented Jul 9, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

OSBotify commented Jul 9, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 11, 2024

OSBotify commented Jul 11, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 17, 2024

gijoe0295 commented Jun 25, 2024 •

edited

Loading

gijoe0295 Jun 25, 2024 •

edited

Loading

gijoe0295 Jun 25, 2024 •

edited

Loading

luacmartins commented Jun 27, 2024 •

edited

Loading

rushatgabhane commented Jul 9, 2024 •

edited

Loading