@tiptap/core 2.0.0-beta.160 → 2.0.0-beta.164

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

@@ -18,7 +18,7 @@ export declare class InputRule {
         commands: SingleCommands;
         chain: () => ChainedCommands;
         can: () => CanCommands;
-    }) => void;
+    }) => void | null;
     constructor(config: {
         find: InputRuleFinder;
         handler: (props: {
@@ -28,7 +28,7 @@ export declare class InputRule {
             commands: SingleCommands;
             chain: () => ChainedCommands;
             can: () => CanCommands;
-        }) => void;
+        }) => void | null;
     });
 }
 /**

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

@@ -18,7 +18,7 @@ export declare class PasteRule {
         commands: SingleCommands;
         chain: () => ChainedCommands;
         can: () => CanCommands;
-    }) => void;
+    }) => void | null;
     constructor(config: {
         find: PasteRuleFinder;
         handler: (props: {
@@ -28,7 +28,7 @@ export declare class PasteRule {
             commands: SingleCommands;
             chain: () => ChainedCommands;
             can: () => CanCommands;
-        }) => void;
+        }) => void | null;
     });
 }
 /**
@@ -39,4 +39,4 @@ export declare class PasteRule {
 export declare function pasteRulesPlugin(props: {
     editor: Editor;
     rules: PasteRule[];
-}): Plugin;
+}): Plugin[];

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

@@ -18,6 +18,7 @@ export * from './inputRules/wrappingInputRule';
 export * from './pasteRules/markPasteRule';
 export * from './pasteRules/textPasteRule';
 export * from './utilities/callOrReturn';
+export * from './utilities/escapeForRegEx';
 export * from './utilities/mergeAttributes';
 export * from './helpers/combineTransactionSteps';
 export * from './helpers/defaultBlockAt';

package/dist/packages/core/src/utilities/escapeForRegEx.d.ts

@@ -0,0 +1 @@
+export declare function escapeForRegEx(string: string): string;

package/dist/tiptap-core.cjs.js

@@ -2274,7 +2274,7 @@ function run$1(config) {
             editor,
             state,
         });
-        rule.handler({
+        const handler = rule.handler({
             state,
             range,
             match,
@@ -2283,7 +2283,7 @@ function run$1(config) {
             can,
         });
         // stop if there are no changes
-        if (!tr.steps.length) {
+        if (handler === null || !tr.steps.length) {
             return;
         }
         // store transform as meta data
@@ -2410,11 +2410,12 @@ const pasteRuleMatcherHandler = (text, find) => {
     });
 };
 function run(config) {
-    const { editor, state, from, to, rules, } = config;
+    const { editor, state, from, to, rule, } = config;
     const { commands, chain, can } = new CommandManager({
         editor,
         state,
     });
+    const handlers = [];
     state.doc.nodesBetween(from, to, (node, pos) => {
         if (!node.isTextblock || node.type.spec.code) {
             return;
@@ -2422,29 +2423,30 @@ function run(config) {
         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');
-        rules.forEach(rule => {
-            const matches = pasteRuleMatcherHandler(textToMatch, rule.find);
-            matches.forEach(match => {
-                if (match.index === undefined) {
-                    return;
-                }
-                const start = resolvedFrom + match.index + 1;
-                const end = start + match[0].length;
-                const range = {
-                    from: state.tr.mapping.map(start),
-                    to: state.tr.mapping.map(end),
-                };
-                rule.handler({
-                    state,
-                    range,
-                    match,
-                    commands,
-                    chain,
-                    can,
-                });
+        const matches = pasteRuleMatcherHandler(textToMatch, rule.find);
+        matches.forEach(match => {
+            if (match.index === undefined) {
+                return;
+            }
+            const start = resolvedFrom + match.index + 1;
+            const end = start + match[0].length;
+            const range = {
+                from: state.tr.mapping.map(start),
+                to: state.tr.mapping.map(end),
+            };
+            const handler = rule.handler({
+                state,
+                range,
+                match,
+                commands,
+                chain,
+                can,
             });
+            handlers.push(handler);
         });
     });
+    const success = handlers.every(handler => handler !== null);
+    return success;
 }
 /**
  * Create an paste rules plugin. When enabled, it will cause pasted
@@ -2453,54 +2455,76 @@ function run(config) {
  */
 function pasteRulesPlugin(props) {
     const { editor, rules } = props;
-    let isProseMirrorHTML = false;
-    const plugin = new prosemirrorState.Plugin({
-        props: {
-            handlePaste: (view, event) => {
-                var _a;
-                const html = (_a = event.clipboardData) === null || _a === void 0 ? void 0 : _a.getData('text/html');
-                isProseMirrorHTML = !!(html === null || html === void 0 ? void 0 : html.includes('data-pm-slice'));
-                return false;
+    let dragSourceElement = null;
+    let isPastedFromProseMirror = false;
+    let isDroppedFromProseMirror = false;
+    const plugins = rules.map(rule => {
+        return new prosemirrorState.Plugin({
+            // we register a global drag handler to track the current drag source element
+            view(view) {
+                const handleDragstart = (event) => {
+                    var _a;
+                    dragSourceElement = ((_a = view.dom.parentElement) === null || _a === void 0 ? void 0 : _a.contains(event.target))
+                        ? view.dom.parentElement
+                        : null;
+                };
+                window.addEventListener('dragstart', handleDragstart);
+                return {
+                    destroy() {
+                        window.removeEventListener('dragstart', handleDragstart);
+                    },
+                };
             },
-        },
-        appendTransaction: (transactions, oldState, state) => {
-            const transaction = transactions[0];
-            // stop if there is not a paste event
-            if (!transaction.getMeta('paste') || isProseMirrorHTML) {
-                return;
-            }
-            // stop if there is no changed range
-            const { doc, before } = transaction;
-            const from = before.content.findDiffStart(doc.content);
-            const to = before.content.findDiffEnd(doc.content);
-            if (!isNumber(from) || !to || from === to.b) {
-                return;
-            }
-            // build a chainable state
-            // so we can use a single transaction for all paste rules
-            const tr = state.tr;
-            const chainableState = createChainableState({
-                state,
-                transaction: tr,
-            });
-            run({
-                editor,
-                state: chainableState,
-                from: Math.max(from - 1, 0),
-                to: to.b,
-                rules,
-                plugin,
-            });
-            // stop if there are no changes
-            if (!tr.steps.length) {
-                return;
-            }
-            return tr;
-        },
-        // @ts-ignore
-        isPasteRules: true,
+            props: {
+                handleDOMEvents: {
+                    drop: view => {
+                        isDroppedFromProseMirror = dragSourceElement === view.dom.parentElement;
+                        return false;
+                    },
+                    paste: (view, event) => {
+                        var _a;
+                        const html = (_a = event.clipboardData) === null || _a === void 0 ? void 0 : _a.getData('text/html');
+                        isPastedFromProseMirror = !!(html === null || html === void 0 ? void 0 : html.includes('data-pm-slice'));
+                        return false;
+                    },
+                },
+            },
+            appendTransaction: (transactions, oldState, state) => {
+                const transaction = transactions[0];
+                const isPaste = transaction.getMeta('uiEvent') === 'paste' && !isPastedFromProseMirror;
+                const isDrop = transaction.getMeta('uiEvent') === 'drop' && !isDroppedFromProseMirror;
+                if (!isPaste && !isDrop) {
+                    return;
+                }
+                // stop if there is no changed range
+                const from = oldState.doc.content.findDiffStart(state.doc.content);
+                const to = oldState.doc.content.findDiffEnd(state.doc.content);
+                if (!isNumber(from) || !to || from === to.b) {
+                    return;
+                }
+                // build a chainable state
+                // so we can use a single transaction for all paste rules
+                const tr = state.tr;
+                const chainableState = createChainableState({
+                    state,
+                    transaction: tr,
+                });
+                const handler = run({
+                    editor,
+                    state: chainableState,
+                    from: Math.max(from - 1, 0),
+                    to: to.b,
+                    rule,
+                });
+                // stop if there are no changes
+                if (!handler || !tr.steps.length) {
+                    return;
+                }
+                return tr;
+            },
+        });
     });
-    return plugin;
+    return plugins;
 }
 
 /**
@@ -2974,7 +2998,7 @@ class ExtensionManager {
                 editor,
                 rules: inputRules,
             }),
-            pasteRulesPlugin({
+            ...pasteRulesPlugin({
                 editor,
                 rules: pasteRules,
             }),
@@ -3893,7 +3917,7 @@ function markInputRule(config) {
         handler: ({ state, range, match }) => {
             const attributes = callOrReturn(config.getAttributes, undefined, match);
             if (attributes === false || attributes === null) {
-                return;
+                return null;
             }
             const { tr } = state;
             const captureGroup = match[match.length - 1];
@@ -4023,7 +4047,7 @@ function markPasteRule(config) {
         handler: ({ state, range, match }) => {
             const attributes = callOrReturn(config.getAttributes, undefined, match);
             if (attributes === false || attributes === null) {
-                return;
+                return null;
             }
             const { tr } = state;
             const captureGroup = match[match.length - 1];
@@ -4083,6 +4107,11 @@ function textPasteRule(config) {
     });
 }
 
+// source: https://stackoverflow.com/a/6969486
+function escapeForRegEx(string) {
+    return string.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+}
+
 /**
  * Returns a new `Transform` based on all steps of the passed transactions.
  */
@@ -4338,6 +4367,7 @@ exports.Tracker = Tracker;
 exports.callOrReturn = callOrReturn;
 exports.combineTransactionSteps = combineTransactionSteps;
 exports.defaultBlockAt = defaultBlockAt;
+exports.escapeForRegEx = escapeForRegEx;
 exports.extensions = extensions;
 exports.findChildren = findChildren;
 exports.findChildrenInRange = findChildrenInRange;