From 2f3196ef86796087ca19f3e6688a4714db7f6cc3 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 22 Oct 2023 10:50:16 +0200 Subject: [PATCH] fix(editor): duplicate name --- src/components/input/editor/TipTap.vue | 57 +++++++++++++------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/src/components/input/editor/TipTap.vue b/src/components/input/editor/TipTap.vue index b7da770b7..3dfe35415 100644 --- a/src/components/input/editor/TipTap.vue +++ b/src/components/input/editor/TipTap.vue @@ -126,24 +126,24 @@ import Underline from '@tiptap/extension-underline' import TaskItem from '@tiptap/extension-task-item' import TaskList from '@tiptap/extension-task-list' -import { Blockquote } from '@tiptap/extension-blockquote' -import { Bold } from '@tiptap/extension-bold' -import { BulletList } from '@tiptap/extension-bullet-list' -import { Code } from '@tiptap/extension-code' -import { CodeBlock } from '@tiptap/extension-code-block' -import { Document } from '@tiptap/extension-document' -import { Dropcursor } from '@tiptap/extension-dropcursor' -import { Gapcursor } from '@tiptap/extension-gapcursor' -import { HardBreak } from '@tiptap/extension-hard-break' -import { Heading } from '@tiptap/extension-heading' -import { History } from '@tiptap/extension-history' -import { HorizontalRule } from '@tiptap/extension-horizontal-rule' -import { Italic } from '@tiptap/extension-italic' -import { ListItem } from '@tiptap/extension-list-item' -import { OrderedList } from '@tiptap/extension-ordered-list' -import { Paragraph } from '@tiptap/extension-paragraph' -import { Strike } from '@tiptap/extension-strike' -import { Text } from '@tiptap/extension-text' +import {Blockquote} from '@tiptap/extension-blockquote' +import {Bold} from '@tiptap/extension-bold' +import {BulletList} from '@tiptap/extension-bullet-list' +import {Code} from '@tiptap/extension-code' +import {CodeBlock} from '@tiptap/extension-code-block' +import {Document} from '@tiptap/extension-document' +import {Dropcursor} from '@tiptap/extension-dropcursor' +import {Gapcursor} from '@tiptap/extension-gapcursor' +import {HardBreak} from '@tiptap/extension-hard-break' +import {Heading} from '@tiptap/extension-heading' +import {History} from '@tiptap/extension-history' +import {HorizontalRule} from '@tiptap/extension-horizontal-rule' +import {Italic} from '@tiptap/extension-italic' +import {ListItem} from '@tiptap/extension-list-item' +import {OrderedList} from '@tiptap/extension-ordered-list' +import {Paragraph} from '@tiptap/extension-paragraph' +import {Strike} from '@tiptap/extension-strike' +import {Text} from '@tiptap/extension-text' import {BubbleMenu, EditorContent, useEditor} from '@tiptap/vue-3' import Commands from './commands' @@ -293,7 +293,9 @@ const editor = useEditor({ Bold, BulletList, Code, - CodeBlock, + CodeBlockLowlight.configure({ + lowlight, + }), Document, Dropcursor, Gapcursor, @@ -321,7 +323,7 @@ const editor = useEditor({ if (!isEditEnabled) { return '' } - + if (placeholder !== '') { return placeholder } @@ -350,13 +352,9 @@ const editor = useEditor({ nested: true, }), - CodeBlockLowlight.configure({ - lowlight, - }), - - Commands.configure({ - suggestion: suggestionSetup(t), - }), + Commands + .configure({suggestion: suggestionSetup(t)}) + .extend({name: 'slashMenuCommands'}), BubbleMenu, ], onUpdate: () => { @@ -460,14 +458,14 @@ function setLink() { onMounted(() => { document.addEventListener('paste', handleImagePaste) - if(editShortcut !== '') { + if (editShortcut !== '') { document.addEventListener('keydown', setFocusToEditor) } }) onBeforeUnmount(() => { document.removeEventListener('paste', handleImagePaste) - if(editShortcut !== '') { + if (editShortcut !== '') { document.removeEventListener('keydown', setFocusToEditor) } }) @@ -480,6 +478,7 @@ function handleImagePaste(event) { } }) } + // See https://github.com/github/hotkey/discussions/85#discussioncomment-5214660 function setFocusToEditor(event) { const hotkeyString = eventToHotkeyString(event)