prosemirror-transform 1.7.3 → 1.7.5

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.7.5 (2023-08-22)
+
+### Bug fixes
+
+Fix a failure in `replaceRange` to drop wrapper nodes when the same wrapper is already present.
+
+## 1.7.4 (2023-07-28)
+
+### Bug fixes
+
+When using `setBlockType` to convert a code block to a type of node that doesn't contain code, replace newlines with spaces.
+
 ## 1.7.3 (2023-06-01)
 
 ### Bug fixes

package/dist/index.cjs

@@ -28,10 +28,6 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-Object.defineProperty(exports, '__esModule', {
-  value: true
-});
-
 var prosemirrorModel = require('prosemirror-model');
 
 var lower16 = 0xffff;
@@ -957,7 +953,7 @@ function _removeMark(tr, from, to, mark) {
 function _clearIncompatible(tr, pos, parentType) {
   var match = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : parentType.contentMatch;
   var node = tr.doc.nodeAt(pos);
-  var delSteps = [],
+  var replSteps = [],
       cur = pos + 1;
 
   for (var i = 0; i < node.childCount; i++) {
@@ -966,13 +962,24 @@ function _clearIncompatible(tr, pos, parentType) {
     var allowed = match.matchType(child.type);
 
     if (!allowed) {
-      delSteps.push(new ReplaceStep(cur, end, prosemirrorModel.Slice.empty));
+      replSteps.push(new ReplaceStep(cur, end, prosemirrorModel.Slice.empty));
     } else {
       match = allowed;
 
       for (var j = 0; j < child.marks.length; j++) {
         if (!parentType.allowsMarkType(child.marks[j].type)) tr.step(new RemoveMarkStep(cur, end, child.marks[j]));
       }
+
+      if (child.isText && !parentType.spec.code) {
+        var m = void 0,
+            newline = /\r?\n|\r/g,
+            slice = void 0;
+
+        while (m = newline.exec(child.text)) {
+          if (!slice) slice = new prosemirrorModel.Slice(prosemirrorModel.Fragment.from(parentType.schema.text(" ", parentType.allowedMarks(child.marks))), 0, 0);
+          replSteps.push(new ReplaceStep(cur + m.index, cur + m.index + m[0].length, slice));
+        }
+      }
     }
 
     cur = end;
@@ -983,8 +990,8 @@ function _clearIncompatible(tr, pos, parentType) {
     tr.replace(cur, cur, new prosemirrorModel.Slice(fill, 0, 0));
   }
 
-  for (var _i = delSteps.length - 1; _i >= 0; _i--) {
-    tr.step(delSteps[_i]);
+  for (var _i = replSteps.length - 1; _i >= 0; _i--) {
+    tr.step(replSteps[_i]);
   }
 }
 
@@ -1652,9 +1659,9 @@ function _replaceRange(tr, from, to, slice) {
   }
 
   for (var _d3 = preferredDepth - 1; _d3 >= 0; _d3--) {
-    var type = leftNodes[_d3].type,
-        def = definesContent(type);
-    if (def && $from.node(preferredTargetIndex).type != type) preferredDepth = _d3;else if (def || !type.isTextblock) break;
+    var leftNode = leftNodes[_d3],
+        def = definesContent(leftNode.type);
+    if (def && !leftNode.sameMarkup($from.node(Math.abs(preferredTarget) - 1))) preferredDepth = _d3;else if (def || !leftNode.type.isTextblock) break;
   }
 
   for (var j = slice.openStart; j >= 0; j--) {
@@ -1817,17 +1824,17 @@ var AttrStep = function (_Step7) {
 Step.jsonID("attr", AttrStep);
 
 exports.TransformError = function (_Error) {
-  _inherits(_class, _Error);
+  _inherits(TransformError, _Error);
 
-  var _super8 = _createSuper(_class);
+  var _super8 = _createSuper(TransformError);
 
-  function _class() {
-    _classCallCheck(this, _class);
+  function TransformError() {
+    _classCallCheck(this, TransformError);
 
     return _super8.apply(this, arguments);
   }
 
-  return _createClass(_class);
+  return _createClass(TransformError);
 }(_wrapNativeSuper(Error));
 
 exports.TransformError = function TransformError(message) {

package/dist/index.js

@@ -938,18 +938,26 @@ function removeMark(tr, from, to, mark) {
 }
 function clearIncompatible(tr, pos, parentType, match = parentType.contentMatch) {
     let node = tr.doc.nodeAt(pos);
-    let delSteps = [], cur = pos + 1;
+    let replSteps = [], cur = pos + 1;
     for (let i = 0; i < node.childCount; i++) {
         let child = node.child(i), end = cur + child.nodeSize;
         let allowed = match.matchType(child.type);
         if (!allowed) {
-            delSteps.push(new ReplaceStep(cur, end, Slice.empty));
+            replSteps.push(new ReplaceStep(cur, end, Slice.empty));
         }
         else {
             match = allowed;
             for (let j = 0; j < child.marks.length; j++)
                 if (!parentType.allowsMarkType(child.marks[j].type))
                     tr.step(new RemoveMarkStep(cur, end, child.marks[j]));
+            if (child.isText && !parentType.spec.code) {
+                let m, newline = /\r?\n|\r/g, slice;
+                while (m = newline.exec(child.text)) {
+                    if (!slice)
+                        slice = new Slice(Fragment.from(parentType.schema.text(" ", parentType.allowedMarks(child.marks))), 0, 0);
+                    replSteps.push(new ReplaceStep(cur + m.index, cur + m.index + m[0].length, slice));
+                }
+            }
         }
         cur = end;
     }
@@ -957,8 +965,8 @@ function clearIncompatible(tr, pos, parentType, match = parentType.contentMatch)
         let fill = match.fillBefore(Fragment.empty, true);
         tr.replace(cur, cur, new Slice(fill, 0, 0));
     }
-    for (let i = delSteps.length - 1; i >= 0; i--)
-        tr.step(delSteps[i]);
+    for (let i = replSteps.length - 1; i >= 0; i--)
+        tr.step(replSteps[i]);
 }
 
 function canCut(node, start, end) {
@@ -1593,10 +1601,10 @@ function replaceRange(tr, from, to, slice) {
     // Back up preferredDepth to cover defining textblocks directly
     // above it, possibly skipping a non-defining textblock.
     for (let d = preferredDepth - 1; d >= 0; d--) {
-        let type = leftNodes[d].type, def = definesContent(type);
-        if (def && $from.node(preferredTargetIndex).type != type)
+        let leftNode = leftNodes[d], def = definesContent(leftNode.type);
+        if (def && !leftNode.sameMarkup($from.node(Math.abs(preferredTarget) - 1)))
             preferredDepth = d;
-        else if (def || !type.isTextblock)
+        else if (def || !leftNode.type.isTextblock)
             break;
     }
     for (let j = slice.openStart; j >= 0; j--) {

package/package.json

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

package/src/mark.ts

@@ -74,16 +74,25 @@ export function removeMark(tr: Transform, from: number, to: number, mark?: Mark
 
 export function clearIncompatible(tr: Transform, pos: number, parentType: NodeType, match = parentType.contentMatch) {
   let node = tr.doc.nodeAt(pos)!
-  let delSteps: Step[] = [], cur = pos + 1
+  let replSteps: Step[] = [], cur = pos + 1
   for (let i = 0; i < node.childCount; i++) {
     let child = node.child(i), end = cur + child.nodeSize
     let allowed = match.matchType(child.type)
     if (!allowed) {
-      delSteps.push(new ReplaceStep(cur, end, Slice.empty))
+      replSteps.push(new ReplaceStep(cur, end, Slice.empty))
     } else {
       match = allowed
       for (let j = 0; j < child.marks.length; j++) if (!parentType.allowsMarkType(child.marks[j].type))
         tr.step(new RemoveMarkStep(cur, end, child.marks[j]))
+
+      if (child.isText && !parentType.spec.code) {
+        let m, newline = /\r?\n|\r/g, slice
+        while (m = newline.exec(child.text!)) {
+          if (!slice) slice = new Slice(Fragment.from(parentType.schema.text(" ", parentType.allowedMarks(child.marks))),
+                                        0, 0)
+          replSteps.push(new ReplaceStep(cur + m.index, cur + m.index + m[0].length, slice))
+        }
+      }
     }
     cur = end
   }
@@ -91,5 +100,5 @@ export function clearIncompatible(tr: Transform, pos: number, parentType: NodeTy
     let fill = match.fillBefore(Fragment.empty, true)
     tr.replace(cur, cur, new Slice(fill!, 0, 0))
   }
-  for (let i = delSteps.length - 1; i >= 0; i--) tr.step(delSteps[i])
+  for (let i = replSteps.length - 1; i >= 0; i--) tr.step(replSteps[i])
 }

package/src/replace.ts

@@ -359,7 +359,7 @@ export function replaceRange(tr: Transform, from: number, to: number, slice: Sli
   // target depth, starting with the preferred depths.
   let preferredTargetIndex = targetDepths.indexOf(preferredTarget)
 
-  let leftNodes = [], preferredDepth = slice.openStart
+  let leftNodes: Node[] = [], preferredDepth = slice.openStart
   for (let content = slice.content, i = 0;; i++) {
     let node = content.firstChild!
     leftNodes.push(node)
@@ -370,9 +370,9 @@ export function replaceRange(tr: Transform, from: number, to: number, slice: Sli
   // Back up preferredDepth to cover defining textblocks directly
   // above it, possibly skipping a non-defining textblock.
   for (let d = preferredDepth - 1; d >= 0; d--) {
-    let type = leftNodes[d].type, def = definesContent(type)
-    if (def && $from.node(preferredTargetIndex).type != type) preferredDepth = d
-    else if (def || !type.isTextblock) break
+    let leftNode = leftNodes[d], def = definesContent(leftNode.type)
+    if (def && !leftNode.sameMarkup($from.node(Math.abs(preferredTarget) - 1))) preferredDepth = d
+    else if (def || !leftNode.type.isTextblock) break
   }
 
   for (let j = slice.openStart; j >= 0; j--) {
@@ -443,7 +443,7 @@ export function deleteRange(tr: Transform, from: number, to: number) {
 // Returns an array of all depths for which $from - $to spans the
 // whole content of the nodes at that depth.
 function coveredDepths($from: ResolvedPos, $to: ResolvedPos) {
-  let result = [], minDepth = Math.min($from.depth, $to.depth)
+  let result: number[] = [], minDepth = Math.min($from.depth, $to.depth)
   for (let d = minDepth; d >= 0; d--) {
     let start = $from.start(d)
     if (start < $from.pos - ($from.depth - d) ||