Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for: Triple clicking an edited message select’s the (edited) label along with the actual message Att# 2 #18523

Merged
merged 9 commits into from
May 19, 2023

Conversation

Ollyws
Copy link
Contributor

@Ollyws Ollyws commented May 6, 2023

Details

Fixed Issues

$ #15194
PROPOSAL: #15194 (comment)

Tests

  1. Navigate to any conversation
  2. Send an message -> Edit that message (make sure it has the (edited) label at end)
  3. Select the message by triple clicking on the message itself
  4. Verify that the message, and not the (edited) label are selected
  • Verify that no errors appear in the JS console

Offline tests

  1. Navigate to any conversation
  2. Send an message -> Edit that message (make sure it has the (edited) label at end)
  3. Select the message by triple clicking on the message itself
  4. Verify that the message, and not the (edited) label are selected

QA Steps

  1. Navigate to any conversation
  2. Send an message -> Edit that message (make sure it has the (edited) label at end)
  3. Select the message by triple clicking on the message itself
  4. Verify that the message, and not the (edited) label are selected
  • 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 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
    • 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 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
MacOS_Chrome.mp4
Mobile Web - Chrome
Android_Chrome.mp4
Mobile Web - Safari
iOS_Safari.mp4
Desktop
MacOS_Desktop.mp4
iOS
iOS_Native.mp4
Android
Android_Native.mp4

@Ollyws Ollyws requested a review from a team as a code owner May 6, 2023 11:23
@melvin-bot melvin-bot bot requested review from marcochavezf and parasharrajat and removed request for a team May 6, 2023 11:23
@melvin-bot
Copy link

melvin-bot bot commented May 6, 2023

@marcochavezf @parasharrajat One of you needs to 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]

@parasharrajat
Copy link
Member

@Ollyws Please change the title and replace #2 with something else. You can use Att# 2.

@Ollyws Ollyws changed the title Fix for: Triple clicking an edited message select’s the (edited) label along with the actual message #2 Fix for: Triple clicking an edited message select’s the (edited) label along with the actual message Att# 2 May 7, 2023
@parasharrajat
Copy link
Member

Screenshots

🔲 iOS / native

Screen.Recording.2023-05-02.at.5.01.48.PM.mov

🔲 iOS / Safari

Screen.Recording.2023-05-02.at.4.46.03.PM.mov

🔲 MacOS / Desktop

Screen.Recording.2023-05-02.at.5.16.27.PM.mov

🔲 MacOS / Chrome

Screen.Recording.2023-05-02.at.4.47.08.PM.mov

🔲 Android / Chrome

Screen.Recording.2023-05-02.at.5.08.47.PM.mov

🔲 Android / native

Screenshot 2023-05-02 at 2 45 35 PM

@parasharrajat
Copy link
Member

@Ollyws It seems that this will still cause #18042.

@Ollyws
Copy link
Contributor Author

Ollyws commented May 7, 2023

@parasharrajat Will be fixed by #17781

@parasharrajat
Copy link
Member

parasharrajat commented May 8, 2023

@Ollyws I tried reproducing the #18358 by moving the Mini menu up like the old PR but I couldn't. I am trying to think a way where we can fix the other emoji selection issue as well.

IMO, we can just keep the UnreadIndicator above in the Mini Menu in JSX that should not cause #18358.

@Ollyws
Copy link
Contributor Author

Ollyws commented May 8, 2023

@parasharrajat That issue was fixed by #18228, but it seemed like that PR also got reverted.

@parasharrajat
Copy link
Member

Thanks for waiting. I will check this as soon as possible. Busy with high-priority issues.

@marcochavezf
Copy link
Contributor

Oops another conflict

@parasharrajat
Copy link
Member

@Ollyws IMO, we can just keep the UnreadIndicator above in the Mini Menu in JSX that should not cause #18358.

Do you think we should attempt that?

@Ollyws
Copy link
Contributor Author

Ollyws commented May 15, 2023

@parasharrajat Yeah seems like #18684 isn't going to fix the copying issues like the original PR did. So we could add the original fixes for that but move it below UnreadIndicator. Shall I remove userSelectNone from the emoji reaction again too?

>
{` ${props.translate('reportActionCompose.edited')}`}
{/* Native devices do not support margin between nested text */}
<Text style={[styles.w1, styles.userSelectNone]}>{' '}</Text>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<Text style={[styles.w1, styles.userSelectNone]}>{' '}</Text>
<Text selectable={false} style={[styles.w1, styles.userSelectNone]}>{' '}</Text>

