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

package/dist/packages/core/src/Mark.d.ts

@@ -245,6 +245,10 @@ declare module '@tiptap/core' {
             storage: Storage;
             parent: ParentConfig<MarkConfig<Options, Storage>>['excludes'];
         }) => MarkSpec['excludes']);
+        /**
+         * Marks this Mark as exitable
+         */
+        exitable?: boolean | (() => boolean);
         /**
          * Group
          */
@@ -316,4 +320,8 @@ export declare class Mark<Options = any, Storage = any> {
     static create<O = any, S = any>(config?: Partial<MarkConfig<O, S>>): Mark<O, S>;
     configure(options?: Partial<Options>): Mark<Options, Storage>;
     extend<ExtendedOptions = Options, ExtendedStorage = Storage>(extendedConfig?: Partial<MarkConfig<ExtendedOptions, ExtendedStorage>>): Mark<ExtendedOptions, ExtendedStorage>;
+    static handleExit({ editor, mark, }: {
+        editor: Editor;
+        mark: Mark;
+    }): boolean;
 }

package/dist/packages/core/src/pasteRules/index.d.ts

@@ -1,2 +1,3 @@
 export * from './markPasteRule';
+export * from './nodePasteRule';
 export * from './textPasteRule';

package/dist/packages/core/src/pasteRules/nodePasteRule.d.ts

@@ -0,0 +1,12 @@
+import { NodeType } from 'prosemirror-model';
+import { PasteRule } from '../PasteRule';
+import { ExtendedRegExpMatchArray } from '../types';
+/**
+ * Build an paste rule that adds a node when the
+ * matched text is pasted into it.
+ */
+export declare function nodePasteRule(config: {
+    find: RegExp;
+    type: NodeType;
+    getAttributes?: Record<string, any> | ((match: ExtendedRegExpMatchArray) => Record<string, any>) | false | null;
+}): PasteRule;

package/dist/tiptap-core.cjs.js

@@ -109,13 +109,13 @@ class CommandManager {
     }
     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,
@@ -546,10 +546,10 @@ function isExtensionRulesEnabled(extension, enabled) {
 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;
 };
@@ -862,7 +862,7 @@ function pasteRulesPlugin(props) {
                     editor,
                     state: chainableState,
                     from: Math.max(from - 1, 0),
-                    to: to.b,
+                    to: to.b - 1,
                     rule,
                 });
                 // stop if there are no changes
@@ -1020,15 +1020,21 @@ class ExtensionManager {
             };
             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());
@@ -1451,23 +1457,8 @@ const first = commands => props => {
     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) {
@@ -1537,7 +1528,9 @@ const focus = (position = null, options = {}) => ({ editor, view, tr, dispatch,
         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) {
@@ -1936,10 +1929,8 @@ function createDocument(content, schema, parseOptions = {}) {
 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;
@@ -2040,10 +2031,8 @@ const setNode = (typeOrName, attributes = {}) => ({ state, dispatch, chain }) =>
 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;
@@ -2070,6 +2059,16 @@ const sinkListItem = typeOrName => ({ state, dispatch }) => {
     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)
@@ -2084,15 +2083,6 @@ function getSplittedAttributes(extensionAttributes, typeName, attributes) {
     }));
 }
 
-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());
@@ -2128,7 +2118,7 @@ const splitBlock = ({ keepMarks = true } = {}) => ({ tr, state, dispatch, editor
         }
         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,
@@ -3093,6 +3083,7 @@ class Editor extends EventEmitter {
      */
     setEditable(editable) {
         this.setOptions({ editable });
+        this.emit('update', { editor: this, transaction: this.state.tr });
     }
     /**
      * Returns whether the editor is editable.
@@ -3350,16 +3341,6 @@ function combineTransactionSteps(oldDoc, transactions) {
     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) => {
@@ -3577,7 +3558,7 @@ function getMarksBetween(from, to, doc) {
 }
 
 function isNodeSelection(value) {
-    return isObject(value) && value instanceof prosemirrorState.NodeSelection;
+    return value instanceof prosemirrorState.NodeSelection;
 }
 
 function posToDOMRect(view, from, to) {
@@ -3838,6 +3819,26 @@ class Mark {
         }));
         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 {
@@ -4136,6 +4137,35 @@ function markPasteRule(config) {
     });
 }
 
+// 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.
@@ -4187,11 +4217,6 @@ class Tracker {
     }
 }
 
-// source: https://stackoverflow.com/a/6969486
-function escapeForRegEx(string) {
-    return string.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
-}
-
 exports.CommandManager = CommandManager;
 exports.Editor = Editor;
 exports.Extension = Extension;
@@ -4241,6 +4266,7 @@ exports.markInputRule = markInputRule;
 exports.markPasteRule = markPasteRule;
 exports.mergeAttributes = mergeAttributes;
 exports.nodeInputRule = nodeInputRule;
+exports.nodePasteRule = nodePasteRule;
 exports.pasteRulesPlugin = pasteRulesPlugin;
 exports.posToDOMRect = posToDOMRect;
 exports.textInputRule = textInputRule;