prosemirror-transform 1.10.3 → 1.10.4

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 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",
@@ -1796,13 +1796,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)
@@ -2091,19 +2091,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.4",
   "description": "ProseMirror document transformations",
   "type": "module",
   "main": "dist/index.cjs",

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/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
   }