Add support for Latin characters in emoji suggestion #39805

tienifr · 2024-04-08T09:48:23Z

Details

Composer does not auto complete or show suggestion and no results found in emoji picker when type emoji name with Latin characters. This PR fixes that.

Fixed Issues

$ #38549
PROPOSAL: #38549 (comment)

Tests

Change language to Spanish
Open emoji picker, search for a Latin emoji (e.g., corazón)
Verify emoji picker shows appropriate results
Type :emoji_name (without closing :) in the main composer to suggest a Latin emoji (e.g., corazón)
Verify emoji suggestions show appropriate results with correct text highlight
Type :emoji_name (without closing :) in the main composer to suggest the above emoji with its base characters (e.g., corazon)
Verify emoji suggestions show appropriate results with correct text highlight
Finish emoji suggestion by adding the closing : (e.g., :corazón:)
Verify the correct emoji is auto-completed in the composer (e.g., ❤️)

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Change language to Spanish
Open emoji picker, search for a Latin emoji (e.g., corazón)
Verify emoji picker shows appropriate results
Type :emoji_name (without closing :) in the main composer to suggest a Latin emoji (e.g., corazón)
Verify emoji suggestions show appropriate results with correct text highlight
Type :emoji_name (without closing :) in the main composer to suggest the above emoji with its base characters (e.g., corazon)
Verify emoji suggestions show appropriate results with correct text highlight
Finish emoji suggestion by adding the closing : (e.g., :corazón:)
Verify the correct emoji is auto-completed in the composer (e.g., ❤️)

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-04-08.at.17.49.40-compressed.mov

Android: mWeb Chrome

Screen.Recording.2024-04-08.at.17.48.05-compressed.mov

iOS: Native

Screen.Recording.2024-04-08.at.17.38.03-compressed.mov

iOS: mWeb Safari

Screen.Recording.2024-04-08.at.17.40.21-compressed.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-08.at.17.34.44-compressed.mov

MacOS: Desktop

Screen.Recording.2024-04-08.at.17.39.43-compressed.mov

melvin-bot · 2024-04-08T10:41:47Z

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

tienifr · 2024-04-08T10:42:42Z

I think we cannot use localeCompare here given the current implementation of Trie and localeCompare only shows us whether two strings are equal but sometimes we want to search for a substring.

tienifr · 2024-04-08T10:51:56Z

src/CONST.ts

@@ -1680,8 +1680,8 @@ const CONST = {
        // Extract attachment's source from the data's html string
        ATTACHMENT_DATA: /(data-expensify-source|data-name)="([^"]+)"/g,

-        EMOJI_NAME: /:[\w+-]+:/g,
-        EMOJI_SUGGESTIONS: /:[a-zA-Z0-9_+-]{1,40}$/,
+        EMOJI_NAME: /:[\p{L}0-9_+-]+:/gu,


This is used when auto-completing the emoji (:emoji_name:).

iwiznia

I think we cannot use localeCompare here given the current implementation of Trie and localeCompare only shows us whether two strings are equal but sometimes we want to search for a substring.

Let's discuss this in the issue

iwiznia

Small nitpick change

src/libs/StringUtils.ts

iwiznia · 2024-04-17T14:20:18Z

Why is 😍 showing before ❤️ ? The former is not an exact match, while the latter is, so I would expect the latter to show up first.

thesahindia · 2024-04-26T13:11:08Z

Why is 😍 showing before ❤️ ? The former is not an exact match, while the latter is, so I would expect the latter to show up first.

@tienifr, can you look into this?

tienifr · 2024-04-26T13:16:17Z

On it.

thesahindia · 2024-05-22T09:29:32Z

Bump @tienifr

tienifr · 2024-05-22T12:32:01Z

@thesahindia I'm sorry this got out of my radar for a while. The problem is that we did not add the accent-normalized version when directly adding to the trie:

App/src/libs/EmojiTrie.ts

Line 74 in e8ae3c5

    
           trie.add(localeName, {code: item.code, types: item.types, name: localeName, suggestions: []});

We also need to add this logic while updating the trie:

App/src/libs/EmojiTrie.ts

Line 41 in e8ae3c5

