@tiptap/core 3.3.1 → 3.4.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/core",
   "description": "headless rich text editor",
-  "version": "3.3.1",
+  "version": "3.4.1",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -52,10 +52,10 @@
     "jsx-dev-runtime"
   ],
   "devDependencies": {
-    "@tiptap/pm": "^3.3.1"
+    "@tiptap/pm": "^3.4.1"
   },
   "peerDependencies": {
-    "@tiptap/pm": "^3.3.1"
+    "@tiptap/pm": "^3.4.1"
   },
   "repository": {
     "type": "git",

package/src/Editor.ts

@@ -95,6 +95,8 @@ export class Editor extends EventEmitter<EditorEvents> {
     emitContentError: false,
     onBeforeCreate: () => null,
     onCreate: () => null,
+    onMount: () => null,
+    onUnmount: () => null,
     onUpdate: () => null,
     onSelectionUpdate: () => null,
     onTransaction: () => null,
@@ -117,6 +119,8 @@ export class Editor extends EventEmitter<EditorEvents> {
     this.createSchema()
     this.on('beforeCreate', this.options.onBeforeCreate)
     this.emit('beforeCreate', { editor: this })
+    this.on('mount', this.options.onMount)
+    this.on('unmount', this.options.onUnmount)
     this.on('contentError', this.options.onContentError)
     this.on('create', this.options.onCreate)
     this.on('update', this.options.onUpdate)
@@ -154,6 +158,7 @@ export class Editor extends EventEmitter<EditorEvents> {
       )
     }
     this.createView(el)
+    this.emit('mount', { editor: this })
 
     window.setTimeout(() => {
       if (this.isDestroyed) {
@@ -197,6 +202,7 @@ export class Editor extends EventEmitter<EditorEvents> {
       }
     }
     this.css = null
+    this.emit('unmount', { editor: this })
   }
 
   /**

package/src/commands/setMark.ts

@@ -29,9 +29,13 @@ function canSetMark(state: EditorState, tr: Transaction, newMarkType: MarkType)
 
   if (cursor) {
     const currentMarks = state.storedMarks ?? cursor.marks()
+    const parentAllowsMarkType = cursor.parent.type.allowsMarkType(newMarkType)
 
-    // There can be no current marks that exclude the new mark
-    return !!newMarkType.isInSet(currentMarks) || !currentMarks.some(mark => mark.type.excludes(newMarkType))
+    // There can be no current marks that exclude the new mark, and the parent must allow this mark type
+    return (
+      parentAllowsMarkType &&
+      (!!newMarkType.isInSet(currentMarks) || !currentMarks.some(mark => mark.type.excludes(newMarkType)))
+    )
   }
 
   const { ranges } = selection

package/src/types.ts

@@ -39,6 +39,18 @@ export type MaybeThisParameterType<T> =
   Exclude<T, Primitive> extends (...args: any) => any ? ThisParameterType<Exclude<T, Primitive>> : any
 
 export interface EditorEvents {
+  mount: {
+    /**
+     * The editor instance
+     */
+    editor: Editor
+  }
+  unmount: {
+    /**
+     * The editor instance
+     */
+    editor: Editor
+  }
   beforeCreate: {
     /**
      * The editor instance
@@ -371,6 +383,14 @@ export interface EditorOptions {
    * Called after the editor is constructed.
    */
   onCreate: (props: EditorEvents['create']) => void
+  /**
+   * Called when the editor is mounted.
+   */
+  onMount: (props: EditorEvents['mount']) => void
+  /**
+   * Called when the editor is unmounted.
+   */
+  onUnmount: (props: EditorEvents['unmount']) => void
   /**
    * Called when the editor encounters an error while parsing the content.
    * Only enabled if `enableContentCheck` is `true`.