fix emoji anchor text with hyperlink

Expensify · May 16, 2023 · a554878 · a554878
1 parent 3cdaa94
commit a554878
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/__tests__/ExpensiMark-HTML-test.js b/__tests__/ExpensiMark-HTML-test.js
@@ -710,3 +710,9 @@ test('Test for link with no content', () => {
     const resultString = '[  ](<a href="https://www.link.com" target="_blank" rel="noreferrer noopener">www.link.com</a>)';
     expect(parser.replace(testString)).toBe(resultString);
 });
+
+test('Test for link with emoji', () => {
+    const testString = '[😀](www.link.com)';
+    const resultString = '[😀](<a href="https://www.link.com" target="_blank" rel="noreferrer noopener">www.link.com</a>)';
+    expect(parser.replace(testString)).toBe(resultString);
+});
diff --git a/lib/CONST.jsx b/lib/CONST.jsx
@@ -331,6 +331,13 @@ export const CONST = {
          * @type String
          */
         MARKDOWN_EMAIL: "([a-zA-Z0-9.!#$%&'+/=?^`{|}-][a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]*@[a-zA-Z0-9-]+?(\\.[a-zA-Z]+)+)",
+
+        /**
+         * Regex matching an text containing an Emoji
+         *
+         * @type RegExp
+         */
+        EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,
     },
 
     REPORT: {

diff --git a/lib/ExpensiMark.js b/lib/ExpensiMark.js
@@ -83,7 +83,7 @@ export default class ExpensiMark {
                 // We use a function here to check if there is already a https:// on the link.
                 // If there is not, we force the link to be absolute by prepending '//' to the target.
                 replacement: (match, g1, g2, g3) => {
-                    if (!g1.trim()) {
+                    if (g1.match(CONST.REG_EXP.EMOJIS) || !g1.trim()) {
                         return match;
                     }