Fix for: Web - Triple clicking an edited message select’s the (edited) label along with the actual message #17704

Ollyws · 2023-04-20T08:41:21Z

Details

Fixed Issues

$ #15194
PROPOSAL: #15194 (comment)

Tests

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

Verify that no errors appear in the JS console

Offline tests

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

QA Steps

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

Verify that no errors appear in the JS console

PR Author Checklist

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

MelvinBot · 2023-04-20T08:41:27Z

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

Ollyws · 2023-04-20T08:56:18Z

@parasharrajat @marcochavezf
I have applied the changes I outlined here, to ensure it works correctly on firefox and also fixes this issue.

The horizontal alignment of the label (when not using EditedRenderer) is slightly different than on production. It can be easily fixed by changing the width style of the space (currently 4px), to 3px. However I thought I would check with you guys as it seems like it was unintentional to have the labels from EditedRenderer and ReportActionItemFragment with a different alignment, and mirroring this mis-alignment for the sake of consistency with production seemed potentially undesirable.

Also there is the issue where when selecting and copying the (edited) label with triple click causes the issues seen in #15810 to persist, however (although potentially out of scope for this issue) I outlined a potential simple fix for this here and fix for the reaction emojis being copied here.

marcochavezf · 2023-04-20T15:57:33Z

However I thought I would check with you guys as it seems like it was unintentional to have the labels from EditedRenderer and ReportActionItemFragment with a different alignment, and mirroring this mis-alignment for the sake of consistency with production seemed potentially undesirable.

Hi @Ollyws, could you take screenshots of how these elements are misaligned? Those elements were probably implemented separately before; if that's the case, I agree we should fix them.

marcochavezf · 2023-04-20T15:57:41Z

Also there is the issue where when selecting and copying the (edited) label with triple click causes the issues seen in #15810 to persist, however (although potentially out of scope for this issue) I outlined a potential simple fix for this #15194 (comment) and fix for the reaction emojis being copied #15194 (comment).

Could you include those fixes in this PR too?

parasharrajat · 2023-04-20T15:59:42Z

Yes, can you share the screenshots to clarify.

parasharrajat · 2023-04-20T16:00:11Z

src/pages/home/report/ReportActionItemFragment.js

                    >
-                        {` ${props.translate('reportActionCompose.edited')}`}
+                        <Text style={styles.w1}>{' '}</Text>


I see same as EditedRenderer. Correct?

@parasharrajat This is necessary for our solution to work on Firefox and also fixes this problem with overflow.
Yes, correct the same code as EditedRenderer.

How does this work?

I think the way Firefox deals with selection using flex, having a <span> between the two pieces of text stops them from both being selected at once.
It's a similar principle that causes them to break onto a second line properly.

This has a drawback where the edited label does not start from the start of the line.

Any thoughts?

@parasharrajat I'm having a look at it, but I'm not sure there is any easy solution. Do you think it is a big issue?
We could do something like setting the space width to 0px and adding margin-right on the preceding text, but that changes where the preceding text breaks.

What do you think @marcochavezf?

Ollyws · 2023-04-20T16:25:45Z

Hi @Ollyws, could you take screenshots of how these elements are misaligned? Those elements were probably implemented separately before; if that's the case, I agree we should fix them.

@marcochavezf Here's the difference between EditedRenderer and ReportActionItemFragment on production. It's only a 1px difference so hardly noticable. But they both have even values in this PR.

Ollyws · 2023-04-20T16:41:14Z

@parasharrajat @marcochavezf These two commits should fix #15810 which in our case is triple click selection which selects the (edited) label and also copies the reaction emojis.
Removing userSelectNone will ofcourse allow the user to select the reaction emojis by dragging, I hope this is acceptable.

marcochavezf · 2023-04-20T16:50:58Z

@marcochavezf Here's the difference between EditedRenderer and ReportActionItemFragment on production. It's only a 1px difference so hardly noticable. But they both have even values in this PR.

Oh that's fine, the difference is pretty minor

marcochavezf · 2023-04-21T18:33:17Z

