Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/EditorFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

import MentionSuggestion from './components/Suggestion/Mention/suggestions.js'

import 'proxy-polyfill'

import { Editor } from '@tiptap/core'
import { createLowlight } from 'lowlight'
import hljs from 'highlight.js/lib/core'

import { logger } from './helpers/logger.js'
import { FocusTrap, Mention, PlainText, RichText } from './extensions/index.js'
import { FocusTrap, PlainText, RichText } from './extensions/index.js'

const lowlight = createLowlight()

Expand Down Expand Up @@ -41,10 +39,7 @@ const createRichEditor = ({ extensions = [], connection, relativePath, isEmbedde
return new Editor({
editorProps,
extensions: [
RichText.configure({ relativePath, isEmbedded }),
Mention.configure({
suggestion: MentionSuggestion({ connection }),
}),
RichText.configure({ connection, relativePath, isEmbedded }),
FocusTrap,
...extensions,
],
Expand Down
8 changes: 8 additions & 0 deletions src/extensions/RichText.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ import LinkBubble from './../extensions/LinkBubble.js'
import LinkPicker from './../extensions/LinkPicker.js'
import ListItem from '@tiptap/extension-list-item'
import Markdown from './../extensions/Markdown.js'
import Mention from './../extensions/Mention.js'
import MentionSuggestion from '../components/Suggestion/Mention/suggestions.js'
import OrderedList from './../nodes/OrderedList.js'
import Paragraph from './../nodes/Paragraph.js'
import Preview from './../nodes/Preview.js'
Expand All @@ -54,6 +56,7 @@ export default Extension.create({

addOptions() {
return {
connection: null,
editing: true,
extensions: [],
relativePath: null,
Expand Down Expand Up @@ -99,6 +102,11 @@ export default Extension.create({
KeepSyntax,
Keymap,
FrontMatter,
Mention.configure({
suggestion: MentionSuggestion({
connection: this.options.connection,
}),
}),
Search,
Emoji.configure({
suggestion: EmojiSuggestion(),
Expand Down
Loading