From 5924f4909f12e6e62c1935ecd0b431383dfd0465 Mon Sep 17 00:00:00 2001 From: CuriousCorrelation <58817502+CuriousCorrelation@users.noreply.github.com> Date: Sun, 17 Jul 2022 19:19:39 +0530 Subject: [PATCH] fix: Cursor disappearing behind emoji (#3786) * fix: Cursor disappearing behind emoji * Move emoji node styles to `Styles.ts` * fix: grammar * fix: Pasting emoji adds a new line * fix: DOM element type --- shared/editor/nodes/Emoji.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shared/editor/nodes/Emoji.tsx b/shared/editor/nodes/Emoji.tsx index f07c46a5ff..2d716295dc 100644 --- a/shared/editor/nodes/Emoji.tsx +++ b/shared/editor/nodes/Emoji.tsx @@ -35,9 +35,9 @@ export default class Emoji extends Node { selectable: false, parseDOM: [ { - tag: "span.emoji", + tag: "strong.emoji", preserveWhitespace: "full", - getAttrs: (dom: HTMLDivElement) => ({ + getAttrs: (dom: HTMLElement) => ({ "data-name": dom.dataset.name, }), }, @@ -48,7 +48,7 @@ export default class Emoji extends Node { nameToEmoji[node.attrs["data-name"]] ); return [ - "span", + "strong", { class: `emoji ${node.attrs["data-name"]}`, "data-name": node.attrs["data-name"], @@ -57,7 +57,7 @@ export default class Emoji extends Node { ]; } const text = document.createTextNode(`:${node.attrs["data-name"]}:`); - return ["span", { class: "emoji" }, text]; + return ["strong", { class: "emoji" }, text]; }, toPlainText: (node) => nameToEmoji[node.attrs["data-name"]], };