From 0e0c38b710cd3f2a8d387eac4db9aee94a5505fb Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Wed, 21 May 2025 19:06:53 +0700
Subject: [PATCH] Preserve space before emoticon emoji (#9011)

---
 .../src/components/extension/emoji.ts                      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/text-editor-resources/src/components/extension/emoji.ts b/plugins/text-editor-resources/src/components/extension/emoji.ts
index f79e1193b0..335cf0d172 100644
--- a/plugins/text-editor-resources/src/components/extension/emoji.ts
+++ b/plugins/text-editor-resources/src/components/extension/emoji.ts
@@ -44,8 +44,13 @@ function handleEmoji (
   if (!isValidEmojiPosition($from)) {
     return
   }
-  const emoji = getEmojiFunction(match.pop())
+
+  const emojiString = match.pop()
+  if (emojiString === undefined) return
+  const emoji = getEmojiFunction(emojiString)
   if (emoji === undefined) return
+  if (match.length > 0) range.from = range.to - emojiString.length + 1
+
   if (typeof emoji === 'string' || !isCustomEmoji(emoji)) {
     commands.insertContentAt(range, [
       {