fix: Cannot read properties of undefined (reading 'replace'), closes #…

…8123
outline · Dec 27, 2024 · f0fcb26 · f0fcb26
1 parent ad237a6
commit f0fcb26
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/shared/editor/lib/emoji.ts b/shared/editor/lib/emoji.ts
@@ -33,7 +33,7 @@ export const nameToEmoji: Record<string, string> = Object.values(
  * @returns The emoji character
  */
 export const getEmojiFromName = (name: string) =>
-  nameToEmoji[name.replace(/:/g, "")];
+  nameToEmoji[name.replace(/:/g, "")] ?? "?";
 
 /**
  * Get the emoji shortcode for a given emoji character.

diff --git a/shared/editor/nodes/Emoji.tsx b/shared/editor/nodes/Emoji.tsx
@@ -24,11 +24,9 @@ export default class Emoji extends Extension {
   get schema(): NodeSpec {
     return {
       attrs: {
-        style: {
-          default: "",
-        },
         "data-name": {
-          default: undefined,
+          default: "grey_question",
+          validate: "string",
         },
       },
       inline: true,
@@ -50,17 +48,15 @@ export default class Emoji extends Extension {
       ],
       toDOM: (node) => {
         const name = node.attrs["data-name"];
-        if (name && getEmojiFromName(name)) {
-          return [
-            "strong",
-            {
-              class: `emoji ${name}`,
-              "data-name": name,
-            },
-            getEmojiFromName(name),
-          ];
-        }
-        return ["strong", { class: "emoji" }, `:${name}:`];
+
+        return [
+          "strong",
+          {
+            class: `emoji ${name}`,
+            "data-name": name,
+          },
+          getEmojiFromName(name),
+        ];
       },
       toPlainText: (node) => getEmojiFromName(node.attrs["data-name"]),
     };