prosemirror-view 1.42.5 → 1.42.7

package/dist/index.cjs

@@ -55,12 +55,12 @@ function scanFor(node, off, targetNode, targetOff, dir) {
     if (node == targetNode && off == targetOff) return true;
     if (off == (dir < 0 ? 0 : nodeSize(node))) {
       var parent = node.parentNode;
-      if (!parent || parent.nodeType != 1 || hasBlockDesc(node) || atomElements.test(node.nodeName) || node.contentEditable == "false") return false;
+      if (!parent || !isElt(parent) || hasBlockDesc(node) || atomElements.test(node.nodeName) || node.contentEditable == "false") return false;
       off = domIndex(node) + (dir < 0 ? 0 : 1);
       node = parent;
-    } else if (node.nodeType == 1) {
+    } else if (isElt(node)) {
       var child = node.childNodes[off + (dir < 0 ? -1 : 0)];
-      if (child.nodeType == 1 && child.contentEditable == "false") {
+      if (isElt(child) && child.contentEditable == "false") {
         if ((_a = child.pmViewDesc) === null || _a === void 0 ? void 0 : _a.ignoreForSelection) off += dir;else return false;
       } else {
         node = child;
@@ -74,10 +74,19 @@ function scanFor(node, off, targetNode, targetOff, dir) {
 function nodeSize(node) {
   return node.nodeType == 3 ? node.nodeValue.length : node.childNodes.length;
 }
+function isElt(node) {
+  return node.nodeType == 1;
+}
+function isText(node) {
+  return node.nodeType == 3;
+}
+function contains(parent, child) {
+  return child ? parent.contains(isElt(child) ? child : child.parentNode) : false;
+}
 function textNodeBefore$1(node, offset) {
   for (;;) {
-    if (node.nodeType == 3 && offset) return node;
-    if (node.nodeType == 1 && offset > 0) {
+    if (isText(node) && offset) return node;
+    if (isElt(node) && offset > 0) {
       if (node.contentEditable == "false") return null;
       node = node.childNodes[offset - 1];
       offset = nodeSize(node);
@@ -91,8 +100,8 @@ function textNodeBefore$1(node, offset) {
 }
 function textNodeAfter$1(node, offset) {
   for (;;) {
-    if (node.nodeType == 3 && offset < node.nodeValue.length) return node;
-    if (node.nodeType == 1 && offset < node.childNodes.length) {
+    if (isText(node) && offset < node.nodeValue.length) return node;
+    if (isElt(node) && offset < node.childNodes.length) {
       if (node.contentEditable == "false") return null;
       node = node.childNodes[offset];
       offset = 0;
@@ -208,13 +217,12 @@ function scrollRectIntoView(view, rect, startDOM) {
   var doc = view.dom.ownerDocument;
   for (var parent = startDOM || view.dom;;) {
     if (!parent) break;
-    if (parent.nodeType != 1) {
+    if (!isElt(parent)) {
       parent = parentNode(parent);
       continue;
     }
-    var elt = parent;
-    var atTop = elt == doc.body;
-    var bounding = atTop ? windowRect(doc) : clientRect(elt);
+    var atTop = parent == doc.body;
+    var bounding = atTop ? windowRect(doc) : clientRect(parent);
     var moveX = 0,
       moveY = 0;
     if (rect.top < bounding.top + getSide(scrollThreshold, "top")) moveY = -(bounding.top - rect.top + getSide(scrollMargin, "top"));else if (rect.bottom > bounding.bottom - getSide(scrollThreshold, "bottom")) moveY = rect.bottom - rect.top > bounding.bottom - bounding.top ? rect.top + getSide(scrollMargin, "top") - bounding.top : rect.bottom - bounding.bottom + getSide(scrollMargin, "bottom");
@@ -223,12 +231,12 @@ function scrollRectIntoView(view, rect, startDOM) {
       if (atTop) {
         doc.defaultView.scrollBy(moveX, moveY);
       } else {
-        var startX = elt.scrollLeft,
-          startY = elt.scrollTop;
-        if (moveY) elt.scrollTop += moveY;
-        if (moveX) elt.scrollLeft += moveX;
-        var dX = elt.scrollLeft - startX,
-          dY = elt.scrollTop - startY;
+        var startX = parent.scrollLeft,
+          startY = parent.scrollTop;
+        if (moveY) parent.scrollTop += moveY;
+        if (moveX) parent.scrollLeft += moveX;
+        var dX = parent.scrollLeft - startX,
+          dY = parent.scrollTop - startY;
         rect = {
           left: rect.left - dX,
           top: rect.top - dY,
@@ -311,8 +319,8 @@ function focusPreventScroll(dom) {
   }
 }
 function findOffsetInNode(node, coords) {
-  var closest,
-    dxClosest = 2e8,
+  var closest;
+  var dxClosest = 2e8,
     coordsClosest,
     offset = 0;
   var rowBot = coords.top,
@@ -320,7 +328,7 @@ function findOffsetInNode(node, coords) {
   var firstBelow, coordsBelow;
   for (var child = node.firstChild, childIndex = 0; child; child = child.nextSibling, childIndex++) {
     var rects = void 0;
-    if (child.nodeType == 1) rects = child.getClientRects();else if (child.nodeType == 3) rects = textRange(child).getClientRects();else continue;
+    if (isElt(child)) rects = child.getClientRects();else if (isText(child)) rects = textRange(child).getClientRects();else continue;
     for (var i = 0; i < rects.length; i++) {
       var rect = rects[i];
       if (rect.top <= rowBot && rect.bottom >= rowTop) {
@@ -330,11 +338,11 @@ function findOffsetInNode(node, coords) {
         if (dx < dxClosest) {
           closest = child;
           dxClosest = dx;
-          coordsClosest = dx && closest.nodeType == 3 ? {
+          coordsClosest = dx && isText(closest) ? {
             left: rect.right < coords.left ? rect.right : rect.left,
             top: coords.top
           } : coords;
-          if (child.nodeType == 1 && dx) offset = childIndex + (coords.left >= (rect.left + rect.right) / 2 ? 1 : 0);
+          if (isElt(child) && dx) offset = childIndex + (coords.left >= (rect.left + rect.right) / 2 ? 1 : 0);
           continue;
         }
       } else if (rect.top > coords.top && !firstBelow && rect.left <= coords.left && rect.right >= coords.left) {
@@ -352,8 +360,8 @@ function findOffsetInNode(node, coords) {
     coordsClosest = coordsBelow;
     dxClosest = 0;
   }
-  if (closest && closest.nodeType == 3) return findOffsetInText(closest, coordsClosest);
-  if (!closest || dxClosest && closest.nodeType == 1) return {
+  if (closest && isText(closest)) return findOffsetInText(closest, coordsClosest);
+  if (!closest || dxClosest) return {
     node: node,
     offset: offset
   };
@@ -395,7 +403,7 @@ function posFromElement(view, elt, coords) {
     node = _findOffsetInNode.node,
     offset = _findOffsetInNode.offset,
     bias = -1;
-  if (node.nodeType == 1 && !node.firstChild) {
+  if (isElt(node) && !node.firstChild) {
     var rect = node.getBoundingClientRect();
     bias = rect.left != rect.right && coords.left > (rect.left + rect.right) / 2 ? 1 : -1;
   }
@@ -408,7 +416,7 @@ function posFromCaret(view, node, offset, coords) {
     var desc = view.docView.nearestDesc(cur, true),
       rect = void 0;
     if (!desc) return null;
-    if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent || !desc.contentDOM) && ((rect = desc.dom.getBoundingClientRect()).width || rect.height)) {
+    if (isElt(desc.dom) && (desc.node.isBlock && desc.parent || !desc.contentDOM) && ((rect = desc.dom.getBoundingClientRect()).width || rect.height)) {
       if (desc.node.isBlock && desc.parent && !/^T(R|BODY|HEAD|FOOT)$/.test(desc.dom.nodeName)) {
         if (!sawBlock && rect.left > coords.left || rect.top > coords.top) outsideBlock = desc.posBefore;else if (!sawBlock && rect.right < coords.left || rect.bottom < coords.top) outsideBlock = desc.posAfter;
         sawBlock = true;
@@ -427,7 +435,7 @@ function elementFromPoint(element, coords, box) {
   if (len && box.top < box.bottom) {
     for (var startI = Math.max(0, Math.min(len - 1, Math.floor(len * (coords.top - box.top) / (box.bottom - box.top)) - 2)), i = startI;;) {
       var child = element.childNodes[i];
-      if (child.nodeType == 1) {
+      if (isElt(child)) {
         var rects = child.getClientRects();
         for (var j = 0; j < rects.length; j++) {
           var rect = rects[j];
@@ -450,7 +458,7 @@ function _posAtCoords(view, coords) {
   }
   var elt = (view.root.elementFromPoint ? view.root : doc).elementFromPoint(coords.left, coords.top);
   var pos;
-  if (!elt || !view.dom.contains(elt.nodeType != 1 ? elt.parentNode : elt)) {
+  if (!elt || !view.dom.contains(elt)) {
     var box = view.dom.getBoundingClientRect();
     if (!inRect(coords, box)) return null;
     elt = elementFromPoint(view.dom, coords, box);
@@ -461,7 +469,7 @@ function _posAtCoords(view, coords) {
   }
   elt = targetKludge(elt, coords);
   if (node) {
-    if (gecko && node.nodeType == 1) {
+    if (gecko && isElt(node)) {
       offset = Math.min(offset, node.childNodes.length);
       if (offset < node.childNodes.length) {
         var next = node.childNodes[offset],
@@ -470,8 +478,8 @@ function _posAtCoords(view, coords) {
       }
     }
     var prev;
-    if (webkit && offset && node.nodeType == 1 && (prev = node.childNodes[offset - 1]).nodeType == 1 && prev.contentEditable == "false" && prev.getBoundingClientRect().top >= coords.top) offset--;
-    if (node == view.dom && offset == node.childNodes.length - 1 && node.lastChild.nodeType == 1 && coords.top > node.lastChild.getBoundingClientRect().bottom) pos = view.state.doc.content.size;else if (offset == 0 || node.nodeType != 1 || node.childNodes[offset - 1].nodeName != "BR") pos = posFromCaret(view, node, offset, coords);
+    if (webkit && offset && isElt(node) && isElt(prev = node.childNodes[offset - 1]) && prev.contentEditable == "false" && prev.getBoundingClientRect().top >= coords.top) offset--;
+    if (node == view.dom && offset == node.childNodes.length - 1 && isElt(node.lastChild) && coords.top > node.lastChild.getBoundingClientRect().bottom) pos = view.state.doc.content.size;else if (offset == 0 || !isElt(node) || node.childNodes[offset - 1].nodeName != "BR") pos = posFromCaret(view, node, offset, coords);
   }
   if (pos == null) pos = posFromElement(view, elt, coords);
   var desc = view.docView.nearestDesc(elt, true);
@@ -498,7 +506,7 @@ function _coordsAtPos(view, pos, side) {
     offset = _view$docView$domFrom.offset,
     atom = _view$docView$domFrom.atom;
   var supportEmptyRange = webkit || gecko;
-  if (node.nodeType == 3) {
+  if (isText(node)) {
     if (supportEmptyRange && (BIDI.test(node.nodeValue) || (side < 0 ? !offset : offset == node.nodeValue.length))) {
       var rect = singleRect(textRange(node, offset, offset), side);
       if (gecko && offset && /\s/.test(node.nodeValue[offset - 1]) && offset < node.nodeValue.length) {
@@ -531,26 +539,26 @@ function _coordsAtPos(view, pos, side) {
   if (!$dom.parent.inlineContent) {
     if (atom == null && offset && (side < 0 || offset == nodeSize(node))) {
       var before = node.childNodes[offset - 1];
-      if (before.nodeType == 1) return flattenH(before.getBoundingClientRect(), false);
+      if (isElt(before)) return flattenH(before.getBoundingClientRect(), false);
     }
     if (atom == null && offset < nodeSize(node)) {
       var after = node.childNodes[offset];
-      if (after.nodeType == 1) return flattenH(after.getBoundingClientRect(), true);
+      if (isElt(after)) return flattenH(after.getBoundingClientRect(), true);
     }
     return flattenH(node.getBoundingClientRect(), side >= 0);
   }
   if (atom == null && offset && (side < 0 || offset == nodeSize(node))) {
     var _before = node.childNodes[offset - 1];
-    var target = _before.nodeType == 3 ? textRange(_before, nodeSize(_before) - (supportEmptyRange ? 0 : 1)) : _before.nodeType == 1 && (_before.nodeName != "BR" || !_before.nextSibling) ? _before : null;
+    var target = isText(_before) ? textRange(_before, nodeSize(_before) - (supportEmptyRange ? 0 : 1)) : isElt(_before) && (_before.nodeName != "BR" || !_before.nextSibling) ? _before : null;
     if (target) return flattenV(singleRect(target, 1), false);
   }
   if (atom == null && offset < nodeSize(node)) {
     var _after = node.childNodes[offset];
     while (_after.pmViewDesc && _after.pmViewDesc.ignoreForCoords) _after = _after.nextSibling;
-    var _target = !_after ? null : _after.nodeType == 3 ? textRange(_after, 0, supportEmptyRange ? 0 : 1) : _after.nodeType == 1 ? _after : null;
+    var _target = !_after ? null : isText(_after) ? textRange(_after, 0, supportEmptyRange ? 0 : 1) : isElt(_after) ? _after : null;
     if (_target) return flattenV(singleRect(_target, -1), true);
   }
-  return flattenV(singleRect(node.nodeType == 3 ? textRange(node) : node, -side), side >= 0);
+  return flattenV(singleRect(isText(node) ? textRange(node) : node, -side), side >= 0);
 }
 function flattenV(rect, left) {
   if (rect.width == 0) return rect;
@@ -602,7 +610,7 @@ function endOfTextblockVertical(view, state, dir) {
     var coords = _coordsAtPos(view, $pos.pos, 1);
     for (var child = dom.firstChild; child; child = child.nextSibling) {
       var boxes = void 0;
-      if (child.nodeType == 1) boxes = child.getClientRects();else if (child.nodeType == 3) boxes = textRange(child, 0, child.nodeValue.length).getClientRects();else continue;
+      if (isElt(child)) boxes = child.getClientRects();else if (isText(child)) boxes = textRange(child, 0, child.nodeValue.length).getClientRects();else continue;
       for (var i = 0; i < boxes.length; i++) {
         var box = boxes[i];
         if (box.bottom > box.top + 1 && (dir == "up" ? coords.top - box.top > (box.bottom - coords.top) * 2 : box.bottom - coords.bottom > (coords.bottom - box.top) * 2)) return false;
@@ -633,7 +641,7 @@ function endOfTextblockHorizontal(view, state, dir) {
     var _view$domSelectionRan2 = view.domSelectionRange(),
       newNode = _view$domSelectionRan2.focusNode,
       newOff = _view$domSelectionRan2.focusOffset;
-    var result = newNode && !parentDOM.contains(newNode.nodeType == 1 ? newNode : newNode.parentNode) || oldNode == newNode && oldOff == newOff;
+    var result = newNode && !contains(parentDOM, newNode) || oldNode == newNode && oldOff == newOff;
     try {
       sel.collapse(anchorNode, anchorOffset);
       if (oldNode && (oldNode != anchorNode || oldOff != anchorOffset) && sel.extend) sel.extend(oldNode, oldOff);
@@ -746,7 +754,8 @@ var ViewDesc = function () {
   }, {
     key: "localPosFromDOM",
     value: function localPosFromDOM(dom, offset, bias) {
-      if (this.contentDOM && this.contentDOM.contains(dom.nodeType == 1 ? dom : dom.parentNode)) {
+      var _this = this;
+      if (this.contentDOM && contains(this.contentDOM, dom)) {
         if (bias < 0) {
           var domBefore, desc;
           if (dom == this.contentDOM) {
@@ -773,7 +782,14 @@ var ViewDesc = function () {
       if (dom == this.dom && this.contentDOM) {
         atEnd = offset > domIndex(this.contentDOM);
       } else if (this.contentDOM && this.contentDOM != this.dom && this.dom.contains(this.contentDOM)) {
-        atEnd = dom.compareDocumentPosition(this.contentDOM) & 2;
+        var rel = dom.compareDocumentPosition(this.contentDOM);
+        if (rel & 16) {
+          atEnd = offset > Array.from(dom.childNodes).findIndex(function (n) {
+            return n.contains(_this.contentDOM);
+          });
+        } else {
+          atEnd = !(rel & 4);
+        }
       } else if (this.dom.firstChild) {
         if (offset == 0) for (var search = dom;; search = search.parentNode) {
           if (search == this.dom) {
@@ -800,7 +816,7 @@ var ViewDesc = function () {
         var desc = this.getDesc(cur),
           nodeDOM = void 0;
         if (desc && (!onlyNodes || desc.node)) {
-          if (first && (nodeDOM = desc.nodeDOM) && !(nodeDOM.nodeType == 1 ? nodeDOM.contains(dom.nodeType == 1 ? dom : dom.parentNode) : nodeDOM == dom)) first = false;else return desc;
+          if (first && (nodeDOM = desc.nodeDOM) && !(isElt(nodeDOM) ? contains(nodeDOM, dom) : nodeDOM == dom)) first = false;else return desc;
         }
       }
     }
@@ -854,14 +870,17 @@ var ViewDesc = function () {
       for (var curPos = 0; i < this.children.length; i++) {
         var child = this.children[i],
           end = curPos + child.size;
-        if (end > pos || child instanceof TrailingHackViewDesc) {
+        if (end > pos) {
           offset = pos - curPos;
           break;
         }
         curPos = end;
       }
       if (offset) return this.children[i].domFromPos(offset - this.children[i].border, side);
-      for (var prev; i && !(prev = this.children[i - 1]).size && prev instanceof WidgetViewDesc && prev.side >= 0; i--) {}
+      for (; i > 0; i--) {
+        var prev = this.children[i - 1];
+        if (prev.size || !(prev instanceof BufferHackViewDesc || prev instanceof WidgetViewDesc && prev.side >= 0)) break;
+      }
       if (side <= 0) {
         var _prev,
           enter = true;
@@ -954,7 +973,7 @@ var ViewDesc = function () {
       var _this$domFromPos = this.domFromPos(pos, 0),
         node = _this$domFromPos.node,
         offset = _this$domFromPos.offset;
-      if (node.nodeType != 1 || offset == node.childNodes.length) throw new RangeError("No node after pos " + pos);
+      if (!isElt(node) || offset == node.childNodes.length) throw new RangeError("No node after pos " + pos);
       return node.childNodes[offset];
     }
   }, {
@@ -978,7 +997,7 @@ var ViewDesc = function () {
         var _anchorDOM = anchorDOM,
           node = _anchorDOM.node,
           _offset = _anchorDOM.offset;
-        if (node.nodeType == 3) {
+        if (isText(node)) {
           brKludge = !!(_offset && node.nodeValue[_offset - 1] == "\n");
           if (brKludge && _offset == node.nodeValue.length) {
             for (var scan = node, after; scan; scan = scan.parentNode) {
@@ -998,7 +1017,7 @@ var ViewDesc = function () {
           brKludge = prev && (prev.nodeName == "BR" || prev.contentEditable == "false");
         }
       }
-      if (gecko && selRange.focusNode && selRange.focusNode != headDOM.node && selRange.focusNode.nodeType == 1) {
+      if (gecko && selRange.focusNode && selRange.focusNode != headDOM.node && isElt(selRange.focusNode)) {
         var _after2 = selRange.focusNode.childNodes[selRange.focusOffset];
         if (_after2 && _after2.contentEditable == "false") force = true;
       }
@@ -1091,7 +1110,7 @@ var WidgetViewDesc = function (_ViewDesc) {
   _inherits(WidgetViewDesc, _ViewDesc);
   var _super = _createSuper(WidgetViewDesc);
   function WidgetViewDesc(parent, widget, view, pos) {
-    var _this;
+    var _this2;
     _classCallCheck(this, WidgetViewDesc);
     var self,
       dom = widget.type.toDOM;
@@ -1100,19 +1119,16 @@ var WidgetViewDesc = function (_ViewDesc) {
       if (self.parent) return self.parent.posBeforeChild(self);
     });
     if (!widget.type.spec.raw) {
-      if (dom.nodeType != 1) {
-        var wrap = document.createElement("span");
-        wrap.appendChild(dom);
-        dom = wrap;
-      }
-      if (!dom.hasAttribute("contenteditable")) dom.contentEditable = "false";
-      dom.classList.add("ProseMirror-widget");
-    }
-    _this = _super.call(this, parent, [], dom, null);
-    _this.widget = widget;
-    _this.widget = widget;
-    self = _assertThisInitialized(_this);
-    return _this;
+      var elt = isElt(dom) ? dom : document.createElement("span");
+      if (elt != dom) elt.appendChild(dom);
+      if (!elt.hasAttribute("contenteditable")) elt.contentEditable = "false";
+      elt.classList.add("ProseMirror-widget");
+    }
+    _this2 = _super.call(this, parent, [], dom, null);
+    _this2.widget = widget;
+    _this2.widget = widget;
+    self = _assertThisInitialized(_this2);
+    return _this2;
   }
   _createClass(WidgetViewDesc, [{
     key: "matchesWidget",
@@ -1165,12 +1181,12 @@ var CompositionViewDesc = function (_ViewDesc2) {
   _inherits(CompositionViewDesc, _ViewDesc2);
   var _super2 = _createSuper(CompositionViewDesc);
   function CompositionViewDesc(parent, dom, textDOM, text) {
-    var _this2;
+    var _this3;
     _classCallCheck(this, CompositionViewDesc);
-    _this2 = _super2.call(this, parent, [], dom, null);
-    _this2.textDOM = textDOM;
-    _this2.text = text;
-    return _this2;
+    _this3 = _super2.call(this, parent, [], dom, null);
+    _this3.textDOM = textDOM;
+    _this3.text = text;
+    return _this3;
   }
   _createClass(CompositionViewDesc, [{
     key: "size",
@@ -1203,12 +1219,12 @@ var MarkViewDesc = function (_ViewDesc3) {
   _inherits(MarkViewDesc, _ViewDesc3);
   var _super3 = _createSuper(MarkViewDesc);
   function MarkViewDesc(parent, mark, dom, contentDOM, spec) {
-    var _this3;
+    var _this4;
     _classCallCheck(this, MarkViewDesc);
-    _this3 = _super3.call(this, parent, [], dom, contentDOM);
-    _this3.mark = mark;
-    _this3.spec = spec;
-    return _this3;
+    _this4 = _super3.call(this, parent, [], dom, contentDOM);
+    _this4.mark = mark;
+    _this4.spec = spec;
+    return _this4;
   }
   _createClass(MarkViewDesc, [{
     key: "parseRule",
@@ -1274,19 +1290,19 @@ var NodeViewDesc = function (_ViewDesc4) {
   _inherits(NodeViewDesc, _ViewDesc4);
   var _super4 = _createSuper(NodeViewDesc);
   function NodeViewDesc(parent, node, outerDeco, innerDeco, dom, contentDOM, nodeDOM) {
-    var _this4;
+    var _this5;
     _classCallCheck(this, NodeViewDesc);
-    _this4 = _super4.call(this, parent, [], dom, contentDOM);
-    _this4.node = node;
-    _this4.outerDeco = outerDeco;
-    _this4.innerDeco = innerDeco;
-    _this4.nodeDOM = nodeDOM;
-    return _this4;
+    _this5 = _super4.call(this, parent, [], dom, contentDOM);
+    _this5.node = node;
+    _this5.outerDeco = outerDeco;
+    _this5.innerDeco = innerDeco;
+    _this5.nodeDOM = nodeDOM;
+    return _this5;
   }
   _createClass(NodeViewDesc, [{
     key: "parseRule",
     value: function parseRule(addedNodes) {
-      var _this5 = this;
+      var _this6 = this;
       if (this.node.type.spec.reparseInView) return null;
       var rule = {
         node: this.node.type.name,
@@ -1295,7 +1311,7 @@ var NodeViewDesc = function (_ViewDesc4) {
       if (this.node.type.whitespace == "pre") rule.preserveWhitespace = "full";
       if (!this.contentDOM) {
         rule.getContent = function () {
-          return _this5.node.content;
+          return _this6.node.content;
         };
       } else if (!this.contentLost) {
         rule.contentElement = this.contentDOM;
@@ -1309,7 +1325,7 @@ var NodeViewDesc = function (_ViewDesc4) {
         }
         if (!rule.contentElement) {
           var found = addedNodes && addedNodes.find(function (n) {
-            return n.nodeType == 1 && addedNodes.indexOf(n.parentNode) < 0 && _this5.dom.contains(n);
+            return isElt(n) && addedNodes.indexOf(n.parentNode) < 0 && _this6.dom.contains(n);
           });
           if (found) rule.contentElement = found;else rule.getContent = function () {
             return prosemirrorModel.Fragment.empty;
@@ -1336,23 +1352,27 @@ var NodeViewDesc = function (_ViewDesc4) {
   }, {
     key: "updateChildren",
     value: function updateChildren(view, pos) {
-      var _this6 = this;
+      var _this7 = this;
       var inline = this.node.inlineContent,
         off = pos;
       var composition = view.composing ? this.localCompositionInfo(view, pos) : null;
       var localComposition = composition && composition.pos > -1 ? composition : null;
       var compositionInChild = composition && composition.pos < 0;
       var updater = new ViewTreeUpdater(this, localComposition && localComposition.node, view);
+      var addBuffers = this.node.inlineContent,
+        atBufferPos = addBuffers && this.node.isBlock;
       iterDeco(this.node, this.innerDeco, function (widget, i, insideNode) {
-        if (widget.spec.marks) updater.syncToMarks(widget.spec.marks, inline, view, i);else if (widget.type.side >= 0 && !insideNode) updater.syncToMarks(i == _this6.node.childCount ? prosemirrorModel.Mark.none : _this6.node.child(i).marks, inline, view, i);
+        if (widget.spec.marks) updater.syncToMarks(widget.spec.marks, inline, view, i);else if (widget.type.side >= 0 && !insideNode) updater.syncToMarks(i == _this7.node.childCount ? prosemirrorModel.Mark.none : _this7.node.child(i).marks, inline, view, i);
         updater.placeWidget(widget, view, off);
       }, function (child, outerDeco, innerDeco, i) {
         updater.syncToMarks(child.marks, inline, view, i);
+        if (atBufferPos && child.isAtom && !child.isText) updater.addHackNode("IMG", updater.top);
         var compIndex;
         if (updater.findNodeMatch(child, outerDeco, innerDeco, i)) ;else if (compositionInChild && view.state.selection.from > off && view.state.selection.to < off + child.nodeSize && (compIndex = updater.findIndexWithChild(composition.node)) > -1 && updater.updateNodeAt(child, outerDeco, innerDeco, compIndex, view)) ;else if (updater.updateNextNode(child, outerDeco, innerDeco, view, i, off)) ;else {
           updater.addNode(child, outerDeco, innerDeco, view, off);
         }
         off += child.nodeSize;
+        if (addBuffers) atBufferPos = child.isAtom && !child.isText;
       });
       updater.syncToMarks([], inline, view, 0);
       if (this.node.isTextblock) updater.addTextblockHacks();
@@ -1426,7 +1446,7 @@ var NodeViewDesc = function (_ViewDesc4) {
     key: "updateOuterDeco",
     value: function updateOuterDeco(outerDeco) {
       if (sameOuterDeco(outerDeco, this.outerDeco)) return;
-      var needsWrap = this.nodeDOM.nodeType != 1;
+      var needsWrap = !isElt(this.nodeDOM);
       var oldDOM = this.dom;
       this.dom = patchOuterDeco(this.dom, this.nodeDOM, computeOuterDeco(this.outerDeco, this.node, needsWrap), computeOuterDeco(outerDeco, this.node, needsWrap));
       if (this.dom != oldDOM) {
@@ -1438,7 +1458,7 @@ var NodeViewDesc = function (_ViewDesc4) {
   }, {
     key: "selectNode",
     value: function selectNode() {
-      if (this.nodeDOM.nodeType == 1) {
+      if (isElt(this.nodeDOM)) {
         this.nodeDOM.classList.add("ProseMirror-selectednode");
         if (this.contentDOM || !this.node.type.spec.draggable) this.nodeDOM.draggable = true;
       }
@@ -1446,7 +1466,7 @@ var NodeViewDesc = function (_ViewDesc4) {
   }, {
     key: "deselectNode",
     value: function deselectNode() {
-      if (this.nodeDOM.nodeType == 1) {
+      if (isElt(this.nodeDOM)) {
         this.nodeDOM.classList.remove("ProseMirror-selectednode");
         if (this.contentDOM || !this.node.type.spec.draggable) this.nodeDOM.removeAttribute("draggable");
       }
@@ -1468,7 +1488,7 @@ var NodeViewDesc = function (_ViewDesc4) {
       var dom = spec && spec.dom,
         contentDOM = spec && spec.contentDOM;
       if (node.isText) {
-        if (!dom) dom = document.createTextNode(node.text);else if (dom.nodeType != 3) throw new RangeError("Text must be rendered as a DOM text node");
+        if (!dom) dom = document.createTextNode(node.text);else if (!isText(dom)) throw new RangeError("Text must be rendered as a DOM text node");
       } else if (!dom) {
         var _spec = prosemirrorModel.DOMSerializer.renderSpec(document, node.type.spec.toDOM(node), null, node.attrs);
         dom = _spec.dom;
@@ -1572,14 +1592,14 @@ var TextViewDesc = function (_NodeViewDesc) {
   }]);
   return TextViewDesc;
 }(NodeViewDesc);
-var TrailingHackViewDesc = function (_ViewDesc5) {
-  _inherits(TrailingHackViewDesc, _ViewDesc5);
-  var _super6 = _createSuper(TrailingHackViewDesc);
-  function TrailingHackViewDesc() {
-    _classCallCheck(this, TrailingHackViewDesc);
+var BufferHackViewDesc = function (_ViewDesc5) {
+  _inherits(BufferHackViewDesc, _ViewDesc5);
+  var _super6 = _createSuper(BufferHackViewDesc);
+  function BufferHackViewDesc() {
+    _classCallCheck(this, BufferHackViewDesc);
     return _super6.apply(this, arguments);
   }
-  _createClass(TrailingHackViewDesc, [{
+  _createClass(BufferHackViewDesc, [{
     key: "parseRule",
     value: function parseRule() {
       return {
@@ -1602,17 +1622,17 @@ var TrailingHackViewDesc = function (_ViewDesc5) {
       return this.dom.nodeName == "IMG";
     }
   }]);
-  return TrailingHackViewDesc;
+  return BufferHackViewDesc;
 }(ViewDesc);
 var CustomNodeViewDesc = function (_NodeViewDesc2) {
   _inherits(CustomNodeViewDesc, _NodeViewDesc2);
   var _super7 = _createSuper(CustomNodeViewDesc);
   function CustomNodeViewDesc(parent, node, outerDeco, innerDeco, dom, contentDOM, nodeDOM, spec) {
-    var _this7;
+    var _this8;
     _classCallCheck(this, CustomNodeViewDesc);
-    _this7 = _super7.call(this, parent, node, outerDeco, innerDeco, dom, contentDOM, nodeDOM);
-    _this7.spec = spec;
-    return _this7;
+    _this8 = _super7.call(this, parent, node, outerDeco, innerDeco, dom, contentDOM, nodeDOM);
+    _this8.spec = spec;
+    return _this8;
   }
   _createClass(CustomNodeViewDesc, [{
     key: "update",
@@ -1754,7 +1774,7 @@ function patchAttributes(dom, prev, cur) {
   }
 }
 function applyOuterDeco(dom, deco, node) {
-  return patchOuterDeco(dom, dom, noDeco, computeOuterDeco(deco, node, dom.nodeType != 1));
+  return patchOuterDeco(dom, dom, noDeco, computeOuterDeco(deco, node, !isElt(dom)));
 }
 function sameOuterDeco(a, b) {
   if (a.length != b.length) return false;
@@ -1990,7 +2010,7 @@ var ViewTreeUpdater = function () {
           dom.alt = "";
         }
         if (nodeName == "BR") dom.className = "ProseMirror-trailingBreak";
-        var hack = new TrailingHackViewDesc(this.top, [], dom, null);
+        var hack = new BufferHackViewDesc(this.top, [], dom, null);
         if (parent != this.top) parent.children.push(hack);else parent.children.splice(this.index++, 0, hack);
         this.changed = true;
       }
@@ -1998,7 +2018,7 @@ var ViewTreeUpdater = function () {
   }, {
     key: "isLocked",
     value: function isLocked(node) {
-      return this.lock && (node == this.lock || node.nodeType == 1 && node.contains(this.lock.parentNode));
+      return this.lock && (node == this.lock || isElt(node) && node.contains(this.lock.parentNode));
     }
   }]);
   return ViewTreeUpdater;
@@ -2175,10 +2195,17 @@ function selectionFromDOM(view) {
   if (selectionCollapsed(domSel)) {
     anchor = head;
     while (nearestDesc && !nearestDesc.node) nearestDesc = nearestDesc.parent;
-    var nearestDescNode = nearestDesc.node;
-    if (nearestDesc && nearestDescNode.isAtom && prosemirrorState.NodeSelection.isSelectable(nearestDescNode) && nearestDesc.parent && !(nearestDescNode.isInline && isOnEdge(domSel.focusNode, domSel.focusOffset, nearestDesc.dom))) {
+    if (nearestDesc && nearestDesc.node.isAtom && prosemirrorState.NodeSelection.isSelectable(nearestDesc.node) && nearestDesc.parent && !(nearestDesc.node.isInline && isOnEdge(domSel.focusNode, domSel.focusOffset, nearestDesc.dom))) {
       var pos = nearestDesc.posBefore;
       selection = new prosemirrorState.NodeSelection(head == pos ? $head : doc.resolve(pos));
+    } else if (gecko && origin == "key" && head > view.state.selection.to && isElt(domSel.focusNode) && domSel.focusOffset == domSel.focusNode.childNodes.length && nearestDesc && nearestDesc.posAtStart > view.state.selection.to) {
+      for (var scan = domSel.focusNode;; scan = scan.parentNode) {
+        if (getComputedStyle(scan).overflow != "visible") {
+          selection = prosemirrorState.Selection.findFrom(doc.resolve(nearestDesc.posAtStart), 1);
+          break;
+        }
+        if (scan == nearestDesc.dom || scan.nextSibling || !scan.parentNode || !isElt(scan.parentNode)) break;
+      }
     }
   } else {
     if (domSel instanceof view.dom.ownerDocument.defaultView.Selection && domSel.rangeCount > 1) {
@@ -2335,7 +2362,7 @@ function hasSelection(view) {
   var sel = view.domSelectionRange();
   if (!sel.anchorNode) return false;
   try {
-    return view.dom.contains(sel.anchorNode.nodeType == 3 ? sel.anchorNode.parentNode : sel.anchorNode) && (view.editable || view.dom.contains(sel.focusNode.nodeType == 3 ? sel.focusNode.parentNode : sel.focusNode));
+    return contains(view.dom, sel.anchorNode) && (view.editable || contains(view.dom, sel.focusNode));
   } catch (_) {
     return false;
   }
@@ -2372,7 +2399,7 @@ function selectHorizontally(view, dir, mods) {
       var next = moveSelectionBlock(view.state, dir);
       if (next && next instanceof prosemirrorState.NodeSelection) return apply(view, next);
       return false;
-    } else if (!(mac && mods.indexOf("m") > -1)) {
+    } else if (!mac || mods.indexOf("m") < 0) {
       var _$head = sel.$head,
         _node = _$head.textOffset ? null : dir < 0 ? _$head.nodeBefore : _$head.nodeAfter,
         desc;
@@ -2381,10 +2408,8 @@ function selectHorizontally(view, dir, mods) {
       if (!(_node.isAtom || (desc = view.docView.descAt(nodePos)) && !desc.contentDOM)) return false;
       if (prosemirrorState.NodeSelection.isSelectable(_node)) {
         return apply(view, new prosemirrorState.NodeSelection(dir < 0 ? view.state.doc.resolve(_$head.pos - _node.nodeSize) : _$head));
-      } else if (webkit) {
-        return apply(view, new prosemirrorState.TextSelection(view.state.doc.resolve(dir < 0 ? nodePos : nodePos + _node.nodeSize)));
       } else {
-        return false;
+        return apply(view, new prosemirrorState.TextSelection(view.state.doc.resolve(dir < 0 ? nodePos : nodePos + _node.nodeSize)));
       }
     }
   } else if (sel instanceof prosemirrorState.NodeSelection && sel.node.isInline) {
@@ -2395,12 +2420,9 @@ function selectHorizontally(view, dir, mods) {
     return false;
   }
 }
-function nodeLen(node) {
-  return node.nodeType == 3 ? node.nodeValue.length : node.childNodes.length;
-}
 function isIgnorable(dom, dir) {
   var desc = dom.pmViewDesc;
-  return desc ? desc.size == 0 && (dir < 0 || dom.nextSibling || dom.nodeName != "BR") : dom.nodeType == 1 && dom.contentEditable == "false";
+  return desc ? desc.size == 0 && (dir < 0 || dom.nextSibling || dom.nodeName != "BR") : isElt(dom) && dom.contentEditable == "false";
 }
 function skipIgnoredNodes(view, dir) {
   return dir < 0 ? skipIgnoredNodesBefore(view) : skipIgnoredNodesAfter(view);
@@ -2413,20 +2435,19 @@ function skipIgnoredNodesBefore(view) {
   var moveNode,
     moveOffset,
     force = false;
-  if (gecko && node.nodeType == 1 && offset < nodeLen(node) && isIgnorable(node.childNodes[offset], -1)) force = true;
+  if (gecko && isElt(node) && offset < nodeSize(node) && isIgnorable(node.childNodes[offset], -1)) force = true;
   for (;;) {
     if (offset > 0) {
-      if (node.nodeType != 1) {
-        break;
+      if (!isElt(node)) break;
+      var before = node.childNodes[offset - 1];
+      if (isIgnorable(before, -1)) {
+        moveNode = node;
+        moveOffset = --offset;
+      } else if (isText(before)) {
+        node = before;
+        offset = node.nodeValue.length;
       } else {
-        var before = node.childNodes[offset - 1];
-        if (isIgnorable(before, -1)) {
-          moveNode = node;
-          moveOffset = --offset;
-        } else if (before.nodeType == 3) {
-          node = before;
-          offset = node.nodeValue.length;
-        } else break;
+        break;
       }
     } else if (isBlockNode(node)) {
       break;
@@ -2443,7 +2464,7 @@ function skipIgnoredNodesBefore(view) {
         offset = 0;
       } else {
         node = prev;
-        offset = nodeLen(node);
+        offset = nodeSize(node);
       }
     }
   }
@@ -2454,16 +2475,18 @@ function skipIgnoredNodesAfter(view) {
   var node = sel.focusNode,
     offset = sel.focusOffset;
   if (!node) return;
-  var len = nodeLen(node);
+  var len = nodeSize(node);
   var moveNode, moveOffset;
   for (;;) {
     if (offset < len) {
-      if (node.nodeType != 1) break;
+      if (!isElt(node)) break;
       var after = node.childNodes[offset];
       if (isIgnorable(after, 1)) {
         moveNode = node;
         moveOffset = ++offset;
-      } else break;
+      } else {
+        break;
+      }
     } else if (isBlockNode(node)) {
       break;
     } else {
@@ -2480,7 +2503,7 @@ function skipIgnoredNodesAfter(view) {
       } else {
         node = next;
         offset = 0;
-        len = nodeLen(node);
+        len = nodeSize(node);
       }
     }
   }
@@ -2497,8 +2520,8 @@ function textNodeAfter(node, offset) {
   }
   while (node && offset < node.childNodes.length) {
     var next = node.childNodes[offset];
-    if (next.nodeType == 3) return next;
-    if (next.nodeType == 1 && next.contentEditable == "false") break;
+    if (isText(next)) return next;
+    if (isElt(next) && next.contentEditable == "false") break;
     node = next;
     offset = 0;
   }
@@ -2510,14 +2533,14 @@ function textNodeBefore(node, offset) {
   }
   while (node && offset) {
     var next = node.childNodes[offset - 1];
-    if (next.nodeType == 3) return next;
-    if (next.nodeType == 1 && next.contentEditable == "false") break;
+    if (isText(next)) return next;
+    if (isElt(next) && next.contentEditable == "false") break;
     node = next;
     offset = node.childNodes.length;
   }
 }
 function setSelFocus(view, node, offset) {
-  if (node.nodeType != 3) {
+  if (!isText(node)) {
     var before, after;
     if (after = textNodeAfter(node, offset)) {
       node = after;
@@ -2527,15 +2550,13 @@ function setSelFocus(view, node, offset) {
       offset = before.nodeValue.length;
     }
   }
-  var sel = view.domSelection();
+  var sel = view.domSelection(),
+    range = view.domSelectionRange();
   if (!sel) return;
-  if (selectionCollapsed(sel)) {
-    var range = document.createRange();
-    range.setEnd(node, offset);
-    range.setStart(node, offset);
-    sel.removeAllRanges();
-    sel.addRange(range);
+  if (selectionCollapsed(range)) {
+    sel.collapse(node, offset);
   } else if (sel.extend) {
+    sel.collapse(range.anchorNode, range.anchorOffset);
     sel.extend(node, offset);
   }
   view.domObserver.setCurSelection();
@@ -2559,7 +2580,12 @@ function findDirection(view, pos) {
       if (_mid > coords.top && _mid < coords.bottom && Math.abs(after.left - coords.left) > 1) return after.left > coords.left ? "ltr" : "rtl";
     }
   }
-  var computed = getComputedStyle(view.dom).direction;
+  var block = view.dom;
+  for (var d = $pos.depth; d > 0; d--) if ($pos.node(d).isBlock) {
+    block = view.nodeDOM($pos.before(d)) || block;
+    break;
+  }
+  var computed = getComputedStyle(block).direction;
   return computed == "rtl" ? "rtl" : "ltr";
 }
 function selectVertically(view, dir, mods) {
@@ -2607,7 +2633,7 @@ function safariDownArrowBug(view) {
   var _view$domSelectionRan3 = view.domSelectionRange(),
     focusNode = _view$domSelectionRan3.focusNode,
     focusOffset = _view$domSelectionRan3.focusOffset;
-  if (focusNode && focusNode.nodeType == 1 && focusOffset == 0 && focusNode.firstChild && focusNode.firstChild.contentEditable == "false") {
+  if (focusNode && isElt(focusNode) && focusOffset == 0 && focusNode.firstChild && isElt(focusNode.firstChild) && focusNode.firstChild.contentEditable == "false") {
     var child = focusNode.firstChild;
     switchEditable(view, child, "true");
     setTimeout(function () {
@@ -2673,7 +2699,7 @@ function _serializeForClipboard(view, slice) {
   var firstChild = wrap.firstChild,
     needsWrap,
     wrappers = 0;
-  while (firstChild && firstChild.nodeType == 1 && (needsWrap = wrapMap[firstChild.nodeName.toLowerCase()])) {
+  while (firstChild && isElt(firstChild) && (needsWrap = wrapMap[firstChild.nodeName.toLowerCase()])) {
     for (var i = needsWrap.length - 1; i >= 0; i--) {
       var wrapper = doc.createElement(needsWrap[i]);
       while (wrap.firstChild) wrapper.appendChild(wrap.firstChild);
@@ -2682,7 +2708,7 @@ function _serializeForClipboard(view, slice) {
     }
     firstChild = wrap.firstChild;
   }
-  if (firstChild && firstChild.nodeType == 1) firstChild.setAttribute("data-pm-slice", "".concat(openStart, " ").concat(openEnd).concat(wrappers ? " -".concat(wrappers) : "", " ").concat(JSON.stringify(context)));
+  if (firstChild && isElt(firstChild)) firstChild.setAttribute("data-pm-slice", "".concat(openStart, " ").concat(openEnd).concat(wrappers ? " -".concat(wrappers) : "", " ").concat(JSON.stringify(context)));
   var text = view.someProp("clipboardTextSerializer", function (f) {
     return f(slice, view);
   }) || slice.content.textBetween(0, slice.content.size, "\n\n");
@@ -2734,7 +2760,7 @@ function parseFromClipboard(view, text, html, plainText, $context) {
   var sliceData = contextNode && /^(\d+) (\d+)(?: -(\d+))? (.*)/.exec(contextNode.getAttribute("data-pm-slice") || "");
   if (sliceData && sliceData[3]) for (var i = +sliceData[3]; i > 0; i--) {
     var child = dom.firstChild;
-    while (child && child.nodeType != 1) child = child.nextSibling;
+    while (child && !isElt(child)) child = child.nextSibling;
     if (!child) break;
     dom = child;
   }
@@ -3093,7 +3119,7 @@ function updateSelection(view, selection, origin) {
   if (!view.focused) view.focus();
   if (view.state.selection.eq(selection)) return;
   var tr = view.state.tr.setSelection(selection);
-  if (origin == "pointer") tr.setMeta("pointer", true);
+  tr.setMeta("pointer", true);
   view.dispatch(tr);
 }
 function selectClickedLeaf(view, inside) {
@@ -3101,7 +3127,7 @@ function selectClickedLeaf(view, inside) {
   var $pos = view.state.doc.resolve(inside),
     node = $pos.nodeAfter;
   if (node && node.isAtom && prosemirrorState.NodeSelection.isSelectable(node)) {
-    updateSelection(view, new prosemirrorState.NodeSelection($pos), "pointer");
+    updateSelection(view, new prosemirrorState.NodeSelection($pos));
     return true;
   }
   return false;
@@ -3121,7 +3147,7 @@ function selectClickedNode(view, inside) {
     }
   }
   if (selectAt != null) {
-    updateSelection(view, prosemirrorState.NodeSelection.create(view.state.doc, selectAt), "pointer");
+    updateSelection(view, prosemirrorState.NodeSelection.create(view.state.doc, selectAt));
     return true;
   } else {
     return false;
@@ -3147,7 +3173,7 @@ function defaultTripleClick(view, inside, event) {
   var selection = selectionForTripleClick(view, inside, true),
     doc = view.state.doc;
   if (!selection) return false;
-  updateSelection(view, selection, "pointer");
+  updateSelection(view, selection);
   if (selection instanceof prosemirrorState.TextSelection && doc.eq(view.state.doc)) view.input.mouseDown = new TripleClickDrag(view, selection);
   return true;
 }
@@ -3230,16 +3256,16 @@ var LeftMouseDown = function (_MouseDown) {
   _inherits(LeftMouseDown, _MouseDown);
   var _super8 = _createSuper(LeftMouseDown);
   function LeftMouseDown(view, pos, event, flushed) {
-    var _this8;
+    var _this9;
     _classCallCheck(this, LeftMouseDown);
-    _this8 = _super8.call(this, view);
-    _this8.pos = pos;
-    _this8.event = event;
-    _this8.flushed = flushed;
-    _this8.delayedSelectionSync = false;
-    _this8.startDoc = view.state.doc;
-    _this8.selectNode = !!event[selectNodeModifier];
-    _this8.allowDefault = event.shiftKey;
+    _this9 = _super8.call(this, view);
+    _this9.pos = pos;
+    _this9.event = event;
+    _this9.flushed = flushed;
+    _this9.delayedSelectionSync = false;
+    _this9.startDoc = view.state.doc;
+    _this9.selectNode = !!event[selectNodeModifier];
+    _this9.allowDefault = event.shiftKey;
     var targetNode, targetPos;
     if (pos.inside > -1) {
       targetNode = view.state.doc.nodeAt(pos.inside);
@@ -3251,29 +3277,29 @@ var LeftMouseDown = function (_MouseDown) {
     }
     var target = flushed ? null : event.target;
     var targetDesc = target ? view.docView.nearestDesc(target, true) : null;
-    _this8.target = targetDesc && targetDesc.nodeDOM.nodeType == 1 ? targetDesc.nodeDOM : null;
+    _this9.target = targetDesc && isElt(targetDesc.nodeDOM) ? targetDesc.nodeDOM : null;
     var selection = view.state.selection;
-    if (event.button == 0 && (targetNode.type.spec.draggable && targetNode.type.spec.selectable !== false || selection instanceof prosemirrorState.NodeSelection && selection.from <= targetPos && selection.to > targetPos)) _this8.mightDrag = {
+    if (event.button == 0 && (targetNode.type.spec.draggable && targetNode.type.spec.selectable !== false || selection instanceof prosemirrorState.NodeSelection && selection.from <= targetPos && selection.to > targetPos)) _this9.mightDrag = {
       node: targetNode,
       pos: targetPos,
-      addAttr: !!(_this8.target && !_this8.target.draggable),
-      setUneditable: !!(_this8.target && gecko && !_this8.target.hasAttribute("contentEditable"))
+      addAttr: !!(_this9.target && !_this9.target.draggable),
+      setUneditable: !!(_this9.target && gecko && !_this9.target.hasAttribute("contentEditable"))
     };
-    if (_this8.target && _this8.mightDrag && (_this8.mightDrag.addAttr || _this8.mightDrag.setUneditable)) {
-      _this8.view.domObserver.stop();
-      if (_this8.mightDrag.addAttr) _this8.target.draggable = true;
-      if (_this8.mightDrag.setUneditable) setTimeout(function () {
-        if (_this8.view.input.mouseDown == _assertThisInitialized(_this8)) _this8.target.setAttribute("contentEditable", "false");
+    if (_this9.target && _this9.mightDrag && (_this9.mightDrag.addAttr || _this9.mightDrag.setUneditable)) {
+      _this9.view.domObserver.stop();
+      if (_this9.mightDrag.addAttr) _this9.target.draggable = true;
+      if (_this9.mightDrag.setUneditable) setTimeout(function () {
+        if (_this9.view.input.mouseDown == _assertThisInitialized(_this9)) _this9.target.setAttribute("contentEditable", "false");
       }, 20);
-      _this8.view.domObserver.start();
+      _this9.view.domObserver.start();
     }
     setSelectionOrigin(view, "pointer");
-    return _this8;
+    return _this9;
   }
   _createClass(LeftMouseDown, [{
     key: "done",
     value: function done() {
-      var _this9 = this;
+      var _this10 = this;
       _get(_getPrototypeOf(LeftMouseDown.prototype), "done", this).call(this);
       if (this.mightDrag && this.target) {
         this.view.domObserver.stop();
@@ -3282,7 +3308,7 @@ var LeftMouseDown = function (_MouseDown) {
         this.view.domObserver.start();
       }
       if (this.delayedSelectionSync) setTimeout(function () {
-        if (!_this9.view.isDestroyed) selectionToDOM(_this9.view);
+        if (!_this10.view.isDestroyed) selectionToDOM(_this10.view);
       });
     }
   }, {
@@ -3298,7 +3324,7 @@ var LeftMouseDown = function (_MouseDown) {
       } else if (handleSingleClick(this.view, pos.pos, pos.inside, event, this.selectNode)) {
         event.preventDefault();
       } else if (event.button == 0 && (this.flushed || safari && this.mightDrag && !this.mightDrag.node.isAtom || chrome && !this.view.state.selection.visible && Math.min(Math.abs(pos.pos - this.view.state.selection.from), Math.abs(pos.pos - this.view.state.selection.to)) <= 2)) {
-        updateSelection(this.view, prosemirrorState.Selection.near(this.view.state.doc.resolve(pos.pos)), "pointer");
+        updateSelection(this.view, prosemirrorState.Selection.near(this.view.state.doc.resolve(pos.pos)));
         event.preventDefault();
       } else {
         setSelectionOrigin(this.view, "pointer");
@@ -3330,12 +3356,12 @@ var TripleClickDrag = function (_MouseDown2) {
   _inherits(TripleClickDrag, _MouseDown2);
   var _super9 = _createSuper(TripleClickDrag);
   function TripleClickDrag(view, startSelection) {
-    var _this10;
+    var _this11;
     _classCallCheck(this, TripleClickDrag);
-    _this10 = _super9.call(this, view);
-    _this10.startSelection = startSelection;
-    _this10.startDoc = view.state.doc;
-    return _this10;
+    _this11 = _super9.call(this, view);
+    _this11.startSelection = startSelection;
+    _this11.startDoc = view.state.doc;
+    return _this11;
   }
   _createClass(TripleClickDrag, [{
     key: "move",
@@ -3355,7 +3381,7 @@ var TripleClickDrag = function (_MouseDown2) {
         _ref6 = _slicedToArray(_ref5, 2),
         anchor = _ref6[0],
         head = _ref6[1];
-      updateSelection(this.view, prosemirrorState.TextSelection.create(doc, anchor, head), "pointer");
+      updateSelection(this.view, prosemirrorState.TextSelection.create(doc, anchor, head));
     }
   }]);
   return TripleClickDrag;
@@ -3396,10 +3422,10 @@ editHandlers.compositionstart = editHandlers.compositionupdate = function (view)
       endComposition(view, !state.selection.empty);
       if (gecko && state.selection.empty && $pos.parentOffset && !$pos.textOffset && $pos.nodeBefore.marks.length) {
         var sel = view.domSelectionRange();
-        for (var node = sel.focusNode, offset = sel.focusOffset; node && node.nodeType == 1 && offset != 0;) {
+        for (var node = sel.focusNode, offset = sel.focusOffset; node && isElt(node) && offset != 0;) {
           var before = offset < 0 ? node.lastChild : node.childNodes[offset - 1];
           if (!before) break;
-          if (before.nodeType == 3) {
+          if (isText(before)) {
             var _sel = view.domSelection();
             if (_sel) _sel.collapse(before, before.nodeValue.length);
             break;
@@ -3418,9 +3444,9 @@ function selectionBeforeUneditable(view) {
   var _view$domSelectionRan4 = view.domSelectionRange(),
     focusNode = _view$domSelectionRan4.focusNode,
     focusOffset = _view$domSelectionRan4.focusOffset;
-  if (!focusNode || focusNode.nodeType != 1 || focusOffset >= focusNode.childNodes.length) return false;
+  if (!focusNode || !isElt(focusNode) || focusOffset >= focusNode.childNodes.length) return false;
   var next = focusNode.childNodes[focusOffset];
-  return next.nodeType == 1 && next.contentEditable == "false";
+  return isElt(next) && next.contentEditable == "false";
 }
 editHandlers.compositionend = function (view, event) {
   if (view.composing) {
@@ -3581,7 +3607,7 @@ handlers.dragstart = function (view, _event) {
   var node;
   if (pos && pos.pos >= sel.from && pos.pos <= (sel instanceof prosemirrorState.NodeSelection ? sel.to - 1 : sel.to)) ;else if (mouseDown && mouseDown.mightDrag) {
     node = prosemirrorState.NodeSelection.create(view.state.doc, mouseDown.mightDrag.pos);
-  } else if (event.target && event.target.nodeType == 1) {
+  } else if (event.target && isElt(event.target)) {
     var desc = view.docView.nearestDesc(event.target, true);
     if (desc && desc.node.type.spec.draggable && desc != view.docView) node = prosemirrorState.NodeSelection.create(view.state.doc, desc.posBefore);
   }
@@ -3705,6 +3731,27 @@ function compareObjs(a, b) {
   for (var _p in b) if (!(_p in a)) return false;
   return true;
 }
+var FragmentCursor = function () {
+  function FragmentCursor(frag) {
+    _classCallCheck(this, FragmentCursor);
+    this.frag = frag;
+    this.index = 0;
+    this.off = 0;
+  }
+  _createClass(FragmentCursor, [{
+    key: "nodeAt",
+    value: function nodeAt(off) {
+      while (this.off <= off && this.index < this.frag.childCount) {
+        var next = this.frag.child(this.index);
+        if (this.off == off) return next;
+        this.off += next.nodeSize;
+        this.index++;
+      }
+      return null;
+    }
+  }]);
+  return FragmentCursor;
+}();
 var WidgetType = function () {
   function WidgetType(toDOM, spec) {
     _classCallCheck(this, WidgetType);
@@ -3789,12 +3836,9 @@ var NodeType = function () {
     }
   }, {
     key: "valid",
-    value: function valid(node, span) {
-      var _node$content$findInd = node.content.findIndex(span.from),
-        index = _node$content$findInd.index,
-        offset = _node$content$findInd.offset,
-        child;
-      return offset == span.from && !(child = node.child(index)).isText && offset + child.nodeSize == span.to;
+    value: function valid(node, span, cursor) {
+      var found = cursor.nodeAt(span.from);
+      return !!found && !found.isText && span.from + found.nodeSize == span.to;
     }
   }, {
     key: "eq",
@@ -3902,9 +3946,12 @@ var DecorationSet = function () {
     key: "mapInner",
     value: function mapInner(mapping, node, offset, oldOffset, options) {
       var newLocal;
-      for (var i = 0; i < this.local.length; i++) {
-        var mapped = this.local[i].map(mapping, offset, oldOffset);
-        if (mapped && mapped.type.valid(node, mapped)) (newLocal || (newLocal = [])).push(mapped);else if (options.onRemove) options.onRemove(this.local[i].spec);
+      if (this.local.length) {
+        var cur = new FragmentCursor(node.content);
+        for (var i = 0; i < this.local.length; i++) {
+          var mapped = this.local[i].map(mapping, offset, oldOffset);
+          if (mapped && mapped.type.valid(node, mapped, cur)) (newLocal || (newLocal = [])).push(mapped);else if (options.onRemove) options.onRemove(this.local[i].spec);
+        }
       }
       if (this.children.length) return mapChildren(this.children, newLocal || [], mapping, node, offset, oldOffset, options);else return newLocal ? new DecorationSet(newLocal.sort(byPos), none) : empty;
     }
@@ -3918,20 +3965,23 @@ var DecorationSet = function () {
   }, {
     key: "addInner",
     value: function addInner(doc, decorations, offset) {
-      var _this11 = this;
+      var _this12 = this;
       var children,
         childIndex = 0;
       doc.forEach(function (childNode, childOffset) {
         var baseOffset = childOffset + offset,
           found;
         if (!(found = takeSpansForNode(decorations, childNode, baseOffset))) return;
-        if (!children) children = _this11.children.slice();
+        if (!children) children = _this12.children.slice();
         while (childIndex < children.length && children[childIndex] < childOffset) childIndex += 3;
         if (children[childIndex] == childOffset) children[childIndex + 2] = children[childIndex + 2].addInner(childNode, found, baseOffset + 1);else children.splice(childIndex, 0, childOffset, childOffset + childNode.nodeSize, buildTree(found, childNode, baseOffset + 1, noSpec));
         childIndex += 3;
       });
       var local = moveSpans(childIndex ? withoutNulls(decorations) : decorations, -offset);
-      for (var i = 0; i < local.length; i++) if (!local[i].type.valid(doc, local[i])) local.splice(i--, 1);
+      if (local.length) {
+        var cur = new FragmentCursor(doc.content);
+        for (var i = 0; i < local.length; i++) if (!local[i].type.valid(doc, local[i], cur)) local.splice(i--, 1);
+      }
       return new DecorationSet(local.length ? this.local.concat(local).sort(byPos) : this.local, children || this.children);
     }
   }, {
@@ -4157,9 +4207,9 @@ function mapChildren(oldChildren, newLocal, mapping, node, offset, oldOffset, op
     }
     var to = mapping.map(oldChildren[_i11 + 1] + oldOffset, -1),
       toLocal = to - offset;
-    var _node$content$findInd2 = node.content.findIndex(fromLocal),
-      index = _node$content$findInd2.index,
-      childOffset = _node$content$findInd2.offset;
+    var _node$content$findInd = node.content.findIndex(fromLocal),
+      index = _node$content$findInd.index,
+      childOffset = _node$content$findInd.offset;
     var childNode = node.maybeChild(index);
     if (childNode && childOffset == fromLocal && childOffset + childNode.nodeSize == toLocal) {
       var mapped = children[_i11 + 2].mapInner(mapping, childNode, from + 1, oldChildren[_i11] + oldOffset + 1, options);
@@ -4240,9 +4290,12 @@ function buildTree(spans, node, offset, options) {
     }
   });
   var locals = moveSpans(hasNulls ? withoutNulls(spans) : spans, -offset).sort(byPos);
-  for (var i = 0; i < locals.length; i++) if (!locals[i].type.valid(node, locals[i])) {
-    if (options.onRemove) options.onRemove(locals[i].spec);
-    locals.splice(i--, 1);
+  if (locals.length) {
+    var cur = new FragmentCursor(node.content);
+    for (var i = 0; i < locals.length; i++) if (!locals[i].type.valid(node, locals[i], cur)) {
+      if (options.onRemove) options.onRemove(locals[i].spec);
+      locals.splice(i--, 1);
+    }
   }
   return locals.length || children.length ? new DecorationSet(locals, children) : empty;
 }
@@ -4327,7 +4380,7 @@ var SelectionState = function () {
 }();
 var DOMObserver = function () {
   function DOMObserver(view, handleDOMChange) {
-    var _this12 = this;
+    var _this13 = this;
     _classCallCheck(this, DOMObserver);
     this.view = view;
     this.handleDOMChange = handleDOMChange;
@@ -4339,28 +4392,28 @@ var DOMObserver = function () {
     this.suppressingSelectionUpdates = false;
     this.lastChangedTextNode = null;
     this.observer = window.MutationObserver && new window.MutationObserver(function (mutations) {
-      for (var i = 0; i < mutations.length; i++) _this12.queue.push(mutations[i]);
+      for (var i = 0; i < mutations.length; i++) _this13.queue.push(mutations[i]);
       if (ie && ie_version <= 11 && mutations.some(function (m) {
         return m.type == "childList" && m.removedNodes.length || m.type == "characterData" && m.oldValue.length > m.target.nodeValue.length;
       })) {
-        _this12.flushSoon();
+        _this13.flushSoon();
       } else if (safari && view.composing && mutations.some(function (m) {
         return m.type == "childList" && m.target.nodeName == "TR";
       })) {
         view.input.badSafariComposition = true;
-        _this12.flushSoon();
+        _this13.flushSoon();
       } else {
-        _this12.flush();
+        _this13.flush();
       }
     });
     if (useCharData) {
       this.onCharData = function (e) {
-        _this12.queue.push({
+        _this13.queue.push({
           target: e.target,
           type: "characterData",
           oldValue: e.prevValue
         });
-        _this12.flushSoon();
+        _this13.flushSoon();
       };
     }
     this.onSelectionChange = this.onSelectionChange.bind(this);
@@ -4368,10 +4421,10 @@ var DOMObserver = function () {
   _createClass(DOMObserver, [{
     key: "flushSoon",
     value: function flushSoon() {
-      var _this13 = this;
+      var _this14 = this;
       if (this.flushingSoon < 0) this.flushingSoon = window.setTimeout(function () {
-        _this13.flushingSoon = -1;
-        _this13.flush();
+        _this14.flushingSoon = -1;
+        _this14.flush();
       }, 20);
     }
   }, {
@@ -4396,13 +4449,13 @@ var DOMObserver = function () {
   }, {
     key: "stop",
     value: function stop() {
-      var _this14 = this;
+      var _this15 = this;
       if (this.observer) {
         var take = this.observer.takeRecords();
         if (take.length) {
           for (var i = 0; i < take.length; i++) this.queue.push(take[i]);
           window.setTimeout(function () {
-            return _this14.flush();
+            return _this15.flush();
           }, 20);
         }
         this.observer.disconnect();
@@ -4423,10 +4476,10 @@ var DOMObserver = function () {
   }, {
     key: "suppressSelectionUpdates",
     value: function suppressSelectionUpdates() {
-      var _this15 = this;
+      var _this16 = this;
       this.suppressingSelectionUpdates = true;
       setTimeout(function () {
-        return _this15.suppressingSelectionUpdates = false;
+        return _this16.suppressingSelectionUpdates = false;
       }, 50);
     }
   }, {
@@ -4459,7 +4512,7 @@ var DOMObserver = function () {
       var desc = container && this.view.docView.nearestDesc(container);
       if (desc && desc.ignoreMutation({
         type: "selection",
-        target: container.nodeType == 3 ? container.parentNode : container
+        target: isText(container) ? container.parentNode : container
       })) {
         this.setCurSelection();
         return true;
@@ -4491,8 +4544,12 @@ var DOMObserver = function () {
       if (!view.docView || this.flushingSoon > -1) return;
       var mutations = this.pendingRecords();
       if (mutations.length) this.queue = [];
-      var sel = view.domSelectionRange();
-      var newSel = !this.suppressingSelectionUpdates && !this.currentSelection.eq(sel) && hasFocusAndSelection(view) && !this.ignoreSelectionChange(sel);
+      var selRange,
+        newSel = false;
+      if (!this.suppressingSelectionUpdates && hasFocusAndSelection(view)) {
+        selRange = view.domSelectionRange();
+        newSel = !this.currentSelection.eq(selRange) && !this.ignoreSelectionChange(selRange);
+      }
       var from = -1,
         to = -1,
         typeOver = false,
@@ -4519,7 +4576,7 @@ var DOMObserver = function () {
             var node = _step3.value;
             if (node.nodeName == "BR" && node.parentNode) {
               var after = node.nextSibling;
-              while (after && after.nodeType == 1) {
+              while (after && isElt(after)) {
                 if (after.contentEditable == "false") {
                   node.parentNode.removeChild(node);
                   break;
@@ -4560,10 +4617,10 @@ var DOMObserver = function () {
         }
       }
       var readSel = null;
-      if (from < 0 && newSel && view.input.lastFocus > Date.now() - 200 && Math.max(view.input.lastTouch, view.input.lastClick.time) < Date.now() - 300 && selectionCollapsed(sel) && (readSel = selectionFromDOM(view)) && readSel.eq(prosemirrorState.Selection.near(view.state.doc.resolve(0), 1))) {
+      if (from < 0 && newSel && view.input.lastFocus > Date.now() - 200 && Math.max(view.input.lastTouch, view.input.lastClick.time) < Date.now() - 300 && selectionCollapsed(selRange) && (readSel = selectionFromDOM(view)) && readSel.eq(prosemirrorState.Selection.near(view.state.doc.resolve(0), 1))) {
         view.input.lastFocus = 0;
         selectionToDOM(view);
-        this.currentSelection.set(sel);
+        this.currentSelection.set(selRange);
         view.scrollToSelection();
       } else if (from > -1 || newSel) {
         if (from > -1) {
@@ -4575,8 +4632,8 @@ var DOMObserver = function () {
           fixUpBadSafariComposition(view, added);
         }
         this.handleDOMChange(from, to, typeOver, added);
-        if (view.docView && view.docView.dirty) view.updateState(view.state);else if (!this.currentSelection.eq(sel)) selectionToDOM(view);
-        this.currentSelection.set(sel);
+        if (view.docView && view.docView.dirty) view.updateState(view.state);else if (selRange && !this.currentSelection.eq(selRange)) selectionToDOM(view);
+        if (selRange) this.currentSelection.set(selRange);
       }
     }
   }, {
@@ -4590,7 +4647,7 @@ var DOMObserver = function () {
         for (var i = 0; i < mut.addedNodes.length; i++) {
           var node = mut.addedNodes[i];
           added.push(node);
-          if (node.nodeType == 3) this.lastChangedTextNode = node;
+          if (isText(node)) this.lastChangedTextNode = node;
         }
         if (desc.contentDOM && desc.contentDOM != desc.dom && !desc.contentDOM.contains(mut.target)) return {
           from: desc.posBefore,
@@ -4704,7 +4761,7 @@ function fixUpBadSafariComposition(view, addedNodes) {
           var parent = nextCell;
           for (;;) {
             var first = parent.firstChild;
-            if (!first || first.nodeType != 1 || first.contentEditable == "false" || /^(BR|IMG)$/.test(first.nodeName)) break;
+            if (!first || !isElt(first) || first.contentEditable == "false" || /^(BR|IMG)$/.test(first.nodeName)) break;
             parent = first;
           }
           parent.insertBefore(node, parent.firstChild);
@@ -4730,7 +4787,7 @@ function parseBetween(view, from_, to_, addedNodes) {
   var domSel = view.domSelectionRange();
   var find;
   var anchor = domSel.anchorNode;
-  if (anchor && view.dom.contains(anchor.nodeType == 1 ? anchor : anchor.parentNode)) {
+  if (anchor && contains(view.dom, anchor)) {
     find = [{
       node: anchor,
       offset: domSel.anchorOffset
@@ -4845,7 +4902,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
   var change = findDiff(compare.content, parse.doc.content, parse.from, preferredPos, preferredSide);
   if (change) view.input.domChangeCount++;
   if ((ios && view.input.lastIOSEnter > Date.now() - 225 || android) && addedNodes.some(function (n) {
-    return n.nodeType == 1 && !isInline.test(n.nodeName);
+    return isElt(n) && !isInline.test(n.nodeName);
   }) && (!change || change.endA >= change.endB) && view.someProp("handleKeyDown", function (f) {
     return f(view, keyEvent(13, "Enter"));
   })) {
@@ -4896,7 +4953,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
     view.input.lastIOSEnter = 0;
     return;
   }
-  if (view.state.selection.anchor > change.start && looksLikeBackspace(doc, change.start, change.endA, $from, $to) && view.someProp("handleKeyDown", function (f) {
+  if (view.state.selection.anchor > change.start && (inlineChange ? change.endA > change.start && change.endB == change.start : looksLikeBlockJoin(doc, change.start, change.endA, $from, $to)) && view.someProp("handleKeyDown", function (f) {
     return f(view, keyEvent(8, "Backspace"));
   })) {
     if (android && chrome) view.domObserver.suppressSelectionUpdates();
@@ -4991,10 +5048,10 @@ function isMarkChange(cur, prev) {
     type: type
   };
 }
-function looksLikeBackspace(old, start, end, $newStart, $newEnd) {
+function looksLikeBlockJoin(old, start, end, $newStart, $newEnd) {
   if (end - start <= $newEnd.pos - $newStart.pos || skipClosingAndOpening($newStart, true, false) < $newEnd.pos) return false;
   var $start = old.resolve(start);
-  if (!$newStart.parent.isTextblock) {
+  if (!$newStart.parent.inlineContent) {
     var after = $start.nodeAfter;
     return after != null && end == start + after.nodeSize;
   }
@@ -5061,7 +5118,7 @@ var __parseFromClipboard = parseFromClipboard;
 var __endComposition = endComposition;
 var EditorView = function () {
   function EditorView(place, props) {
-    var _this16 = this;
+    var _this17 = this;
     _classCallCheck(this, EditorView);
     this._root = null;
     this.focused = false;
@@ -5089,7 +5146,7 @@ var EditorView = function () {
     this.nodeViews = buildNodeViews(this);
     this.docView = docViewDesc(this.state.doc, computeDocDeco(this), viewDecorations(this), this.dom, this);
     this.domObserver = new DOMObserver(this, function (from, to, typeOver, added) {
-      return readDOMChange(_this16, from, to, typeOver, added);
+      return readDOMChange(_this17, from, to, typeOver, added);
     });
     this.domObserver.start();
     initInput(this);
@@ -5203,13 +5260,13 @@ var EditorView = function () {
   }, {
     key: "scrollToSelection",
     value: function scrollToSelection() {
-      var _this17 = this;
+      var _this18 = this;
       var startDOM = this.domSelectionRange().focusNode;
-      if (!startDOM || !this.dom.contains(startDOM.nodeType == 1 ? startDOM : startDOM.parentNode)) ;else if (this.someProp("handleScrollToSelection", function (f) {
-        return f(_this17);
+      if (!startDOM || !contains(this.dom, startDOM)) ;else if (this.someProp("handleScrollToSelection", function (f) {
+        return f(_this18);
       })) ;else if (this.state.selection instanceof prosemirrorState.NodeSelection) {
         var target = this.docView.domAfterPos(this.state.selection.from);
-        if (target.nodeType == 1) scrollRectIntoView(this, target.getBoundingClientRect(), startDOM);
+        if (isElt(target)) scrollRectIntoView(this, target.getBoundingClientRect(), startDOM);
       } else {
         scrollRectIntoView(this, this.coordsAtPos(this.state.selection.head, 1), startDOM);
       }
@@ -5297,7 +5354,7 @@ var EditorView = function () {
   }, {
     key: "root",
     get: function get() {
-      var _this18 = this;
+      var _this19 = this;
       var cached = this._root;
       if (cached == null) {
         var _loop5 = function _loop5(search) {
@@ -5306,7 +5363,7 @@ var EditorView = function () {
                 return search.ownerDocument.getSelection();
               };
               return {
-                v: _this18._root = search
+                v: _this19._root = search
               };
             }
           },
@@ -5403,7 +5460,7 @@ var EditorView = function () {
   }, {
     key: "domSelectionRange",
     value: function domSelectionRange() {
-      var sel = this.domSelection();
+      var sel = this.dom.isConnected !== false && this.domSelection();
       if (!sel) return {
         focusNode: null,
         focusOffset: 0,