trie.update(keyword, {

App/src/libs/EmojiTrie.ts

Line 76 in e8ae3c5

    
           trie.update(localeName, {code: item.code, types: item.types, name: localeName, suggestions: node.metaData.suggestions});

thesahindia · 2024-05-22T15:35:57Z

src/libs/StringUtils.ts

- * Remove accents/diacritics
- * @param text - The input string
- * @returns The string with all accents/diacritics removed
- */


Let's keep some description for this @tienifr

bump @tienifr

thesahindia · 2024-05-24T14:20:31Z

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

thesahindia

Looks good!

marcaaron · 2024-05-28T21:32:53Z

Gonna duck out of this review since @iwiznia is reviewing and participated in the linked issue more than me.

OSBotify · 2024-05-30T21:53:23Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 1.4.77-11 🚀

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

OSBotify · 2024-05-30T22:29:53Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 1.4.77-11 🚀

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

OSBotify · 2024-05-30T23:10:43Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 1.4.78-0 🚀

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

OSBotify · 2024-05-30T23:22:57Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 1.4.78-0 🚀

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

OSBotify · 2024-05-30T23:56:27Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 1.4.78-2 🚀

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

OSBotify · 2024-05-31T00:25:52Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 1.4.78-2 🚀

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

OSBotify · 2024-06-04T13:55:55Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.78-5 🚀

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

tienifr added 3 commits April 8, 2024 15:36

add support for latin characters in emoji suggestion

2c9bc81

add original keyword to trie

723d365

add original keyword to trie

af77cbf

tienifr marked this pull request as ready for review April 8, 2024 10:41

tienifr requested a review from a team as a code owner April 8, 2024 10:41

melvin-bot bot requested review from thesahindia and removed request for a team April 8, 2024 10:41

tienifr mentioned this pull request Apr 8, 2024

[HOLD for payment 2024-06-11] [$500] Auto complete emojis does not pop up if a letter with tilde in spanish #38549

Closed

6 tasks

tienifr commented Apr 8, 2024

View reviewed changes

iwiznia requested changes Apr 9, 2024

View reviewed changes

Merge branch 'main' into fix/38549

896c57d

iwiznia requested changes Apr 17, 2024

View reviewed changes

src/libs/StringUtils.ts Show resolved Hide resolved

tienifr added 2 commits April 22, 2024 16:15

Merge branch 'main' of https://github.com/tienifr/App into fix/38549

958600f

Merge branch 'main' of https://github.com/tienifr/App into fix/38549

bddcdae

Merge branch 'main' of https://github.com/tienifr/App into fix/38549

8dbf217

tienifr added 2 commits May 22, 2024 17:39

Merge branch 'main' of https://github.com/tienifr/App into fix/38549

faf12e4

add and update normalized emoji in trie

166ecec

thesahindia reviewed May 22, 2024

View reviewed changes

add back comment

08ac2fa

thesahindia approved these changes May 24, 2024

View reviewed changes

melvin-bot bot requested a review from marcaaron May 24, 2024 14:21

Merge branch 'main' of https://github.com/tienifr/App into fix/38549

30fd7bb

marcaaron removed their request for review May 28, 2024 21:31

iwiznia approved these changes May 30, 2024

View reviewed changes

iwiznia merged commit a99ce82 into Expensify:main May 30, 2024
15 checks passed

github-actions bot mentioned this pull request May 30, 2024

Deploy Checklist: New Expensify 2024-05-30 #42872

Closed

95 tasks

github-actions bot mentioned this pull request May 30, 2024

Investigate workflow job failing on main: e2ePerformanceTests / Run E2E tests in AWS device farm #42880

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for Latin characters in emoji suggestion #39805

Add support for Latin characters in emoji suggestion #39805

tienifr commented Apr 8, 2024 •

edited

Loading

melvin-bot bot commented Apr 8, 2024

tienifr commented Apr 8, 2024

tienifr Apr 8, 2024

iwiznia left a comment

iwiznia left a comment

iwiznia commented Apr 17, 2024

thesahindia commented Apr 26, 2024

tienifr commented Apr 26, 2024

thesahindia commented May 22, 2024

tienifr commented May 22, 2024 •

edited

Loading

thesahindia May 22, 2024

thesahindia May 24, 2024

tienifr May 24, 2024

thesahindia commented May 24, 2024

thesahindia left a comment

marcaaron commented May 28, 2024

OSBotify commented May 30, 2024

OSBotify commented May 30, 2024

OSBotify commented May 30, 2024

OSBotify commented May 30, 2024

OSBotify commented May 30, 2024

OSBotify commented May 31, 2024

OSBotify commented Jun 4, 2024

Add support for Latin characters in emoji suggestion #39805

Add support for Latin characters in emoji suggestion #39805

Conversation

tienifr commented Apr 8, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 8, 2024

tienifr commented Apr 8, 2024

tienifr Apr 8, 2024

Choose a reason for hiding this comment

iwiznia left a comment

Choose a reason for hiding this comment

iwiznia left a comment

Choose a reason for hiding this comment

iwiznia commented Apr 17, 2024

thesahindia commented Apr 26, 2024

tienifr commented Apr 26, 2024

thesahindia commented May 22, 2024

tienifr commented May 22, 2024 • edited Loading

thesahindia May 22, 2024

Choose a reason for hiding this comment

thesahindia May 24, 2024

Choose a reason for hiding this comment

tienifr May 24, 2024

Choose a reason for hiding this comment

thesahindia commented May 24, 2024

Reviewer Checklist

Screenshots/Videos

thesahindia left a comment

Choose a reason for hiding this comment

marcaaron commented May 28, 2024

OSBotify commented May 30, 2024

OSBotify commented May 30, 2024

OSBotify commented May 30, 2024

OSBotify commented May 30, 2024

OSBotify commented May 30, 2024

OSBotify commented May 31, 2024

OSBotify commented Jun 4, 2024

tienifr commented Apr 8, 2024 •

edited

Loading

tienifr commented May 22, 2024 •

edited

Loading