Update regex to split leftword and prefix to highlight #17551

dukenv0307 · 2023-04-18T01:47:25Z

Details

The emoji suggestion is not highlighted if the cursor is before another emoji and the emoji suggestion is not displayed when before is another emoji. To fix it we update regex to split left word and prefix to highlight

Fixed Issues

$ #16626
PROPOSAL: #16626 (comment)

Tests

Go to any report, and try to add emoji using shorthand suggestions. Ex: :Smile
Move the cursor in front of that emoji, and try to type another emoji.
Verify that the emoji text is highlighted in the emoji suggestion popup.
Move the cursor right after an emoji, and try to type another emoji.
Verify that the emoji suggestion still displays

Verify that no errors appear in the JS console

Offline tests

Same above

QA Steps

Go to any report, and try to add emoji using shorthand suggestions. Ex: :Smile
Move the cursor in front of that emoji, and try to type another emoji.
Verify that the emoji text is highlighted in the emoji suggestion popup.
Move the cursor right after an emoji, and try to type another emoji.
Verify that the emoji suggestion still displays

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screen.Recording.2023-04-18.at.08.39.30.mov

Mobile Web - Chrome

Screen.Recording.2023-04-18.at.08.41.17.mov

Mobile Web - Safari

Screen.Recording.2023-04-18.at.08.43.59.mov

Desktop

Screen.Recording.2023-04-18.at.08.46.35.mov

iOS

Screen.Recording.2023-04-18.at.09.04.51.mp4

Android

Screen.Recording.2023-04-18.at.09.45.27.mp4

MelvinBot · 2023-04-18T01:48:07Z

@PauloGasparSv @Santhosh-Sellavel 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]

PauloGasparSv · 2023-04-18T18:01:54Z

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

Mobile Web - Chrome

Screen.Recording.2023-04-24.at.16.14.13.mov

Mobile Web - Safari

ios.mWeb.mov

Desktop

Desktop.mov

iOS

Screen.Recording.2023-04-24.at.16.20.44.mov

Android

Android.mov

PauloGasparSv · 2023-04-18T18:04:45Z

src/CONST.js

