Fix/28324 : App keeps both right click LHN popup and delete message popup open together #28846

astrohunter62 · 2023-10-04T17:39:56Z

Details

App keeps both right click LHN popup and delete message popup open together

Fixed Issues

$ #28324
PROPOSAL: #28324 (comment)

Tests

Open the app
Open any report
Focus on composer
Right click on any report in LHN to open LHN popover
Verify that the composer loses focus.
Verify that the composer does not lose focus when clicking on the same chat in LHN.

Verify that no errors appear in the JS console

Offline tests

QA Steps

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 / Chrome
- iOS / native
- iOS / 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 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 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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.js 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 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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

28324.safari.webm

28324.chrome.webm

Mobile Web - Chrome

mobile.chrome.mp4

Mobile Web - Safari

mobile.safari.mp4

Desktop

28324.desktop.webm

iOS

ios.mp4

Android

android.mp4

github-actions · 2023-10-04T17:40:11Z

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

melvin-bot · 2023-10-04T17:40:32Z

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

astrohunter62 · 2023-10-04T17:41:57Z

I have read the CLA Document and I hereby sign the CLA

thienlnam · 2023-10-05T07:47:34Z

A couple things:

Could you fix conflicts
Update the PR title to reflect the changes that you are making

Also for next time, before you assign pullerbear please make sure to link the issue correctly like in the instructions so that it assigns the proper people:

