feat: update mention replacer regex #19004

allroundexperts · 2023-05-16T11:39:12Z

Details

This PR updates the mention replacer regex such that it does not replace the emoji's written next to the mention text.

Fixed Issues

$ #18867
PROPOSAL: #18867 (comment)

Tests

Open the ND app and go to any chat
Enter an emoji eg 😄 or a special character like '/'
Move the cursor beside the emoji (without the space) and enter @a such that a few mentions are shown
Click on any of the mention and verify that the emoji next to it stays visible

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Open the ND app and go to any chat.
Enter an emoji eg 😄 or a special character like '/'
Move the cursor beside the emoji (without the space) and enter @a such that a few mentions are shown
Click on any of the mention and verify that the emoji next to it stays visible

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screen.Recording.2023-05-16.at.4.20.34.PM.mov

Mobile Web - Chrome

Screen.Recording.2023-05-16.at.4.28.09.PM.mov

Mobile Web - Safari

Screen.Recording.2023-05-16.at.4.26.55.PM.mov

Desktop

Screen.Recording.2023-05-16.at.4.23.48.PM.mov

iOS

Screen.Recording.2023-05-16.at.4.30.37.PM.mov

Android

Screen.Recording.2023-05-16.at.4.36.43.PM.mov

melvin-bot · 2023-05-16T11:39:18Z

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

mananjadhav · 2023-05-17T17:01:08Z

src/CONST.js

@@ -1027,7 +1027,7 @@ const CONST = {
        EMOJI_REPLACER: /^:[^\n\r]+?(?=$|\s)/,

        // Define the regular expression pattern to match a string starting with an at sign and ending with a space or newline character
-        MENTION_REPLACER: /^@[^\n\r]*?(?=$|\s)/,
+        MENTION_REPLACER: /^@[^\n\r]*?(?=$|[\s\u2700-\u27BF]|[\uE000-\uF8FF]|\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDFFF]|[\u2011-\u26FF]|\uD83E[\uDD10-\uDDFF])/,


I am wondering what's the difference between this and other regex for Emojis. @allroundexperts can you please elaborate on the need for a new regex?

@allroundexperts did you get a chance to look at this comment?

cc - @Beamanator

@mananjadhav Thanks for the reminder. I was actually holding it off until this thread resolves. But I guess its taking time so I'll just proceed with this PR.

I used a new regex because of no particular reason. I agree that we should just re-use the one we have already. I'll replace this.

allroundexperts · 2023-05-18T20:12:16Z

@mananjadhav I've updated the regex such that it also includes the use case defined here.

mananjadhav · 2023-05-19T04:38:09Z

@allroundexperts it looks like we're using the same PR to fix two similar issues? Can we update the test steps to reflect that please?

allroundexperts · 2023-05-19T10:13:55Z

@mananjadhav Updated the steps.

Beamanator · 2023-05-22T08:18:58Z

Code is looking good, but @mananjadhav can you complete the checklist & screenshots please?

mananjadhav · 2023-05-22T08:40:23Z

I’ll do that today.

mananjadhav · 2023-05-22T09:55:17Z

@Beamanator I am just checking linked issue #19338 do we want to fix it here?

Beamanator · 2023-05-22T10:00:40Z

@mananjadhav if this change does fix that issue, great! If it doesn't but it's a super simple fix, I'd say let's go ahead and fix it here 👍

mananjadhav · 2023-05-22T10:22:24Z

@allroundexperts Can you please add a comma to your regex? that should cover the special characters cases for the linked issue.

allroundexperts · 2023-05-22T10:23:50Z

@allroundexperts Can you please add a comma to your regex? that should cover the special characters cases for the linked issue.

@mananjadhav Sure.

allroundexperts · 2023-05-22T14:13:50Z

@mananjadhav Updated.

mananjadhav · 2023-05-23T11:41:09Z

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.

Screenshots/Videos

Web

web-mention-replace-regex.mov

Mobile Web - Chrome

mweb-chrome-mention-replace-regex.mov

Mobile Web - Safari

mweb-safari-mention-replace-regex.mov

Desktop

desktop-mention-replace-regex.mov

iOS

ios-mention-replace-regex.mov

Android

android-mention-replace-regex.mov

My iOS simulator is running terribly slow. Apologies for the delay.

@Beamanator All yours.

Beamanator

LGTM 💪

OSBotify · 2023-05-23T14:49:49Z

✋ 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-05-25T00:35:18Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 1.3.18-0 🚀

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

OSBotify · 2023-05-25T01:08:50Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 1.3.18-0 🚀

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

OSBotify · 2023-05-25T01:30:46Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 1.3.18-0 🚀

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

OSBotify · 2023-05-26T07:07:58Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.3.18-2 🚀

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

fedirjh · 2023-11-22T16:04:39Z

src/CONST.js

