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

@tiptap/core 2.2.0-rc.7 → 2.2.0

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 (27) hide show

package/dist/index.cjs +198 -11
package/dist/index.cjs.map +1 -1
package/dist/index.js +199 -13
package/dist/index.js.map +1 -1
package/dist/index.umd.js +198 -11
package/dist/index.umd.js.map +1 -1
package/dist/packages/core/src/Editor.d.ts +9 -0
package/dist/packages/core/src/NodePos.d.ts +40 -0
package/dist/packages/core/src/PasteRule.d.ts +1 -1
package/dist/packages/core/src/commands/index.d.ts +2 -0
package/dist/packages/core/src/commands/joinTextblockBackward.d.ts +12 -0
package/dist/packages/core/src/commands/joinTextblockForward.d.ts +12 -0
package/dist/packages/core/src/index.d.ts +1 -0
package/package.json +2 -2
package/src/Editor.ts +22 -1
package/src/Extension.ts +2 -2
package/src/Mark.ts +2 -2
package/src/Node.ts +2 -2
package/src/NodePos.ts +201 -0
package/src/PasteRule.ts +4 -3
package/src/commands/index.ts +2 -0
package/src/commands/joinTextblockBackward.ts +18 -0
package/src/commands/joinTextblockForward.ts +18 -0
package/src/helpers/createChainableState.ts +0 -1
package/src/helpers/getMarksBetween.ts +4 -0
package/src/index.ts +1 -0
package/src/utilities/elementFromString.ts +19 -1

package/dist/index.umd.js CHANGED Viewed

@@ -13,7 +13,6 @@
           ...state,
           apply: state.apply.bind(state),
           applyTransaction: state.applyTransaction.bind(state),
-          filterTransaction: state.filterTransaction,
           plugins: state.plugins,
           schema: state.schema,
           reconfigure: state.reconfigure.bind(state),
@@ -728,11 +727,11 @@
           this.handler = config.handler;
       }
   }
