npm - @tiptap/core - Versions diffs - 2.2.0-rc.8 → 2.2.1 - Mend

@tiptap/core 2.2.0-rc.8 → 2.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/dist/index.cjs +60 -17
package/dist/index.cjs.map +1 -1
package/dist/index.js +60 -17
package/dist/index.js.map +1 -1
package/dist/index.umd.js +60 -17
package/dist/index.umd.js.map +1 -1
package/dist/packages/core/src/NodePos.d.ts +5 -1
package/package.json +2 -2
package/src/NodePos.ts +56 -15
package/src/helpers/getMarksBetween.ts +1 -1
package/src/utilities/elementFromString.ts +19 -1

package/dist/index.umd.js CHANGED Viewed

@@ -1581,10 +1581,24 @@
       return commands.insertContentAt({ from: tr.selection.from, to: tr.selection.to }, value, options);
   };
+  const removeWhitespaces = (node) => {
+      const children = node.childNodes;
+      for (let i = children.length - 1; i >= 0; i -= 1) {
+          const child = children[i];
+          if (child.nodeType === 3 && child.nodeValue && /^(\n\s\s|\n)$/.test(child.nodeValue)) {
+              node.removeChild(child);
+          }
+          else if (child.nodeType === 1) {
+              removeWhitespaces(child);
+          }
+      }
+      return node;
+  };
   function elementFromString(value) {
       // add a wrapper to preserve leading and trailing whitespace
       const wrappedValue = `<body>${value}</body>`;
-      return new window.DOMParser().parseFromString(wrappedValue, 'text/html').body;
+      const html = new window.DOMParser().parseFromString(wrappedValue, 'text/html').body;
+      return removeWhitespaces(html);
   }
   function createNodeFromContent(content, schema, options) {
@@ -2312,7 +2326,7 @@
       }
       else {
           doc.nodesBetween(from, to, (node, pos) => {
-              if (!node || node.nodeSize === undefined) {
+              if (!node || (node === null || node === void 0 ? void 0 : node.nodeSize) === undefined) {
                   return;
               }
               marks.push(...node.marks.map(mark => ({
@@ -3320,18 +3334,26 @@
   });
   class NodePos {
-      constructor(pos, editor) {
+      constructor(pos, editor, isBlock = false, node = null) {
+          this.currentNode = null;
+          this.actualDepth = null;
+          this.isBlock = isBlock;
           this.resolvedPos = pos;
           this.editor = editor;
+          this.currentNode = node;
+      }
+      get name() {
+          return this.node.type.name;
       }
       get node() {
-          return this.resolvedPos.node();
+          return this.currentNode || this.resolvedPos.node();
       }
       get element() {
           return this.editor.view.domAtPos(this.pos).node;
       }
       get depth() {
-          return this.resolvedPos.depth;
+          var _a;
+          return (_a = this.actualDepth) !== null && _a !== void 0 ? _a : this.resolvedPos.depth;
       }
       get pos() {
           return this.resolvedPos.pos;
@@ -3340,7 +3362,17 @@
           return this.node.content;
       }
       set content(content) {
-          this.editor.commands.insertContentAt({ from: this.from, to: this.to }, content);
+          let from = this.from;
+          let to = this.to;
+          if (this.isBlock) {
+              if (this.content.size === 0) {
+                  console.error(`You can’t set content on a block node. Tried to set content on ${this.name} at ${this.pos}`);
+                  return;
+              }
+              from = this.from + 1;
+              to = this.to - 1;
+          }
+          this.editor.commands.insertContentAt({ from, to }, content);
       }
       get attributes() {
           return this.node.attrs;
@@ -3352,6 +3384,9 @@
           return this.node.nodeSize;
       }
       get from() {
+          if (this.isBlock) {
+              return this.pos;
+          }
           return this.resolvedPos.start(this.resolvedPos.depth);
       }
       get range() {
@@ -3361,6 +3396,9 @@
           };
       }
       get to() {
+          if (this.isBlock) {
+              return this.pos + this.size;
+          }
           return this.resolvedPos.end(this.resolvedPos.depth) + (this.node.isText ? 0 : 1);
       }
       get parent() {
@@ -3372,14 +3410,14 @@
           return new NodePos($pos, this.editor);
       }
       get before() {
-          let $pos = this.resolvedPos.doc.resolve(this.from - 2);
+          let $pos = this.resolvedPos.doc.resolve(this.from - (this.isBlock ? 1 : 2));
           if ($pos.depth !== this.depth) {
               $pos = this.resolvedPos.doc.resolve(this.from - 3);
           }
           return new NodePos($pos, this.editor);
       }
       get after() {
-          let $pos = this.resolvedPos.doc.resolve(this.to + 2);
+          let $pos = this.resolvedPos.doc.resolve(this.to + (this.isBlock ? 2 : 1));
           if ($pos.depth !== this.depth) {
               $pos = this.resolvedPos.doc.resolve(this.to + 3);
           }
@@ -3388,12 +3426,17 @@
       get children() {
           const children = [];
           this.node.content.forEach((node, offset) => {
-              const targetPos = this.pos + offset + 1;
+              const isBlock = node.isBlock && !node.isTextblock;
+              const targetPos = this.pos + offset + (isBlock ? 0 : 1);
               const $pos = this.resolvedPos.doc.resolve(targetPos);
-              if ($pos.depth === this.depth) {
+              if (!isBlock && $pos.depth <= this.depth) {
                   return;
               }
-              children.push(new NodePos($pos, this.editor));
+              const childNodePos = new NodePos($pos, this.editor, isBlock, isBlock ? node : null);
+              if (isBlock) {
+                  childNodePos.actualDepth = this.depth + 1;
+              }
+              children.push(new NodePos($pos, this.editor, isBlock, isBlock ? node : null));
           });
           return children;
       }
@@ -3433,13 +3476,13 @@
       querySelectorAll(selector, attributes = {}, firstItemOnly = false) {
           let nodes = [];
           // iterate through children recursively finding all nodes which match the selector with the node name
-          if (!this.children || this.children.length === 0) {
+          if (this.isBlock || !this.children || this.children.length === 0) {
               return nodes;
           }
-          this.children.forEach(node => {
-              if (node.node.type.name === selector) {
+          this.children.forEach(childPos => {
+              if (childPos.node.type.name === selector) {
                   if (Object.keys(attributes).length > 0) {
-                      const nodeAttributes = node.node.attrs;
+                      const nodeAttributes = childPos.node.attrs;
                       const attrKeys = Object.keys(attributes);
                       for (let index = 0; index < attrKeys.length; index += 1) {
                           const key = attrKeys[index];
@@ -3448,12 +3491,12 @@
                           }
                       }
                   }
-                  nodes.push(node);
+                  nodes.push(childPos);
                   if (firstItemOnly) {
                       return;
                   }
               }
-              nodes = nodes.concat(node.querySelectorAll(selector));
+              nodes = nodes.concat(childPos.querySelectorAll(selector));
           });
           return nodes;
       }