diff --git a/packages/editor/src/core/extensions/emoji/emoji.ts b/packages/editor/src/core/extensions/emoji/emoji.ts index 4ad20136672..e2fba3fefdd 100644 --- a/packages/editor/src/core/extensions/emoji/emoji.ts +++ b/packages/editor/src/core/extensions/emoji/emoji.ts @@ -16,7 +16,9 @@ import Suggestion, { SuggestionOptions } from "@tiptap/suggestion"; import emojiRegex from "emoji-regex"; import { isEmojiSupported } from "is-emoji-supported"; // helpers +import { CORE_EXTENSIONS } from "@/constants/extension"; import { customFindSuggestionMatch } from "@/helpers/find-suggestion-match"; +import { getExtensionStorage } from "@/helpers/get-extension-storage"; declare module "@tiptap/core" { interface Commands { @@ -342,6 +344,10 @@ export const Emoji = Node.create({ }, addProseMirrorPlugins() { + const isTouchDevice = !!getExtensionStorage(this.editor, CORE_EXTENSIONS.UTILITY).isTouchDevice; + if (isTouchDevice) { + return []; + } return [ Suggestion({ editor: this.editor, diff --git a/packages/editor/src/core/extensions/emoji/extension.ts b/packages/editor/src/core/extensions/emoji/extension.ts index 7e35038cc95..e9f715b31c7 100644 --- a/packages/editor/src/core/extensions/emoji/extension.ts +++ b/packages/editor/src/core/extensions/emoji/extension.ts @@ -3,7 +3,7 @@ import { gitHubEmojis, shortcodeToEmoji } from "@tiptap/extension-emoji"; import { MarkdownSerializerState } from "@tiptap/pm/markdown"; import { Node as ProseMirrorNode } from "@tiptap/pm/model"; import { Emoji } from "./emoji"; -import suggestion from "./suggestion"; +import { emojiSuggestion } from "./suggestion"; export const EmojiExtension = Emoji.extend({ addStorage() { @@ -25,6 +25,6 @@ export const EmojiExtension = Emoji.extend({ }, }).configure({ emojis: gitHubEmojis, - suggestion: suggestion, + suggestion: emojiSuggestion, enableEmoticons: true, }); diff --git a/packages/editor/src/core/extensions/emoji/suggestion.ts b/packages/editor/src/core/extensions/emoji/suggestion.ts index a0aa9168806..ca0ab49ac7e 100644 --- a/packages/editor/src/core/extensions/emoji/suggestion.ts +++ b/packages/editor/src/core/extensions/emoji/suggestion.ts @@ -10,7 +10,7 @@ import { EmojiItem, EmojiList, EmojiListRef } from "./components/emojis-list"; const DEFAULT_EMOJIS = ["+1", "-1", "smile", "orange_heart", "eyes"]; -const emojiSuggestion: EmojiOptions["suggestion"] = { +export const emojiSuggestion: EmojiOptions["suggestion"] = { items: ({ editor, query }: { editor: Editor; query: string }): EmojiItem[] => { const { emojis } = getExtensionStorage(editor, CORE_EXTENSIONS.EMOJI); const { isSupported } = getExtensionStorage(editor, CORE_EXTENSIONS.EMOJI); @@ -116,5 +116,3 @@ const emojiSuggestion: EmojiOptions["suggestion"] = { }; }, }; - -export default emojiSuggestion;