Hi @Ollyws could you resolve the conflict with ReportActionItem?

Ollyws · 2023-04-21T18:48:00Z

@marcochavezf All done.

marcochavezf · 2023-04-21T18:52:05Z

Thanks @Ollyws, @parasharrajat let's review this one asap to keep our WAQ goal 🚀

parasharrajat · 2023-04-21T19:55:33Z

I will do that as soon. Currently working on an internal PR which is urgent.

Ollyws · 2023-04-22T08:45:13Z

@marcochavezf @parasharrajat I made these changes to stop it throwing an error on iOS, note we already do the same thing with many other styles. Hope this is OK.

Ollyws · 2023-04-25T09:43:07Z

@parasharrajat Any thoughts?

parasharrajat · 2023-04-25T13:27:33Z

Gonna check this today before EOD.

Ollyws · 2023-04-27T08:18:17Z

Gonna check this today before EOD.

@parasharrajat Any progress.....?

parasharrajat · 2023-04-27T11:14:07Z

I am away for 3:30 hrs. Then I will start the review process here.

parasharrajat · 2023-04-27T11:15:21Z

src/pages/home/report/ReportActionItem.js

+                            <MiniReportActionContextMenu
+                                reportID={this.props.report.reportID}
+                                reportAction={this.props.action}
+                                isArchivedRoom={ReportUtils.isArchivedRoom(this.props.report)}
+                                displayAsGroup={this.props.displayAsGroup}
+                                isVisible={
+                                    hovered
+                                    && !this.props.draftMessage
+                                }
+                                draftMessage={this.props.draftMessage}
+                                isChronosReport={ReportUtils.chatIncludesChronos(this.props.report)}
+                            />


Why the refactor?

Moving this to the top of the view changes its position in the DOM to be first (which makes sense since visually it is at the top). This means it won't be selected on triple-click as it is no longer after the (edited) label. This resolves the MiniReportActionContextMenu part of #15810

I am fine with it as it does not logically change anything.

parasharrajat · 2023-05-01T10:35:45Z

src/components/Reactions/EmojiReactionBubble.js

