@tiptap/core 2.8.0 → 2.9.0

package/dist/index.js

@@ -1668,12 +1668,16 @@ function getMarkRange($pos, type, attributes = {}) {
         return;
     }
     let start = $pos.parent.childAfter($pos.parentOffset);
-    if ($pos.parentOffset === start.offset && start.offset !== 0) {
+    // If the cursor is at the start of a text node that does not have the mark, look backward
+    if (!start.node || !start.node.marks.some(mark => mark.type === type)) {
         start = $pos.parent.childBefore($pos.parentOffset);
     }
-    if (!start.node) {
+    // If there is no text node with the mark even backward, return undefined
+    if (!start.node || !start.node.marks.some(mark => mark.type === type)) {
         return;
     }
+    // We now know that the cursor is either at the start, middle or end of a text node with the specified mark
+    // so we can look it up on the targeted mark
     const mark = findMarkInSet([...start.node.marks], type, attributes);
     if (!mark) {
         return;
@@ -1963,7 +1967,7 @@ const insertContentAt = (position, value, options) => ({ tr, dispatch, editor })
     var _a;
     if (dispatch) {
         options = {
-            parseOptions: {},
+            parseOptions: editor.options.parseOptions,
             updateSelection: true,
             applyInputRules: false,
             applyPasteRules: false,
@@ -1984,7 +1988,9 @@ const insertContentAt = (position, value, options) => ({ tr, dispatch, editor })
                 editor,
                 error: e,
                 disableCollaboration: () => {
-                    console.error('[tiptap error]: Unable to disable collaboration at this point in time');
+                    if (editor.storage.collaboration) {
+                        editor.storage.collaboration.isDisabled = true;
+                    }
                 },
             });
             return false;
@@ -3963,7 +3969,8 @@ class NodePos {
         const children = [];
         this.node.content.forEach((node, offset) => {
             const isBlock = node.isBlock && !node.isTextblock;
-            const targetPos = this.pos + offset + 1;
+            const isNonTextAtom = node.isAtom && !node.isText;
+            const targetPos = this.pos + offset + (isNonTextAtom ? 0 : 1);
             const $pos = this.resolvedPos.doc.resolve(targetPos);
             if (!isBlock && $pos.depth <= this.depth) {
                 return;
@@ -4039,9 +4046,12 @@ class NodePos {
         return nodes;
     }
     setAttribute(attributes) {
-        const oldSelection = this.editor.state.selection;
-        this.editor.chain().setTextSelection(this.from).updateAttributes(this.node.type.name, attributes).setTextSelection(oldSelection.from)
-            .run();
+        const { tr } = this.editor.state;
+        tr.setNodeMarkup(this.from, undefined, {
+            ...this.node.attrs,
+            ...attributes,
+        });
+        this.editor.view.dispatch(tr);
     }
 }
 
@@ -4293,18 +4303,27 @@ class Editor extends EventEmitter {
     /**
      * Unregister a ProseMirror plugin.
      *
-     * @param nameOrPluginKey The plugins name
+     * @param nameOrPluginKeyToRemove The plugins name
      * @returns The new editor state or undefined if the editor is destroyed
      */
-    unregisterPlugin(nameOrPluginKey) {
+    unregisterPlugin(nameOrPluginKeyToRemove) {
         if (this.isDestroyed) {
             return undefined;
         }
-        // @ts-ignore
-        const name = typeof nameOrPluginKey === 'string' ? `${nameOrPluginKey}$` : nameOrPluginKey.key;
-        const state = this.state.reconfigure({
+        const prevPlugins = this.state.plugins;
+        let plugins = prevPlugins;
+        [].concat(nameOrPluginKeyToRemove).forEach(nameOrPluginKey => {
+            // @ts-ignore
+            const name = typeof nameOrPluginKey === 'string' ? `${nameOrPluginKey}$` : nameOrPluginKey.key;
             // @ts-ignore
-            plugins: this.state.plugins.filter(plugin => !plugin.key.startsWith(name)),
+            plugins = prevPlugins.filter(plugin => !plugin.key.startsWith(name));
+        });
+        if (prevPlugins.length === plugins.length) {
+            // No plugin was removed, so we don’t need to update the state
+            return undefined;
+        }
+        const state = this.state.reconfigure({
+            plugins,
         });
         this.view.updateState(state);
         return state;
@@ -4367,6 +4386,9 @@ class Editor extends EventEmitter {
                 editor: this,
                 error: e,
                 disableCollaboration: () => {
+                    if (this.storage.collaboration) {
+                        this.storage.collaboration.isDisabled = true;
+                    }
                     // To avoid syncing back invalid content, reinitialize the extensions without the collaboration extension
                     this.options.extensions = this.options.extensions.filter(extension => extension.name !== 'collaboration');
                     // Restart the initialization process by recreating the extension manager with the new set of extensions
@@ -4385,6 +4407,12 @@ class Editor extends EventEmitter {
                 selection: selection || undefined,
             }),
         });
+        // add `role="textbox"` to the editor element
+        this.view.dom.setAttribute('role', 'textbox');
+        // add aria-label to the editor element
+        if (!this.view.dom.getAttribute('aria-label')) {
+            this.view.dom.setAttribute('aria-label', 'Rich-Text Editor');
+        }
         // `editor.view` is not yet available at this time.
         // Therefore we will add all plugins and node views directly afterwards.
         const newState = this.state.reconfigure({