@tiptap/core 2.0.0-beta.180 → 2.0.0-beta.183

package/dist/tiptap-core.umd.js

@@ -103,13 +103,13 @@
       }
       createCan(startTr) {
           const { rawCommands, state } = this;
-          const dispatch = undefined;
+          const dispatch = false;
           const tr = startTr || state.tr;
           const props = this.buildProps(tr, dispatch);
           const formattedCommands = Object.fromEntries(Object
               .entries(rawCommands)
               .map(([name, command]) => {
-              return [name, (...args) => command(...args)({ ...props, dispatch })];
+              return [name, (...args) => command(...args)({ ...props, dispatch: undefined })];
           }));
           return {
               ...formattedCommands,
@@ -540,10 +540,10 @@
   const getTextContentFromNodes = ($from, maxMatch = 500) => {
       let textBefore = '';
       $from.parent.nodesBetween(Math.max(0, $from.parentOffset - maxMatch), $from.parentOffset, (node, pos, parent, index) => {
-          var _a, _b;
+          var _a, _b, _c;
           textBefore += ((_b = (_a = node.type.spec).toText) === null || _b === void 0 ? void 0 : _b.call(_a, {
               node, pos, parent, index,
-          })) || node.textContent || '%leaf%';
+          })) || ((_c = $from.nodeBefore) === null || _c === void 0 ? void 0 : _c.text) || '%leaf%';
       });
       return textBefore;
   };
@@ -856,7 +856,7 @@
                       editor,
                       state: chainableState,
                       from: Math.max(from - 1, 0),
-                      to: to.b,
+                      to: to.b - 1,
                       rule,
                   });
                   // stop if there are no changes
@@ -1014,15 +1014,21 @@
               };
               const plugins = [];
               const addKeyboardShortcuts = getExtensionField(extension, 'addKeyboardShortcuts', context);
+              let defaultBindings = {};
+              // bind exit handling
+              if (extension.type === 'mark' && extension.config.exitable) {
+                  defaultBindings.ArrowRight = () => Mark.handleExit({ editor, mark: extension });
+              }
               if (addKeyboardShortcuts) {
                   const bindings = Object.fromEntries(Object
                       .entries(addKeyboardShortcuts())
                       .map(([shortcut, method]) => {
                       return [shortcut, () => method({ editor })];
                   }));
-                  const keyMapPlugin = prosemirrorKeymap.keymap(bindings);
-                  plugins.push(keyMapPlugin);
+                  defaultBindings = { ...defaultBindings, ...bindings };
               }
+              const keyMapPlugin = prosemirrorKeymap.keymap(defaultBindings);
+              plugins.push(keyMapPlugin);
               const addInputRules = getExtensionField(extension, 'addInputRules', context);
               if (isExtensionRulesEnabled(extension, editor.options.enableInputRules) && addInputRules) {
                   inputRules.push(...addInputRules());
@@ -1445,23 +1451,8 @@
       return false;
   };
 
-  function isClass(value) {
-      var _a;
-      if (((_a = value.constructor) === null || _a === void 0 ? void 0 : _a.toString().substring(0, 5)) !== 'class') {
-          return false;
-      }
-      return true;
-  }
-
-  function isObject(value) {
-      return (value
-          && typeof value === 'object'
-          && !Array.isArray(value)
-          && !isClass(value));
-  }
-
   function isTextSelection(value) {
-      return isObject(value) && value instanceof prosemirrorState.TextSelection;
+      return value instanceof prosemirrorState.TextSelection;
   }
 
   function minMax(value = 0, min = 0, max = 0) {
@@ -1531,7 +1522,9 @@
           delayedFocus();
           return true;
       }
