@tiptap/core 2.0.0-beta.218 → 2.0.0-beta.219

package/dist/index.js

@@ -1571,7 +1571,7 @@ function createNodeFromContent(content, schema, options) {
     };
     if (typeof content === 'object' && content !== null) {
         try {
-            if (Array.isArray(content)) {
+            if (Array.isArray(content) && content.length > 0) {
                 return Fragment.fromArray(content.map(item => schema.nodeFromJSON(item)));
             }
             return schema.nodeFromJSON(content);
@@ -1656,7 +1656,17 @@ const insertContentAt = (position, value, options) => ({ tr, dispatch, editor })
         // 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);
+            // if value is string, we can use it directly
+            // otherwise if it is an array, we have to join it
+            if (Array.isArray(value)) {
+                tr.insertText(value.map(v => v.text || '').join(''), from, to);
+            }
+            else if (typeof value === 'object' && !!value && !!value.text) {
+                tr.insertText(value.text, from, to);
+            }
+            else {
+                tr.insertText(value, from, to);
+            }
         }
         else {
             tr.replaceWith(from, to, content);
@@ -2246,6 +2256,20 @@ function getMarksBetween(from, to, doc) {
     return marks;
 }
 
+function getSplittedAttributes(extensionAttributes, typeName, attributes) {
+    return Object.fromEntries(Object
+        .entries(attributes)
+        .filter(([name]) => {
+        const extensionAttribute = extensionAttributes.find(item => {
+            return item.type === typeName && item.name === name;
+        });
+        if (!extensionAttribute) {
+            return false;
+        }
+        return extensionAttribute.attribute.keepOnSplit;
+    }));
+}
+
 function isMarkActive(state, typeOrName, attributes = {}) {
     const { empty, ranges } = state.selection;
     const type = typeOrName ? getMarkType(typeOrName, state.schema) : null;
@@ -2515,20 +2539,6 @@ const sinkListItem = typeOrName => ({ state, dispatch }) => {
     return sinkListItem$1(type)(state, dispatch);
 };
 
-function getSplittedAttributes(extensionAttributes, typeName, attributes) {
-    return Object.fromEntries(Object
-        .entries(attributes)
-        .filter(([name]) => {
-        const extensionAttribute = extensionAttributes.find(item => {
-            return item.type === typeName && item.name === name;
-        });
-        if (!extensionAttribute) {
-            return false;
-        }
-        return extensionAttribute.attribute.keepOnSplit;
-    }));
-}
-
 function ensureMarks(state, splittableMarks) {
     const marks = state.storedMarks || (state.selection.$to.parentOffset && state.selection.$from.marks());
     if (marks) {
@@ -2675,7 +2685,15 @@ const splitListItem = typeOrName => ({ tr, state, dispatch, editor, }) => {
         return false;
     }
     if (dispatch) {
+        const { selection, storedMarks } = state;
+        const { splittableMarks } = editor.extensionManager;
+        const marks = storedMarks || (selection.$to.parentOffset && selection.$from.marks());
         tr.split($from.pos, 2, types).scrollIntoView();
+        if (!marks || !dispatch) {
+            return true;
+        }
+        const filteredMarks = marks.filter(mark => splittableMarks.includes(mark.type.name));
+        tr.ensureMarks(filteredMarks);
     }
     return true;
 };
@@ -2714,13 +2732,14 @@ const joinListForwards = (tr, listType) => {
     tr.join(after);
     return true;
 };
-const toggleList = (listTypeOrName, itemTypeOrName) => ({ editor, tr, state, dispatch, chain, commands, can, }) => {
-    const { extensions } = editor.extensionManager;
+const toggleList = (listTypeOrName, itemTypeOrName, keepMarks) => ({ editor, tr, state, dispatch, chain, commands, can, }) => {
+    const { extensions, splittableMarks } = editor.extensionManager;
     const listType = getNodeType(listTypeOrName, state.schema);
     const itemType = getNodeType(itemTypeOrName, state.schema);
-    const { selection } = state;
+    const { selection, storedMarks } = state;
     const { $from, $to } = selection;
     const range = $from.blockRange($to);
+    const marks = storedMarks || (selection.$to.parentOffset && selection.$from.marks());
     if (!range) {
         return false;
     }
@@ -2744,10 +2763,27 @@ const toggleList = (listTypeOrName, itemTypeOrName) => ({ editor, tr, state, dis
                 .run();
         }
     }
+    if (!keepMarks || !marks || !dispatch) {
+        return chain()
+            // try to convert node to default node if needed
+            .command(() => {
+            const canWrapInList = can().wrapInList(listType);
+            if (canWrapInList) {
+                return true;
+            }
+            return commands.clearNodes();
+        })
+            .wrapInList(listType)
+            .command(() => joinListBackwards(tr, listType))
+            .command(() => joinListForwards(tr, listType))
+            .run();
+    }
     return (chain()
         // try to convert node to default node if needed
         .command(() => {
         const canWrapInList = can().wrapInList(listType);
+        const filteredMarks = marks.filter(mark => splittableMarks.includes(mark.type.name));
+        tr.ensureMarks(filteredMarks);
         if (canWrapInList) {
             return true;
         }
@@ -3545,8 +3581,8 @@ class Editor extends EventEmitter {
         return getText(this.state.doc, {
             blockSeparator,
             textSerializers: {
-                ...textSerializers,
                 ...getTextSerializersFromSchema(this.schema),
+                ...textSerializers,
             },
         });
     }
@@ -3728,7 +3764,7 @@ function textInputRule(config) {
 function wrappingInputRule(config) {
     return new InputRule({
         find: config.find,
-        handler: ({ state, range, match }) => {
+        handler: ({ state, range, match, chain, }) => {
             const attributes = callOrReturn(config.getAttributes, undefined, match) || {};
             const tr = state.tr.delete(range.from, range.to);
             const $start = tr.doc.resolve(range.from);
@@ -3738,6 +3774,20 @@ function wrappingInputRule(config) {
                 return null;
             }
             tr.wrap(blockRange, wrapping);
+            if (config.keepMarks && config.editor) {
+                const { selection, storedMarks } = state;
+                const { splittableMarks } = config.editor.extensionManager;
+                const marks = storedMarks || (selection.$to.parentOffset && selection.$from.marks());
+                if (marks) {
+                    const filteredMarks = marks.filter(mark => splittableMarks.includes(mark.type.name));
+                    tr.ensureMarks(filteredMarks);
+                }
+            }
+            if (config.keepAttributes) {
+                /** If the nodeType is `bulletList` or `orderedList` set the `nodeType` as `listItem` */
+                const nodeType = config.type.name === 'bulletList' || config.type.name === 'orderedList' ? 'listItem' : 'taskList';
+                chain().updateAttributes(nodeType, attributes).run();
+            }
             const before = tr.doc.resolve(range.from - 1).nodeBefore;
             if (before
                 && before.type === config.type
@@ -4205,5 +4255,5 @@ class Tracker {
     }
 }
 
-export { CommandManager, Editor, Extension, InputRule, Mark, Node, NodeView, PasteRule, Tracker, callOrReturn, combineTransactionSteps, createStyleTag, defaultBlockAt, deleteProps, elementFromString, escapeForRegEx, extensions, findChildren, findChildrenInRange, findDuplicates, findParentNode, findParentNodeClosestToPos, fromString, generateHTML, generateJSON, generateText, getAttributes, getChangedRanges, getDebugJSON, getExtensionField, getHTMLFromFragment, getMarkAttributes, getMarkRange, getMarkType, getMarksBetween, getNodeAttributes, getNodeType, getSchema, getText, getTextBetween, getTextContentFromNodes, getTextSerializersFromSchema, inputRulesPlugin, isActive, isEmptyObject, isFunction, isList, isMacOS, isMarkActive, isNodeActive, isNodeEmpty, isNodeSelection, isNumber, isPlainObject, isRegExp, isString, isTextSelection, isiOS, markInputRule, markPasteRule, mergeAttributes, mergeDeep, minMax, nodeInputRule, nodePasteRule, objectIncludes, pasteRulesPlugin, posToDOMRect, removeDuplicates, textInputRule, textPasteRule, textblockTypeInputRule, wrappingInputRule };
+export { CommandManager, Editor, Extension, InputRule, Mark, Node, NodeView, PasteRule, Tracker, callOrReturn, combineTransactionSteps, createChainableState, createDocument, createNodeFromContent, createStyleTag, defaultBlockAt, deleteProps, elementFromString, escapeForRegEx, extensions, findChildren, findChildrenInRange, findDuplicates, findParentNode, findParentNodeClosestToPos, fromString, generateHTML, generateJSON, generateText, getAttributes, getAttributesFromExtensions, getChangedRanges, getDebugJSON, getExtensionField, getHTMLFromFragment, getMarkAttributes, getMarkRange, getMarkType, getMarksBetween, getNodeAttributes, getNodeType, getRenderedAttributes, getSchema, getSchemaByResolvedExtensions, getSchemaTypeByName, getSchemaTypeNameByName, getSplittedAttributes, getText, getTextBetween, getTextContentFromNodes, getTextSerializersFromSchema, injectExtensionAttributesToParseRule, inputRulesPlugin, isActive, 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 };
 //# sourceMappingURL=index.js.map