prosemirror-transform 0.19.0 → 0.20.0

package/dist/index.js

@@ -1,15 +1,15 @@
 ;var assign;
-((assign = require("./transform"), exports.Transform = assign.Transform, exports.TransformError = assign.TransformError))
+((assign = require("./transform"), exports.Transform = assign.Transform, exports.TransformError = assign.TransformError, assign))
 ;var assign$1;
-((assign$1 = require("./step"), exports.Step = assign$1.Step, exports.StepResult = assign$1.StepResult))
+((assign$1 = require("./step"), exports.Step = assign$1.Step, exports.StepResult = assign$1.StepResult, assign$1))
 ;var assign$2;
-((assign$2 = require("./structure"), exports.joinPoint = assign$2.joinPoint, exports.canJoin = assign$2.canJoin, exports.canSplit = assign$2.canSplit, exports.insertPoint = assign$2.insertPoint, exports.liftTarget = assign$2.liftTarget, exports.findWrapping = assign$2.findWrapping))
+((assign$2 = require("./structure"), exports.joinPoint = assign$2.joinPoint, exports.canJoin = assign$2.canJoin, exports.canSplit = assign$2.canSplit, exports.insertPoint = assign$2.insertPoint, exports.liftTarget = assign$2.liftTarget, exports.findWrapping = assign$2.findWrapping, assign$2))
 ;var assign$3;
-((assign$3 = require("./map"), exports.StepMap = assign$3.StepMap, exports.MapResult = assign$3.MapResult, exports.Mapping = assign$3.Mapping))
+((assign$3 = require("./map"), exports.StepMap = assign$3.StepMap, exports.MapResult = assign$3.MapResult, exports.Mapping = assign$3.Mapping, assign$3))
 ;var assign$4;
-((assign$4 = require("./mark_step"), exports.AddMarkStep = assign$4.AddMarkStep, exports.RemoveMarkStep = assign$4.RemoveMarkStep))
+((assign$4 = require("./mark_step"), exports.AddMarkStep = assign$4.AddMarkStep, exports.RemoveMarkStep = assign$4.RemoveMarkStep, assign$4))
 ;var assign$5;
-((assign$5 = require("./replace_step"), exports.ReplaceStep = assign$5.ReplaceStep, exports.ReplaceAroundStep = assign$5.ReplaceAroundStep))
+((assign$5 = require("./replace_step"), exports.ReplaceStep = assign$5.ReplaceStep, exports.ReplaceAroundStep = assign$5.ReplaceAroundStep, assign$5))
 require("./mark")
 ;var assign$6;
-((assign$6 = require("./replace"), exports.replaceStep = assign$6.replaceStep))
+((assign$6 = require("./replace"), exports.replaceStep = assign$6.replaceStep, assign$6))

package/dist/replace.js

@@ -384,7 +384,7 @@ function placeSlice($from, slice) {
     if (dSlice >= 0) {
       if (dSlice > 0) { // Inside slice
         ;var assign;
-        ((assign = nodeLeft(slice.content, dSlice), curType = assign.type, curAttrs = assign.attrs, curFragment = assign.content))
+        ((assign = nodeLeft(slice.content, dSlice), curType = assign.type, curAttrs = assign.attrs, curFragment = assign.content, assign))
       } else if (dSlice == 0) { // Top of slice
         curFragment = slice.content
       }
@@ -404,6 +404,9 @@ function placeSlice($from, slice) {
     // This will go through the positions in $from, down from dFrom,
     // to find a fit
     var found = findPlacement(curFragment, $from, dFrom, placed)
+    if (found && unneccesaryFallthrough($from, dFrom, found.depth, slice, dSlice))
+      { found = null }
+
     if (found) {
       // If there was a fit, store it, and consider this content placed
       if (found.fragment.size > 0) { placed[found.depth] = {
@@ -429,7 +432,7 @@ function placeSlice($from, slice) {
         // Store the result for subsequent iterations.
         parents = [{type: top.type, attrs: top.attrs}].concat(wrap)
         ;var assign$1;
-        ((assign$1 = last, curType = assign$1.type, curAttrs = assign$1.attrs))
+        ((assign$1 = last, curType = assign$1.type, curAttrs = assign$1.attrs, assign$1))
       }
       if (curFragment.size) {
         curFragment = curType.contentExpr.start(curAttrs).fillBefore(curFragment, true).append(curFragment)
@@ -478,3 +481,13 @@ function matchStrippingMarks(match, fragment) {
   }
   return Fragment.from(newNodes)
 }
+
+function unneccesaryFallthrough($from, dFrom, dFound, slice, dSlice) {
+  if (dSlice < 1) { return false }
+  for (; dFrom > dFound; dFrom--) {
+    var here = $from.node(dFrom).contentMatchAt($from.indexAfter(dFrom))
+    for (var d = dSlice - 1; d >= 0; d--)
+      { if (here.matchNode(nodeLeft(slice.content, d))) { return true } }
+  }
+  return false
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-transform",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "ProseMirror document transformations",
   "main": "dist/index.js",
   "license": "MIT",
@@ -16,13 +16,14 @@
     "url": "git://github.com/prosemirror/prosemirror-transform.git"
   },
   "dependencies": {
-    "prosemirror-model": "^0.19.0"
+    "prosemirror-model": "^0.20.0"
   },
   "devDependencies": {
     "buble": "^0.15.1",
     "mocha": "^3.0.2",
     "ist": "^1.0.0",
-    "rimraf": "^2.5.4"
+    "rimraf": "^2.5.4",
+    "prosemirror-test-builder": "^0.20.0"
   },
   "scripts": {
     "test": "mocha test/test-*.js",

package/src/replace.js

@@ -387,6 +387,9 @@ function placeSlice($from, slice) {
     // This will go through the positions in $from, down from dFrom,
     // to find a fit
     let found = findPlacement(curFragment, $from, dFrom, placed)
+    if (found && unneccesaryFallthrough($from, dFrom, found.depth, slice, dSlice))
+      found = null
+
     if (found) {
       // If there was a fit, store it, and consider this content placed
       if (found.fragment.size > 0) placed[found.depth] = {
@@ -460,3 +463,13 @@ function matchStrippingMarks(match, fragment) {
   }
   return Fragment.from(newNodes)
 }
+
+function unneccesaryFallthrough($from, dFrom, dFound, slice, dSlice) {
+  if (dSlice < 1) return false
+  for (; dFrom > dFound; dFrom--) {
+    let here = $from.node(dFrom).contentMatchAt($from.indexAfter(dFrom))
+    for (let d = dSlice - 1; d >= 0; d--)
+      if (here.matchNode(nodeLeft(slice.content, d))) return true
+  }
+  return false
+}