diff --git a/app/editor/index.tsx b/app/editor/index.tsx index a098d237c..1bdcefe25 100644 --- a/app/editor/index.tsx +++ b/app/editor/index.tsx @@ -500,7 +500,7 @@ export class Editor extends React.PureComponent< createPasteParser() { return this.extensions.parser({ schema: this.schema, - rules: { linkify: true }, + rules: { linkify: true, emoji: false }, plugins: this.rulePlugins, }); } diff --git a/shared/editor/rules/emoji.ts b/shared/editor/rules/emoji.ts index faa73c10d..09fb59c49 100644 --- a/shared/editor/rules/emoji.ts +++ b/shared/editor/rules/emoji.ts @@ -4,7 +4,7 @@ import emojiPlugin from "markdown-it-emoji"; export default function emoji(md: MarkdownIt) { return emojiPlugin(md, { - defs: nameToEmoji, + defs: (md.options as any).emoji === false ? {} : nameToEmoji, shortcuts: {}, }); }