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

package/dist/index.umd.js

@@ -1569,7 +1569,7 @@
       };
       if (typeof content === 'object' && content !== null) {
           try {
-              if (Array.isArray(content)) {
+              if (Array.isArray(content) && content.length > 0) {
                   return model.Fragment.fromArray(content.map(item => schema.nodeFromJSON(item)));
               }
               return schema.nodeFromJSON(content);
@@ -1654,7 +1654,17 @@
           // 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);
@@ -2244,6 +2254,20 @@
       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;
@@ -2513,20 +2537,6 @@
       return schemaList.sinkListItem(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) {
@@ -2673,7 +2683,15 @@
           return false;
       }
       if (dispatch) {
+          const { selection, storedMarks } = state$1;
+          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;
   };
@@ -2712,13 +2730,14 @@
       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;
       }
@@ -2742,10 +2761,27 @@
                   .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;
           }
@@ -3543,8 +3579,8 @@ img.ProseMirror-separator {
           return getText(this.state.doc, {
               blockSeparator,
               textSerializers: {
-                  ...textSerializers,
                   ...getTextSerializersFromSchema(this.schema),
+                  ...textSerializers,
               },
           });
       }
@@ -3726,7 +3762,7 @@ img.ProseMirror-separator {
   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);
@@ -3736,6 +3772,20 @@ img.ProseMirror-separator {
                   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
@@ -3964,10 +4014,11 @@ img.ProseMirror-separator {
           if (!isInElement) {
               return false;
           }
+          const isDragEvent = event.type.startsWith('drag');
           const isDropEvent = event.type === 'drop';
           const isInput = ['INPUT', 'BUTTON', 'SELECT', 'TEXTAREA'].includes(target.tagName) || target.isContentEditable;
           // any input event within node views should be ignored by ProseMirror
-          if (isInput && !isDropEvent) {
+          if (isInput && !isDropEvent && !isDragEvent) {
               return true;
           }
           const { isEditable } = this.editor;
@@ -3978,7 +4029,6 @@ img.ProseMirror-separator {
           const isPasteEvent = event.type === 'paste';
           const isCutEvent = event.type === 'cut';
           const isClickEvent = event.type === 'mousedown';
-          const isDragEvent = event.type.startsWith('drag');
           // ProseMirror tries to drag selectable nodes
           // even if `draggable` is set to `false`
           // this fix prevents that
@@ -3998,6 +4048,9 @@ img.ProseMirror-separator {
                   document.addEventListener('dragend', () => {
                       this.isDragging = false;
                   }, { once: true });
+                  document.addEventListener('drop', () => {
+                      this.isDragging = false;
+                  }, { once: true });
                   document.addEventListener('mouseup', () => {
                       this.isDragging = false;
                   }, { once: true });
@@ -4211,6 +4264,9 @@ img.ProseMirror-separator {
   exports.Tracker = Tracker;
   exports.callOrReturn = callOrReturn;
   exports.combineTransactionSteps = combineTransactionSteps;
+  exports.createChainableState = createChainableState;
+  exports.createDocument = createDocument;
+  exports.createNodeFromContent = createNodeFromContent;
   exports.createStyleTag = createStyleTag;
   exports.defaultBlockAt = defaultBlockAt;
   exports.deleteProps = deleteProps;
@@ -4227,6 +4283,7 @@ img.ProseMirror-separator {
   exports.generateJSON = generateJSON;
   exports.generateText = generateText;
   exports.getAttributes = getAttributes;
+  exports.getAttributesFromExtensions = getAttributesFromExtensions;
   exports.getChangedRanges = getChangedRanges;
   exports.getDebugJSON = getDebugJSON;
   exports.getExtensionField = getExtensionField;
@@ -4237,14 +4294,21 @@ img.ProseMirror-separator {
   exports.getMarksBetween = getMarksBetween;
   exports.getNodeAttributes = getNodeAttributes;
   exports.getNodeType = getNodeType;
+  exports.getRenderedAttributes = getRenderedAttributes;
   exports.getSchema = getSchema;
+  exports.getSchemaByResolvedExtensions = getSchemaByResolvedExtensions;
+  exports.getSchemaTypeByName = getSchemaTypeByName;
+  exports.getSchemaTypeNameByName = getSchemaTypeNameByName;
+  exports.getSplittedAttributes = getSplittedAttributes;
   exports.getText = getText;
   exports.getTextBetween = getTextBetween;
   exports.getTextContentFromNodes = getTextContentFromNodes;
   exports.getTextSerializersFromSchema = getTextSerializersFromSchema;
+  exports.injectExtensionAttributesToParseRule = injectExtensionAttributesToParseRule;
   exports.inputRulesPlugin = inputRulesPlugin;
   exports.isActive = isActive;
   exports.isEmptyObject = isEmptyObject;
+  exports.isExtensionRulesEnabled = isExtensionRulesEnabled;
   exports.isFunction = isFunction;
   exports.isList = isList;
   exports.isMacOS = isMacOS;
@@ -4269,6 +4333,9 @@ img.ProseMirror-separator {
   exports.pasteRulesPlugin = pasteRulesPlugin;
   exports.posToDOMRect = posToDOMRect;
   exports.removeDuplicates = removeDuplicates;
+  exports.resolveFocusPosition = resolveFocusPosition;
+  exports.selectionToInsertionEnd = selectionToInsertionEnd;
+  exports.splitExtensions = splitExtensions;
   exports.textInputRule = textInputRule;
   exports.textPasteRule = textPasteRule;
   exports.textblockTypeInputRule = textblockTypeInputRule;