@@ -68,7 +68,6 @@ const EmojiReactionBubble = (props) => {
        >
            <Text style={[
                styles.emojiReactionBubbleText,
-                styles.userSelectNone,


Checking on it where it was added originally.

@Ollyws Which part does this fix?

@parasharrajat it fixes copying the emoji reaction.

Which one is Context or Underneath the message?

@parasharrajat Underneath the message.

@Ollyws Ah I see, In case we don’t want the emojis to be selectable or copiable , this PR #18228 will handle that case.

It means that this change will be against #18228 as that PR uses userSelect:none.

I think this change is not needed for the current issue and is delaying the PR. I don't want anyone to be penalized for figuring this out on this PR.

So should we remove this change and merge as it is @marcochavezf?

@parasharrajat It seems #18228 will fix the problem that us removing userSelectNone is meant to solve. So it makes sense to revert the removal of userSelectNone.
Also changing the position of the context-menu will also be unnecessary, that PR fixes all of it.

Yes please revert it. @Ollyws

parasharrajat · 2023-05-01T10:40:12Z

src/styles/utilities/dInlineFlex/index.native.js

@@ -0,0 +1 @@
+export default {};


The problem with this code is inconsistency. It looks incorrect that inline-flex is null on native.

The proper way would be:

Directly define this in the display.js as a new rule.

Where we have to switch the styles based on the platform and create a new function that decides which styles go where.

So a new function|lib editedlabelStyles can be created.

@parasharrajat Ok I see, could you point me at some code where we already do something like this so I have something to go on? I'm slightly confused about the implementation. Thanks.

You can do following

move display:inline-flex to the display.js as a new rule.

Create a new folder somewhere named editedlabelStyles. Created two child files index.native.js and index.js.

export objects from these files. Add dInlineFlex to the index.js file.

Now import and use this lib where needed.

Ollyws · 2023-05-01T12:29:41Z

@parasharrajat Updated.

Ollyws · 2023-05-02T08:57:16Z

@parasharrajat @marcochavezf Reverted these two commits because the emoji copying issue will be solved by #18228

parasharrajat · 2023-05-02T09:17:25Z

@Ollyws I would say that you put back the MiniReportActionContextMenu change as it does not affect anything but solves a bug. It is good if #18228 make is future-proof.

let me know if you disagree.

parasharrajat · 2023-05-02T09:19:00Z

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

Ollyws · 2023-05-02T09:24:51Z

@parasharrajat Ok, moved it back.

parasharrajat · 2023-05-02T11:20:32Z

src/pages/home/report/ReportActionItemFragment.js

                    >
-                        {` ${props.translate('reportActionCompose.edited')}`}
+                        <Text style={styles.w1}>{' '}</Text>


Another issue with this change is that this space is selectable via triple click.

triple click on only the space and notice that it is selectable.

Can we just replace it with a margin?

@parasharrajat We could just add userSelectNone to prevent selection on triple click. Note: in this PR it will also copy the space but when #18228 is merged it shouldn't.
I'm concerned how removing the space would affect the original intention of adding it.

Ok, let's add that.

Ollyws · 2023-05-02T13:02:01Z

@parasharrajat Updated.

parasharrajat

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.

cc: @marcochavezf

🎀 👀 🎀 C+ reviewed

parasharrajat · 2023-05-02T15:31:59Z

There are a couple of questions above @marcochavezf in the review comments. Apart from these, I think it is working well. There are cases where triple click still selects extra elements but that is outside the scope of this PR and there are already PR that are trying to solve that.

marcochavezf · 2023-05-02T18:23:24Z

Yeah, I agree the selection of extra elements is not part of the scope of the PR. Also, I don't think there's a problem with the current platform file usage in the PR. Eventually, if we identify an issue, we should solve all the instances of platform file usage.

marcochavezf

Thanks guys! 🚀

OSBotify · 2023-05-03T00:07:11Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 1.3.9-12 🚀

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

Ollyws · 2023-05-04T15:20:04Z

@marcochavezf @parasharrajat Unsure about the procedure here as it's the first time I've had a PR reverted. We decided to keep the change of MiniReportActionContextMenu just for good measure, although it's not necessary.
We can remove it without any problems which will solve the issue that caused the deploy blocker.

OSBotify · 2023-05-09T04:07:07Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.12-0 🚀

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

Ollyws added 3 commits April 20, 2023 09:31

Mirror text layout from EditedRenderer

0951986

Added dInlineFlex style

861fc7c

Add alignItemsBaseline,dInlineFlex to edited label

18274bd

Ollyws requested a review from a team as a code owner April 20, 2023 08:41

melvin-bot bot requested review from marcochavezf and parasharrajat and removed request for a team April 20, 2023 08:41

parasharrajat reviewed Apr 20, 2023

View reviewed changes

Ollyws added 2 commits April 20, 2023 17:39

Moved MiniReportActionContextMenu to top of view

93f3662

Removed userSelectNone from emoji text

45646d5

Merge branch 'main' into fix-15194

2619a9b

Added dInlineFlex index/index.native

db83d74

parasharrajat reviewed Apr 27, 2023

View reviewed changes

parasharrajat reviewed May 1, 2023

View reviewed changes

parasharrajat suggested changes May 1, 2023

View reviewed changes

Added editedLabelStyles

fcf4630

parasharrajat mentioned this pull request May 2, 2023

[HOLD for payment 2023-05-26] [$4000] Web - Triple clicking an edited message select’s the (edited) label along with the actual message #15194

Closed

6 tasks

Ollyws added 2 commits May 2, 2023 09:51

Revert remove userSelectNone

a994917

Revert move MiniReportActionContextMenu

133d4d5

Move MiniReportActionContextMenu to top of view

7633f88

parasharrajat reviewed May 2, 2023

View reviewed changes

Added userSelectNone to space Text

44bbe3c

parasharrajat approved these changes May 2, 2023

View reviewed changes

marcochavezf approved these changes May 2, 2023

View reviewed changes

marcochavezf merged commit da1f5ff into Expensify:main May 2, 2023

OSBotify mentioned this pull request May 2, 2023

Deploy Checklist: New Expensify 2023-05-02 #18315

Closed

marcaaron mentioned this pull request May 3, 2023

Deploy Checklist: New Expensify 2023-05-02 #18322

Closed

59 tasks

bernhardoj mentioned this pull request May 3, 2023

[$1000] The strikethrough on the "edited" label is not visible for Code Blocks, Quotes, and Headings when an edited message was deleted in offline mode on mobile apps. #18042

Closed

6 tasks

This was referenced May 3, 2023

New marker line overlaps on the context menu items when marking a message as "unread" #18358

Closed

Revert "Fix for: Web - Triple clicking an edited message select’s the (edited) label along with the actual message" #18360

Merged

Ollyws mentioned this pull request May 4, 2023

Fix Edited Line Through Alignment #17781

Merged

56 tasks

parasharrajat mentioned this pull request May 7, 2023

[HOLD for payment 2023-06-07] [$1000] The horizontal line (for deleted message) is not in the center for the text 'edited' but is center for the 'chat messages' on web chrome (offline mode) #17181

Closed

6 tasks

Fix for: Web - Triple clicking an edited message select’s the (edited) label along with the actual message #17704

Fix for: Web - Triple clicking an edited message select’s the (edited) label along with the actual message #17704

Conversation

Ollyws commented Apr 20, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

MelvinBot commented Apr 20, 2023

Ollyws commented Apr 20, 2023 • edited Loading

marcochavezf commented Apr 20, 2023

marcochavezf commented Apr 20, 2023

parasharrajat commented Apr 20, 2023

Choose a reason for hiding this comment

parasharrajat Apr 20, 2023 • edited Loading

Choose a reason for hiding this comment

Ollyws Apr 20, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ollyws Apr 20, 2023 • edited Loading

Choose a reason for hiding this comment

parasharrajat May 1, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ollyws May 1, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ollyws commented Apr 20, 2023 • edited Loading

Ollyws commented Apr 20, 2023 • edited Loading

marcochavezf commented Apr 20, 2023

marcochavezf commented Apr 21, 2023

Ollyws commented Apr 21, 2023

marcochavezf commented Apr 21, 2023

parasharrajat commented Apr 21, 2023

Ollyws commented Apr 22, 2023

Ollyws commented Apr 25, 2023

parasharrajat commented Apr 25, 2023

Ollyws commented Apr 27, 2023

parasharrajat commented Apr 27, 2023

Choose a reason for hiding this comment

Ollyws Apr 27, 2023 • edited Loading

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

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

Ollyws May 2, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ollyws May 1, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ollyws commented May 1, 2023

Ollyws commented May 2, 2023 • edited Loading

parasharrajat commented May 2, 2023 • edited Loading

parasharrajat commented May 2, 2023 • edited Loading

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Desktop

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

Ollyws commented May 2, 2023

Choose a reason for hiding this comment

Ollyws May 2, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ollyws commented May 2, 2023

parasharrajat left a comment

Choose a reason for hiding this comment

Ollyws commented Apr 20, 2023 •

edited

Loading

Ollyws commented Apr 20, 2023 •

edited

Loading

parasharrajat Apr 20, 2023 •

edited

Loading

Ollyws Apr 20, 2023 •

edited

Loading

Ollyws Apr 20, 2023 •

edited

Loading

parasharrajat May 1, 2023 •

edited

Loading

Ollyws May 1, 2023 •

edited

Loading

Ollyws commented Apr 20, 2023 •

edited

Loading

Ollyws commented Apr 20, 2023 •

edited

Loading

Ollyws Apr 27, 2023 •

edited

Loading

Ollyws May 2, 2023 •

edited

Loading

Ollyws May 1, 2023 •

edited

Loading

Ollyws commented May 2, 2023 •

edited

Loading

parasharrajat commented May 2, 2023 •

edited

Loading

parasharrajat commented May 2, 2023 •

edited

Loading

Ollyws May 2, 2023 •

edited

Loading