prosemirror-transform 1.3.2 → 1.4.0

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;
 };
@@ -145,6 +146,8 @@ StepMap.offset = function offset (n) {
   return n == 0 ? StepMap.empty : new StepMap(n < 0 ? [0, -n, 0] : [0, 0, n])
 };
 
+// :: StepMap
+// A StepMap that contains no changed ranges.
 StepMap.empty = new StepMap([]);
 
 // :: class extends Mappable
@@ -724,8 +727,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))
@@ -1533,6 +1542,10 @@ function invalidMarks(type, fragment, start) {
   return false
 }
 
+function definesContent(type) {
+  return type.spec.defining || type.spec.definingForContent
+}
+
 // :: (number, number, Slice) → this
 // Replace a range of the document with a given slice, using `from`,
 // `to`, and the slice's [`openStart`](#model.Slice.openStart) property
@@ -1540,9 +1553,9 @@ function invalidMarks(type, fragment, start) {
 // grow the replaced area or close open nodes in the slice in order to
 // get a fit that is more in line with WYSIWYG expectations, by
 // dropping fully covered parent nodes of the replaced region when
-// they are marked [non-defining](#model.NodeSpec.defining), or
+// they are marked [non-defining as context](#model.NodeSpec.definingAsContext), or
 // including an open parent node from the slice that _is_ marked as
-// [defining](#model.NodeSpec.defining).
+// [defining its content](#model.NodeSpec.definingForContent).
 //
 // This is the method, for example, to handle paste. The similar
 // [`replace`](#transform.Transform.replace) method is a more
@@ -1569,7 +1582,7 @@ Transform.prototype.replaceRange = function(from, to, slice) {
   // cross a defining node.
   for (var d = $from.depth, pos = $from.pos - 1; d > 0; d--, pos--) {
     var spec = $from.node(d).type.spec;
-    if (spec.defining || spec.isolating) { break }
+    if (spec.defining || spec.definingAsContext || spec.isolating) { break }
     if (targetDepths.indexOf(d) > -1) { preferredTarget = d; }
     else if ($from.before(d) == pos) { targetDepths.splice(1, 0, -d); }
   }
@@ -1586,10 +1599,12 @@ Transform.prototype.replaceRange = function(from, to, slice) {
   }
   // Back up if the node directly above openStart, or the node above
   // that separated only by a non-defining textblock node, is defining.
-  if (preferredDepth > 0 && leftNodes[preferredDepth - 1].type.spec.defining &&
+  if (preferredDepth > 0 && definesContent(leftNodes[preferredDepth - 1].type) &&
       $from.node(preferredTargetIndex).type != leftNodes[preferredDepth - 1].type)
     { preferredDepth -= 1; }
-  else if (preferredDepth >= 2 && leftNodes[preferredDepth - 1].isTextblock && leftNodes[preferredDepth - 2].type.spec.defining &&
+  else if (preferredDepth >= 2 &&
+           leftNodes[preferredDepth - 1].isTextblock &&
+           definesContent(leftNodes[preferredDepth - 2].type) &&
            $from.node(preferredTargetIndex).type != leftNodes[preferredDepth - 2].type)
     { preferredDepth -= 2; }
 
@@ -1681,7 +1696,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
 }