Should there be selectable={false}?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@parasharrajat We didn't have it in the original PR, as far as I'm aware it just adds userSelectNone so is redundant in this case.

Copy link
Member

Choose a reason for hiding this comment

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

But this is the proper way so let's add this as well.

color={themeColors.textSupporting}
style={[styles.alignItemsBaseline, editedLabelStyles]}
>
<Text style={[styles.w1, styles.userSelectNone]}>{' '}</Text>
Copy link
Member

Choose a reason for hiding this comment

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

Same here?

@parasharrajat
Copy link
Member

Shall I remove userSelectNone from the emoji reaction again too?

Can you please enlighten me on this? Where are we doing this?

@Ollyws
Copy link
Contributor Author

Ollyws commented May 15, 2023

@parasharrajat We have a discussion here in the original PR. But #18228 was reverted and the replacement PR no longer fixes the emoji copy issue.

@parasharrajat
Copy link
Member

parasharrajat commented May 15, 2023

It seems we decided to not do that in that PR so let's follow the same. I wasn't able to reproduce #18358. Can you please test this issue after making MiniMenu adjustments?

@Ollyws
Copy link
Contributor Author

Ollyws commented May 15, 2023

@parasharrajat Ok but the copying of the reaction emoji (underneath the message) will persist.
I can reproduce the issue if we move MiniReportActionContextMenu above the UnreadActionIndicator, but not if we place it below it.

@parasharrajat
Copy link
Member

So if we keep userSelectNone on emojis then the triple select will select the reactions from the message, and if we remove it then selecting the messages via cursor will select the reactions as well.

Seems like both paths have an issue. IMO, userSelectNone should not be the root cause for triple selection. Did we have this discussion somewhere? Can you please share the link here if any?

What if we refactor the Reaction UI in a way that prevents it from quick selection?

@Ollyws
Copy link
Contributor Author

Ollyws commented May 15, 2023

@parasharrajat

So if we keep userSelectNone on emojis then the triple select will select the reactions from the message, and if we remove it then selecting the messages via cursor will select the reactions as well.

Correct.

The only discussion we had is the one I linked.

What if we refactor the Reaction UI in a way that prevents it from quick selection?

One potential solution is to put an empty View with a height and width of 1px above the EmojiReactionBubbles. It can be positioned absolutely so it doesn't affect the layout.

@parasharrajat
Copy link
Member

I don't think that is a good idea. Let's not worry about that issue for now. That can be handled separately. Do we have a GH issue for this already?

@parasharrajat
Copy link
Member

Please update me when changes are done.

@Ollyws
Copy link
Contributor Author

Ollyws commented May 16, 2023

@parasharrajat Updated. Prettier also made some aesthetic changes to the code.

@Ollyws
Copy link
Contributor Author

Ollyws commented May 16, 2023

@parasharrajat Did you want me to move MiniReportActionContextMenu or should we fix all selection issues seperately?

@parasharrajat
Copy link
Member

I think we should do MiniMenu change as it is not causing issues.

@Ollyws
Copy link
Contributor Author

Ollyws commented May 16, 2023

@parasharrajat Ok, updated.

@marcochavezf
Copy link
Contributor

Conflict issue

@parasharrajat
Copy link
Member

Testing...

Copy link
Member

@parasharrajat parasharrajat left a comment

Choose a reason for hiding this comment

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

LGTM.

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 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.

@marcochavezf

🎀 👀 🎀 C+ reviewed

@parasharrajat
Copy link
Member

bump @marcochavezf

@marcochavezf marcochavezf merged commit 8a3d79c into Expensify:main May 19, 2023
@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

🚀 Deployed to staging by https://github.com/marcochavezf in version: 1.3.17-0 🚀

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

@mvtglobally
Copy link

@Ollyws @parasharrajat @marcochavezf Team is still able to repro the issue on Desktop

Screen.Recording.2023-05-23.at.6.23.26.PM.mov

@Ollyws
Copy link
Contributor Author

Ollyws commented May 24, 2023

@mvtglobally Strange, I can't reproduce. It's working fine on mine with the latest main:

norepro.mp4

@mvtglobally
Copy link

no longer repro on our side as well. Checking it off

@parasharrajat
Copy link
Member

It might be a browser cache. Happens sometimes.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.17-5 🚀

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

@Ollyws Ollyws deleted the fix2-15194 branch May 30, 2023 14:52
{` ${props.translate('reportActionCompose.edited')}`}
<Text
selectable={false}
style={[styles.w1, styles.userSelectNone]}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Because we didn't set a line height for this Text, it caused a regression here.

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.

6 participants