Merge pull request #26507 from Thanos30/thanos/emoji-suggestions-adju…

…stments Emoji Suggestions Adjustments + Remove Duplicates
Expensify · Sep 11, 2023 · d497e86 · d497e86
2 parents ea3d575 + f47d363
commit d497e86
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 13 deletions.
diff --git a/src/libs/EmojiTrie.js b/src/libs/EmojiTrie.js
@@ -18,26 +18,40 @@ function createTrie(lang = CONST.LOCALES.DEFAULT) {
             return;
         }
 
-        const name = isDefaultLocale ? item.name : _.get(langEmojis, [item.code, 'name']);
-        const names = isDefaultLocale ? [name] : [...new Set([name, item.name])];
-        _.forEach(names, (nm) => {
-            const node = trie.search(nm);
-            if (!node) {
-                trie.add(nm, {code: item.code, types: item.types, name: nm, suggestions: []});
-            } else {
-                trie.update(nm, {code: item.code, types: item.types, name: nm, suggestions: node.metaData.suggestions});
-            }
-        });
+        const englishName = item.name;
+        const localeName = _.get(langEmojis, [item.code, 'name'], englishName);
 
+        const node = trie.search(localeName);
+        if (!node) {
+            trie.add(localeName, {code: item.code, types: item.types, name: localeName, suggestions: []});
+        } else {
+            trie.update(localeName, {code: item.code, types: item.types, name: localeName, suggestions: node.metaData.suggestions});
+        }
+
+        // Add keywords for both the locale language and English to enable users to search using either language.
         const keywords = _.get(langEmojis, [item.code, 'keywords'], []).concat(isDefaultLocale ? [] : _.get(localeEmojis, [CONST.LOCALES.DEFAULT, item.code, 'keywords'], []));
         for (let j = 0; j < keywords.length; j++) {
             const keywordNode = trie.search(keywords[j]);
             if (!keywordNode) {
-                trie.add(keywords[j], {suggestions: [{code: item.code, types: item.types, name}]});
+                trie.add(keywords[j], {suggestions: [{code: item.code, types: item.types, name: localeName}]});
             } else {
                 trie.update(keywords[j], {
                     ...keywordNode.metaData,
-                    suggestions: [...keywordNode.metaData.suggestions, {code: item.code, types: item.types, name}],
+                    suggestions: [...keywordNode.metaData.suggestions, {code: item.code, types: item.types, name: localeName}],
+                });
+            }
+        }
+
+        // If current language isn't the default, prepend the English name of the emoji in the suggestions as well.
+        // We do this because when the user types the english name of the emoji, we want to show the emoji in the suggestions before all the others.
+        if (!isDefaultLocale) {
+            const englishNode = trie.search(englishName);
+            if (!englishNode) {
+                trie.add(englishName, {suggestions: [{code: item.code, types: item.types, name: localeName}]});
+            } else {
+                trie.update(englishName, {
+                    ...englishNode.metaData,
+                    suggestions: [{code: item.code, types: item.types, name: localeName}, ...englishNode.metaData.suggestions],
                 });
             }
         }

diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
@@ -319,7 +319,16 @@ function replaceEmojis(text, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE,
     }
     for (let i = 0; i < emojiData.length; i++) {
         const name = emojiData[i].slice(1, -1);
-        const checkEmoji = trie.search(name);
+        let checkEmoji = trie.search(name);
+        // If the user has selected a language other than English, and the emoji doesn't exist in that language,
+        // we will check if the emoji exists in English.
+        if (lang !== CONST.LOCALES.DEFAULT && (!checkEmoji || !checkEmoji.metaData.code)) {
+            const englishTrie = emojisTrie[CONST.LOCALES.DEFAULT];
+            if (englishTrie) {
+                const englishEmoji = englishTrie.search(name);
+                checkEmoji = englishEmoji;
+            }
+        }
         if (checkEmoji && checkEmoji.metaData.code) {
             let emojiReplacement = getEmojiCodeWithSkinColor(checkEmoji.metaData, preferredSkinTone);
             emojis.push({