prosemirror-transform 1.7.2 → 1.7.4

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 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
+
+Fix a bug in `canSplit` that made it interpret the `typesAfter` argument incorrectly on splits of depth greater than 1.
+
 ## 1.7.2 (2023-05-17)
 
 ### Bug fixes

package/dist/index.cjs

@@ -957,7 +957,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 +966,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 +994,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]);
   }
 }
 
@@ -1153,8 +1164,9 @@ function canSplit(doc, pos) {
 
     if (node.type.spec.isolating) return false;
     var rest = node.content.cutByIndex(_index, node.childCount);
+    var overrideChild = typesAfter && typesAfter[i + 1];
+    if (overrideChild) rest = rest.replaceChild(0, overrideChild.type.create(overrideChild.attrs));
     var after = typesAfter && typesAfter[i] || node;
-    if (after != node) rest = rest.replaceChild(0, after.type.create(after.attrs));
     if (!node.canReplace(_index + 1, node.childCount) || !after.type.validContent(rest)) return false;
   }
 

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) {
@@ -1112,9 +1120,10 @@ function canSplit(doc, pos, depth = 1, typesAfter) {
         if (node.type.spec.isolating)
             return false;
         let rest = node.content.cutByIndex(index, node.childCount);
+        let overrideChild = typesAfter && typesAfter[i + 1];
+        if (overrideChild)
+            rest = rest.replaceChild(0, overrideChild.type.create(overrideChild.attrs));
         let after = (typesAfter && typesAfter[i]) || node;
-        if (after != node)
-            rest = rest.replaceChild(0, after.type.create(after.attrs));
         if (!node.canReplace(index + 1, node.childCount) || !after.type.validContent(rest))
             return false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-transform",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "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/structure.ts

@@ -163,8 +163,10 @@ export function canSplit(doc: Node, pos: number, depth = 1,
     let node = $pos.node(d), index = $pos.index(d)
     if (node.type.spec.isolating) return false
     let rest = node.content.cutByIndex(index, node.childCount)
+    let overrideChild = typesAfter && typesAfter[i + 1]
+    if (overrideChild)
+      rest = rest.replaceChild(0, overrideChild.type.create(overrideChild.attrs))
     let after = (typesAfter && typesAfter[i]) || node
-    if (after != node) rest = rest.replaceChild(0, after.type.create(after.attrs))
     if (!node.canReplace(index + 1, node.childCount) || !after.type.validContent(rest))
       return false
   }