prosemirror-transform 1.3.0 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-transform",
-  "version": "1.3.0",
+  "version": "1.3.4",
   "description": "ProseMirror document transformations",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
@@ -20,7 +20,7 @@
     "prosemirror-model": "^1.0.0"
   },
   "devDependencies": {
-    "mocha": "^3.0.2",
+    "mocha": "^9.1.2",
     "ist": "^1.0.0",
     "prosemirror-test-builder": "^1.0.0",
     "rollup": "^2.26.3",

package/src/map.js

@@ -57,6 +57,7 @@ export class StepMap {
   // represented as an array of numbers, in which each group of three
   // represents a modified chunk as `[start, oldSize, newSize]`.
   constructor(ranges, inverted = false) {
+    if (!ranges.length && StepMap.empty) return StepMap.empty
     this.ranges = ranges
     this.inverted = inverted
   }

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
@@ -483,7 +483,10 @@ function coveredDepths($from, $to) {
         $to.end(d) > $to.pos + ($to.depth - d) ||
         $from.node(d).type.spec.isolating ||
         $to.node(d).type.spec.isolating) break
-    if (start == $to.start(d)) result.push(d)
+    if (start == $to.start(d) ||
+        (d == $from.depth && d == $to.depth && $from.parent.inlineContent && $to.parent.inlineContent &&
+         d && $to.start(d - 1) == start - 1))
+      result.push(d)
   }
   return result
 }

package/src/structure.js

@@ -103,8 +103,14 @@ function findWrappingInside(range, type) {
 // probably be computed with [`findWrapping`](#transform.findWrapping).
 Transform.prototype.wrap = function(range, wrappers) {
   let content = Fragment.empty
-  for (let i = wrappers.length - 1; i >= 0; i--)
+  for (let i = wrappers.length - 1; i >= 0; i--) {
+    if (content.size) {
+      let match = wrappers[i].type.contentMatch.matchFragment(content)
+      if (!match || !match.validEnd)
+        throw new RangeError("Wrapper type given to Transform.wrap does not form valid content of its parent wrapper")
+    }
     content = Fragment.from(wrappers[i].type.create(wrappers[i].attrs, content))
+  }
 
   let start = range.start, end = range.end
   return this.step(new ReplaceAroundStep(start, end, start, end, new Slice(content, 0, 0), wrappers.length, true))
@@ -276,9 +282,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)
     }
   }