prosemirror-transform 1.2.11 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-transform",
-  "version": "1.2.11",
+  "version": "1.3.2",
   "description": "ProseMirror document transformations",
   "main": "dist/index.js",
   "module": "dist/index.es.js",

package/src/mark_step.js

@@ -17,8 +17,14 @@ export class AddMarkStep extends Step {
   // :: (number, number, Mark)
   constructor(from, to, mark) {
     super()
+    // :: number
+    // The start of the marked range.
     this.from = from
+    // :: number
+    // The end of the marked range.
     this.to = to
+    // :: Mark
+    // The mark to add.
     this.mark = mark
   }
 
@@ -69,8 +75,14 @@ export class RemoveMarkStep extends Step {
   // :: (number, number, Mark)
   constructor(from, to, mark) {
     super()
+    // :: number
+    // The start of the unmarked range.
     this.from = from
+    // :: number
+    // The end of the unmarked range.
     this.to = to
+    // :: Mark
+    // The mark to remove.
     this.mark = mark
   }
 

package/src/replace.js

@@ -417,7 +417,7 @@ Transform.prototype.replaceRange = function(from, to, slice) {
     this.replace(from, to, slice)
     if (this.steps.length > startSteps) break
     let depth = targetDepths[i]
-    if (i < 0) continue
+    if (depth < 0) continue
     from = $from.before(depth); to = $to.after(depth)
   }
   return this

package/src/replace_step.js

@@ -15,8 +15,14 @@ export class ReplaceStep extends Step {
   // overwriting something they weren't supposed to).
   constructor(from, to, slice, structure) {
     super()
+    // :: number
+    // The start position of the replaced range.
     this.from = from
+    // :: number
+    // The end position of the replaced range.
     this.to = to
+    // :: Slice
+    // The slice to insert.
     this.slice = slice
     this.structure = !!structure
   }
@@ -42,7 +48,7 @@ export class ReplaceStep extends Step {
   }
 
   merge(other) {
-    if (!(other instanceof ReplaceStep) || other.structure != this.structure) return null
+    if (!(other instanceof ReplaceStep) || other.structure || this.structure) return null
 
     if (this.from + this.slice.size == other.from && !this.slice.openEnd && !other.slice.openStart) {
       let slice = this.slice.size + other.slice.size == 0 ? Slice.empty
@@ -84,11 +90,24 @@ export class ReplaceAroundStep extends Step {
   // it has in the [`ReplaceStep`](#transform.ReplaceStep) class.
   constructor(from, to, gapFrom, gapTo, slice, insert, structure) {
     super()
+    // :: number
+    // The start position of the replaced range.
     this.from = from
+    // :: number
+    // The end position of the replaced range.
     this.to = to
+    // :: number
+    // The start of preserved range.
     this.gapFrom = gapFrom
+    // :: number
+    // The end of preserved range.
     this.gapTo = gapTo
+    // :: Slice
+    // The slice to insert.
     this.slice = slice
+    // :: number
+    // The position in the slice where the preserved range should be
+    // inserted.
     this.insert = insert
     this.structure = !!structure
   }

package/src/structure.js

@@ -276,9 +276,14 @@ export function dropPoint(doc, pos, slice) {
     for (let d = $pos.depth; d >= 0; d--) {
       let bias = d == $pos.depth ? 0 : $pos.pos <= ($pos.start(d + 1) + $pos.end(d + 1)) / 2 ? -1 : 1
       let insertPos = $pos.index(d) + (bias > 0 ? 1 : 0)
-      if (pass == 1
-          ? $pos.node(d).canReplace(insertPos, insertPos, content)
-          : $pos.node(d).contentMatchAt(insertPos).findWrapping(content.firstChild.type))
+      let parent = $pos.node(d), fits = false
+      if (pass == 1) {
+        fits = parent.canReplace(insertPos, insertPos, content)
+      } else {
+        let wrapping = parent.contentMatchAt(insertPos).findWrapping(content.firstChild.type)
+        fits = wrapping && parent.canReplaceWith(insertPos, insertPos, wrapping[0])
+      }
+      if (fits)
         return bias == 0 ? $pos.pos : bias < 0 ? $pos.before(d + 1) : $pos.after(d + 1)
     }
   }