prosemirror-transform 1.4.0 → 1.5.0-beta.1

package/dist/index.es.js

@@ -300,10 +300,10 @@ var Transform = function Transform(doc) {
   this.mapping = new Mapping;
 };
 
-var prototypeAccessors = { before: { configurable: true },docChanged: { configurable: true } };
+var prototypeAccessors$1 = { before: { configurable: true },docChanged: { configurable: true } };
 
 // :: Node The starting document.
-prototypeAccessors.before.get = function () { return this.docs.length ? this.docs[0] : this.doc };
+prototypeAccessors$1.before.get = function () { return this.docs.length ? this.docs[0] : this.doc };
 
 // :: (step: Step) → this
 // Apply a new step in this transform, saving the result. Throws an
@@ -326,7 +326,7 @@ Transform.prototype.maybeStep = function maybeStep (step) {
 // :: bool
 // True when the document has been changed (when there are any
 // steps).
-prototypeAccessors.docChanged.get = function () {
+prototypeAccessors$1.docChanged.get = function () {
   return this.steps.length > 0
 };
 
@@ -337,7 +337,7 @@ Transform.prototype.addStep = function addStep (step, doc) {
   this.doc = doc;
 };
 
-Object.defineProperties( Transform.prototype, prototypeAccessors );
+Object.defineProperties( Transform.prototype, prototypeAccessors$1 );
 
 function mustOverride() { throw new Error("Override me") }
 
@@ -740,18 +740,18 @@ Transform.prototype.wrap = function(range, wrappers) {
 // Set the type of all textblocks (partly) between `from` and `to` to
 // the given node type with the given attributes.
 Transform.prototype.setBlockType = function(from, to, type, attrs) {
-  var this$1 = this;
+  var this$1$1 = this;
   if ( to === void 0 ) to = from;
 
   if (!type.isTextblock) { throw new RangeError("Type given to setBlockType should be a textblock") }
   var mapFrom = this.steps.length;
   this.doc.nodesBetween(from, to, function (node, pos) {
-    if (node.isTextblock && !node.hasMarkup(type, attrs) && canChangeType(this$1.doc, this$1.mapping.slice(mapFrom).map(pos), type)) {
+    if (node.isTextblock && !node.hasMarkup(type, attrs) && canChangeType(this$1$1.doc, this$1$1.mapping.slice(mapFrom).map(pos), type)) {
       // Ensure all markup that isn't allowed in the new node type is cleared
-      this$1.clearIncompatible(this$1.mapping.slice(mapFrom).map(pos, 1), type);
-      var mapping = this$1.mapping.slice(mapFrom);
+      this$1$1.clearIncompatible(this$1$1.mapping.slice(mapFrom).map(pos, 1), type);
+      var mapping = this$1$1.mapping.slice(mapFrom);
       var startM = mapping.map(pos, 1), endM = mapping.map(pos + node.nodeSize, 1);
-      this$1.step(new ReplaceAroundStep(startM, endM, startM + 1, endM - 1,
+      this$1$1.step(new ReplaceAroundStep(startM, endM, startM + 1, endM - 1,
                                       new Slice(Fragment.from(type.create(attrs, null, node.marks)), 0, 0), 1, true));
       return false
     }
@@ -958,13 +958,13 @@ var AddMarkStep = /*@__PURE__*/(function (Step) {
   AddMarkStep.prototype.constructor = AddMarkStep;
 
   AddMarkStep.prototype.apply = function apply (doc) {
-    var this$1 = this;
+    var this$1$1 = this;
 
     var oldSlice = doc.slice(this.from, this.to), $from = doc.resolve(this.from);
     var parent = $from.node($from.sharedDepth(this.to));
     var slice = new Slice(mapFragment(oldSlice.content, function (node, parent) {
-      if (!node.isAtom || !parent.type.allowsMarkType(this$1.mark.type)) { return node }
-      return node.mark(this$1.mark.addToSet(node.marks))
+      if (!node.isAtom || !parent.type.allowsMarkType(this$1$1.mark.type)) { return node }
+      return node.mark(this$1$1.mark.addToSet(node.marks))
     }, parent), oldSlice.openStart, oldSlice.openEnd);
     return StepResult.fromReplace(doc, this.from, this.to, slice)
   };
@@ -1023,11 +1023,11 @@ var RemoveMarkStep = /*@__PURE__*/(function (Step) {
   RemoveMarkStep.prototype.constructor = RemoveMarkStep;
 
   RemoveMarkStep.prototype.apply = function apply (doc) {
-    var this$1 = this;
+    var this$1$1 = this;
 
     var oldSlice = doc.slice(this.from, this.to);
     var slice = new Slice(mapFragment(oldSlice.content, function (node) {
-      return node.mark(this$1.mark.removeFromSet(node.marks))
+      return node.mark(this$1$1.mark.removeFromSet(node.marks))
     }), oldSlice.openStart, oldSlice.openEnd);
     return StepResult.fromReplace(doc, this.from, this.to, slice)
   };
@@ -1069,7 +1069,7 @@ Step.jsonID("removeMark", RemoveMarkStep);
 // :: (number, number, Mark) → this
 // Add the given mark to the inline content between `from` and `to`.
 Transform.prototype.addMark = function(from, to, mark) {
-  var this$1 = this;
+  var this$1$1 = this;
 
   var removed = [], added = [], removing = null, adding = null;
   this.doc.nodesBetween(from, to, function (node, pos, parent) {
@@ -1095,8 +1095,8 @@ Transform.prototype.addMark = function(from, to, mark) {
     }
   });
 
-  removed.forEach(function (s) { return this$1.step(s); });
-  added.forEach(function (s) { return this$1.step(s); });
+  removed.forEach(function (s) { return this$1$1.step(s); });
+  added.forEach(function (s) { return this$1$1.step(s); });
   return this
 };
 
@@ -1106,7 +1106,7 @@ Transform.prototype.addMark = function(from, to, mark) {
 // remove all marks of that type. When it is null, remove all marks of
 // any type.
 Transform.prototype.removeMark = function(from, to, mark) {
-  var this$1 = this;
+  var this$1$1 = this;
   if ( mark === void 0 ) mark = null;
 
   var matched = [], step = 0;
@@ -1142,7 +1142,7 @@ Transform.prototype.removeMark = function(from, to, mark) {
       }
     }
   });
-  matched.forEach(function (m) { return this$1.step(new RemoveMarkStep(m.from, m.to, m.style)); });
+  matched.forEach(function (m) { return this$1$1.step(new RemoveMarkStep(m.from, m.to, m.style)); });
   return this
 };
 
@@ -1268,9 +1268,9 @@ var Fitter = function Fitter($from, $to, slice) {
     { this.placed = Fragment.from($from.node(i$1).copy(this.placed)); }
 };
 
-var prototypeAccessors$1 = { depth: { configurable: true } };
+var prototypeAccessors = { depth: { configurable: true } };
 
-prototypeAccessors$1.depth.get = function () { return this.frontier.length - 1 };
+prototypeAccessors.depth.get = function () { return this.frontier.length - 1 };
 
 Fitter.prototype.fit = function fit () {
   // As long as there's unplaced content, try to place some of it.
@@ -1437,7 +1437,7 @@ Fitter.prototype.placeNodes = function placeNodes (ref) {
 };
 
 Fitter.prototype.mustMoveInline = function mustMoveInline () {
-  if (!this.$to.parent.isTextblock || this.$to.end() == this.$to.pos) { return -1 }
+  if (!this.$to.parent.isTextblock) { return -1 }
   var top = this.frontier[this.depth], level;
   if (!top.type.isTextblock || !contentAfterFits(this.$to, this.$to.depth, top.type, top.match, false) ||
       (this.$to.depth == this.depth && (level = this.findCloseLevel(this.$to)) && level.depth == this.depth)) { return -1 }
@@ -1495,7 +1495,7 @@ Fitter.prototype.closeFrontierNode = function closeFrontierNode () {
   if (add.childCount) { this.placed = addToFragment(this.placed, this.frontier.length, add); }
 };
 
-Object.defineProperties( Fitter.prototype, prototypeAccessors$1 );
+Object.defineProperties( Fitter.prototype, prototypeAccessors );
 
 function dropFromFragment(fragment, depth, count) {
   if (depth == 0) { return fragment.cutByIndex(count) }
@@ -1593,16 +1593,14 @@ Transform.prototype.replaceRange = function(from, to, slice) {
     if (i == slice.openStart) { break }
     content = node.content;
   }
-  // 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 && definesContent(leftNodes[preferredDepth - 1].type) &&
-      $from.node(preferredTargetIndex).type != leftNodes[preferredDepth - 1].type)
-    { preferredDepth -= 1; }
-  else if (preferredDepth >= 2 &&
-           leftNodes[preferredDepth - 1].isTextblock &&
-           definesContent(leftNodes[preferredDepth - 2].type) &&
-           $from.node(preferredTargetIndex).type != leftNodes[preferredDepth - 2].type)
-    { preferredDepth -= 2; }
+
+  // Back up preferredDepth to cover defining textblocks directly
+  // above it, possibly skipping a non-defining textblock.
+  for (var d$1 = preferredDepth - 1; d$1 >= 0; d$1--) {
+    var type = leftNodes[d$1].type, def = definesContent(type);
+    if (def && $from.node(preferredTargetIndex).type != type) { preferredDepth = d$1; }
+    else if (def || !type.isTextblock) { break }
+  }
 
   for (var j = slice.openStart; j >= 0; j--) {
     var openDepth = (j + preferredDepth + 1) % (slice.openStart + 1);