prosemirror-transform 1.10.1 → 1.10.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.10.2 (2024-10-11)
+
+### Bug fixes
+
+Allow `Transform.join` to clear incompatible inline content from the node after the join.
+
 ## 1.10.1 (2024-10-10)
 
 ### Bug fixes

package/dist/index.cjs

@@ -1034,7 +1034,7 @@ function canJoin(doc, pos) {
     index = $pos.index();
   return joinable($pos.nodeBefore, $pos.nodeAfter) && $pos.parent.canReplace(index, index + 1);
 }
-function canAppendWithSubstitutedLinebeaks(a, b) {
+function canAppendWithSubstitutedLinebreaks(a, b) {
   if (!b.content.size) a.type.compatibleContent(b.type);
   var match = a.contentMatchAt(a.childCount);
   var linebreakReplacement = a.type.schema.linebreakReplacement;
@@ -1048,7 +1048,7 @@ function canAppendWithSubstitutedLinebeaks(a, b) {
   return match.validEnd;
 }
 function joinable(a, b) {
-  return !!(a && b && !a.isLeaf && canAppendWithSubstitutedLinebeaks(a, b));
+  return !!(a && b && !a.isLeaf && canAppendWithSubstitutedLinebreaks(a, b));
 }
 function joinPoint(doc, pos) {
   var dir = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : -1;
@@ -1076,10 +1076,11 @@ function joinPoint(doc, pos) {
 function _join(tr, pos, depth) {
   var convertNewlines = null;
   var linebreakReplacement = tr.doc.type.schema.linebreakReplacement;
-  if (linebreakReplacement) {
-    var before = tr.doc.resolve(pos - depth).node().type;
-    var pre = before.whitespace == "pre";
-    var supportLinebreak = !!before.contentMatch.matchType(linebreakReplacement);
+  var $before = tr.doc.resolve(pos - depth),
+    beforeType = $before.node().type;
+  if (linebreakReplacement && beforeType.inlineContent) {
+    var pre = beforeType.whitespace == "pre";
+    var supportLinebreak = !!beforeType.contentMatch.matchType(linebreakReplacement);
     if (pre && !supportLinebreak) convertNewlines = false;else if (!pre && supportLinebreak) convertNewlines = true;
   }
   var mapFrom = tr.steps.length;
@@ -1087,6 +1088,7 @@ function _join(tr, pos, depth) {
     var $after = tr.doc.resolve(pos + depth);
     replaceLinebreaks(tr, $after.node(), $after.before(), mapFrom);
   }
+  if (beforeType.inlineContent) _clearIncompatible(tr, pos + depth - 1, beforeType, $before.node().contentMatchAt($before.index()), convertNewlines == null);
   var mapping = tr.mapping.slice(mapFrom),
     start = mapping.map(pos - depth);
   tr.step(new ReplaceStep(start, mapping.map(pos + depth, -1), prosemirrorModel.Slice.empty, true));

package/dist/index.js

@@ -1183,7 +1183,7 @@ function canJoin(doc, pos) {
     return joinable($pos.nodeBefore, $pos.nodeAfter) &&
         $pos.parent.canReplace(index, index + 1);
 }
-function canAppendWithSubstitutedLinebeaks(a, b) {
+function canAppendWithSubstitutedLinebreaks(a, b) {
     if (!b.content.size)
         a.type.compatibleContent(b.type);
     let match = a.contentMatchAt(a.childCount);
@@ -1200,7 +1200,7 @@ function canAppendWithSubstitutedLinebeaks(a, b) {
     return match.validEnd;
 }
 function joinable(a, b) {
-    return !!(a && b && !a.isLeaf && canAppendWithSubstitutedLinebeaks(a, b));
+    return !!(a && b && !a.isLeaf && canAppendWithSubstitutedLinebreaks(a, b));
 }
 /**
 Find an ancestor of the given position that can be joined to the
@@ -1235,10 +1235,10 @@ function joinPoint(doc, pos, dir = -1) {
 function join(tr, pos, depth) {
     let convertNewlines = null;
     let { linebreakReplacement } = tr.doc.type.schema;
-    if (linebreakReplacement) {
-        let before = tr.doc.resolve(pos - depth).node().type;
-        let pre = before.whitespace == "pre";
-        let supportLinebreak = !!before.contentMatch.matchType(linebreakReplacement);
+    let $before = tr.doc.resolve(pos - depth), beforeType = $before.node().type;
+    if (linebreakReplacement && beforeType.inlineContent) {
+        let pre = beforeType.whitespace == "pre";
+        let supportLinebreak = !!beforeType.contentMatch.matchType(linebreakReplacement);
         if (pre && !supportLinebreak)
             convertNewlines = false;
         else if (!pre && supportLinebreak)
@@ -1249,6 +1249,8 @@ function join(tr, pos, depth) {
         let $after = tr.doc.resolve(pos + depth);
         replaceLinebreaks(tr, $after.node(), $after.before(), mapFrom);
     }
+    if (beforeType.inlineContent)
+        clearIncompatible(tr, pos + depth - 1, beforeType, $before.node().contentMatchAt($before.index()), convertNewlines == null);
     let mapping = tr.mapping.slice(mapFrom), start = mapping.map(pos - depth);
     tr.step(new ReplaceStep(start, mapping.map(pos + depth, -1), Slice.empty, true));
     if (convertNewlines === true) {

package/package.json

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

package/src/structure.ts

@@ -226,7 +226,7 @@ export function canJoin(doc: Node, pos: number): boolean {
     $pos.parent.canReplace(index, index + 1)
 }
 
-function canAppendWithSubstitutedLinebeaks(a: Node, b: Node) {
+function canAppendWithSubstitutedLinebreaks(a: Node, b: Node) {
   if (!b.content.size) a.type.compatibleContent(b.type)
   let match: ContentMatch | null = a.contentMatchAt(a.childCount)
   let {linebreakReplacement} = a.type.schema
@@ -241,7 +241,7 @@ function canAppendWithSubstitutedLinebeaks(a: Node, b: Node) {
 }
 
 function joinable(a: Node | null, b: Node | null) {
-  return !!(a && b && !a.isLeaf && canAppendWithSubstitutedLinebeaks(a, b))
+  return !!(a && b && !a.isLeaf && canAppendWithSubstitutedLinebreaks(a, b))
 }
 
 /// Find an ancestor of the given position that can be joined to the
@@ -272,10 +272,10 @@ export function joinPoint(doc: Node, pos: number, dir = -1) {
 export function join(tr: Transform, pos: number, depth: number) {
   let convertNewlines = null
   let {linebreakReplacement} = tr.doc.type.schema
-  if (linebreakReplacement) {
-    let before = tr.doc.resolve(pos - depth).node().type
-    let pre = before.whitespace == "pre"
-    let supportLinebreak = !!before.contentMatch.matchType(linebreakReplacement)
+  let $before = tr.doc.resolve(pos - depth), beforeType = $before.node().type
+  if (linebreakReplacement && beforeType.inlineContent) {
+    let pre = beforeType.whitespace == "pre"
+    let supportLinebreak = !!beforeType.contentMatch.matchType(linebreakReplacement)
     if (pre && !supportLinebreak) convertNewlines = false
     else if (!pre && supportLinebreak) convertNewlines = true
   }
@@ -284,6 +284,9 @@ export function join(tr: Transform, pos: number, depth: number) {
     let $after = tr.doc.resolve(pos + depth)
     replaceLinebreaks(tr, $after.node(), $after.before(), mapFrom)
   }
+  if (beforeType.inlineContent)
+    clearIncompatible(tr, pos + depth - 1, beforeType,
+                      $before.node().contentMatchAt($before.index()), convertNewlines == null)
   let mapping = tr.mapping.slice(mapFrom), start = mapping.map(pos - depth)
   tr.step(new ReplaceStep(start, mapping.map(pos + depth, - 1), Slice.empty, true))
   if (convertNewlines === true) {