-      const selection = resolveFocusPosition(editor.state.doc, position) || editor.state.selection;
+      // pass through tr.doc instead of editor.state.doc
+      // since transactions could change the editors state before this command has been run
+      const selection = resolveFocusPosition(tr.doc, position) || editor.state.selection;
       const isSameSelection = editor.state.selection.eq(selection);
       if (dispatch) {
           if (!isSameSelection) {
@@ -1930,10 +1923,8 @@
   const setContent = (content, emitUpdate = false, parseOptions = {}) => ({ tr, editor, dispatch }) => {
       const { doc } = tr;
       const document = createDocument(content, editor.schema, parseOptions);
-      const selection = prosemirrorState.TextSelection.create(doc, 0, doc.content.size);
       if (dispatch) {
-          tr.setSelection(selection)
-              .replaceSelectionWith(document, false)
+          tr.replaceWith(0, doc.content.size, document)
               .setMeta('preventUpdate', !emitUpdate);
       }
       return true;
@@ -2034,10 +2025,8 @@
   const setNodeSelection = position => ({ tr, dispatch }) => {
       if (dispatch) {
           const { doc } = tr;
-          const minPos = prosemirrorState.Selection.atStart(doc).from;
-          const maxPos = prosemirrorState.Selection.atEnd(doc).to;
-          const resolvedPos = minMax(position, minPos, maxPos);
-          const selection = prosemirrorState.NodeSelection.create(doc, resolvedPos);
+          const from = minMax(position, 0, doc.content.size);
+          const selection = prosemirrorState.NodeSelection.create(doc, from);
           tr.setSelection(selection);
       }
       return true;
@@ -2064,6 +2053,16 @@
       return prosemirrorSchemaList.sinkListItem(type)(state, dispatch);
   };
 
+  function defaultBlockAt(match) {
+      for (let i = 0; i < match.edgeCount; i += 1) {
+          const { type } = match.edge(i);
+          if (type.isTextblock && !type.hasRequiredAttrs()) {
+              return type;
+          }
+      }
+      return null;
+  }
+
   function getSplittedAttributes(extensionAttributes, typeName, attributes) {
       return Object.fromEntries(Object
           .entries(attributes)
@@ -2078,15 +2077,6 @@
       }));
   }
 
-  function defaultBlockAt$1(match) {
-      for (let i = 0; i < match.edgeCount; i += 1) {
-          const { type } = match.edge(i);
-          if (type.isTextblock && !type.hasRequiredAttrs()) {
-              return type;
-          }
-      }
-      return null;
-  }
   function ensureMarks(state, splittableMarks) {
       const marks = state.storedMarks
           || (state.selection.$to.parentOffset && state.selection.$from.marks());
@@ -2122,7 +2112,7 @@
           }
           const deflt = $from.depth === 0
               ? undefined
-              : defaultBlockAt$1($from.node(-1).contentMatchAt($from.indexAfter(-1)));
+              : defaultBlockAt($from.node(-1).contentMatchAt($from.indexAfter(-1)));
           let types = atEnd && deflt
               ? [{
                       type: deflt,
@@ -3087,6 +3077,7 @@ img.ProseMirror-separator {
        */
       setEditable(editable) {
           this.setOptions({ editable });
+          this.emit('update', { editor: this, transaction: this.state.tr });
       }
       /**
        * Returns whether the editor is editable.
@@ -3344,16 +3335,6 @@ img.ProseMirror-separator {
       return transform;
   }
 
-  function defaultBlockAt(match) {
-      for (let i = 0; i < match.edgeCount; i += 1) {
-          const { type } = match.edge(i);
-          if (type.isTextblock && !type.hasRequiredAttrs()) {
-              return type;
-          }
-      }
-      return null;
-  }
-
   function findChildren(node, predicate) {
       const nodesWithPos = [];
       node.descendants((child, pos) => {
@@ -3571,7 +3552,7 @@ img.ProseMirror-separator {
   }
 
   function isNodeSelection(value) {
-      return isObject(value) && value instanceof prosemirrorState.NodeSelection;
+      return value instanceof prosemirrorState.NodeSelection;
   }
 
   function posToDOMRect(view, from, to) {
@@ -3832,6 +3813,26 @@ img.ProseMirror-separator {
           }));
           return extension;
       }
+      static handleExit({ editor, mark, }) {
+          const { tr } = editor.state;
+          const currentPos = editor.state.selection.$from;
+          const isAtEnd = currentPos.pos === currentPos.end();
+          if (isAtEnd) {
+              const currentMarks = currentPos.marks();
+              const isInMark = !!currentMarks.find(m => (m === null || m === void 0 ? void 0 : m.type.name) === mark.name);
+              if (!isInMark) {
+                  return false;
+              }
+              const removeMark = currentMarks.find(m => (m === null || m === void 0 ? void 0 : m.type.name) === mark.name);
+              if (removeMark) {
+                  tr.removeStoredMark(removeMark);
+              }
+              tr.insertText(' ', currentPos.pos);
+              editor.view.dispatch(tr);
+              return true;
+          }
+          return false;
+      }
   }
 
   class Node {
@@ -4130,6 +4131,35 @@ img.ProseMirror-separator {
       });
   }
 
+  // source: https://stackoverflow.com/a/6969486
+  function escapeForRegEx(string) {
+      return string.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+  }
+
+  /**
+   * Build an paste rule that adds a node when the
+   * matched text is pasted into it.
+   */
+  function nodePasteRule(config) {
+      return new PasteRule({
+          find: config.find,
+          handler({ match, chain, range }) {
+              const attributes = callOrReturn(config.getAttributes, undefined, match);
+              if (attributes === false || attributes === null) {
+                  return null;
+              }
+              if (match.input) {
+                  chain()
+                      .deleteRange(range)
+                      .insertContent({
+                      type: config.type.name,
+                      attrs: attributes,
+                  });
+              }
+          },
+      });
+  }
+
   /**
    * Build an paste rule that replaces text when the
    * matched text is pasted into it.
@@ -4181,11 +4211,6 @@ img.ProseMirror-separator {
       }
   }
 
-  // source: https://stackoverflow.com/a/6969486
-  function escapeForRegEx(string) {
-      return string.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
-  }
-
   exports.CommandManager = CommandManager;
   exports.Editor = Editor;
   exports.Extension = Extension;
@@ -4235,6 +4260,7 @@ img.ProseMirror-separator {
   exports.markPasteRule = markPasteRule;
   exports.mergeAttributes = mergeAttributes;
   exports.nodeInputRule = nodeInputRule;
+  exports.nodePasteRule = nodePasteRule;
   exports.pasteRulesPlugin = pasteRulesPlugin;
   exports.posToDOMRect = posToDOMRect;
   exports.textInputRule = textInputRule;