prosemirror-transform 1.7.0 → 1.7.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.7.1 (2023-01-20)
+
+### Bug fixes
+
+Keep content in isolating nodes inside their parent when fitting a replace step.
+
+`Transform.setNodeMarkup` will no longer clear the node's marks when it isn't given an array of marks.
+
 ## 1.7.0 (2022-08-16)
 
 ### New features

package/README.md

@@ -1,6 +1,6 @@
 # prosemirror-transform
 
-[ [**WEBSITE**](https://prosemirror.net) | [**ISSUES**](https://github.com/prosemirror/prosemirror/issues) | [**FORUM**](https://discuss.prosemirror.net) | [**GITTER**](https://gitter.im/ProseMirror/prosemirror) | [**CHANGELOG**](https://github.com/ProseMirror/prosemirror-transform/blob/master/CHANGELOG.md) ]
+[ [**WEBSITE**](https://prosemirror.net) | [**ISSUES**](https://github.com/prosemirror/prosemirror/issues) | [**FORUM**](https://discuss.prosemirror.net) | [**CHANGELOG**](https://github.com/ProseMirror/prosemirror-transform/blob/master/CHANGELOG.md) ]
 
 This is a [core module](https://prosemirror.net/docs/ref/#transform) of [ProseMirror](https://prosemirror.net).
 ProseMirror is a well-behaved rich semantic content editor based on

package/dist/index.cjs

@@ -1341,8 +1341,22 @@ var Fitter = function () {
   }, {
     key: "findFittable",
     value: function findFittable() {
+      var startDepth = this.unplaced.openStart;
+
+      for (var cur = this.unplaced.content, d = 0, openEnd = this.unplaced.openEnd; d < startDepth; d++) {
+        var node = cur.firstChild;
+        if (cur.childCount > 1) openEnd = 0;
+
+        if (node.type.spec.isolating && openEnd <= d) {
+          startDepth = d;
+          break;
+        }
+
+        cur = node.content;
+      }
+
       for (var pass = 1; pass <= 2; pass++) {
-        for (var sliceDepth = this.unplaced.openStart; sliceDepth >= 0; sliceDepth--) {
+        for (var sliceDepth = pass == 1 ? startDepth : this.unplaced.openStart; sliceDepth >= 0; sliceDepth--) {
           var fragment = void 0,
               parent = null;
 
@@ -1950,7 +1964,7 @@ var Transform = function () {
     key: "setNodeMarkup",
     value: function setNodeMarkup(pos, type) {
       var attrs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-      var marks = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+      var marks = arguments.length > 3 ? arguments[3] : undefined;
 
       _setNodeMarkup(this, pos, type, attrs, marks);
 

package/dist/index.js

@@ -1332,10 +1332,21 @@ class Fitter {
     // content that can be moved somewhere on the frontier. Returns two
     // depths, one for the slice and one for the frontier.
     findFittable() {
+        let startDepth = this.unplaced.openStart;
+        for (let cur = this.unplaced.content, d = 0, openEnd = this.unplaced.openEnd; d < startDepth; d++) {
+            let node = cur.firstChild;
+            if (cur.childCount > 1)
+                openEnd = 0;
+            if (node.type.spec.isolating && openEnd <= d) {
+                startDepth = d;
+                break;
+            }
+            cur = node.content;
+        }
         // Only try wrapping nodes (pass 2) after finding a place without
         // wrapping failed.
         for (let pass = 1; pass <= 2; pass++) {
-            for (let sliceDepth = this.unplaced.openStart; sliceDepth >= 0; sliceDepth--) {
+            for (let sliceDepth = pass == 1 ? startDepth : this.unplaced.openStart; sliceDepth >= 0; sliceDepth--) {
                 let fragment, parent = null;
                 if (sliceDepth) {
                     parent = contentAt(this.unplaced.content, sliceDepth - 1).firstChild;
@@ -1924,7 +1935,7 @@ class Transform {
     Change the type, attributes, and/or marks of the node at `pos`.
     When `type` isn't given, the existing node type is preserved,
     */
-    setNodeMarkup(pos, type, attrs = null, marks = []) {
+    setNodeMarkup(pos, type, attrs = null, marks) {
         setNodeMarkup(this, pos, type, attrs, marks);
         return this;
     }

package/package.json

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

package/src/replace.ts

@@ -110,10 +110,21 @@ class Fitter {
   // content that can be moved somewhere on the frontier. Returns two
   // depths, one for the slice and one for the frontier.
   findFittable(): Fittable | undefined {
+    let startDepth = this.unplaced.openStart
+    for (let cur = this.unplaced.content, d = 0, openEnd = this.unplaced.openEnd; d < startDepth; d++) {
+      let node = cur.firstChild!
+      if (cur.childCount > 1) openEnd = 0
+      if (node.type.spec.isolating && openEnd <= d) {
+        startDepth = d
+        break
+      }
+      cur = node.content
+    }
+
     // Only try wrapping nodes (pass 2) after finding a place without
     // wrapping failed.
     for (let pass = 1; pass <= 2; pass++) {
-      for (let sliceDepth = this.unplaced.openStart; sliceDepth >= 0; sliceDepth--) {
+      for (let sliceDepth = pass == 1 ? startDepth : this.unplaced.openStart; sliceDepth >= 0; sliceDepth--) {
         let fragment, parent = null
         if (sliceDepth) {
           parent = contentAt(this.unplaced.content, sliceDepth - 1).firstChild

package/src/structure.ts

@@ -135,7 +135,7 @@ function canChangeType(doc: Node, pos: number, type: NodeType) {
 /// Change the type, attributes, and/or marks of the node at `pos`.
 /// When `type` isn't given, the existing node type is preserved,
 export function setNodeMarkup(tr: Transform, pos: number, type: NodeType | undefined | null,
-                              attrs: Attrs | null, marks: readonly Mark[]) {
+                              attrs: Attrs | null, marks: readonly Mark[] | undefined) {
   let node = tr.doc.nodeAt(pos)
   if (!node) throw new RangeError("No node at given position")
   if (!type) type = node.type

package/src/transform.ts

@@ -173,7 +173,7 @@ export class Transform {
 
   /// Change the type, attributes, and/or marks of the node at `pos`.
   /// When `type` isn't given, the existing node type is preserved,
-  setNodeMarkup(pos: number, type?: NodeType | null, attrs: Attrs | null = null, marks: readonly Mark[] = []): this {
+  setNodeMarkup(pos: number, type?: NodeType | null, attrs: Attrs | null = null, marks?: readonly Mark[]): this {
     setNodeMarkup(this, pos, type, attrs, marks)
     return this
   }