prosemirror-view 1.31.6 → 1.31.8

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 1.31.8 (2023-09-12)
+
+### Bug fixes
+
+Fix a bug that broke arrow motion near uneditable nodes on Chrome in some situations.
+
+Fix an issue that broke backspace at the end of a textblock that ended in a newline on Chrome.
+
+Fix a crash in the way inline decorations that ended right after a node end position were drawn.
+
+## 1.31.7 (2023-07-28)
+
+### Bug fixes
+
+Fix a bug where, when a compositionend event was received before the composition's final changes were processed, the resulting transaction didn't have its composition metadata set.
+
+Fix an issue that caused cursor motion to stop at uneditable nodes that aren't widget decorations.
+
+When scrolling an element higher than the viewport into view, make sure its top is visible.
+
 ## 1.31.6 (2023-07-14)
 
 ### Bug fixes

package/dist/index.cjs

@@ -32,10 +32,6 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-Object.defineProperty(exports, '__esModule', {
-  value: true
-});
-
 var prosemirrorState = require('prosemirror-state');
 
 var prosemirrorModel = require('prosemirror-model');
@@ -216,7 +212,7 @@ function scrollRectIntoView(view, rect, startDOM) {
     var bounding = atTop ? windowRect(doc) : clientRect(elt);
     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 - bounding.bottom + getSide(scrollMargin, "bottom");
+    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");
     if (rect.left < bounding.left + getSide(scrollThreshold, "left")) moveX = -(bounding.left - rect.left + getSide(scrollMargin, "left"));else if (rect.right > bounding.right - getSide(scrollThreshold, "right")) moveX = rect.right - bounding.right + getSide(scrollMargin, "right");
 
     if (moveX || moveY) {
@@ -2190,9 +2186,13 @@ var ViewTreeUpdater = function () {
             return true;
           } else if (!locked && (updated = this.recreateWrapper(next, node, outerDeco, innerDeco, view, pos))) {
             this.top.children[this.index] = updated;
-            updated.dirty = CONTENT_DIRTY;
-            updated.updateChildren(view, pos + 1);
-            updated.dirty = NOT_DIRTY;
+
+            if (updated.contentDOM) {
+              updated.dirty = CONTENT_DIRTY;
+              updated.updateChildren(view, pos + 1);
+              updated.dirty = NOT_DIRTY;
+            }
+
             this.changed = true;
             this.index++;
             return true;
@@ -2209,25 +2209,27 @@ var ViewTreeUpdater = function () {
     value: function recreateWrapper(next, node, outerDeco, innerDeco, view, pos) {
       if (next.dirty || node.isAtom || !next.children.length || !next.node.content.eq(node.content)) return null;
       var wrapper = NodeViewDesc.create(this.top, node, outerDeco, innerDeco, view, pos);
-      if (!wrapper.contentDOM) return null;
-      wrapper.children = next.children;
-      next.children = [];
-      next.destroy();
 
-      var _iterator = _createForOfIteratorHelper(wrapper.children),
-          _step;
+      if (wrapper.contentDOM) {
+        wrapper.children = next.children;
+        next.children = [];
 
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var ch = _step.value;
-          ch.parent = wrapper;
+        var _iterator = _createForOfIteratorHelper(wrapper.children),
+            _step;
+
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var ch = _step.value;
+            ch.parent = wrapper;
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
       }
 
+      next.destroy();
       return wrapper;
     }
   }, {
@@ -2364,14 +2366,18 @@ function iterDeco(parent, deco, onWidget, onNode) {
       restNode = null;
 
   for (var parentIndex = 0;;) {
-    if (decoIndex < locals.length && locals[decoIndex].to == offset) {
-      var widget = locals[decoIndex++],
-          widgets = void 0;
+    var widget = void 0,
+        widgets = void 0;
+
+    while (decoIndex < locals.length && locals[decoIndex].to == offset) {
+      var next = locals[decoIndex++];
 
-      while (decoIndex < locals.length && locals[decoIndex].to == offset) {
-        (widgets || (widgets = [widget])).push(locals[decoIndex++]);
+      if (next.widget) {
+        if (!widget) widget = next;else (widgets || (widgets = [widget])).push(next);
       }
+    }
 
+    if (widget) {
       if (widgets) {
         widgets.sort(compareSide);
 
@@ -2773,9 +2779,10 @@ function nodeLen(node) {
   return node.nodeType == 3 ? node.nodeValue.length : node.childNodes.length;
 }
 
-function isIgnorable(dom) {
+function isIgnorable(dom, dir) {
+  if (dom.contentEditable == "false") return true;
   var desc = dom.pmViewDesc;
-  return desc && desc.size == 0 && (dom.nextSibling || dom.nodeName != "BR");
+  return desc && desc.size == 0 && (dir < 0 || dom.nextSibling || dom.nodeName != "BR");
 }
 
 function skipIgnoredNodes(view, dir) {
@@ -2790,7 +2797,7 @@ function skipIgnoredNodesBefore(view) {
   var moveNode,
       moveOffset,
       force = false;
-  if (gecko && node.nodeType == 1 && offset < nodeLen(node) && isIgnorable(node.childNodes[offset])) force = true;
+  if (gecko && node.nodeType == 1 && offset < nodeLen(node) && isIgnorable(node.childNodes[offset], -1)) force = true;
 
   for (;;) {
     if (offset > 0) {
@@ -2799,7 +2806,7 @@ function skipIgnoredNodesBefore(view) {
       } else {
         var before = node.childNodes[offset - 1];
 
-        if (isIgnorable(before)) {
+        if (isIgnorable(before, -1)) {
           moveNode = node;
           moveOffset = --offset;
         } else if (before.nodeType == 3) {
@@ -2812,7 +2819,7 @@ function skipIgnoredNodesBefore(view) {
     } else {
       var prev = node.previousSibling;
 
-      while (prev && isIgnorable(prev)) {
+      while (prev && isIgnorable(prev, -1)) {
         moveNode = node.parentNode;
         moveOffset = domIndex(prev);
         prev = prev.previousSibling;
@@ -2845,7 +2852,7 @@ function skipIgnoredNodesAfter(view) {
       if (node.nodeType != 1) break;
       var after = node.childNodes[offset];
 
-      if (isIgnorable(after)) {
+      if (isIgnorable(after, 1)) {
         moveNode = node;
         moveOffset = ++offset;
       } else break;
@@ -2854,7 +2861,7 @@ function skipIgnoredNodesAfter(view) {
     } else {
       var next = node.nextSibling;
 
-      while (next && isIgnorable(next)) {
+      while (next && isIgnorable(next, 1)) {
         moveNode = next.parentNode;
         moveOffset = domIndex(next) + 1;
         next = next.nextSibling;
@@ -2880,7 +2887,49 @@ function isBlockNode(dom) {
   return desc && desc.node && desc.node.isBlock;
 }
 
+function textNodeAfter(node, offset) {
+  while (node && offset == node.childNodes.length && !hasBlockDesc(node)) {
+    offset = domIndex(node) + 1;
+    node = node.parentNode;
+  }
+
+  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;
+    node = next;
+    offset = 0;
+  }
+}
+
+function textNodeBefore(node, offset) {
+  while (node && !offset && !hasBlockDesc(node)) {
+    offset = domIndex(node);
+    node = node.parentNode;
+  }
+
+  while (node && offset) {
+    var next = node.childNodes[offset - 1];
+    if (next.nodeType == 3) return next;
+    if (next.nodeType == 1 && next.contentEditable == "false") break;
+    node = next;
+    offset = node.childNodes.length;
+  }
+}
+
 function setSelFocus(view, node, offset) {
+  if (node.nodeType != 3) {
+    var before, after;
+
+    if (after = textNodeAfter(node, offset)) {
+      node = after;
+      offset = 0;
+    } else if (before = textNodeBefore(node, offset)) {
+      node = before;
+      offset = before.nodeValue.length;
+    }
+  }
+
   var sel = view.domSelection();
 
   if (selectionCollapsed(sel)) {
@@ -3020,7 +3069,7 @@ function captureKeyDown(view, event) {
   } else if (code == 38 || mac && code == 80 && mods == "c") {
     return selectVertically(view, -1, mods) || skipIgnoredNodes(view, -1);
   } else if (code == 40 || mac && code == 78 && mods == "c") {
-    return safariDownArrowBug(view) || selectVertically(view, 1, mods) || skipIgnoredNodesAfter(view);
+    return safariDownArrowBug(view) || selectVertically(view, 1, mods) || skipIgnoredNodes(view, 1);
   } else if (mods == (mac ? "m" : "c") && (code == 66 || code == 73 || code == 89 || code == 90)) {
     return true;
   }
@@ -3349,6 +3398,7 @@ var InputState = _createClass(function InputState() {
   this.compositionNodes = [];
   this.compositionEndedAt = -2e8;
   this.compositionID = 1;
+  this.compositionPendingChanges = 0;
   this.domChangeCount = 0;
   this.eventHandlers = Object.create(null);
   this.hideSelectionGuard = null;
@@ -3812,6 +3862,10 @@ editHandlers.compositionend = function (view, event) {
   if (view.composing) {
     view.input.composing = false;
     view.input.compositionEndedAt = event.timeStamp;
+    view.input.compositionPendingChanges = view.domObserver.pendingRecords().length ? view.input.compositionID : 0;
+    if (view.input.compositionPendingChanges) Promise.resolve().then(function () {
+      return view.domObserver.flush();
+    });
     view.input.compositionID++;
     scheduleComposeEnd(view, 20);
   }
@@ -4252,6 +4306,11 @@ var Decoration = function () {
     get: function get() {
       return this.type instanceof InlineType;
     }
+  }, {
+    key: "widget",
+    get: function get() {
+      return this.type instanceof WidgetType;
+    }
   }], [{
     key: "widget",
     value: function widget(pos, toDOM, spec) {
@@ -5018,18 +5077,34 @@ var DOMObserver = function () {
         return true;
       }
     }
+  }, {
+    key: "pendingRecords",
+    value: function pendingRecords() {
+      if (this.observer) {
+        var _iterator2 = _createForOfIteratorHelper(this.observer.takeRecords()),
+            _step2;
+
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var mut = _step2.value;
+            this.queue.push(mut);
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
+
+      return this.queue;
+    }
   }, {
     key: "flush",
     value: function flush() {
       var view = this.view;
       if (!view.docView || this.flushingSoon > -1) return;
-      var mutations = this.observer ? this.observer.takeRecords() : [];
-
-      if (this.queue.length) {
-        mutations = this.queue.concat(mutations);
-        this.queue.length = 0;
-      }
-
+      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 from = -1,
@@ -5284,6 +5359,9 @@ function ruleFromNode(dom) {
 var isInline = /^(a|abbr|acronym|b|bd[io]|big|br|button|cite|code|data(list)?|del|dfn|em|i|ins|kbd|label|map|mark|meter|output|q|ruby|s|samp|small|span|strong|su[bp]|time|u|tt|var)$/i;
 
 function readDOMChange(view, from, to, typeOver, addedNodes) {
+  var compositionID = view.input.compositionPendingChanges || (view.composing ? view.input.compositionID : 0);
+  view.input.compositionPendingChanges = 0;
+
   if (from < 0) {
     var origin = view.input.lastSelectionTime > Date.now() - 50 ? view.input.lastSelectionOrigin : null;
     var newSel = selectionFromDOM(view, origin);
@@ -5296,7 +5374,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
       var _tr = view.state.tr.setSelection(newSel);
 
       if (origin == "pointer") _tr.setMeta("pointer", true);else if (origin == "key") _tr.scrollIntoView();
-      if (view.composing) _tr.setMeta("composition", view.input.compositionID);
+      if (compositionID) _tr.setMeta("composition", compositionID);
       view.dispatch(_tr);
     }
 
@@ -5347,7 +5425,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
         if (_sel && !_sel.eq(view.state.selection)) {
           var _tr2 = view.state.tr.setSelection(_sel);
 
-          if (view.composing) _tr2.setMeta("composition", view.input.compositionID);
+          if (compositionID) _tr2.setMeta("composition", compositionID);
           view.dispatch(_tr2);
         }
       }
@@ -5451,7 +5529,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
   }
 
   if (storedMarks) tr.ensureMarks(storedMarks);
-  if (view.composing) tr.setMeta("composition", view.input.compositionID);
+  if (compositionID) tr.setMeta("composition", compositionID);
   view.dispatch(tr.scrollIntoView());
 }
 

package/dist/index.d.cts

@@ -2,9 +2,9 @@ import { EditorState, Transaction, Selection, Plugin } from 'prosemirror-state';
 import { Mark, Node, ParseRule, Slice, ResolvedPos, DOMParser, DOMSerializer } from 'prosemirror-model';
 import { Mapping } from 'prosemirror-transform';
 
-declare type DOMNode = InstanceType<typeof window.Node>;
+type DOMNode = InstanceType<typeof window.Node>;
 
-declare type WidgetConstructor = ((view: EditorView, getPos: () => number | undefined) => DOMNode) | DOMNode;
+type WidgetConstructor = ((view: EditorView, getPos: () => number | undefined) => DOMNode) | DOMNode;
 /**
 Decoration objects can be provided to the view through the
 [`decorations` prop](https://prosemirror.net/docs/ref/#view.EditorProps.decorations). They come in
@@ -125,7 +125,7 @@ A set of attributes to add to a decorated node. Most properties
 simply directly correspond to DOM attributes of the same name,
 which will be set to the property's value. These are exceptions:
 */
-declare type DecorationAttrs = {
+type DecorationAttrs = {
     /**
     When non-null, the target node is wrapped in a DOM element of
     this type (and the other attributes are applied to this element).
@@ -166,7 +166,8 @@ updates create a new value.
 declare class DecorationSet implements DecorationSource {
     /**
     Create a set of decorations, using the structure of the given
-    document.
+    document. This will consume (modify) the `decorations` array, so
+    you must make a copy if you want need to preserve that.
     */
     static create(doc: Node, decorations: Decoration[]): DecorationSet;
     /**
@@ -193,8 +194,9 @@ declare class DecorationSet implements DecorationSource {
     }): DecorationSet;
     /**
     Add the given array of decorations to the ones in the set,
-    producing a new set. Needs access to the current document to
-    create the appropriate tree structure.
+    producing a new set. Consumes the `decorations` array. Needs
+    access to the current document to create the appropriate tree
+    structure.
     */
     add(doc: Node, decorations: Decoration[]): DecorationSet;
     private addInner;
@@ -356,7 +358,7 @@ declare class NodeViewDesc extends ViewDesc {
     parseRule(): ParseRule | null;
     matchesNode(node: Node, outerDeco: readonly Decoration[], innerDeco: DecorationSource): boolean;
     get size(): number;
-    get border(): 1 | 0;
+    get border(): 0 | 1;
     updateChildren(view: EditorView, pos: number): void;
     localCompositionInfo(view: EditorView, pos: number): {
         node: Text;
@@ -604,12 +606,12 @@ declare class EditorView {
 The type of function [provided](https://prosemirror.net/docs/ref/#view.EditorProps.nodeViews) to
 create [node views](https://prosemirror.net/docs/ref/#view.NodeView).
 */
-declare type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number | undefined, decorations: readonly Decoration[], innerDecorations: DecorationSource) => NodeView;
+type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number | undefined, decorations: readonly Decoration[], innerDecorations: DecorationSource) => NodeView;
 /**
 The function types [used](https://prosemirror.net/docs/ref/#view.EditorProps.markViews) to create
 mark views.
 */
-declare type MarkViewConstructor = (mark: Mark, view: EditorView, inline: boolean) => {
+type MarkViewConstructor = (mark: Mark, view: EditorView, inline: boolean) => {
     dom: HTMLElement;
     contentDOM?: HTMLElement;
 };

package/dist/index.d.ts

@@ -2,9 +2,9 @@ import { EditorState, Transaction, Selection, Plugin } from 'prosemirror-state';
 import { Mark, Node, ParseRule, Slice, ResolvedPos, DOMParser, DOMSerializer } from 'prosemirror-model';
 import { Mapping } from 'prosemirror-transform';
 
-declare type DOMNode = InstanceType<typeof window.Node>;
+type DOMNode = InstanceType<typeof window.Node>;
 
-declare type WidgetConstructor = ((view: EditorView, getPos: () => number | undefined) => DOMNode) | DOMNode;
+type WidgetConstructor = ((view: EditorView, getPos: () => number | undefined) => DOMNode) | DOMNode;
 /**
 Decoration objects can be provided to the view through the
 [`decorations` prop](https://prosemirror.net/docs/ref/#view.EditorProps.decorations). They come in
@@ -125,7 +125,7 @@ A set of attributes to add to a decorated node. Most properties
 simply directly correspond to DOM attributes of the same name,
 which will be set to the property's value. These are exceptions:
 */
-declare type DecorationAttrs = {
+type DecorationAttrs = {
     /**
     When non-null, the target node is wrapped in a DOM element of
     this type (and the other attributes are applied to this element).
@@ -166,7 +166,8 @@ updates create a new value.
 declare class DecorationSet implements DecorationSource {
     /**
     Create a set of decorations, using the structure of the given
-    document.
+    document. This will consume (modify) the `decorations` array, so
+    you must make a copy if you want need to preserve that.
     */
     static create(doc: Node, decorations: Decoration[]): DecorationSet;
     /**
@@ -193,8 +194,9 @@ declare class DecorationSet implements DecorationSource {
     }): DecorationSet;
     /**
     Add the given array of decorations to the ones in the set,
-    producing a new set. Needs access to the current document to
-    create the appropriate tree structure.
+    producing a new set. Consumes the `decorations` array. Needs
+    access to the current document to create the appropriate tree
+    structure.
     */
     add(doc: Node, decorations: Decoration[]): DecorationSet;
     private addInner;
@@ -356,7 +358,7 @@ declare class NodeViewDesc extends ViewDesc {
     parseRule(): ParseRule | null;
     matchesNode(node: Node, outerDeco: readonly Decoration[], innerDeco: DecorationSource): boolean;
     get size(): number;
-    get border(): 1 | 0;
+    get border(): 0 | 1;
     updateChildren(view: EditorView, pos: number): void;
     localCompositionInfo(view: EditorView, pos: number): {
         node: Text;
@@ -604,12 +606,12 @@ declare class EditorView {
 The type of function [provided](https://prosemirror.net/docs/ref/#view.EditorProps.nodeViews) to
 create [node views](https://prosemirror.net/docs/ref/#view.NodeView).
 */
-declare type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number | undefined, decorations: readonly Decoration[], innerDecorations: DecorationSource) => NodeView;
+type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number | undefined, decorations: readonly Decoration[], innerDecorations: DecorationSource) => NodeView;
 /**
 The function types [used](https://prosemirror.net/docs/ref/#view.EditorProps.markViews) to create
 mark views.
 */
-declare type MarkViewConstructor = (mark: Mark, view: EditorView, inline: boolean) => {
+type MarkViewConstructor = (mark: Mark, view: EditorView, inline: boolean) => {
     dom: HTMLElement;
     contentDOM?: HTMLElement;
 };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { TextSelection, NodeSelection, Selection, AllSelection } from 'prosemirror-state';
+import { TextSelection, NodeSelection, AllSelection, Selection } from 'prosemirror-state';
 import { DOMSerializer, Fragment, Mark, Slice, DOMParser } from 'prosemirror-model';
 import { dropPoint } from 'prosemirror-transform';
 
@@ -163,7 +163,9 @@ function scrollRectIntoView(view, rect, startDOM) {
         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 - bounding.bottom + getSide(scrollMargin, "bottom");
+            moveY = rect.bottom - rect.top > bounding.bottom - bounding.top
+                ? rect.top + getSide(scrollMargin, "top") - bounding.top
+                : rect.bottom - bounding.bottom + getSide(scrollMargin, "bottom");
         if (rect.left < bounding.left + getSide(scrollThreshold, "left"))
             moveX = -(bounding.left - rect.left + getSide(scrollMargin, "left"));
         else if (rect.right > bounding.right - getSide(scrollThreshold, "right"))
@@ -1808,9 +1810,11 @@ class ViewTreeUpdater {
                 }
                 else if (!locked && (updated = this.recreateWrapper(next, node, outerDeco, innerDeco, view, pos))) {
                     this.top.children[this.index] = updated;
-                    updated.dirty = CONTENT_DIRTY;
-                    updated.updateChildren(view, pos + 1);
-                    updated.dirty = NOT_DIRTY;
+                    if (updated.contentDOM) {
+                        updated.dirty = CONTENT_DIRTY;
+                        updated.updateChildren(view, pos + 1);
+                        updated.dirty = NOT_DIRTY;
+                    }
                     this.changed = true;
                     this.index++;
                     return true;
@@ -1827,13 +1831,13 @@ class ViewTreeUpdater {
             !next.node.content.eq(node.content))
             return null;
         let wrapper = NodeViewDesc.create(this.top, node, outerDeco, innerDeco, view, pos);
-        if (!wrapper.contentDOM)
-            return null;
-        wrapper.children = next.children;
-        next.children = [];
+        if (wrapper.contentDOM) {
+            wrapper.children = next.children;
+            next.children = [];
+            for (let ch of wrapper.children)
+                ch.parent = wrapper;
+        }
         next.destroy();
-        for (let ch of wrapper.children)
-            ch.parent = wrapper;
         return wrapper;
     }
     // Insert the node as a newly created node desc.
@@ -1961,10 +1965,17 @@ function iterDeco(parent, deco, onWidget, onNode) {
     }
     let decoIndex = 0, active = [], restNode = null;
     for (let parentIndex = 0;;) {
-        if (decoIndex < locals.length && locals[decoIndex].to == offset) {
-            let widget = locals[decoIndex++], widgets;
-            while (decoIndex < locals.length && locals[decoIndex].to == offset)
-                (widgets || (widgets = [widget])).push(locals[decoIndex++]);
+        let widget, widgets;
+        while (decoIndex < locals.length && locals[decoIndex].to == offset) {
+            let next = locals[decoIndex++];
+            if (next.widget) {
+                if (!widget)
+                    widget = next;
+                else
+                    (widgets || (widgets = [widget])).push(next);
+            }
+        }
+        if (widget) {
             if (widgets) {
                 widgets.sort(compareSide);
                 for (let i = 0; i < widgets.length; i++)
@@ -2353,9 +2364,11 @@ function selectHorizontally(view, dir, mods) {
 function nodeLen(node) {
     return node.nodeType == 3 ? node.nodeValue.length : node.childNodes.length;
 }
-function isIgnorable(dom) {
+function isIgnorable(dom, dir) {
+    if (dom.contentEditable == "false")
+        return true;
     let desc = dom.pmViewDesc;
-    return desc && desc.size == 0 && (dom.nextSibling || dom.nodeName != "BR");
+    return desc && desc.size == 0 && (dir < 0 || dom.nextSibling || dom.nodeName != "BR");
 }
 function skipIgnoredNodes(view, dir) {
     return dir < 0 ? skipIgnoredNodesBefore(view) : skipIgnoredNodesAfter(view);
@@ -2371,7 +2384,7 @@ function skipIgnoredNodesBefore(view) {
     // Gecko will do odd things when the selection is directly in front
     // of a non-editable node, so in that case, move it into the next
     // node if possible. Issue prosemirror/prosemirror#832.
-    if (gecko && node.nodeType == 1 && offset < nodeLen(node) && isIgnorable(node.childNodes[offset]))
+    if (gecko && node.nodeType == 1 && offset < nodeLen(node) && isIgnorable(node.childNodes[offset], -1))
         force = true;
     for (;;) {
         if (offset > 0) {
@@ -2380,7 +2393,7 @@ function skipIgnoredNodesBefore(view) {
             }
             else {
                 let before = node.childNodes[offset - 1];
-                if (isIgnorable(before)) {
+                if (isIgnorable(before, -1)) {
                     moveNode = node;
                     moveOffset = --offset;
                 }
@@ -2397,7 +2410,7 @@ function skipIgnoredNodesBefore(view) {
         }
         else {
             let prev = node.previousSibling;
-            while (prev && isIgnorable(prev)) {
+            while (prev && isIgnorable(prev, -1)) {
                 moveNode = node.parentNode;
                 moveOffset = domIndex(prev);
                 prev = prev.previousSibling;
@@ -2433,7 +2446,7 @@ function skipIgnoredNodesAfter(view) {
             if (node.nodeType != 1)
                 break;
             let after = node.childNodes[offset];
-            if (isIgnorable(after)) {
+            if (isIgnorable(after, 1)) {
                 moveNode = node;
                 moveOffset = ++offset;
             }
@@ -2445,7 +2458,7 @@ function skipIgnoredNodesAfter(view) {
         }
         else {
             let next = node.nextSibling;
-            while (next && isIgnorable(next)) {
+            while (next && isIgnorable(next, 1)) {
                 moveNode = next.parentNode;
                 moveOffset = domIndex(next) + 1;
                 next = next.nextSibling;
@@ -2470,7 +2483,48 @@ function isBlockNode(dom) {
     let desc = dom.pmViewDesc;
     return desc && desc.node && desc.node.isBlock;
 }
+function textNodeAfter(node, offset) {
+    while (node && offset == node.childNodes.length && !hasBlockDesc(node)) {
+        offset = domIndex(node) + 1;
+        node = node.parentNode;
+    }
+    while (node && offset < node.childNodes.length) {
+        let next = node.childNodes[offset];
+        if (next.nodeType == 3)
+            return next;
+        if (next.nodeType == 1 && next.contentEditable == "false")
+            break;
+        node = next;
+        offset = 0;
+    }
+}
+function textNodeBefore(node, offset) {
+    while (node && !offset && !hasBlockDesc(node)) {
+        offset = domIndex(node);
+        node = node.parentNode;
+    }
+    while (node && offset) {
+        let next = node.childNodes[offset - 1];
+        if (next.nodeType == 3)
+            return next;
+        if (next.nodeType == 1 && next.contentEditable == "false")
+            break;
+        node = next;
+        offset = node.childNodes.length;
+    }
+}
 function setSelFocus(view, node, offset) {
+    if (node.nodeType != 3) {
+        let before, after;
+        if (after = textNodeAfter(node, offset)) {
+            node = after;
+            offset = 0;
+        }
+        else if (before = textNodeBefore(node, offset)) {
+            node = before;
+            offset = before.nodeValue.length;
+        }
+    }
     let sel = view.domSelection();
     if (selectionCollapsed(sel)) {
         let range = document.createRange();
@@ -2617,7 +2671,7 @@ function captureKeyDown(view, event) {
         return selectVertically(view, -1, mods) || skipIgnoredNodes(view, -1);
     }
     else if (code == 40 || (mac && code == 78 && mods == "c")) { // Down arrow, Ctrl-n on Mac
-        return safariDownArrowBug(view) || selectVertically(view, 1, mods) || skipIgnoredNodesAfter(view);
+        return safariDownArrowBug(view) || selectVertically(view, 1, mods) || skipIgnoredNodes(view, 1);
     }
     else if (mods == (mac ? "m" : "c") &&
         (code == 66 || code == 73 || code == 89 || code == 90)) { // Mod-[biyz]
@@ -2899,6 +2953,8 @@ class InputState {
         this.compositionNodes = [];
         this.compositionEndedAt = -2e8;
         this.compositionID = 1;
+        // Set to a composition ID when there are pending changes at compositionend
+        this.compositionPendingChanges = 0;
         this.domChangeCount = 0;
         this.eventHandlers = Object.create(null);
         this.hideSelectionGuard = null;
@@ -3328,6 +3384,9 @@ editHandlers.compositionend = (view, event) => {
     if (view.composing) {
         view.input.composing = false;
         view.input.compositionEndedAt = event.timeStamp;
+        view.input.compositionPendingChanges = view.domObserver.pendingRecords().length ? view.input.compositionID : 0;
+        if (view.input.compositionPendingChanges)
+            Promise.resolve().then(() => view.domObserver.flush());
         view.input.compositionID++;
         scheduleComposeEnd(view, 20);
     }
@@ -3770,6 +3829,10 @@ class Decoration {
     @internal
     */
     get inline() { return this.type instanceof InlineType; }
+    /**
+    @internal
+    */
+    get widget() { return this.type instanceof WidgetType; }
 }
 const none = [], noSpec = {};
 /**
@@ -3788,7 +3851,8 @@ class DecorationSet {
     }
     /**
     Create a set of decorations, using the structure of the given
-    document.
+    document. This will consume (modify) the `decorations` array, so
+    you must make a copy if you want need to preserve that.
     */
     static create(doc, decorations) {
         return decorations.length ? buildTree(decorations, doc, 0, noSpec) : empty;
@@ -3847,8 +3911,9 @@ class DecorationSet {
     }
     /**
     Add the given array of decorations to the ones in the set,
-    producing a new set. Needs access to the current document to
-    create the appropriate tree structure.
+    producing a new set. Consumes the `decorations` array. Needs
+    access to the current document to create the appropriate tree
+    structure.
     */
     add(doc, decorations) {
         if (!decorations.length)
@@ -4432,15 +4497,19 @@ class DOMObserver {
             return true;
         }
     }
+    pendingRecords() {
+        if (this.observer)
+            for (let mut of this.observer.takeRecords())
+                this.queue.push(mut);
+        return this.queue;
+    }
     flush() {
         let { view } = this;
         if (!view.docView || this.flushingSoon > -1)
             return;
-        let mutations = this.observer ? this.observer.takeRecords() : [];
-        if (this.queue.length) {
-            mutations = this.queue.concat(mutations);
-            this.queue.length = 0;
-        }
+        let mutations = this.pendingRecords();
+        if (mutations.length)
+            this.queue = [];
         let sel = view.domSelectionRange();
         let newSel = !this.suppressingSelectionUpdates && !this.currentSelection.eq(sel) && hasFocusAndSelection(view) && !this.ignoreSelectionChange(sel);
         let from = -1, to = -1, typeOver = false, added = [];
@@ -4661,6 +4730,8 @@ function ruleFromNode(dom) {
 }
 const isInline = /^(a|abbr|acronym|b|bd[io]|big|br|button|cite|code|data(list)?|del|dfn|em|i|ins|kbd|label|map|mark|meter|output|q|ruby|s|samp|small|span|strong|su[bp]|time|u|tt|var)$/i;
 function readDOMChange(view, from, to, typeOver, addedNodes) {
+    let compositionID = view.input.compositionPendingChanges || (view.composing ? view.input.compositionID : 0);
+    view.input.compositionPendingChanges = 0;
     if (from < 0) {
         let origin = view.input.lastSelectionTime > Date.now() - 50 ? view.input.lastSelectionOrigin : null;
         let newSel = selectionFromDOM(view, origin);
@@ -4674,8 +4745,8 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
                 tr.setMeta("pointer", true);
             else if (origin == "key")
                 tr.scrollIntoView();
-            if (view.composing)
-                tr.setMeta("composition", view.input.compositionID);
+            if (compositionID)
+                tr.setMeta("composition", compositionID);
             view.dispatch(tr);
         }
         return;
@@ -4716,8 +4787,8 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
                 let sel = resolveSelection(view, view.state.doc, parse.sel);
                 if (sel && !sel.eq(view.state.selection)) {
                     let tr = view.state.tr.setSelection(sel);
-                    if (view.composing)
-                        tr.setMeta("composition", view.input.compositionID);
+                    if (compositionID)
+                        tr.setMeta("composition", compositionID);
                     view.dispatch(tr);
                 }
             }
@@ -4850,8 +4921,8 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
     }
     if (storedMarks)
         tr.ensureMarks(storedMarks);
-    if (view.composing)
-        tr.setMeta("composition", view.input.compositionID);
+    if (compositionID)
+        tr.setMeta("composition", compositionID);
     view.dispatch(tr.scrollIntoView());
 }
 function resolveSelection(view, doc, parsedSel) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-view",
-  "version": "1.31.6",
+  "version": "1.31.8",
   "description": "ProseMirror's view component",
   "type": "module",
   "main": "dist/index.cjs",

package/src/capturekeys.ts

@@ -1,7 +1,7 @@
 import {Selection, NodeSelection, TextSelection, AllSelection, EditorState} from "prosemirror-state"
 import {EditorView} from "./index"
 import * as browser from "./browser"
-import {domIndex, selectionCollapsed} from "./dom"
+import {domIndex, selectionCollapsed, hasBlockDesc} from "./dom"
 import {selectionToDOM} from "./selection"
 
 function moveSelectionBlock(state: EditorState, dir: number) {
@@ -54,9 +54,10 @@ function nodeLen(node: Node) {
   return node.nodeType == 3 ? node.nodeValue!.length : node.childNodes.length
 }
 
-function isIgnorable(dom: Node) {
+function isIgnorable(dom: Node, dir: number) {
+  if ((dom as HTMLElement).contentEditable == "false") return true
   let desc = dom.pmViewDesc
-  return desc && desc.size == 0 && (dom.nextSibling || dom.nodeName != "BR")
+  return desc && desc.size == 0 && (dir < 0 || dom.nextSibling || dom.nodeName != "BR")
 }
 
 function skipIgnoredNodes(view: EditorView, dir: number) {
@@ -73,14 +74,14 @@ function skipIgnoredNodesBefore(view: EditorView) {
   // Gecko will do odd things when the selection is directly in front
   // of a non-editable node, so in that case, move it into the next
   // node if possible. Issue prosemirror/prosemirror#832.
-  if (browser.gecko && node.nodeType == 1 && offset < nodeLen(node) && isIgnorable(node.childNodes[offset])) force = true
+  if (browser.gecko && node.nodeType == 1 && offset < nodeLen(node) && isIgnorable(node.childNodes[offset], -1)) force = true
   for (;;) {
     if (offset > 0) {
       if (node.nodeType != 1) {
         break
       } else {
         let before = node.childNodes[offset - 1]
-        if (isIgnorable(before)) {
+        if (isIgnorable(before, -1)) {
           moveNode = node
           moveOffset = --offset
         } else if (before.nodeType == 3) {
@@ -92,7 +93,7 @@ function skipIgnoredNodesBefore(view: EditorView) {
       break
     } else {
       let prev = node.previousSibling
-      while (prev && isIgnorable(prev)) {
+      while (prev && isIgnorable(prev, -1)) {
         moveNode = node.parentNode
         moveOffset = domIndex(prev)
         prev = prev.previousSibling
@@ -123,7 +124,7 @@ function skipIgnoredNodesAfter(view: EditorView) {
     if (offset < len) {
       if (node.nodeType != 1) break
       let after = node.childNodes[offset]
-      if (isIgnorable(after)) {
+      if (isIgnorable(after, 1)) {
         moveNode = node
         moveOffset = ++offset
       }
@@ -132,7 +133,7 @@ function skipIgnoredNodesAfter(view: EditorView) {
       break
     } else {
       let next = node.nextSibling
-      while (next && isIgnorable(next)) {
+      while (next && isIgnorable(next, 1)) {
         moveNode = next.parentNode
         moveOffset = domIndex(next) + 1
         next = next.nextSibling
@@ -156,7 +157,46 @@ function isBlockNode(dom: Node) {
   return desc && desc.node && desc.node.isBlock
 }
 
+function textNodeAfter(node: Node | null, offset: number): Text | undefined {
+  while (node && offset == node.childNodes.length && !hasBlockDesc(node)) {
+    offset = domIndex(node) + 1
+    node = node.parentNode
+  }
+  while (node && offset < node.childNodes.length) {
+    let next = node.childNodes[offset]
+    if (next.nodeType == 3) return next as Text
+    if (next.nodeType == 1 && (next as HTMLElement).contentEditable == "false") break
+    node = next
+    offset = 0
+  }
+}
+
+function textNodeBefore(node: Node | null, offset: number): Text | undefined {
+  while (node && !offset && !hasBlockDesc(node)) {
+    offset = domIndex(node)
+    node = node.parentNode
+  }
+  while (node && offset) {
+    let next = node.childNodes[offset - 1]
+    if (next.nodeType == 3) return next as Text
+    if (next.nodeType == 1 && (next as HTMLElement).contentEditable == "false") break
+    node = next
+    offset = node.childNodes.length
+  }
+}
+
 function setSelFocus(view: EditorView, node: Node, offset: number) {
+  if (node.nodeType != 3) {
+    let before, after
+    if (after = textNodeAfter(node, offset)) {
+      node = after
+      offset = 0
+    } else if (before = textNodeBefore(node, offset)) {
+      node = before
+      offset = before.nodeValue!.length
+    }
+  }
+
   let sel = view.domSelection()
   if (selectionCollapsed(sel)) {
     let range = document.createRange()
@@ -291,7 +331,7 @@ export function captureKeyDown(view: EditorView, event: KeyboardEvent) {
   } else if (code == 38 || (browser.mac && code == 80 && mods == "c")) { // Up arrow, Ctrl-p on Mac
     return selectVertically(view, -1, mods) || skipIgnoredNodes(view, -1)
   } else if (code == 40 || (browser.mac && code == 78 && mods == "c")) { // Down arrow, Ctrl-n on Mac
-    return safariDownArrowBug(view) || selectVertically(view, 1, mods) || skipIgnoredNodesAfter(view)
+    return safariDownArrowBug(view) || selectVertically(view, 1, mods) || skipIgnoredNodes(view, 1)
   } else if (mods == (browser.mac ? "m" : "c") &&
              (code == 66 || code == 73 || code == 89 || code == 90)) { // Mod-[biyz]
     return true

package/src/decoration.ts

@@ -223,6 +223,9 @@ export class Decoration {
 
   /// @internal
   get inline() { return this.type instanceof InlineType }
+
+  /// @internal
+  get widget() { return this.type instanceof WidgetType }
 }
 
 /// A set of attributes to add to a decorated node. Most properties
@@ -278,7 +281,8 @@ export class DecorationSet implements DecorationSource {
   }
 
   /// Create a set of decorations, using the structure of the given
-  /// document.
+  /// document. This will consume (modify) the `decorations` array, so
+  /// you must make a copy if you want need to preserve that.
   static create(doc: Node, decorations: Decoration[]) {
     return decorations.length ? buildTree(decorations, doc, 0, noSpec) : empty
   }
@@ -302,7 +306,7 @@ export class DecorationSet implements DecorationSource {
         result.push(span.copy(span.from + offset, span.to + offset))
     }
     for (let i = 0; i < this.children.length; i += 3) {
-      if (this.children[i] < end && this.children[i + 1] > start) {
+      if ((this.children[i] as number) < end && (this.children[i + 1] as number) > start) {
         let childOff = (this.children[i] as number) + 1
         ;(this.children[i + 2] as DecorationSet).findInner(start - childOff, end - childOff,
                                                            result, offset + childOff, predicate)
@@ -340,8 +344,9 @@ export class DecorationSet implements DecorationSource {
   }
 
   /// Add the given array of decorations to the ones in the set,
-  /// producing a new set. Needs access to the current document to
-  /// create the appropriate tree structure.
+  /// producing a new set. Consumes the `decorations` array. Needs
+  /// access to the current document to create the appropriate tree
+  /// structure.
   add(doc: Node, decorations: Decoration[]) {
     if (!decorations.length) return this
     if (this == empty) return DecorationSet.create(doc, decorations)
@@ -355,7 +360,7 @@ export class DecorationSet implements DecorationSource {
       if (!(found = takeSpansForNode(decorations, childNode, baseOffset))) return
 
       if (!children) children = this.children.slice()
-      while (childIndex < children.length && children[childIndex] < childOffset) childIndex += 3
+      while (childIndex < children.length && (children[childIndex] as number) < childOffset) childIndex += 3
       if (children[childIndex] == childOffset)
         children[childIndex + 2] = (children[childIndex + 2] as DecorationSet).addInner(childNode, found, baseOffset + 1)
       else
@@ -414,7 +419,7 @@ export class DecorationSet implements DecorationSource {
     if (node.isLeaf) return DecorationSet.empty
 
     let child, local: Decoration[] | undefined
-    for (let i = 0; i < this.children.length; i += 3) if (this.children[i] >= offset) {
+    for (let i = 0; i < this.children.length; i += 3) if ((this.children[i] as number) >= offset) {
       if (this.children[i] == offset) child = this.children[i + 2] as DecorationSet
       break
     }
@@ -576,7 +581,7 @@ function mapChildren(
   // Find the child nodes that still correspond to a single node,
   // recursively call mapInner on them and update their positions.
   let mustRebuild = false
-  for (let i = 0; i < children.length; i += 3) if (children[i + 1] < 0) { // Touched nodes
+  for (let i = 0; i < children.length; i += 3) if ((children[i + 1] as number) < 0) { // Touched nodes
     if (children[i + 1] == -2) {
       mustRebuild = true
       children[i + 1] = -1
@@ -613,7 +618,7 @@ function mapChildren(
                                                        offset, oldOffset, options)
     let built = buildTree(decorations, node, 0, options)
     newLocal = built.local as Decoration[]
-    for (let i = 0; i < children.length; i += 3) if (children[i + 1] < 0) {
+    for (let i = 0; i < children.length; i += 3) if ((children[i + 1] as number) < 0) {
       children.splice(i, 3)
       i -= 3
     }

package/src/dom.ts

@@ -74,7 +74,7 @@ export function isOnEdge(node: Node, offset: number, parent: Node) {
   }
 }
 
-function hasBlockDesc(dom: Node) {
+export function hasBlockDesc(dom: Node) {
   let desc
   for (let cur: Node | null = dom; cur; cur = cur.parentNode) if (desc = cur.pmViewDesc) break
   return desc && desc.node && desc.node.isBlock && (desc.dom == dom || desc.contentDOM == dom)

package/src/domchange.ts

@@ -79,6 +79,9 @@ function ruleFromNode(dom: DOMNode): ParseRule | null {
 const isInline = /^(a|abbr|acronym|b|bd[io]|big|br|button|cite|code|data(list)?|del|dfn|em|i|ins|kbd|label|map|mark|meter|output|q|ruby|s|samp|small|span|strong|su[bp]|time|u|tt|var)$/i
 
 export function readDOMChange(view: EditorView, from: number, to: number, typeOver: boolean, addedNodes: readonly DOMNode[]) {
+  let compositionID = view.input.compositionPendingChanges || (view.composing ? view.input.compositionID : 0)
+  view.input.compositionPendingChanges = 0
+  
   if (from < 0) {
     let origin = view.input.lastSelectionTime > Date.now() - 50 ? view.input.lastSelectionOrigin : null
     let newSel = selectionFromDOM(view, origin)
@@ -90,7 +93,7 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
       let tr = view.state.tr.setSelection(newSel)
       if (origin == "pointer") tr.setMeta("pointer", true)
       else if (origin == "key") tr.scrollIntoView()
-      if (view.composing) tr.setMeta("composition", view.input.compositionID)
+      if (compositionID) tr.setMeta("composition", compositionID)
       view.dispatch(tr)
     }
     return
@@ -133,7 +136,7 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
         let sel = resolveSelection(view, view.state.doc, parse.sel)
         if (sel && !sel.eq(view.state.selection)) {
           let tr = view.state.tr.setSelection(sel)
-          if (view.composing) tr.setMeta("composition", view.input.compositionID)
+          if (compositionID) tr.setMeta("composition", compositionID)
           view.dispatch(tr)
         }
       }
@@ -268,7 +271,7 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
       tr.setSelection(sel)
   }
   if (storedMarks) tr.ensureMarks(storedMarks)
-  if (view.composing) tr.setMeta("composition", view.input.compositionID)
+  if (compositionID) tr.setMeta("composition", compositionID)
   view.dispatch(tr.scrollIntoView())
 }
 

package/src/domcoords.ts

@@ -37,7 +37,9 @@ export function scrollRectIntoView(view: EditorView, rect: Rect, startDOM: Node)
     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 - bounding.bottom + getSide(scrollMargin, "bottom")
+      moveY = rect.bottom - rect.top > bounding.bottom - bounding.top
+        ? rect.top + getSide(scrollMargin, "top") - bounding.top
+        : rect.bottom - bounding.bottom + getSide(scrollMargin, "bottom")
     if (rect.left < bounding.left + getSide(scrollThreshold, "left"))
       moveX = -(bounding.left - rect.left + getSide(scrollMargin, "left"))
     else if (rect.right > bounding.right - getSide(scrollThreshold, "right"))

package/src/domobserver.ts

@@ -157,14 +157,16 @@ export class DOMObserver {
     }
   }
 
+  pendingRecords() {
+    if (this.observer) for (let mut of this.observer.takeRecords()) this.queue.push(mut)
+    return this.queue
+  }
+
   flush() {
     let {view} = this
     if (!view.docView || this.flushingSoon > -1) return
-    let mutations = this.observer ? this.observer.takeRecords() : []
-    if (this.queue.length) {
-      mutations = this.queue.concat(mutations)
-      this.queue.length = 0
-    }
+    let mutations = this.pendingRecords()
+    if (mutations.length) this.queue = []
 
     let sel = view.domSelectionRange()
     let newSel = !this.suppressingSelectionUpdates && !this.currentSelection.eq(sel) && hasFocusAndSelection(view) && !this.ignoreSelectionChange(sel)

package/src/input.ts

@@ -34,6 +34,8 @@ export class InputState {
   compositionNodes: ViewDesc[] = []
   compositionEndedAt = -2e8
   compositionID = 1
+  // Set to a composition ID when there are pending changes at compositionend
+  compositionPendingChanges = 0
   domChangeCount = 0
   eventHandlers: {[event: string]: (event: Event) => void} = Object.create(null)
   hideSelectionGuard: (() => void) | null = null
@@ -487,6 +489,8 @@ editHandlers.compositionend = (view, event) => {
   if (view.composing) {
     view.input.composing = false
     view.input.compositionEndedAt = event.timeStamp
+    view.input.compositionPendingChanges = view.domObserver.pendingRecords().length ? view.input.compositionID : 0
+    if (view.input.compositionPendingChanges) Promise.resolve().then(() => view.domObserver.flush())
     view.input.compositionID++
     scheduleComposeEnd(view, 20)
   }

package/src/viewdesc.ts

@@ -387,7 +387,7 @@ export class ViewDesc {
         brKludge = !!(offset && node.nodeValue![offset - 1] == "\n")
         // Issue #1128
         if (brKludge && offset == node.nodeValue!.length) {
-          for (let scan: DOMNode | null = node, after; scan; scan = scan.parentNode) {
+           for (let scan: DOMNode | null = node, after; scan; scan = scan.parentNode) {
             if (after = scan.nextSibling) {
               if (after.nodeName == "BR")
                 anchorDOM = headDOM = {node: after.parentNode!, offset: domIndex(after) + 1}
@@ -1244,9 +1244,11 @@ class ViewTreeUpdater {
           return true
         } else if (!locked && (updated = this.recreateWrapper(next, node, outerDeco, innerDeco, view, pos))) {
           this.top.children[this.index] = updated
-          updated.dirty = CONTENT_DIRTY
-          updated.updateChildren(view, pos + 1)
-          updated.dirty = NOT_DIRTY
+          if (updated.contentDOM) {
+            updated.dirty = CONTENT_DIRTY
+            updated.updateChildren(view, pos + 1)
+            updated.dirty = NOT_DIRTY
+          }
           this.changed = true
           this.index++
           return true
@@ -1264,12 +1266,12 @@ class ViewTreeUpdater {
     if (next.dirty || node.isAtom || !next.children.length ||
         !next.node.content.eq(node.content)) return null
     let wrapper = NodeViewDesc.create(this.top, node, outerDeco, innerDeco, view, pos)
-    if (!wrapper.contentDOM) return null
-    wrapper.children = next.children
-    next.children = []
+    if (wrapper.contentDOM) {
+      wrapper.children = next.children
+      next.children = []
+      for (let ch of wrapper.children) ch.parent = wrapper
+    }
     next.destroy()
-    for (let ch of wrapper.children) ch.parent = wrapper
-   
     return wrapper
   }
 
@@ -1403,10 +1405,15 @@ function iterDeco(
 
   let decoIndex = 0, active = [], restNode = null
   for (let parentIndex = 0;;) {
-    if (decoIndex < locals.length && locals[decoIndex].to == offset) {
-      let widget = locals[decoIndex++], widgets
-      while (decoIndex < locals.length && locals[decoIndex].to == offset)
-        (widgets || (widgets = [widget])).push(locals[decoIndex++])
+    let widget, widgets
+    while (decoIndex < locals.length && locals[decoIndex].to == offset) {
+      let next = locals[decoIndex++]
+      if (next.widget) {
+        if (!widget) widget = next
+        else (widgets || (widgets = [widget])).push(next)
+      }
+    }
+    if (widget) {
       if (widgets) {
         widgets.sort(compareSide)
         for (let i = 0; i < widgets.length; i++) onWidget(widgets[i], parentIndex, !!restNode)