@tiptap/core 2.5.5 → 2.5.7

package/dist/index.umd.js

@@ -1775,12 +1775,12 @@
           }
       }
       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 model.Schema({
+              let hasInvalidContent = false;
+              let invalidContent = '';
+              // A copy of the current schema with a catch-all node at the end
+              const contentCheckSchema = new model.Schema({
                   topNode: schema.spec.topNode,
                   marks: schema.spec.marks,
                   // Prosemirror's schemas are executed such that: the last to execute, matches last
@@ -1804,15 +1804,21 @@
                       },
                   }),
               });
+              if (options.slice) {
+                  model.DOMParser.fromSchema(contentCheckSchema).parseSlice(elementFromString(content), options.parseOptions);
+              }
+              else {
+                  model.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 = model.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 = model.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);
   }
@@ -1861,6 +1867,13 @@
               });
           }
           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 };
@@ -2811,12 +2824,34 @@
       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) {
@@ -3014,15 +3049,24 @@
       if (!$from.parent.isBlock) {
           return false;
       }
-      if (dispatch) {
-          const atEnd = $to.parentOffset === $to.parent.content.size;
-          if (selection instanceof state.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 = transform.canSplit(tr.doc, tr.mapping.map($from.pos), 1, types);
+      if (!types
+          && !can
+          && transform.canSplit(tr.doc, tr.mapping.map($from.pos), 1, deflt ? [{ type: deflt }] : undefined)) {
+          can = true;
+          types = deflt
               ? [
                   {
                       type: deflt,
@@ -3030,21 +3074,12 @@
                   },
               ]
               : undefined;
-          let can = transform.canSplit(tr.doc, tr.mapping.map($from.pos), 1, types);
-          if (!types
-              && !can
-              && transform.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 state.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());
@@ -3059,7 +3094,7 @@
           }
           tr.scrollIntoView();
       }
-      return true;
+      return can;
   };
 
   const splitListItem = typeOrName => ({ tr, state: state$1, dispatch, editor, }) => {
@@ -4158,6 +4193,7 @@ img.ProseMirror-separator {
           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;
       }
@@ -4165,6 +4201,9 @@ img.ProseMirror-separator {
        * Creates all node views.
        */
       createNodeViews() {
+          if (this.view.isDestroyed) {
+              return;
+          }
           this.view.setProps({
               nodeViews: this.extensionManager.nodeViews,
           });