jjcoffee · 2023-10-05T12:51:28Z

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 / Chrome
- iOS / native
- iOS / 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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(themeColors.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 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

Web

chrome-desktop-2023-10-13_15.25.48.mp4

Mobile Web - Chrome

android-chrome.mp4

Mobile Web - Safari

ios-safari-2023-10-13_15.43.11.mp4

Desktop

mac-desktop-2023-10-13_15.36.06.mp4

iOS

ios-native-2023-10-13_15.53.24.mp4

Android

android-native.mp4

jjcoffee · 2023-10-05T12:52:56Z

@astrohunter62 Please can you add screenshots for all platforms listed, thanks! Also, in the test steps step 4 should start with Right click....

jjcoffee · 2023-10-05T13:11:27Z

@astrohunter62 Regardless, PRs always need to be tested on all platforms. This is so we don't miss regressions that we might not necessarily expect (this is particularly important in this case as your changes are not limited to web).

Please add a screenshot of the app running on each platform (Web, Desktop, iOS, Android, Mobile Web).

Make sure you read carefully through the contributing guide so that you avoid missing out on steps like this.

astrohunter62 · 2023-10-05T13:18:42Z

Thanks, I am testing and adding screenshots right now.

astrohunter62 · 2023-10-05T17:29:43Z

@jjcoffee
I added videos for all platforms.

jjcoffee · 2023-10-06T12:58:17Z

src/components/PopoverProvider/index.js

@@ -24,6 +25,7 @@ function PopoverContextProvider(props) {
        }
        activePopoverRef.current.close();
        activePopoverRef.current = null;
+        ReportActionComposeFocusManager.focus();


We can't call this here as it would focus on the composer in all places where this component is used, e.g. when picking a new avatar (AvatarWithImagePicker).

Does this still work to keep focus on the composer when clicking the same chat?

This is a screenshot for this solution.

1.webm

This results in the composer not being focused when switching chats. I still think an early return for anything other than a left click in onMouseDown might be the best bet here.

My solution is working when switching chats. I think onMouseDown is used to prevent loss of focus when clicking the same chat.
But if you want to use it,

onMouseDown={(e) => { if (!e) { return; } ReportActionComposeFocusManager.focus(); if (e.button !== 2) e.preventDefault(); }}

Ah my bad, I must have tested incorrectly! Retested and that seems to work. The downside is long-presses focus on the composer still (which would affect tablet users). Do you have any reason you aren't keen on the early return in onMouseDown?

@jjcoffee I have changed my solution to handle the issue for tablets.

@astrohunter62 Can you push the change so I can test tomorrow? Thanks!

jjcoffee · 2023-10-10T14:50:39Z

@astrohunter62 You have conflicts. I think this may have been fixed in the meantime in #28953

astrohunter62 · 2023-10-10T15:13:24Z

I have resolved the conflict.

astrohunter62 · 2023-10-10T16:14:19Z

@jjcoffee Do you test #28953 in Tablets?

jjcoffee · 2023-10-10T16:17:32Z

@astrohunter62 No, you're welcome to try!

astrohunter62 · 2023-10-10T16:28:57Z

28953.tablet.webm

astrohunter62 · 2023-10-11T10:08:06Z

@jjcoffee any updates?

jjcoffee · 2023-10-11T10:12:36Z

@astrohunter62 I've asked on the issue to see if we should proceed. Tablet isn't an officially supported platform so I'm a bit unsure.

jjcoffee · 2023-10-13T13:10:46Z

@astrohunter62 Can you merge main and I guess you can revert the code from that PR?

jjcoffee · 2023-10-13T13:55:26Z

@astrohunter62 Tests well! Once you add comments and revert the change from the other PR, I will approve.

astrohunter62 · 2023-10-13T15:49:24Z

I have just pushed.

jjcoffee · 2023-10-13T15:50:58Z

@astrohunter62 Thanks! We also want to revert this change right?

App/src/components/LHNOptionsList/OptionRowLHN.js

Line 178 in 2ca6049

if (!e || e.button === 2) {

src/components/LHNOptionsList/OptionRowLHN.js

Co-authored-by: Joel Davies <[email protected]>

astrohunter62 · 2023-10-13T15:55:22Z

onMouseDown={(e) => {
  if (!e) {
      return;
  }
``

astrohunter62 · 2023-10-13T15:58:13Z

Can I push the code that reverts the above change?

jjcoffee · 2023-10-13T15:59:09Z

@astrohunter62 Yes!

astrohunter62 · 2023-10-13T16:12:04Z

Could you review the PR?

jjcoffee

LGTM!

jjcoffee · 2023-10-13T16:13:32Z

All yours @MariaHCD!

astrohunter62 · 2023-10-13T16:21:35Z

@jjcoffee
I sent a proposal on Upwork, but I haven't received any offer.
When can I expect an offer?

MariaHCD · 2023-10-13T17:05:45Z

Looks like some commits are unverified, @astrohunter62. Can you fix them?

As for payment-related questions, those can be on the issue.

astrohunter62 · 2023-10-13T17:16:58Z

I have resolved.

OSBotify · 2023-10-16T10:05:53Z

✋ 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 · 2023-10-16T21:48:39Z

🚀 Deployed to staging by https://github.com/MariaHCD in version: 1.3.85-0 🚀

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

OSBotify · 2023-10-17T23:13:24Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.85-4 🚀

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

OSBotify · 2023-10-17T23:59:48Z

🚀 Deployed to staging by https://github.com/MariaHCD in version: 1.3.86-0 🚀

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

OSBotify · 2023-10-18T23:57:18Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.86-5 🚀

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

28324

4bb4619

astrohunter62 requested a review from a team as a code owner October 4, 2023 17:39

melvin-bot bot requested review from thienlnam and removed request for a team October 4, 2023 17:40

astrohunter62 mentioned this pull request Oct 4, 2023

[HOLD for payment 2023-10-24] [$500] Web - App keeps both right click LHN popup and delete message popup open together #28324

Closed

6 tasks

thienlnam requested a review from jjcoffee October 5, 2023 07:46

thienlnam requested review from MariaHCD and removed request for thienlnam October 5, 2023 07:47

astrohunter62 changed the title ~~28324~~ Fix : App keeps both right click LHN popup and delete message popup open together Oct 5, 2023

resolve conflict

4c90ba4

astrohunter62 changed the title ~~Fix : App keeps both right click LHN popup and delete message popup open together~~ Fix/28324 : App keeps both right click LHN popup and delete message popup open together Oct 5, 2023

jjcoffee reviewed Oct 6, 2023

View reviewed changes

removed ReportActionComposeFocusManager from PopoverProvider

82b7f02

Merge branch 'main' into a-28324

7ca2a1a

add comment

2ca6049

jjcoffee reviewed Oct 13, 2023

View reviewed changes

src/components/LHNOptionsList/OptionRowLHN.js Outdated Show resolved Hide resolved

Update src/components/LHNOptionsList/OptionRowLHN.js

3aa0000

Co-authored-by: Joel Davies <[email protected]>

astrohunter62 added 2 commits October 13, 2023 08:59

revert

d83fb5c

revert

fa08095

This comment was marked as outdated.

Sign in to view

jjcoffee approved these changes Oct 13, 2023

View reviewed changes

MariaHCD approved these changes Oct 16, 2023

View reviewed changes

MariaHCD merged commit ebf8306 into Expensify:main Oct 16, 2023
14 checks passed

OSBotify mentioned this pull request Oct 16, 2023

Deploy Checklist: New Expensify 2023-10-16 #29717

Closed

pradeepmdk mentioned this pull request Oct 17, 2023

[HOLD for payment 2023-10-25] [HOLD for payment 2023-10-24] [$500] LHN-App crashes on long pressing any report in the LHN #29746

Closed

6 tasks

OSBotify mentioned this pull request Oct 17, 2023

Deploy Checklist: New Expensify 2023-10-17 #29837

Closed

jjcoffee mentioned this pull request Oct 26, 2023

prevent focusing on composer while popover is open #28953

Merged

58 tasks

Fix/28324 : App keeps both right click LHN popup and delete message popup open together #28846

Fix/28324 : App keeps both right click LHN popup and delete message popup open together #28846

Conversation

astrohunter62 commented Oct 4, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

github-actions bot commented Oct 4, 2023 • edited Loading

melvin-bot bot commented Oct 4, 2023

astrohunter62 commented Oct 4, 2023

thienlnam commented Oct 5, 2023 • edited Loading

jjcoffee commented Oct 5, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

jjcoffee commented Oct 5, 2023

jjcoffee commented Oct 5, 2023

astrohunter62 commented Oct 5, 2023

astrohunter62 commented Oct 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jjcoffee Oct 6, 2023 • edited Loading

Choose a reason for hiding this comment

astrohunter62 Oct 9, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jjcoffee commented Oct 10, 2023

astrohunter62 commented Oct 10, 2023

astrohunter62 commented Oct 10, 2023

jjcoffee commented Oct 10, 2023

astrohunter62 commented Oct 10, 2023

astrohunter62 commented Oct 11, 2023

jjcoffee commented Oct 11, 2023

jjcoffee commented Oct 13, 2023

jjcoffee commented Oct 13, 2023

astrohunter62 commented Oct 13, 2023

jjcoffee commented Oct 13, 2023

astrohunter62 commented Oct 13, 2023

astrohunter62 commented Oct 13, 2023

jjcoffee commented Oct 13, 2023

This comment was marked as outdated.

astrohunter62 commented Oct 13, 2023

jjcoffee left a comment

Choose a reason for hiding this comment

jjcoffee commented Oct 13, 2023

astrohunter62 commented Oct 13, 2023

MariaHCD commented Oct 13, 2023

astrohunter62 commented Oct 13, 2023

OSBotify commented Oct 16, 2023

OSBotify commented Oct 16, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 18, 2023

astrohunter62 commented Oct 4, 2023 •

edited

Loading

github-actions bot commented Oct 4, 2023 •

edited

Loading

thienlnam commented Oct 5, 2023 •

edited

Loading

jjcoffee commented Oct 5, 2023 •

edited

Loading

jjcoffee Oct 6, 2023 •

edited

Loading

astrohunter62 Oct 9, 2023 •

edited

Loading