@tiptap/core 2.0.0-beta.162 → 2.0.0-beta.166

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

@@ -210,8 +210,12 @@ const ClipboardTextSerializer = Extension.create({
 
 const blur = () => ({ editor, view }) => {
     requestAnimationFrame(() => {
+        var _a;
         if (!editor.isDestroyed) {
             view.dom.blur();
+            // Browsers should remove the caret on blur but safari does not.
+            // See: https://github.com/ueberdosis/tiptap/issues/2405
+            (_a = window === null || window === void 0 ? void 0 : window.getSelection()) === null || _a === void 0 ? void 0 : _a.removeAllRanges();
         }
     });
     return true;
@@ -670,6 +674,7 @@ const insertContentAt = (position, value, options) => ({ tr, dispatch, editor })
         let { from, to } = typeof position === 'number'
             ? { from: position, to: position }
             : position;
+        let isOnlyTextContent = true;
         let isOnlyBlockContent = true;
         const nodes = isFragment(content)
             ? content
@@ -677,6 +682,9 @@ const insertContentAt = (position, value, options) => ({ tr, dispatch, editor })
         nodes.forEach(node => {
             // check if added node is valid
             node.check();
+            isOnlyTextContent = isOnlyTextContent
+                ? node.isText && node.marks.length === 0
+                : false;
             isOnlyBlockContent = isOnlyBlockContent
                 ? node.isBlock
                 : false;
@@ -696,7 +704,14 @@ const insertContentAt = (position, value, options) => ({ tr, dispatch, editor })
                 to += 1;
             }
         }
-        tr.replaceWith(from, to, content);
+        // if there is only plain text we have to use `insertText`
+        // because this will keep the current marks
+        if (isOnlyTextContent) {
+            tr.insertText(value, from, to);
+        }
+        else {
+            tr.replaceWith(from, to, content);
+        }
         // set cursor at end of inserted content
         if (options.updateSelection) {
             selectionToInsertionEnd(tr, tr.steps.length - 1, -1);
@@ -2455,21 +2470,45 @@ function run(config) {
  */
 function pasteRulesPlugin(props) {
     const { editor, rules } = props;
-    let isProseMirrorHTML = false;
+    let dragSourceElement = null;
+    let isPastedFromProseMirror = false;
+    let isDroppedFromProseMirror = false;
     const plugins = rules.map(rule => {
         return new prosemirrorState.Plugin({
-            props: {
-                handlePaste: (view, event) => {
+            // we register a global drag handler to track the current drag source element
+            view(view) {
+                const handleDragstart = (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;
+                    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);
+                    },
+                };
+            },
+            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];
-                // stop if there is not a paste event
-                if (!transaction.getMeta('paste') || isProseMirrorHTML) {
+                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
@@ -4083,6 +4122,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 +4382,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;