prosemirror-transform 1.10.3 → 1.10.5

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.10.5 (2025-11-11)
+
+### Bug fixes
+
+Fix a bug in `liftTarget` that caused it to fail to properly check content constraints when a lift would split a node.
+
+## 1.10.4 (2025-04-22)
+
+### Bug fixes
+
+Fix a bug that caused mapping `ReplaceStep`s to reset their `structure` flag.
+
+Align `removeNodeMark`'s behavior to that of `removeMark`. When passing in a node type, it now removes all occurrences of that type.
+
 ## 1.10.3 (2025-03-04)
 
 ### Bug fixes

package/dist/index.cjs

@@ -613,7 +613,7 @@ var ReplaceStep = function (_Step5) {
       var from = mapping.mapResult(this.from, 1),
         to = mapping.mapResult(this.to, -1);
       if (from.deletedAcross && to.deletedAcross) return null;
-      return new ReplaceStep(from.pos, Math.max(from.pos, to.pos), this.slice);
+      return new ReplaceStep(from.pos, Math.max(from.pos, to.pos), this.slice, this.structure);
     }
   }, {
     key: "merge",
@@ -853,12 +853,14 @@ function canCut(node, start, end) {
 function liftTarget(range) {
   var parent = range.parent;
   var content = parent.content.cutByIndex(range.startIndex, range.endIndex);
-  for (var depth = range.depth;; --depth) {
+  for (var depth = range.depth, contentBefore = 0, contentAfter = 0;; --depth) {
     var node = range.$from.node(depth);
-    var index = range.$from.index(depth),
-      endIndex = range.$to.indexAfter(depth);
+    var index = range.$from.index(depth) + contentBefore,
+      endIndex = range.$to.indexAfter(depth) - contentAfter;
     if (depth < range.depth && node.canReplace(index, endIndex, content)) return depth;
     if (depth == 0 || node.type.spec.isolating || !canCut(node, index, endIndex)) break;
+    if (index) contentBefore = 1;
+    if (endIndex < node.childCount) contentAfter = 1;
   }
   return null;
 }
@@ -1434,7 +1436,7 @@ function _replaceRange(tr, from, to, slice) {
   var $from = tr.doc.resolve(from),
     $to = tr.doc.resolve(to);
   if (fitsTrivially($from, $to, slice)) return tr.step(new ReplaceStep(from, to, slice));
-  var targetDepths = coveredDepths($from, tr.doc.resolve(to));
+  var targetDepths = coveredDepths($from, $to);
   if (targetDepths[targetDepths.length - 1] == 0) targetDepths.pop();
   var preferredTarget = -($from.depth + 1);
   targetDepths.unshift(preferredTarget);
@@ -1796,13 +1798,20 @@ var Transform = function () {
   }, {
     key: "removeNodeMark",
     value: function removeNodeMark(pos, mark) {
-      if (!(mark instanceof prosemirrorModel.Mark)) {
-        var node = this.doc.nodeAt(pos);
-        if (!node) throw new RangeError("No node at position " + pos);
-        mark = mark.isInSet(node.marks);
-        if (!mark) return this;
+      var node = this.doc.nodeAt(pos);
+      if (!node) throw new RangeError("No node at position " + pos);
+      if (mark instanceof prosemirrorModel.Mark) {
+        if (mark.isInSet(node.marks)) this.step(new RemoveNodeMarkStep(pos, mark));
+      } else {
+        var set = node.marks,
+          found,
+          steps = [];
+        while (found = mark.isInSet(set)) {
+          steps.push(new RemoveNodeMarkStep(pos, found));
+          set = found.removeFromSet(set);
+        }
+        for (var i = steps.length - 1; i >= 0; i--) this.step(steps[i]);
       }
-      this.step(new RemoveNodeMarkStep(pos, mark));
       return this;
     }
   }, {

package/dist/index.d.cts

@@ -425,7 +425,7 @@ declare class Transform {
     */
     addNodeMark(pos: number, mark: Mark): this;
     /**
-    Remove a mark (or a mark of the given type) from the node at
+    Remove a mark (or all marks of the given type) from the node at
     position `pos`.
     */
     removeNodeMark(pos: number, mark: Mark | MarkType): this;

package/dist/index.d.ts

@@ -425,7 +425,7 @@ declare class Transform {
     */
     addNodeMark(pos: number, mark: Mark): this;
     /**
-    Remove a mark (or a mark of the given type) from the node at
+    Remove a mark (or all marks of the given type) from the node at
     position `pos`.
     */
     removeNodeMark(pos: number, mark: Mark | MarkType): this;

package/dist/index.js

@@ -714,7 +714,7 @@ class ReplaceStep extends Step {
         let from = mapping.mapResult(this.from, 1), to = mapping.mapResult(this.to, -1);
         if (from.deletedAcross && to.deletedAcross)
             return null;
-        return new ReplaceStep(from.pos, Math.max(from.pos, to.pos), this.slice);
+        return new ReplaceStep(from.pos, Math.max(from.pos, to.pos), this.slice, this.structure);
     }
     merge(other) {
         if (!(other instanceof ReplaceStep) || other.structure || this.structure)
@@ -982,13 +982,17 @@ can be lifted. Will not go across
 function liftTarget(range) {
     let parent = range.parent;
     let content = parent.content.cutByIndex(range.startIndex, range.endIndex);
-    for (let depth = range.depth;; --depth) {
+    for (let depth = range.depth, contentBefore = 0, contentAfter = 0;; --depth) {
         let node = range.$from.node(depth);
-        let index = range.$from.index(depth), endIndex = range.$to.indexAfter(depth);
+        let index = range.$from.index(depth) + contentBefore, endIndex = range.$to.indexAfter(depth) - contentAfter;
         if (depth < range.depth && node.canReplace(index, endIndex, content))
             return depth;
         if (depth == 0 || node.type.spec.isolating || !canCut(node, index, endIndex))
             break;
+        if (index)
+            contentBefore = 1;
+        if (endIndex < node.childCount)
+            contentAfter = 1;
     }
     return null;
 }
@@ -1639,7 +1643,7 @@ function replaceRange(tr, from, to, slice) {
     let $from = tr.doc.resolve(from), $to = tr.doc.resolve(to);
     if (fitsTrivially($from, $to, slice))
         return tr.step(new ReplaceStep(from, to, slice));
-    let targetDepths = coveredDepths($from, tr.doc.resolve(to));
+    let targetDepths = coveredDepths($from, $to);
     // Can't replace the whole document, so remove 0 if it's present
     if (targetDepths[targetDepths.length - 1] == 0)
         targetDepths.pop();
@@ -2091,19 +2095,26 @@ class Transform {
         return this;
     }
     /**
-    Remove a mark (or a mark of the given type) from the node at
+    Remove a mark (or all marks of the given type) from the node at
     position `pos`.
     */
     removeNodeMark(pos, mark) {
-        if (!(mark instanceof Mark)) {
-            let node = this.doc.nodeAt(pos);
-            if (!node)
-                throw new RangeError("No node at position " + pos);
-            mark = mark.isInSet(node.marks);
-            if (!mark)
-                return this;
+        let node = this.doc.nodeAt(pos);
+        if (!node)
+            throw new RangeError("No node at position " + pos);
+        if (mark instanceof Mark) {
+            if (mark.isInSet(node.marks))
+                this.step(new RemoveNodeMarkStep(pos, mark));
+        }
+        else {
+            let set = node.marks, found, steps = [];
+            while (found = mark.isInSet(set)) {
+                steps.push(new RemoveNodeMarkStep(pos, found));
+                set = found.removeFromSet(set);
+            }
+            for (let i = steps.length - 1; i >= 0; i--)
+                this.step(steps[i]);
         }
-        this.step(new RemoveNodeMarkStep(pos, mark));
         return this;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-transform",
-  "version": "1.10.3",
+  "version": "1.10.5",
   "description": "ProseMirror document transformations",
   "type": "module",
   "main": "dist/index.cjs",

package/src/replace.ts

@@ -338,7 +338,7 @@ export function replaceRange(tr: Transform, from: number, to: number, slice: Sli
   if (fitsTrivially($from, $to, slice))
     return tr.step(new ReplaceStep(from, to, slice))
 
-  let targetDepths = coveredDepths($from, tr.doc.resolve(to))
+  let targetDepths = coveredDepths($from, $to)
   // Can't replace the whole document, so remove 0 if it's present
   if (targetDepths[targetDepths.length - 1] == 0) targetDepths.pop()
   // Negative numbers represent not expansion over the whole node at

package/src/replace_step.ts

@@ -42,7 +42,7 @@ export class ReplaceStep extends Step {
   map(mapping: Mappable) {
     let from = mapping.mapResult(this.from, 1), to = mapping.mapResult(this.to, -1)
     if (from.deletedAcross && to.deletedAcross) return null
-    return new ReplaceStep(from.pos, Math.max(from.pos, to.pos), this.slice)
+    return new ReplaceStep(from.pos, Math.max(from.pos, to.pos), this.slice, this.structure)
   }
 
   merge(other: Step) {

package/src/structure.ts

@@ -15,12 +15,14 @@ function canCut(node: Node, start: number, end: number) {
 export function liftTarget(range: NodeRange): number | null {
   let parent = range.parent
   let content = parent.content.cutByIndex(range.startIndex, range.endIndex)
-  for (let depth = range.depth;; --depth) {
+  for (let depth = range.depth, contentBefore = 0, contentAfter = 0;; --depth) {
     let node = range.$from.node(depth)
-    let index = range.$from.index(depth), endIndex = range.$to.indexAfter(depth)
+    let index = range.$from.index(depth) + contentBefore, endIndex = range.$to.indexAfter(depth) - contentAfter
     if (depth < range.depth && node.canReplace(index, endIndex, content))
       return depth
     if (depth == 0 || node.type.spec.isolating || !canCut(node, index, endIndex)) break
+    if (index) contentBefore = 1
+    if (endIndex < node.childCount) contentAfter = 1
   }
   return null
 }

package/src/transform.ts

@@ -198,16 +198,21 @@ export class Transform {
     return this
   }
 
-  /// Remove a mark (or a mark of the given type) from the node at
+  /// Remove a mark (or all marks of the given type) from the node at
   /// position `pos`.
   removeNodeMark(pos: number, mark: Mark | MarkType): this {
-    if (!(mark instanceof Mark)) {
-      let node = this.doc.nodeAt(pos)
-      if (!node) throw new RangeError("No node at position " + pos)
-      mark = mark.isInSet(node.marks)!
-      if (!mark) return this
+    let node = this.doc.nodeAt(pos)
+    if (!node) throw new RangeError("No node at position " + pos)
+    if (mark instanceof Mark) {
+      if (mark.isInSet(node.marks)) this.step(new RemoveNodeMarkStep(pos, mark))
+    } else {
+      let set = node.marks, found, steps: Step[] = []
+      while (found = mark.isInSet(set)) {
+        steps.push(new RemoveNodeMarkStep(pos, found))
+        set = found.removeFromSet(set)
+      }
+      for (let i = steps.length - 1; i >= 0; i--) this.step(steps[i])
     }
-    this.step(new RemoveNodeMarkStep(pos, mark))
     return this
   }