@@ -991,7 +991,7 @@ const CONST = {
        CODE_2FA: /^\d{6}$/,
        ATTACHMENT_ID: /chat-attachments\/(\d+)/,
        HAS_COLON_ONLY_AT_THE_BEGINNING: /^:[^:]+$/,
-        NEW_LINE_OR_WHITE_SPACE: /[\n\s]/g,
+        NEW_LINE_OR_WHITE_SPACE_OR_EMOJI: /([\uD800-\uDBFF][\uDC00-\uDFFF]|[\n\s])/g,


Hey @dukenv0307 I was curious in the proposal too about this, how did you come up with this regex?
I tried searching the web real quick here and didn't find a standard regex for checking for emojis

PauloGasparSv · 2023-04-18T18:36:27Z

Hey @dukenv0307 I think the feature isn't working correctly for some emojis (e.g. the spider web 🕸️ and spider 🕷️) , can you take a look at that?

Screen.Recording.2023-04-18.at.15.29.59.mov

Santhosh-Sellavel · 2023-04-18T21:00:08Z

Can you remove Fix/16626: from title @dukenv0307

dukenv0307 · 2023-04-19T03:08:20Z

@PauloGasparSv @Santhosh-Sellavel I see that we just had a regex to check emojis

App/src/CONST.js

Line 922 in f54a8bd

    
           EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,

I just updated my PR to use above regex and test again with :spider and :spider_web, It works well

Santhosh-Sellavel · 2023-04-19T14:06:57Z

src/CONST.js

+        // eslint-disable-next-line no-misleading-character-class
+        NEW_LINE_OR_WHITE_SPACE_OR_EMOJI: /[\n\s\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,


Can't we substitute the variable instead of copy-paste two to avoid repeating Regex twice?

@Santhosh-Sellavel To resolve this problem, we can create new function to concat regex like this or we can split multiple time like this

It's confusing, please check how URL regex is formed here https://github.com/Expensify/expensify-common/blob/main/lib/Url.js

Thanks for pointing out that, in this PR, we need to insert \n\s (new line or space) to the checking emojis regex. So there are some problems, and I am trying to fix it

Cool, keep us updated

@Santhosh-Sellavel I just updated, help to review

Also tested again. It works well

dukenv0307 · 2023-04-20T09:31:30Z

src/CONST.js

-        // eslint-disable-next-line max-len, no-misleading-character-class
-        EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,
+        // eslint-disable-next-line no-misleading-character-class
+        EMOJIS: new RegExp(`${EMOJIS.source}`, 'g'),


The EMOJIS REGEX is the same as the old one

Santhosh-Sellavel · 2023-04-20T21:29:09Z

@dukenv0307 Unable to run Desktop App

dukenv0307 · 2023-04-21T11:42:58Z

I changed the PR to:

const EMOJIS = '[\\p{Extended_Pictographic}\\u200d\\u{1f1e6}-\\u{1f1ff}\\u{1f3fb}-\\u{1f3ff}\\u{e0020}-\\u{e007f}\\u20E3\\uFE0F]|[#*0-9]\\uFE0F?\\u20E3'
...
EMOJIS: new RegExp(EMOJIS, 'gu'),

It worked well on web/mweb/desktop, but I found the error on IOS native

Do you have any ideas @Santhosh-Sellavel ?

Santhosh-Sellavel · 2023-04-21T18:51:28Z

Looking back It's not a big thing to me, can we just revert back to where it was working? We don't want to make everything reusable.

@PauloGasparSv Are you fine with this?

dukenv0307 · 2023-04-22T03:08:05Z

@Santhosh-Sellavel @PauloGasparSv I just reverted back and the current code works well on all platforms.

PauloGasparSv · 2023-04-23T14:13:43Z

Can you guys test if the feature is working for you? I think it's broken here and the search only opens for the first emoji you type @dukenv0307 : /

Screen.Recording.2023-04-23.at.11.11.56.mov

src/pages/home/report/ReportActionCompose.js

Santhosh-Sellavel · 2023-04-24T18:23:55Z

This step could be improved

Go to any report, and try to type any emoji.

Go to any report, and try to add emoji using shorthand suggestions. Ex: :Smile

Santhosh-Sellavel · 2023-04-24T18:47: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 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 & Desktop

Screen.Recording.2023-04-24.at.11.55.50.PM.mov

Mobile Web - Chrome

Emoji_HIgh_mweb.mp4

Mobile Web - Safari & iOS

Simulator.Screen.Recording.-.iPhone.14.-.2023-04-25.at.00.12.32.mp4

Android

Screen_Recording_20230425_001412_New.Expensify.1.mp4

Santhosh-Sellavel

LGTM tests well!

Waiting for a small update on test steps here but not a blocker. So approving all you @PauloGasparSv

Santhosh-Sellavel · 2023-04-24T19:03:50Z

@PauloGasparSv I think the checklist failing this comment #17551 (comment)

Can remove this one or fill it thanks!

PauloGasparSv · 2023-04-24T19:05:24Z

I'm testing all platforms here so I'll fill it in a bit : )

PauloGasparSv

LGTM!

PauloGasparSv · 2023-04-24T19:23:11Z

This step could be improved

Go to any report, and try to type any emoji.

Go to any report, and try to add emoji using shorthand suggestions. Ex: :Smile

I also agree we should change the steps to explicitly mention the user needs to type in the word after a colon* : )
Can you please change that @dukenv0307

I'll merge it already!

Santhosh-Sellavel · 2023-04-24T19:25:10Z

@PauloGasparSv It's colon not comma 😄

PauloGasparSv · 2023-04-24T19:26:10Z

@PauloGasparSv It's colon not comma 😄

hahahaha you are right, sorry!

OSBotify · 2023-04-24T19:30: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-04-25T06:08:26Z

🚀 Deployed to staging by https://github.com/PauloGasparSv in version: 1.3.5-0 🚀

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

OSBotify · 2023-04-26T05:50:26Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.5-6 🚀

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

dukenv0307 added 2 commits April 18, 2023 08:19

fix: update regex to split leftword and update prefix to highlight

b798552

fix: update new regex

c6de1b5

dukenv0307 marked this pull request as ready for review April 18, 2023 01:48

dukenv0307 requested a review from a team as a code owner April 18, 2023 01:48

melvin-bot bot requested review from PauloGasparSv and Santhosh-Sellavel and removed request for a team April 18, 2023 01:48

dukenv0307 mentioned this pull request Apr 18, 2023

[HOLD for payment 2023-05-03] [$1000] Emoji suggestion doesn’t highlight the text in front of another emoji #16626

Closed

6 tasks

PauloGasparSv assigned dukenv0307 Apr 18, 2023

PauloGasparSv reviewed Apr 18, 2023

View reviewed changes

dukenv0307 changed the title ~~Fix/16626: Update regex to split leftword and prefix to highlight~~ Update regex to split leftword and prefix to highlight Apr 19, 2023

fix: update regex check emoji

b92a45f

Santhosh-Sellavel suggested changes Apr 19, 2023

View reviewed changes

dukenv0307 added 5 commits April 19, 2023 23:18

fix: not duplicate regex

66c1972

fix: merge main

362d5d1

fix: reset to old solution

