prosemirror-transform 1.3.0 → 1.3.4

package/dist/index.js

@@ -61,6 +61,7 @@ var MapResult = function MapResult(pos, deleted, recover) {
 var StepMap = function StepMap(ranges, inverted) {
   if ( inverted === void 0 ) inverted = false;
 
+  if (!ranges.length && StepMap.empty) { return StepMap.empty }
   this.ranges = ranges;
   this.inverted = inverted;
 };
@@ -724,8 +725,14 @@ function findWrappingInside(range, type) {
 // probably be computed with [`findWrapping`](#transform.findWrapping).
 Transform.prototype.wrap = function(range, wrappers) {
   var content = prosemirrorModel.Fragment.empty;
-  for (var i = wrappers.length - 1; i >= 0; i--)
-    { content = prosemirrorModel.Fragment.from(wrappers[i].type.create(wrappers[i].attrs, content)); }
+  for (var i = wrappers.length - 1; i >= 0; i--) {
+    if (content.size) {
+      var 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 = prosemirrorModel.Fragment.from(wrappers[i].type.create(wrappers[i].attrs, content));
+  }
 
   var start = range.start, end = range.end;
   return this.step(new ReplaceAroundStep(start, end, start, end, new prosemirrorModel.Slice(content, 0, 0), wrappers.length, true))
@@ -908,9 +915,14 @@ function dropPoint(doc, pos, slice) {
     for (var d = $pos.depth; d >= 0; d--) {
       var bias = d == $pos.depth ? 0 : $pos.pos <= ($pos.start(d + 1) + $pos.end(d + 1)) / 2 ? -1 : 1;
       var 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))
+      var parent = $pos.node(d), fits = false;
+      if (pass == 1) {
+        fits = parent.canReplace(insertPos, insertPos, content);
+      } else {
+        var 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) }
     }
   }
@@ -1610,7 +1622,7 @@ Transform.prototype.replaceRange = function(from, to, slice) {
     this.replace(from, to, slice);
     if (this.steps.length > startSteps) { break }
     var depth = targetDepths[i$2];
-    if (i$2 < 0) { continue }
+    if (depth < 0) { continue }
     from = $from.before(depth); to = $to.after(depth);
   }
   return this
@@ -1676,7 +1688,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
 }