+        MENTION_REPLACER:
+            // eslint-disable-next-line no-misleading-character-class
+            /^@[^\n\r]*?(?=$|[\s,/?"{}[\]()&^%$#<>!*\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3)/u,


This regex caused a regression in #29187 , more details #29187 (comment)

feat: update mention replacer regex

49469a8

allroundexperts requested a review from a team as a code owner May 16, 2023 11:39

melvin-bot bot requested review from Beamanator and mananjadhav and removed request for a team May 16, 2023 11:39

mananjadhav reviewed May 17, 2023

View reviewed changes

feat: unify the regex to be used

bfa2079

allroundexperts force-pushed the fix-18867 branch from b9cfe67 to bfa2079 Compare May 18, 2023 20:16

allroundexperts requested a review from mananjadhav May 18, 2023 20:17

feat: fix lint errors

ff6e3e8

dukenv0307 mentioned this pull request May 20, 2023

Using a comma after mention doesn't display the blue highlight (but still recommendation is shown) #19338

Closed

6 tasks

mananjadhav previously approved these changes May 21, 2023

View reviewed changes

allroundexperts added 2 commits May 22, 2023 19:11

Merge branch 'main' into fix-18867

fd5fed4

feat: add comma in mention replacer regex

55eb406

allroundexperts dismissed mananjadhav’s stale review via 55eb406 May 22, 2023 14:13

allroundexperts requested a review from mananjadhav May 22, 2023 20:22

mananjadhav approved these changes May 23, 2023

View reviewed changes

Beamanator approved these changes May 23, 2023

View reviewed changes

Beamanator merged commit 5e99de8 into Expensify:main May 23, 2023

OSBotify mentioned this pull request May 25, 2023

Deploy Checklist: New Expensify 2023-05-25 #19565

Closed

53 tasks

kbecciv mentioned this pull request Jun 7, 2023

[HOLD for payment 2023-07-05] [$1000] Web - Chat - Mention list doesn't display when enter special key: '_-+=|\;`~ before: #20401

Closed

6 tasks

eVoloshchak mentioned this pull request Jul 13, 2023

[$1000] Mentioned list is not showing with display name with & in between #22375

Closed

6 tasks

paultsimura mentioned this pull request Oct 3, 2023

[HOLD for payment 2023-10-25] [$500] Chat - App closes mention suggestions when cursor is between double @ #28754

Closed

6 tasks

conorpendergrast mentioned this pull request Oct 26, 2023

[HOLD for payment 2023-11-22] [$500] Chat - App does not replace # on selection of mention #29187

Closed

6 tasks

fedirjh reviewed Nov 22, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: update mention replacer regex #19004

feat: update mention replacer regex #19004

allroundexperts commented May 16, 2023 •

edited

Loading

melvin-bot bot commented May 16, 2023

mananjadhav May 17, 2023

mananjadhav May 18, 2023

allroundexperts May 18, 2023

allroundexperts commented May 18, 2023

mananjadhav commented May 19, 2023

allroundexperts commented May 19, 2023

Beamanator commented May 22, 2023

mananjadhav commented May 22, 2023

mananjadhav commented May 22, 2023

Beamanator commented May 22, 2023

mananjadhav commented May 22, 2023

allroundexperts commented May 22, 2023

allroundexperts commented May 22, 2023

mananjadhav commented May 23, 2023 •

edited

Loading

Beamanator left a comment

OSBotify commented May 23, 2023

OSBotify commented May 25, 2023

OSBotify commented May 25, 2023

OSBotify commented May 25, 2023

OSBotify commented May 26, 2023

fedirjh Nov 22, 2023

feat: update mention replacer regex #19004

feat: update mention replacer regex #19004

Conversation

allroundexperts commented May 16, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 16, 2023

mananjadhav May 17, 2023

Choose a reason for hiding this comment

mananjadhav May 18, 2023

Choose a reason for hiding this comment

allroundexperts May 18, 2023

Choose a reason for hiding this comment

allroundexperts commented May 18, 2023

mananjadhav commented May 19, 2023

allroundexperts commented May 19, 2023

Beamanator commented May 22, 2023

mananjadhav commented May 22, 2023

mananjadhav commented May 22, 2023

Beamanator commented May 22, 2023

mananjadhav commented May 22, 2023

allroundexperts commented May 22, 2023

allroundexperts commented May 22, 2023

mananjadhav commented May 23, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

Beamanator left a comment

Choose a reason for hiding this comment

OSBotify commented May 23, 2023

OSBotify commented May 25, 2023

OSBotify commented May 25, 2023

OSBotify commented May 25, 2023

OSBotify commented May 26, 2023

fedirjh Nov 22, 2023

Choose a reason for hiding this comment

allroundexperts commented May 16, 2023 •

edited

Loading

mananjadhav commented May 23, 2023 •

edited

Loading