fix: issue with emoji and text parsed as emoji (#288)

FlorianWoelki · Nov 4, 2023 · 9a4332f · 9a4332f
1 parent ba81823
commit 9a4332f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/emoji.test.ts b/src/emoji.test.ts
@@ -32,5 +32,7 @@ describe('getShortcode', () => {
   it('should return `undefined` for invalid emojis', () => {
     expect(emoji.getShortcode('hello')).toBe(undefined);
     expect(emoji.getShortcode('123')).toBe(undefined);
+    expect(emoji.getShortcode('🤗 hello')).toBe(undefined);
+    expect(emoji.getShortcode('hello 🤗')).toBe(undefined);
   });
 });
diff --git a/src/emoji.ts b/src/emoji.ts
@@ -1855,15 +1855,12 @@ const shortNames: Record<string, string> = {
 };
 
 const isEmoji = (str: string): boolean => {
-  const ranges = [
-    '(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|[\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|[\ud83c[\ude32-\ude3a]|[\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])', // U+1F680 to U+1F6FF
-  ];
+  const emojiRegex =
+    /(\p{Emoji}|\p{Emoji_Presentation}|\p{Emoji_Modifier}|\p{Emoji_Modifier_Base}|\p{Emoji_Component}|\p{Extended_Pictographic})/gu;
+  const emojiMatches = str.match(emojiRegex);
+  const emojiString = emojiMatches ? emojiMatches.join('') : '';
 
-  if (str.match(ranges.join('|'))) {
-    return true;
-  } else {
-    return false;
-  }
+  return !/\d/.test(str) && emojiString === str;
 };
 
 /**