@tiptap/core 2.10.4 → 2.11.1

package/dist/index.js

@@ -1,4 +1,4 @@
-import { Plugin, PluginKey, TextSelection, Selection, NodeSelection, EditorState } from '@tiptap/pm/state';
+import { Plugin, PluginKey, TextSelection, Selection, AllSelection, NodeSelection, EditorState } from '@tiptap/pm/state';
 import { EditorView } from '@tiptap/pm/view';
 import { keymap } from '@tiptap/pm/keymap';
 import { Schema, DOMSerializer, Fragment, Node as Node$1, DOMParser, Slice } from '@tiptap/pm/model';
@@ -320,7 +320,7 @@ function mergeAttributes(...objects) {
                 return;
             }
             if (key === 'class') {
-                const valueClasses = value ? value.split(' ') : [];
+                const valueClasses = value ? String(value).split(' ') : [];
                 const existingClasses = mergedAttributes[key] ? mergedAttributes[key].split(' ') : [];
                 const insertClasses = valueClasses.filter(valueClass => !existingClasses.includes(valueClass));
                 mergedAttributes[key] = [...existingClasses, ...insertClasses].join(' ');
@@ -362,6 +362,7 @@ function getRenderedAttributes(nodeOrMark, extensionAttributes) {
         .reduce((attributes, attribute) => mergeAttributes(attributes, attribute), {});
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
 function isFunction(value) {
     return typeof value === 'function';
 }
@@ -996,6 +997,8 @@ function run(config) {
     const success = handlers.every(handler => handler !== null);
     return success;
 }
+// When dragging across editors, must get another editor instance to delete selection content.
+let tiptapDragFromOtherEditor = null;
 const createClipboardPasteEvent = (text) => {
     var _a;
     const event = new ClipboardEvent('paste', {
@@ -1019,7 +1022,7 @@ function pasteRulesPlugin(props) {
     try {
         dropEvent = typeof DragEvent !== 'undefined' ? new DragEvent('drop') : null;
     }
-    catch (e) {
+    catch {
         dropEvent = null;
     }
     const processEvent = ({ state, from, to, rule, pasteEvt, }) => {
@@ -1043,7 +1046,7 @@ function pasteRulesPlugin(props) {
         try {
             dropEvent = typeof DragEvent !== 'undefined' ? new DragEvent('drop') : null;
         }
-        catch (e) {
+        catch {
             dropEvent = null;
         }
         pasteEvent = typeof ClipboardEvent !== 'undefined' ? new ClipboardEvent('paste') : null;
@@ -1058,11 +1061,21 @@ function pasteRulesPlugin(props) {
                     dragSourceElement = ((_a = view.dom.parentElement) === null || _a === void 0 ? void 0 : _a.contains(event.target))
                         ? view.dom.parentElement
                         : null;
+                    if (dragSourceElement) {
+                        tiptapDragFromOtherEditor = editor;
+                    }
+                };
+                const handleDragend = () => {
+                    if (tiptapDragFromOtherEditor) {
+                        tiptapDragFromOtherEditor = null;
+                    }
                 };
                 window.addEventListener('dragstart', handleDragstart);
+                window.addEventListener('dragend', handleDragend);
                 return {
                     destroy() {
                         window.removeEventListener('dragstart', handleDragstart);
+                        window.removeEventListener('dragend', handleDragend);
                     },
                 };
             },
@@ -1071,6 +1084,18 @@ function pasteRulesPlugin(props) {
                     drop: (view, event) => {
                         isDroppedFromProseMirror = dragSourceElement === view.dom.parentElement;
                         dropEvent = event;
+                        if (!isDroppedFromProseMirror) {
+                            const dragFromOtherEditor = tiptapDragFromOtherEditor;
+                            if (dragFromOtherEditor) {
+                                // setTimeout to avoid the wrong content after drop, timeout arg can't be empty or 0
+                                setTimeout(() => {
+                                    const selection = dragFromOtherEditor.state.selection;
+                                    if (selection) {
+                                        dragFromOtherEditor.commands.deleteRange({ from: selection.from, to: selection.to });
+                                    }
+                                }, 10);
+                            }
+                        }
                         return false;
                     },
                     paste: (_view, event) => {
@@ -1829,30 +1854,13 @@ function resolveFocusPosition(doc, position = null) {
     return TextSelection.create(doc, minMax(position, minPos, maxPos), minMax(position, minPos, maxPos));
 }
 
-function isiOS() {
-    return [
-        'iPad Simulator',
-        'iPhone Simulator',
-        'iPod Simulator',
-        'iPad',
-        'iPhone',
-        'iPod',
-    ].includes(navigator.platform)
-        // iPad on iOS 13 detection
-        || (navigator.userAgent.includes('Mac') && 'ontouchend' in document);
-}
-
 const focus = (position = null, options = {}) => ({ editor, view, tr, dispatch, }) => {
     options = {
         scrollIntoView: true,
         ...options,
     };
     const delayedFocus = () => {
-        // focus within `requestAnimationFrame` breaks focus on iOS
-        // so we have to call this
-        if (isiOS()) {
-            view.dom.focus();
-        }
+        view.dom.focus();
         // For React we have to focus asynchronously. Otherwise wild things happen.
         // see: https://github.com/ueberdosis/tiptap/issues/1520
         requestAnimationFrame(() => {
@@ -2153,7 +2161,7 @@ const joinItemBackward = () => ({ state, dispatch, tr, }) => {
         }
         return true;
     }
-    catch (e) {
+    catch {
         return false;
     }
 };
@@ -2170,7 +2178,7 @@ const joinItemForward = () => ({ state, dispatch, tr, }) => {
         }
         return true;
     }
-    catch (e) {
+    catch {
         return false;
     }
 };
@@ -2183,6 +2191,19 @@ const joinTextblockForward = () => ({ state, dispatch }) => {
     return joinTextblockForward$1(state, dispatch);
 };
 
+function isiOS() {
+    return [
+        'iPad Simulator',
+        'iPhone Simulator',
+        'iPod Simulator',
+        'iPad',
+        'iPhone',
+        'iPod',
+    ].includes(navigator.platform)
+        // iPad on iOS 13 detection
+        || (navigator.userAgent.includes('Mac') && 'ontouchend' in document);
+}
+
 function isMacOS() {
     return typeof navigator !== 'undefined'
         ? /Mac/.test(navigator.platform)
@@ -2393,11 +2414,12 @@ const scrollIntoView = () => ({ tr, dispatch }) => {
     return true;
 };
 
-const selectAll = () => ({ tr, commands }) => {
-    return commands.setTextSelection({
-        from: 0,
-        to: tr.doc.content.size,
-    });
+const selectAll = () => ({ tr, dispatch }) => {
+    if (dispatch) {
+        const selection = new AllSelection(tr.doc);
+        tr.setSelection(selection);
+    }
+    return true;
 };
 
 const selectNodeBackward = () => ({ state, dispatch }) => {
@@ -3084,6 +3106,81 @@ function posToDOMRect(view, from, to) {
     };
 }
 
+/**
+ * The actual implementation of the rewriteUnknownContent function
+ */
+function rewriteUnknownContentInner({ json, validMarks, validNodes, options, rewrittenContent = [], }) {
+    if (json.marks && Array.isArray(json.marks)) {
+        json.marks = json.marks.filter(mark => {
+            const name = typeof mark === 'string' ? mark : mark.type;
+            if (validMarks.has(name)) {
+                return true;
+            }
+            rewrittenContent.push({
+                original: JSON.parse(JSON.stringify(mark)),
+                unsupported: name,
+            });
+            // Just ignore any unknown marks
+            return false;
+        });
+    }
+    if (json.content && Array.isArray(json.content)) {
+        json.content = json.content
+            .map(value => rewriteUnknownContentInner({
+            json: value,
+            validMarks,
+            validNodes,
+            options,
+            rewrittenContent,
+        }).json)
+            .filter(a => a !== null && a !== undefined);
+    }
+    if (json.type && !validNodes.has(json.type)) {
+        rewrittenContent.push({
+            original: JSON.parse(JSON.stringify(json)),
+            unsupported: json.type,
+        });
+        if (json.content && Array.isArray(json.content) && ((options === null || options === void 0 ? void 0 : options.fallbackToParagraph) !== false)) {
+            // Just treat it like a paragraph and hope for the best
+            json.type = 'paragraph';
+            return {
+                json,
+                rewrittenContent,
+            };
+        }
+        // or just omit it entirely
+        return {
+            json: null,
+            rewrittenContent,
+        };
+    }
+    return { json, rewrittenContent };
+}
+/**
+ * Rewrite unknown nodes and marks within JSON content
+ * Allowing for user within the editor
+ */
+function rewriteUnknownContent(
+/**
+ * The JSON content to clean of unknown nodes and marks
+ */
+json, 
+/**
+ * The schema to use for validation
+ */
+schema, 
+/**
+ * Options for the cleaning process
+ */
+options) {
+    return rewriteUnknownContentInner({
+        json,
+        validNodes: new Set(Object.keys(schema.nodes)),
+        validMarks: new Set(Object.keys(schema.marks)),
+        options,
+    });
+}
+
 function canSetMark(state, tr, newMarkType) {
     var _a;
     const { selection } = tr;
@@ -5079,10 +5176,10 @@ class NodeView {
         // ProseMirror tries to drag selectable nodes
         // even if `draggable` is set to `false`
         // this fix prevents that
-        if (!isDraggable && isSelectable && isDragEvent) {
+        if (!isDraggable && isSelectable && isDragEvent && event.target === this.dom) {
             event.preventDefault();
         }
-        if (isDraggable && isDragEvent && !isDragging) {
+        if (isDraggable && isDragEvent && !isDragging && event.target === this.dom) {
             event.preventDefault();
             return false;
         }
@@ -5323,5 +5420,5 @@ class Tracker {
     }
 }
 
-export { CommandManager, Editor, Extension, InputRule, Mark, Node, NodePos, NodeView, PasteRule, Tracker, callOrReturn, combineTransactionSteps, createChainableState, createDocument, createNodeFromContent, createStyleTag, defaultBlockAt, deleteProps, elementFromString, escapeForRegEx, index as extensions, findChildren, findChildrenInRange, findDuplicates, findParentNode, findParentNodeClosestToPos, fromString, generateHTML, generateJSON, generateText, getAttributes, getAttributesFromExtensions, getChangedRanges, getDebugJSON, getExtensionField, getHTMLFromFragment, getMarkAttributes, getMarkRange, getMarkType, getMarksBetween, getNodeAtPosition, getNodeAttributes, getNodeType, getRenderedAttributes, getSchema, getSchemaByResolvedExtensions, getSchemaTypeByName, getSchemaTypeNameByName, getSplittedAttributes, getText, getTextBetween, getTextContentFromNodes, getTextSerializersFromSchema, injectExtensionAttributesToParseRule, inputRulesPlugin, isActive, isAtEndOfNode, isAtStartOfNode, isEmptyObject, isExtensionRulesEnabled, isFunction, isList, isMacOS, isMarkActive, isNodeActive, isNodeEmpty, isNodeSelection, isNumber, isPlainObject, isRegExp, isString, isTextSelection, isiOS, markInputRule, markPasteRule, mergeAttributes, mergeDeep, minMax, nodeInputRule, nodePasteRule, objectIncludes, pasteRulesPlugin, posToDOMRect, removeDuplicates, resolveFocusPosition, selectionToInsertionEnd, splitExtensions, textInputRule, textPasteRule, textblockTypeInputRule, wrappingInputRule };
+export { CommandManager, Editor, Extension, InputRule, Mark, Node, NodePos, NodeView, PasteRule, Tracker, callOrReturn, combineTransactionSteps, createChainableState, createDocument, createNodeFromContent, createStyleTag, defaultBlockAt, deleteProps, elementFromString, escapeForRegEx, index as extensions, findChildren, findChildrenInRange, findDuplicates, findParentNode, findParentNodeClosestToPos, fromString, generateHTML, generateJSON, generateText, getAttributes, getAttributesFromExtensions, getChangedRanges, getDebugJSON, getExtensionField, getHTMLFromFragment, getMarkAttributes, getMarkRange, getMarkType, getMarksBetween, getNodeAtPosition, getNodeAttributes, getNodeType, getRenderedAttributes, getSchema, getSchemaByResolvedExtensions, getSchemaTypeByName, getSchemaTypeNameByName, getSplittedAttributes, getText, getTextBetween, getTextContentFromNodes, getTextSerializersFromSchema, injectExtensionAttributesToParseRule, inputRulesPlugin, isActive, isAtEndOfNode, isAtStartOfNode, isEmptyObject, isExtensionRulesEnabled, isFunction, isList, isMacOS, isMarkActive, isNodeActive, isNodeEmpty, isNodeSelection, isNumber, isPlainObject, isRegExp, isString, isTextSelection, isiOS, markInputRule, markPasteRule, mergeAttributes, mergeDeep, minMax, nodeInputRule, nodePasteRule, objectIncludes, pasteRulesPlugin, posToDOMRect, removeDuplicates, resolveFocusPosition, rewriteUnknownContent, selectionToInsertionEnd, splitExtensions, textInputRule, textPasteRule, textblockTypeInputRule, wrappingInputRule };
 //# sourceMappingURL=index.js.map