@tiptap/core 2.5.5 → 2.5.7

package/dist/index.js

@@ -1777,12 +1777,12 @@ function createNodeFromContent(content, schema, options) {
         }
     }
     if (isTextContent) {
-        let schemaToUse = schema;
-        let hasInvalidContent = false;
-        let invalidContent = '';
-        // Only ever check for invalid content if we're supposed to throw an error
+        // Check for invalid content
         if (options.errorOnInvalidContent) {
-            schemaToUse = new Schema({
+            let hasInvalidContent = false;
+            let invalidContent = '';
+            // A copy of the current schema with a catch-all node at the end
+            const contentCheckSchema = new Schema({
                 topNode: schema.spec.topNode,
                 marks: schema.spec.marks,
                 // Prosemirror's schemas are executed such that: the last to execute, matches last
@@ -1806,15 +1806,21 @@ function createNodeFromContent(content, schema, options) {
                     },
                 }),
             });
+            if (options.slice) {
+                DOMParser.fromSchema(contentCheckSchema).parseSlice(elementFromString(content), options.parseOptions);
+            }
+            else {
+                DOMParser.fromSchema(contentCheckSchema).parse(elementFromString(content), options.parseOptions);
+            }
+            if (options.errorOnInvalidContent && hasInvalidContent) {
+                throw new Error('[tiptap error]: Invalid HTML content', { cause: new Error(`Invalid element found: ${invalidContent}`) });
+            }
         }
-        const parser = DOMParser.fromSchema(schemaToUse);
-        const response = options.slice
-            ? parser.parseSlice(elementFromString(content), options.parseOptions).content
-            : parser.parse(elementFromString(content), options.parseOptions);
-        if (options.errorOnInvalidContent && hasInvalidContent) {
-            throw new Error('[tiptap error]: Invalid HTML content', { cause: new Error(`Invalid element found: ${invalidContent}`) });
+        const parser = DOMParser.fromSchema(schema);
+        if (options.slice) {
+            return parser.parseSlice(elementFromString(content), options.parseOptions).content;
         }
-        return response;
+        return parser.parse(elementFromString(content), options.parseOptions);
     }
     return createNodeFromContent('', schema, options);
 }
@@ -1863,6 +1869,13 @@ const insertContentAt = (position, value, options) => ({ tr, dispatch, editor })
             });
         }
         catch (e) {
+            editor.emit('contentError', {
+                editor,
+                error: e,
+                disableCollaboration: () => {
+                    console.error('[tiptap error]: Unable to disable collaboration at this point in time');
+                },
+            });
             return false;
         }
         let { from, to } = typeof position === 'number' ? { from: position, to: position } : { from: position.from, to: position.to };
@@ -2813,12 +2826,34 @@ function isList(name, extensions) {
     return group.split(' ').includes('list');
 }
 
-function isNodeEmpty(node) {
-    const defaultContent = node.type.createAndFill();
-    if (!defaultContent) {
+/**
+ * Returns true if the given node is empty.
+ * When `checkChildren` is true (default), it will also check if all children are empty.
+ */
+function isNodeEmpty(node, { checkChildren } = { checkChildren: true }) {
+    if (node.isText) {
+        return !node.text;
+    }
+    if (node.content.childCount === 0) {
+        return true;
+    }
+    if (node.isLeaf) {
         return false;
     }
-    return node.eq(defaultContent);
+    if (checkChildren) {
+        let hasSameContent = true;
+        node.content.forEach(childNode => {
+            if (hasSameContent === false) {
+                // Exit early for perf
+                return;
+            }
+            if (!isNodeEmpty(childNode)) {
+                hasSameContent = false;
+            }
+        });
+        return hasSameContent;
+    }
+    return false;
 }
 
 function isNodeSelection(value) {
@@ -3016,15 +3051,24 @@ const splitBlock = ({ keepMarks = true } = {}) => ({ tr, state, dispatch, editor
     if (!$from.parent.isBlock) {
         return false;
     }
-    if (dispatch) {
-        const atEnd = $to.parentOffset === $to.parent.content.size;
-        if (selection instanceof TextSelection) {
-            tr.deleteSelection();
-        }
-        const deflt = $from.depth === 0
-            ? undefined
-            : defaultBlockAt($from.node(-1).contentMatchAt($from.indexAfter(-1)));
-        let types = atEnd && deflt
+    const atEnd = $to.parentOffset === $to.parent.content.size;
+    const deflt = $from.depth === 0
+        ? undefined
+        : defaultBlockAt($from.node(-1).contentMatchAt($from.indexAfter(-1)));
+    let types = atEnd && deflt
+        ? [
+            {
+                type: deflt,
+                attrs: newAttributes,
+            },
+        ]
+        : undefined;
+    let can = canSplit(tr.doc, tr.mapping.map($from.pos), 1, types);
+    if (!types
+        && !can
+        && canSplit(tr.doc, tr.mapping.map($from.pos), 1, deflt ? [{ type: deflt }] : undefined)) {
+        can = true;
+        types = deflt
             ? [
                 {
                     type: deflt,
@@ -3032,21 +3076,12 @@ const splitBlock = ({ keepMarks = true } = {}) => ({ tr, state, dispatch, editor
                 },
             ]
             : undefined;
-        let can = canSplit(tr.doc, tr.mapping.map($from.pos), 1, types);
-        if (!types
-            && !can
-            && canSplit(tr.doc, tr.mapping.map($from.pos), 1, deflt ? [{ type: deflt }] : undefined)) {
-            can = true;
-            types = deflt
-                ? [
-                    {
-                        type: deflt,
-                        attrs: newAttributes,
-                    },
-                ]
-                : undefined;
-        }
+    }
+    if (dispatch) {
         if (can) {
+            if (selection instanceof TextSelection) {
+                tr.deleteSelection();
+            }
             tr.split(tr.mapping.map($from.pos), 1, types);
             if (deflt && !atEnd && !$from.parentOffset && $from.parent.type !== deflt) {
                 const first = tr.mapping.map($from.before());
@@ -3061,7 +3096,7 @@ const splitBlock = ({ keepMarks = true } = {}) => ({ tr, state, dispatch, editor
         }
         tr.scrollIntoView();
     }
-    return true;
+    return can;
 };
 
 const splitListItem = typeOrName => ({ tr, state, dispatch, editor, }) => {
@@ -4160,6 +4195,7 @@ class Editor extends EventEmitter {
         this.prependClass();
         // Let’s store the editor instance in the DOM element.
         // So we’ll have access to it for tests.
+        // @ts-ignore
         const dom = this.view.dom;
         dom.editor = this;
     }
@@ -4167,6 +4203,9 @@ class Editor extends EventEmitter {
      * Creates all node views.
      */
     createNodeViews() {
+        if (this.view.isDestroyed) {
+            return;
+        }
         this.view.setProps({
             nodeViews: this.extensionManager.nodeViews,
         });