-  const pasteRuleMatcherHandler = (text, find) => {
+  const pasteRuleMatcherHandler = (text, find, event) => {
       if (isRegExp(find)) {
           return [...text.matchAll(find)];
       }
-      const matches = find(text);
+      const matches = find(text, event);
       if (!matches) {
           return [];
       }
@@ -764,7 +763,7 @@
           const resolvedFrom = Math.max(from, pos);
           const resolvedTo = Math.min(to, pos + node.content.size);
           const textToMatch = node.textBetween(resolvedFrom - pos, resolvedTo - pos, undefined, '\ufffc');
-          const matches = pasteRuleMatcherHandler(textToMatch, rule.find);
+          const matches = pasteRuleMatcherHandler(textToMatch, rule.find, pasteEvent);
           matches.forEach(match => {
               if (match.index === undefined) {
                   return;
@@ -1138,14 +1137,14 @@
           this.child = null;
           this.config = {
               name: this.name,
-              defaultOptions: undefined,
+              defaultOptions: {},
           };
           this.config = {
               ...this.config,
               ...config,
           };
           this.name = this.config.name;
-          if (config.defaultOptions) {
+          if (config.defaultOptions && Object.keys(config.defaultOptions).length > 0) {
               console.warn(`[tiptap warn]: BREAKING CHANGE: "defaultOptions" is deprecated. Please use "addOptions" instead. Found in extension: "${this.name}".`);
           }
           // TODO: remove `addOptions` fallback
@@ -1582,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) {
@@ -1751,6 +1764,14 @@
       }
   };
+  const joinTextblockBackward = () => ({ state, dispatch }) => {
+      return commands$1.joinTextblockBackward(state, dispatch);
+  };
+  const joinTextblockForward = () => ({ state, dispatch }) => {
+      return commands$1.joinTextblockForward(state, dispatch);
+  };
   function isMacOS() {
       return typeof navigator !== 'undefined'
           ? /Mac/.test(navigator.platform)
@@ -2305,6 +2326,9 @@
       }
       else {
           doc.nodesBetween(from, to, (node, pos) => {
+              if (!node || (node === null || node === void 0 ? void 0 : node.nodeSize) === undefined) {
+                  return;
+              }
               marks.push(...node.marks.map(mark => ({
                   from: pos,
                   to: pos + node.nodeSize,
@@ -3082,6 +3106,8 @@
     joinForward: joinForward,
     joinItemBackward: joinItemBackward,
     joinItemForward: joinItemForward,
+    joinTextblockBackward: joinTextblockBackward,
+    joinTextblockForward: joinTextblockForward,
     keyboardShortcut: keyboardShortcut,
     lift: lift,
     liftEmptyBlock: liftEmptyBlock,
@@ -3307,6 +3333,151 @@
     Tabindex: Tabindex
   });
+  class NodePos {
+      constructor(pos, editor) {
+          this.resolvedPos = pos;
+          this.editor = editor;
+      }
+      get node() {
+          return this.resolvedPos.node();
+      }
+      get element() {
+          return this.editor.view.domAtPos(this.pos).node;
+      }
+      get depth() {
+          return this.resolvedPos.depth;
+      }
+      get pos() {
+          return this.resolvedPos.pos;
+      }
+      get content() {
+          return this.node.content;
+      }
+      set content(content) {
+          this.editor.commands.insertContentAt({ from: this.from, to: this.to }, content);
+      }
+      get attributes() {
+          return this.node.attrs;
+      }
+      get textContent() {
+          return this.node.textContent;
+      }
+      get size() {
+          return this.node.nodeSize;
+      }
+      get from() {
+          return this.resolvedPos.start(this.resolvedPos.depth);
+      }
+      get range() {
+          return {
+              from: this.from,
+              to: this.to,
+          };
+      }
+      get to() {
+          return this.resolvedPos.end(this.resolvedPos.depth) + (this.node.isText ? 0 : 1);
+      }
+      get parent() {
+          if (this.depth === 0) {
+              return null;
+          }
+          const parentPos = this.resolvedPos.start(this.resolvedPos.depth - 1);
+          const $pos = this.resolvedPos.doc.resolve(parentPos);
+          return new NodePos($pos, this.editor);
+      }
+      get before() {
+          let $pos = this.resolvedPos.doc.resolve(this.from - 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);
+          if ($pos.depth !== this.depth) {
+              $pos = this.resolvedPos.doc.resolve(this.to + 3);
+          }
+          return new NodePos($pos, this.editor);
+      }
+      get children() {
+          const children = [];
+          this.node.content.forEach((node, offset) => {
+              const targetPos = this.pos + offset + 1;
+              const $pos = this.resolvedPos.doc.resolve(targetPos);
+              if ($pos.depth === this.depth) {
+                  return;
+              }
+              children.push(new NodePos($pos, this.editor));
+          });
+          return children;
+      }
+      get firstChild() {
+          return this.children[0] || null;
+      }
+      get lastChild() {
+          const children = this.children;
+          return children[children.length - 1] || null;
+      }
+      closest(selector, attributes = {}) {
+          let node = null;
+          let currentNode = this.parent;
+          while (currentNode && !node) {
+              if (currentNode.node.type.name === selector) {
+                  if (Object.keys(attributes).length > 0) {
+                      const nodeAttributes = currentNode.node.attrs;
+                      const attrKeys = Object.keys(attributes);
+                      for (let index = 0; index < attrKeys.length; index += 1) {
+                          const key = attrKeys[index];
+                          if (nodeAttributes[key] !== attributes[key]) {
+                              break;
+                          }
+                      }
+                  }
+                  else {
+                      node = currentNode;
+                  }
+              }
+              currentNode = currentNode.parent;
+          }
+          return node;
+      }
+      querySelector(selector, attributes = {}) {
+          return this.querySelectorAll(selector, attributes, true)[0] || null;
+      }
+      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) {
+              return nodes;
+          }
+          this.children.forEach(node => {
+              if (node.node.type.name === selector) {
+                  if (Object.keys(attributes).length > 0) {
+                      const nodeAttributes = node.node.attrs;
+                      const attrKeys = Object.keys(attributes);
+                      for (let index = 0; index < attrKeys.length; index += 1) {
+                          const key = attrKeys[index];
+                          if (nodeAttributes[key] !== attributes[key]) {
+                              return;
+                          }
+                      }
+                  }
+                  nodes.push(node);
+                  if (firstItemOnly) {
+                      return;
+                  }
+              }
+              nodes = nodes.concat(node.querySelectorAll(selector));
+          });
+          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 style = `.ProseMirror {
   position: relative;
 }
@@ -3752,6 +3923,21 @@ img.ProseMirror-separator {
           // @ts-ignore
           return !((_a = this.view) === null || _a === void 0 ? void 0 : _a.docView);
       }
+      $node(selector, attributes) {
+          var _a;
+          return ((_a = this.$doc) === null || _a === void 0 ? void 0 : _a.querySelector(selector, attributes)) || null;
+      }
+      $nodes(selector, attributes) {
+          var _a;
+          return ((_a = this.$doc) === null || _a === void 0 ? void 0 : _a.querySelectorAll(selector, attributes)) || null;
+      }
+      $pos(pos) {
+          const $pos = this.state.doc.resolve(pos);
+          return new NodePos($pos, this);
+      }
+      get $doc() {
+          return this.$pos(0);
+      }
   }
   /**
@@ -3941,14 +4127,14 @@ img.ProseMirror-separator {
           this.child = null;
           this.config = {
               name: this.name,
-              defaultOptions: undefined,
+              defaultOptions: {},
           };
           this.config = {
               ...this.config,
               ...config,
           };
           this.name = this.config.name;
-          if (config.defaultOptions) {
+          if (config.defaultOptions && Object.keys(config.defaultOptions).length > 0) {
               console.warn(`[tiptap warn]: BREAKING CHANGE: "defaultOptions" is deprecated. Please use "addOptions" instead. Found in extension: "${this.name}".`);
           }
           // TODO: remove `addOptions` fallback
@@ -4024,14 +4210,14 @@ img.ProseMirror-separator {
           this.child = null;
           this.config = {
               name: this.name,
-              defaultOptions: undefined,
+              defaultOptions: {},
           };
           this.config = {
               ...this.config,
               ...config,
           };
           this.name = this.config.name;
-          if (config.defaultOptions) {
+          if (config.defaultOptions && Object.keys(config.defaultOptions).length > 0) {
               console.warn(`[tiptap warn]: BREAKING CHANGE: "defaultOptions" is deprecated. Please use "addOptions" instead. Found in extension: "${this.name}".`);
           }
           // TODO: remove `addOptions` fallback
@@ -4400,6 +4586,7 @@ img.ProseMirror-separator {
   exports.InputRule = InputRule;
   exports.Mark = Mark;
   exports.Node = Node;
+  exports.NodePos = NodePos;
   exports.NodeView = NodeView;
   exports.PasteRule = PasteRule;
   exports.Tracker = Tracker;