@tiptap/core 2.0.0-beta.163 → 2.0.0-beta.167

package/dist/packages/core/src/commands/selectTextblockEnd.d.ts

@@ -0,0 +1,12 @@
+import { RawCommands } from '../types';
+declare module '@tiptap/core' {
+    interface Commands<ReturnType> {
+        selectTextblockEnd: {
+            /**
+             * Moves the cursor to the end of current text block.
+             */
+            selectTextblockEnd: () => ReturnType;
+        };
+    }
+}
+export declare const selectTextblockEnd: RawCommands['selectTextblockEnd'];

package/dist/packages/core/src/commands/selectTextblockStart.d.ts

@@ -0,0 +1,12 @@
+import { RawCommands } from '../types';
+declare module '@tiptap/core' {
+    interface Commands<ReturnType> {
+        selectTextblockStart: {
+            /**
+             * Moves the cursor to the start of current text block.
+             */
+            selectTextblockStart: () => ReturnType;
+        };
+    }
+}
+export declare const selectTextblockStart: RawCommands['selectTextblockStart'];

package/dist/packages/core/src/extensions/commands.d.ts

@@ -28,6 +28,8 @@ import * as selectAll from '../commands/selectAll';
 import * as selectNodeBackward from '../commands/selectNodeBackward';
 import * as selectNodeForward from '../commands/selectNodeForward';
 import * as selectParentNode from '../commands/selectParentNode';
+import * as selectTextblockEnd from '../commands/selectTextblockEnd';
+import * as selectTextblockStart from '../commands/selectTextblockStart';
 import * as setContent from '../commands/setContent';
 import * as setMark from '../commands/setMark';
 import * as setMeta from '../commands/setMeta';
@@ -76,6 +78,8 @@ export { selectAll };
 export { selectNodeBackward };
 export { selectNodeForward };
 export { selectParentNode };
+export { selectTextblockEnd };
+export { selectTextblockStart };
 export { setContent };
 export { setMark };
 export { setMeta };

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

@@ -0,0 +1 @@
+export declare function isMacOS(): boolean;

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);
@@ -728,7 +743,12 @@ var joinForward$1 = /*#__PURE__*/Object.freeze({
   joinForward: joinForward
 });
 
-const mac = typeof navigator !== 'undefined' ? /Mac/.test(navigator.platform) : false;
+function isMacOS() {
+    return typeof navigator !== 'undefined'
+        ? /Mac/.test(navigator.platform)
+        : false;
+}
+
 function normalizeKeyName(name) {
     const parts = name.split(/-(?!$)/);
     let result = parts[parts.length - 1];
@@ -754,7 +774,7 @@ function normalizeKeyName(name) {
             shift = true;
         }
         else if (/^mod$/i.test(mod)) {
-            if (mac) {
+            if (isiOS() || isMacOS()) {
                 meta = true;
             }
             else {
@@ -1006,6 +1026,26 @@ var selectParentNode$1 = /*#__PURE__*/Object.freeze({
   selectParentNode: selectParentNode
 });
 
+// @ts-ignore
+const selectTextblockEnd = () => ({ state, dispatch }) => {
+    return prosemirrorCommands.selectTextblockEnd(state, dispatch);
+};
+
+var selectTextblockEnd$1 = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  selectTextblockEnd: selectTextblockEnd
+});
+
+// @ts-ignore
+const selectTextblockStart = () => ({ state, dispatch }) => {
+    return prosemirrorCommands.selectTextblockStart(state, dispatch);
+};
+
+var selectTextblockStart$1 = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  selectTextblockStart: selectTextblockStart
+});
+
 function createDocument(content, schema, parseOptions = {}) {
     return createNodeFromContent(content, schema, { slice: false, parseOptions });
 }
@@ -1804,6 +1844,8 @@ const Commands = Extension.create({
             ...selectNodeBackward$1,
             ...selectNodeForward$1,
             ...selectParentNode$1,
+            ...selectTextblockEnd$1,
+            ...selectTextblockStart$1,
             ...setContent$1,
             ...setMark$1,
             ...setMeta$1,
@@ -2043,13 +2085,14 @@ const Keymap = Extension.create({
             () => commands.joinForward(),
             () => commands.selectNodeForward(),
         ]);
-        return {
-            Enter: () => this.editor.commands.first(({ commands }) => [
-                () => commands.newlineInCode(),
-                () => commands.createParagraphNear(),
-                () => commands.liftEmptyBlock(),
-                () => commands.splitBlock(),
-            ]),
+        const handleEnter = () => this.editor.commands.first(({ commands }) => [
+            () => commands.newlineInCode(),
+            () => commands.createParagraphNear(),
+            () => commands.liftEmptyBlock(),
+            () => commands.splitBlock(),
+        ]);
+        const baseKeymap = {
+            Enter: handleEnter,
             'Mod-Enter': () => this.editor.commands.exitCode(),
             Backspace: handleBackspace,
             'Mod-Backspace': handleBackspace,
@@ -2058,6 +2101,26 @@ const Keymap = Extension.create({
             'Mod-Delete': handleDelete,
             'Mod-a': () => this.editor.commands.selectAll(),
         };
+        const pcKeymap = {
+            ...baseKeymap,
+            Home: () => this.editor.commands.selectTextblockStart(),
+            End: () => this.editor.commands.selectTextblockStart(),
+        };
+        const macKeymap = {
+            ...baseKeymap,
+            'Ctrl-h': handleBackspace,
+            'Alt-Backspace': handleBackspace,
+            'Ctrl-d': handleDelete,
+            'Ctrl-Alt-Backspace': handleDelete,
+            'Alt-Delete': handleDelete,
+            'Alt-d': handleDelete,
+            'Ctrl-a': () => this.editor.commands.selectTextblockStart(),
+            'Ctrl-e': () => this.editor.commands.selectTextblockEnd(),
+        };
+        if (isiOS() || isMacOS()) {
+            return macKeymap;
+        }
+        return pcKeymap;
     },
     addProseMirrorPlugins() {
         return [
@@ -2455,21 +2518,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