Merge branch 'master' into v1.0

packages/tiptap-extensions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiptap-extensions",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "description": "Extensions for tiptap",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",

packages/tiptap-extensions/src/nodes/Mention.js

@@ -36,14 +36,14 @@ export default class Mention extends Node {
 					class: this.options.mentionClass,
 					'data-mention-id': node.attrs.id,
 				},
-				`@${node.attrs.label}`,
+				`${this.options.matcher.char}${node.attrs.label}`,
 			],
 			parseDOM: [
 				{
 					tag: 'span[data-mention-id]',
 					getAttrs: dom => {
 						const id = dom.getAttribute('data-mention-id')
-						const label = dom.innerText.split('@').join('')
+						const label = dom.innerText.split(this.options.matcher.char).join('')
 						return { id, label }
 					},
 				},