@tiptap/core 2.5.0-beta.1 → 2.5.0-beta.2

package/dist/index.umd.js

@@ -3350,30 +3350,40 @@
           markType = getMarkType(typeOrName, state.schema);
       }
       if (dispatch) {
-          tr.selection.ranges.forEach(range => {
+          let lastPos;
+          let lastNode;
+          let trimmedFrom;
+          let trimmedTo;
+          tr.selection.ranges.forEach((range) => {
               const from = range.$from.pos;
               const to = range.$to.pos;
               state.doc.nodesBetween(from, to, (node, pos) => {
                   if (nodeType && nodeType === node.type) {
-                      tr.setNodeMarkup(pos, undefined, {
-                          ...node.attrs,
-                          ...attributes,
-                      });
-                  }
-                  if (markType && node.marks.length) {
-                      node.marks.forEach(mark => {
-                          if (markType === mark.type) {
-                              const trimmedFrom = Math.max(pos, from);
-                              const trimmedTo = Math.min(pos + node.nodeSize, to);
-                              tr.addMark(trimmedFrom, trimmedTo, markType.create({
-                                  ...mark.attrs,
-                                  ...attributes,
-                              }));
-                          }
-                      });
+                      trimmedFrom = Math.max(pos, from);
+                      trimmedTo = Math.min(pos + node.nodeSize, to);
+                      lastPos = pos;
+                      lastNode = node;
                   }
               });
           });
+          if (lastNode) {
+              if (lastPos !== undefined) {
+                  tr.setNodeMarkup(lastPos, undefined, {
+                      ...lastNode.attrs,
+                      ...attributes,
+                  });
+              }
+              if (markType && lastNode.marks.length) {
+                  lastNode.marks.forEach((mark) => {
+                      if (markType === mark.type) {
+                          tr.addMark(trimmedFrom, trimmedTo, markType.create({
+                              ...mark.attrs,
+                              ...attributes,
+                          }));
+                      }
+                  });
+              }
+          }
       }
       return true;
   };