7a9d5c8

fix: reset to old solution

a50d8ad

fix: not duplicate the emoji regex

2a30e38

dukenv0307 commented Apr 20, 2023

View reviewed changes

dukenv0307 added 2 commits April 21, 2023 16:29

fix: emoji error

b25597d

fix: remove empty line

6877ed1

fix: revert to old way

4b0b340

fix: merge main

dbdc370

Santhosh-Sellavel suggested changes Apr 23, 2023

View reviewed changes

src/pages/home/report/ReportActionCompose.js Outdated Show resolved Hide resolved

fix: typo

8455fbb

Santhosh-Sellavel approved these changes Apr 24, 2023

View reviewed changes

PauloGasparSv approved these changes Apr 24, 2023

View reviewed changes

PauloGasparSv merged commit acb4cc7 into Expensify:main Apr 24, 2023

OSBotify mentioned this pull request Apr 25, 2023

Deploy Checklist: New Expensify 2023-04-25 #17948

Closed

37 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update regex to split leftword and prefix to highlight #17551

Update regex to split leftword and prefix to highlight #17551

dukenv0307 commented Apr 18, 2023 •

edited

Loading

MelvinBot commented Apr 18, 2023

PauloGasparSv commented Apr 18, 2023 •

edited

Loading

PauloGasparSv Apr 18, 2023

PauloGasparSv commented Apr 18, 2023

Santhosh-Sellavel commented Apr 18, 2023

dukenv0307 commented Apr 19, 2023

Santhosh-Sellavel Apr 19, 2023

dukenv0307 Apr 19, 2023

Santhosh-Sellavel Apr 19, 2023

dukenv0307 Apr 19, 2023

Santhosh-Sellavel Apr 19, 2023

dukenv0307 Apr 20, 2023

dukenv0307 Apr 20, 2023

dukenv0307 Apr 20, 2023

Santhosh-Sellavel commented Apr 20, 2023

dukenv0307 commented Apr 21, 2023

Santhosh-Sellavel commented Apr 21, 2023 •

edited

Loading

dukenv0307 commented Apr 22, 2023

PauloGasparSv commented Apr 23, 2023

Santhosh-Sellavel commented Apr 24, 2023

Santhosh-Sellavel commented Apr 24, 2023

Santhosh-Sellavel left a comment

Santhosh-Sellavel commented Apr 24, 2023

PauloGasparSv commented Apr 24, 2023

PauloGasparSv left a comment

PauloGasparSv commented Apr 24, 2023 •

edited

Loading

Santhosh-Sellavel commented Apr 24, 2023

PauloGasparSv commented Apr 24, 2023

OSBotify commented Apr 24, 2023

OSBotify commented Apr 25, 2023

OSBotify commented Apr 26, 2023

		// eslint-disable-next-line no-misleading-character-class
		NEW_LINE_OR_WHITE_SPACE_OR_EMOJI: /[\n\s\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]\|[#*0-9]\uFE0F?\u20E3/gu,

Update regex to split leftword and prefix to highlight #17551

Update regex to split leftword and prefix to highlight #17551

Conversation

dukenv0307 commented Apr 18, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

MelvinBot commented Apr 18, 2023

PauloGasparSv commented Apr 18, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

Choose a reason for hiding this comment

PauloGasparSv commented Apr 18, 2023

Santhosh-Sellavel commented Apr 18, 2023

dukenv0307 commented Apr 19, 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Santhosh-Sellavel commented Apr 20, 2023

dukenv0307 commented Apr 21, 2023

Santhosh-Sellavel commented Apr 21, 2023 • edited Loading

dukenv0307 commented Apr 22, 2023

PauloGasparSv commented Apr 23, 2023

Santhosh-Sellavel commented Apr 24, 2023

Santhosh-Sellavel commented Apr 24, 2023

Reviewer Checklist

Screenshots/Videos

Santhosh-Sellavel left a comment

Choose a reason for hiding this comment

Santhosh-Sellavel commented Apr 24, 2023

PauloGasparSv commented Apr 24, 2023

PauloGasparSv left a comment

Choose a reason for hiding this comment

PauloGasparSv commented Apr 24, 2023 • edited Loading

Santhosh-Sellavel commented Apr 24, 2023

PauloGasparSv commented Apr 24, 2023

OSBotify commented Apr 24, 2023

OSBotify commented Apr 25, 2023

OSBotify commented Apr 26, 2023

dukenv0307 commented Apr 18, 2023 •

edited

Loading

PauloGasparSv commented Apr 18, 2023 •

edited

Loading

Santhosh-Sellavel commented Apr 21, 2023 •

edited

Loading

PauloGasparSv commented Apr 24, 2023 •

edited

Loading