From dc94d707b02842fad2656a4436da86de22277fdf Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Tue, 27 Dec 2022 21:42:58 +0100
Subject: [PATCH] fix: emoji replacement

---
 components/publish/PublishWidget.vue        |  2 +-
 composables/content-parse.ts                |  5 +++--
 composables/tiptap/emoji.ts                 |  9 ++++++++-
 package.json                                |  1 +
 pnpm-lock.yaml                              |  6 ++++++
 tests/__snapshots__/html-parse.test.ts.snap | 15 +++++++++++++++
 tests/html-parse.test.ts                    |  6 ++++++
 7 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue
index 484d8041..bdd84660 100644
--- a/components/publish/PublishWidget.vue
+++ b/components/publish/PublishWidget.vue
@@ -296,7 +296,7 @@ defineExpose({
             <button
               btn-action-icon
               :aria-label="$t('tooltip.toggle_code_block')"
-              :class="editor.isActive('codeBlock') ? 'op100' : 'op50'"
+              :class="editor.isActive('codeBlock') ? 'text-primary' : ''"
               @click="editor?.chain().focus().toggleCodeBlock().run()"
             >
               <div i-ri:code-s-slash-line />
diff --git a/composables/content-parse.ts b/composables/content-parse.ts
index 2549d4b7..59127e70 100644
--- a/composables/content-parse.ts
+++ b/composables/content-parse.ts
@@ -2,8 +2,9 @@
 import type { Emoji } from 'masto'
 import type { Node } from 'ultrahtml'
 import { TEXT_NODE, parse, render, walkSync } from 'ultrahtml'
+import createEmojiRegex from 'emoji-regex'
 
-export const EMOJI_REGEX = /(\p{Emoji_Presentation})/ug
+export const EMOJI_REGEX = createEmojiRegex()
 
 const decoder = process.client ? document.createElement('textarea') : null as any as HTMLTextAreaElement
 export function decodeHtml(text: string) {
@@ -25,7 +26,7 @@ export function parseMastodonHTML(html: string, customEmojis: Record<string, Emo
         ? `<img src="${emoji.url}" alt=":${name}:" class="custom-emoji" data-emoji-id="${name}" />`
         : `:${name}:`
     })
-    .replace(EMOJI_REGEX, '<em-emoji native="$1" />')
+    .replace(EMOJI_REGEX, '<em-emoji native="$&" fallback="$&" />')
 
   if (markdown) {
     // handle code blocks
diff --git a/composables/tiptap/emoji.ts b/composables/tiptap/emoji.ts
index eb2d00e4..c0f7be3f 100644
--- a/composables/tiptap/emoji.ts
+++ b/composables/tiptap/emoji.ts
@@ -24,6 +24,9 @@ export const Emoji = Node.create({
       native: {
         default: null,
       },
+      fallback: {
+        default: null,
+      },
     }
   },
 
@@ -38,6 +41,7 @@ export const Emoji = Node.create({
           type: this.name,
           attrs: {
             native: name,
+            fallback: name,
           },
         })
       },
@@ -51,7 +55,10 @@ export const Emoji = Node.create({
         type: this.type,
         getAttributes: (match) => {
           const [native] = match
-          return { native }
+          return {
+            native,
+            fallback: native,
+          }
         },
       }),
     ]
diff --git a/package.json b/package.json
index 358f89a5..80dc91d5 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
     "@vueuse/nuxt": "^9.9.0",
     "bumpp": "^8.2.1",
     "emoji-mart": "^5.4.0",
+    "emoji-regex": "^10.2.1",
     "eslint": "^8.30.0",
     "esno": "^0.16.3",
     "file-saver": "^2.0.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 542b7caf..245a3fb6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -38,6 +38,7 @@ specifiers:
   browser-fs-access: ^0.31.1
   bumpp: ^8.2.1
   emoji-mart: ^5.4.0
+  emoji-regex: ^10.2.1
   eslint: ^8.30.0
   esno: ^0.16.3
   file-saver: ^2.0.5
@@ -136,6 +137,7 @@ devDependencies:
   '@vueuse/nuxt': 9.9.0_nuxt@3.0.0
   bumpp: 8.2.1
   emoji-mart: 5.4.0
+  emoji-regex: 10.2.1
   eslint: 8.30.0
   esno: 0.16.3
   file-saver: 2.0.5
@@ -4845,6 +4847,10 @@ packages:
     resolution: {integrity: sha512-xrRrUmMqZG64oRxmUZcf8zSMUGQtIUYUL3aZD5iMkqAve+I9wMNh3OVOXL7NW9fEm48L2LI3BUPpj/DUIAJrVg==}
     dev: true
 
+  /emoji-regex/10.2.1:
+    resolution: {integrity: sha512-97g6QgOk8zlDRdgq1WxwgTMgEWGVAQvB5Fdpgc1MkNy56la5SKP9GsMXKDOdqwn90/41a8yPwIGk1Y6WVbeMQA==}
+    dev: true
+
   /emoji-regex/8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
     dev: true
diff --git a/tests/__snapshots__/html-parse.test.ts.snap b/tests/__snapshots__/html-parse.test.ts.snap
index a6284fc8..e5e74058 100644
--- a/tests/__snapshots__/html-parse.test.ts.snap
+++ b/tests/__snapshots__/html-parse.test.ts.snap
@@ -54,6 +54,21 @@ exports[`html-parse > custom emoji > html 1`] = `
 
 exports[`html-parse > custom emoji > text 1`] = `"Daniel Roe :nuxt:"`;
 
+exports[`html-parse > emojis > html 1`] = `
+"🇫🇷 👨<em-emoji native=\\"‍\\" fallback=\\"‍\\"></em-emoji>👩<em-emoji
+  native=\\"‍\\"
+  fallback=\\"‍\\"
+></em-emoji
+>👦 👩<em-emoji native=\\"‍\\" fallback=\\"‍\\"></em-emoji>🚒🧑🏽<em-emoji
+  native=\\"‍\\"
+  fallback=\\"‍\\"
+></em-emoji
+>🚀
+"
+`;
+
+exports[`html-parse > emojis > text 1`] = `"🇫🇷 👨‍👩‍👦 👩‍🚒🧑🏽‍🚀"`;
+
 exports[`html-parse > empty > html 1`] = `""`;
 
 exports[`html-parse > empty > text 1`] = `""`;
diff --git a/tests/html-parse.test.ts b/tests/html-parse.test.ts
index cd70365a..04c0a684 100644
--- a/tests/html-parse.test.ts
+++ b/tests/html-parse.test.ts
@@ -34,6 +34,12 @@ describe('html-parse', () => {
     expect(serializedText).toMatchSnapshot('text')
   })
 
+  it('emojis', async () => {
+    const { formatted, serializedText } = await render('🇫🇷 👨‍👩‍👦 👩‍🚒🧑🏽‍🚀')
+    expect(formatted).toMatchSnapshot('html')
+    expect(serializedText).toMatchSnapshot('text')
+  })
+
   it('code frame', async () => {
     // https://mas.to/@antfu/109396489827394721
     const { formatted, serializedText } = await render('<p>Testing code block</p><p>```ts<br />import { useMouse, usePreferredDark } from &#39;@vueuse/core&#39;</p><p>// tracks mouse position<br />const { x, y } = useMouse()</p><p>// is the user prefers dark theme<br />const isDark = usePreferredDark()<br />```</p>')