@onereach/ui-components 6.2.0-beta.3286.0 → 6.2.0-beta.3294.0

package/dist/bundled/v2/{index-61aeae22.js → index-b261a47e.js}

@@ -2,10 +2,6 @@
 The data structure for documents. @nonabstract
 */
 class Text {
-  /**
-  @internal
-  */
-  constructor() {}
   /**
   Get the line description around the given position.
   */
@@ -100,7 +96,8 @@ class Text {
     return new LineCursor(inner);
   }
   /**
-  @internal
+  Return the document as a string, using newline characters to
+  separate lines.
   */
   toString() {
     return this.sliceString(0);
@@ -115,6 +112,10 @@ class Text {
     return lines;
   }
   /**
+  @internal
+  */
+  constructor() {}
+  /**
   Create a `Text` instance for the given array of lines.
   */
   static of(text) {
@@ -2150,7 +2151,10 @@ class StateEffect {
   }
   /**
   Define a new effect type. The type parameter indicates the type
-  of values that his effect holds.
+  of values that his effect holds. It should be a type that
+  doesn't include `undefined`, since that is used in
+  [mapping](https://codemirror.net/6/docs/ref/#state.StateEffect.map) to indicate that an effect is
+  removed.
   */
   static define() {
     let spec = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -3287,8 +3291,7 @@ class RangeSet {
   static compare(oldSets, newSets,
   /**
   This indicates how the underlying data changed between these
-  ranges, and is needed to synchronize the iteration. `from` and
-  `to` are coordinates in the _new_ space, after these changes.
+  ranges, and is needed to synchronize the iteration.
   */
   textDiff, comparator) {
     let minPointSize = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : -1;
@@ -3383,6 +3386,18 @@ A range set builder is a data structure that helps build up a
 an array of [`Range`](https://codemirror.net/6/docs/ref/#state.Range) objects.
 */
 class RangeSetBuilder {
+  finishChunk(newArrays) {
+    this.chunks.push(new Chunk(this.from, this.to, this.value, this.maxPoint));
+    this.chunkPos.push(this.chunkStart);
+    this.chunkStart = -1;
+    this.setMaxPoint = Math.max(this.setMaxPoint, this.maxPoint);
+    this.maxPoint = -1;
+    if (newArrays) {
+      this.from = [];
+      this.to = [];
+      this.value = [];
+    }
+  }
   /**
   Create an empty builder.
   */
@@ -3400,18 +3415,6 @@ class RangeSetBuilder {
     this.setMaxPoint = -1;
     this.nextLayer = null;
   }
-  finishChunk(newArrays) {
-    this.chunks.push(new Chunk(this.from, this.to, this.value, this.maxPoint));
-    this.chunkPos.push(this.chunkStart);
-    this.chunkStart = -1;
-    this.setMaxPoint = Math.max(this.setMaxPoint, this.maxPoint);
-    this.maxPoint = -1;
-    if (newArrays) {
-      this.from = [];
-      this.to = [];
-      this.value = [];
-    }
-  }
   /**
   Add a range. Ranges should be added in sorted (by `from` and
   `value.startSide`) order.
@@ -3745,7 +3748,7 @@ function compare(a, startA, b, startB, length, comparator) {
     let end = diff < 0 ? a.to + dPos : b.to,
       clipEnd = Math.min(end, endB);
     if (a.point || b.point) {
-      if (!(a.point && b.point && (a.point == b.point || a.point.eq(b.point)) && sameValues(a.activeForPoint(a.to + dPos), b.activeForPoint(b.to)))) comparator.comparePoint(pos, clipEnd, a.point, b.point);
+      if (!(a.point && b.point && (a.point == b.point || a.point.eq(b.point)) && sameValues(a.activeForPoint(a.to), b.activeForPoint(b.to)))) comparator.comparePoint(pos, clipEnd, a.point, b.point);
     } else {
       if (clipEnd > pos && !sameValues(a.active, b.active)) comparator.compareRange(pos, clipEnd, a.active, b.active);
     }
@@ -4407,7 +4410,7 @@ class ContentView {
   constructor() {
     this.parent = null;
     this.dom = null;
-    this.dirty = 2 /* Dirty.Node */;
+    this.dirty = 2 /* Node */;
   }
 
   get overrideDOMText() {
@@ -4431,7 +4434,7 @@ class ContentView {
     return this.posBefore(view) + view.length;
   }
   sync(view, track) {
-    if (this.dirty & 2 /* Dirty.Node */) {
+    if (this.dirty & 2 /* Node */) {
       let parent = this.dom;
       let prev = null,
         next;
@@ -4442,7 +4445,7 @@ class ContentView {
             if (!contentView || !contentView.parent && contentView.canReuseDOM(child)) child.reuseDOM(next);
           }
           child.sync(view, track);
-          child.dirty = 0 /* Dirty.Not */;
+          child.dirty = 0 /* Not */;
         }
 
         next = prev ? prev.nextSibling : parent.firstChild;
@@ -4457,10 +4460,10 @@ class ContentView {
       next = prev ? prev.nextSibling : parent.firstChild;
       if (next && track && track.node == parent) track.written = true;
       while (next) next = rm$1(next);
-    } else if (this.dirty & 1 /* Dirty.Child */) {
+    } else if (this.dirty & 1 /* Child */) {
       for (let child of this.children) if (child.dirty) {
         child.sync(view, track);
-        child.dirty = 0 /* Dirty.Not */;
+        child.dirty = 0 /* Not */;
       }
     }
   }
@@ -4522,14 +4525,14 @@ class ContentView {
   }
   markDirty() {
     let andParent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    this.dirty |= 2 /* Dirty.Node */;
+    this.dirty |= 2 /* Node */;
     this.markParentsDirty(andParent);
   }
   markParentsDirty(childList) {
     for (let parent = this.parent; parent; parent = parent.parent) {
-      if (childList) parent.dirty |= 2 /* Dirty.Node */;
-      if (parent.dirty & 1 /* Dirty.Child */) return;
-      parent.dirty |= 1 /* Dirty.Child */;
+      if (childList) parent.dirty |= 2 /* Node */;
+      if (parent.dirty & 1 /* Child */) return;
+      parent.dirty |= 1 /* Child */;
       childList = false;
     }
   }
@@ -4824,12 +4827,12 @@ class MarkView extends ContentView {
   reuseDOM(node) {
     if (node.nodeName == this.mark.tagName.toUpperCase()) {
       this.setDOM(node);
-      this.dirty |= 4 /* Dirty.Attrs */ | 2 /* Dirty.Node */;
+      this.dirty |= 4 /* Attrs */ | 2 /* Node */;
     }
   }
 
   sync(view, track) {
-    if (!this.dom) this.setDOM(this.setAttrs(document.createElement(this.mark.tagName)));else if (this.dirty & 4 /* Dirty.Attrs */) this.setAttrs(this.dom);
+    if (!this.dom) this.setDOM(this.setAttrs(document.createElement(this.mark.tagName)));else if (this.dirty & 4 /* Attrs */) this.setAttrs(this.dom);
     super.sync(view, track);
   }
   merge(from, to, source, _hasStart, openStart, openEnd) {
@@ -4894,9 +4897,6 @@ function textCoords(text, pos, side) {
 }
 // Also used for collapsed ranges that don't have a placeholder widget!
 class WidgetView extends ContentView {
-  static create(widget, length, side) {
-    return new (widget.customView || WidgetView)(widget, length, side);
-  }
   constructor(widget, length, side) {
     super();
     this.widget = widget;
@@ -4904,6 +4904,9 @@ class WidgetView extends ContentView {
     this.side = side;
     this.prevWidget = null;
   }
+  static create(widget, length, side) {
+    return new (widget.customView || WidgetView)(widget, length, side);
+  }
   split(from) {
     let result = WidgetView.create(this.widget, this.length - from, this.side);
     this.length -= from;
@@ -4964,11 +4967,12 @@ class WidgetView extends ContentView {
     let rects = this.dom.getClientRects(),
       rect = null;
     if (!rects.length) return null;
-    for (let i = pos > 0 ? rects.length - 1 : 0;; i += pos > 0 ? -1 : 1) {
+    let fromBack = this.side ? this.side < 0 : pos > 0;
+    for (let i = fromBack ? rects.length - 1 : 0;; i += fromBack ? -1 : 1) {
       rect = rects[i];
       if (pos > 0 ? i == 0 : i == rects.length - 1 || rect.top < rect.bottom) break;
     }
-    return this.length ? rect : flattenRect(rect, this.side > 0);
+    return flattenRect(rect, !fromBack);
   }
   get isEditable() {
     return false;
@@ -5312,6 +5316,15 @@ class WidgetType {
     return -1;
   }
   /**
+  For inline widgets that are displayed inline (as opposed to
+  `inline-block`) and introduce line breaks (through `<br>` tags
+  or textual newlines), this must indicate the amount of line
+  breaks they introduce. Defaults to 0.
+  */
+  get lineBreaks() {
+    return 0;
+  }
+  /**
   Can be used to configure which kinds of events inside the widget
   should be ignored by the editor. The default is to ignore all
   events.
@@ -5424,9 +5437,9 @@ class Decoration extends RangeValue {
   given position.
   */
   static widget(spec) {
-    let side = spec.side || 0,
+    let side = Math.max(-10000, Math.min(10000, spec.side || 0)),
       block = !!spec.block;
-    side += block ? side > 0 ? 300000000 /* Side.BlockAfter */ : -400000000 /* Side.BlockBefore */ : side > 0 ? 100000000 /* Side.InlineAfter */ : -100000000 /* Side.InlineBefore */;
+    side += block && !spec.inlineOrder ? side > 0 ? 300000000 /* BlockAfter */ : -400000000 /* BlockBefore */ : side > 0 ? 100000000 /* InlineAfter */ : -100000000 /* InlineBefore */;
     return new PointDecoration(spec, side, side, block, spec.widget || null, false);
   }
   /**
@@ -5438,15 +5451,15 @@ class Decoration extends RangeValue {
       startSide,
       endSide;
     if (spec.isBlockGap) {
-      startSide = -500000000 /* Side.GapStart */;
-      endSide = 400000000 /* Side.GapEnd */;
+      startSide = -500000000 /* GapStart */;
+      endSide = 400000000 /* GapEnd */;
     } else {
       let {
         start,
         end
       } = getInclusive(spec, block);
-      startSide = (start ? block ? -300000000 /* Side.BlockIncStart */ : -1 /* Side.InlineIncStart */ : 500000000 /* Side.NonIncStart */) - 1;
-      endSide = (end ? block ? 200000000 /* Side.BlockIncEnd */ : 1 /* Side.InlineIncEnd */ : -600000000 /* Side.NonIncEnd */) + 1;
+      startSide = (start ? block ? -300000000 /* BlockIncStart */ : -1 /* InlineIncStart */ : 500000000 /* NonIncStart */) - 1;
+      endSide = (end ? block ? 200000000 /* BlockIncEnd */ : 1 /* InlineIncEnd */ : -600000000 /* NonIncEnd */) + 1;
     }
     return new PointDecoration(spec, startSide, endSide, block, spec.widget || null, true);
   }
@@ -5483,7 +5496,7 @@ class MarkDecoration extends Decoration {
       start,
       end
     } = getInclusive(spec);
-    super(start ? -1 /* Side.InlineIncStart */ : 500000000 /* Side.NonIncStart */, end ? 1 /* Side.InlineIncEnd */ : -600000000 /* Side.NonIncEnd */, null, spec);
+    super(start ? -1 /* InlineIncStart */ : 500000000 /* NonIncStart */, end ? 1 /* InlineIncEnd */ : -600000000 /* NonIncEnd */, null, spec);
     this.tagName = spec.tagName || "span";
     this.class = spec.class || "";
     this.attrs = spec.attributes || null;
@@ -5500,7 +5513,7 @@ class MarkDecoration extends Decoration {
 MarkDecoration.prototype.point = false;
 class LineDecoration extends Decoration {
   constructor(spec) {
-    super(-200000000 /* Side.Line */, -200000000 /* Side.Line */, null, spec);
+    super(-200000000 /* Line */, -200000000 /* Line */, null, spec);
   }
   eq(other) {
     return other instanceof LineDecoration && this.spec.class == other.spec.class && attrsEq(this.spec.attributes, other.spec.attributes);
@@ -5525,7 +5538,7 @@ class PointDecoration extends Decoration {
     return this.startSide < this.endSide ? BlockType.WidgetRange : this.startSide <= 0 ? BlockType.WidgetBefore : BlockType.WidgetAfter;
   }
   get heightRelevant() {
-    return this.block || !!this.widget && this.widget.estimatedHeight >= 5;
+    return this.block || !!this.widget && (this.widget.estimatedHeight >= 5 || this.widget.lineBreaks > 0);
   }
   eq(other) {
     return other instanceof PointDecoration && widgetsEq(this.widget, other.widget) && this.block == other.block && this.startSide == other.startSide && this.endSide == other.endSide;
@@ -5634,7 +5647,7 @@ class LineView extends ContentView {
   reuseDOM(node) {
     if (node.nodeName == "DIV") {
       this.setDOM(node);
-      this.dirty |= 4 /* Dirty.Attrs */ | 2 /* Dirty.Node */;
+      this.dirty |= 4 /* Attrs */ | 2 /* Node */;
     }
   }
 
@@ -5644,7 +5657,7 @@ class LineView extends ContentView {
       this.setDOM(document.createElement("div"));
       this.dom.className = "cm-line";
       this.prevAttrs = this.attrs ? null : undefined;
-    } else if (this.dirty & 4 /* Dirty.Attrs */) {
+    } else if (this.dirty & 4 /* Attrs */) {
       clearAttributes(this.dom);
       this.dom.className = "cm-line";
       this.prevAttrs = this.attrs ? null : undefined;
@@ -5802,7 +5815,7 @@ class ContentBuilder {
     this.content = [];
     this.curLine = null;
     this.breakAtStart = 0;
-    this.pendingBuffer = 0 /* Buf.No */;
+    this.pendingBuffer = 0 /* No */;
     this.bufferMarks = [];
     // Set to false directly after a widget that covers the position after it
     this.atCursorPos = true;
@@ -5829,7 +5842,7 @@ class ContentBuilder {
     let active = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.bufferMarks;
     if (this.pendingBuffer) {
       this.curLine.append(wrapMarks(new WidgetBufferView(-1), active), active.length);
-      this.pendingBuffer = 0 /* Buf.No */;
+      this.pendingBuffer = 0 /* No */;
     }
   }
 
@@ -5839,7 +5852,7 @@ class ContentBuilder {
     this.content.push(view);
   }
   finish(openEnd) {
-    if (this.pendingBuffer && openEnd <= this.bufferMarks.length) this.flushBuffer();else this.pendingBuffer = 0 /* Buf.No */;
+    if (this.pendingBuffer && openEnd <= this.bufferMarks.length) this.flushBuffer();else this.pendingBuffer = 0 /* No */;
     if (!this.posCovered()) this.getLine();
   }
   buildText(length, active, openStart) {
@@ -5865,7 +5878,7 @@ class ContentBuilder {
           this.textOff = 0;
         }
       }
-      let take = Math.min(this.text.length - this.textOff, length, 512 /* T.Chunk */);
+      let take = Math.min(this.text.length - this.textOff, length, 512 /* Chunk */);
       this.flushBuffer(active.slice(active.length - openStart));
       this.getLine().append(wrapMarks(new TextView(this.text.slice(this.textOff, this.textOff + take)), active), openStart);
       this.atCursorPos = true;
@@ -5897,7 +5910,7 @@ class ContentBuilder {
         let cursorBefore = this.atCursorPos && !view.isEditable && openStart <= active.length && (from < to || deco.startSide > 0);
         let cursorAfter = !view.isEditable && (from < to || openStart > active.length || deco.startSide <= 0);
         let line = this.getLine();
-        if (this.pendingBuffer == 2 /* Buf.IfCursor */ && !cursorBefore && !view.isEditable) this.pendingBuffer = 0 /* Buf.No */;
+        if (this.pendingBuffer == 2 /* IfCursor */ && !cursorBefore && !view.isEditable) this.pendingBuffer = 0 /* No */;
         this.flushBuffer(active);
         if (cursorBefore) {
           line.append(wrapMarks(new WidgetBufferView(1), active), openStart);
@@ -5905,7 +5918,7 @@ class ContentBuilder {
         }
         line.append(wrapMarks(view, active), openStart);
         this.atCursorPos = cursorAfter;
-        this.pendingBuffer = !cursorAfter ? 0 /* Buf.No */ : from < to || openStart > active.length ? 1 /* Buf.Yes */ : 2 /* Buf.IfCursor */;
+        this.pendingBuffer = !cursorAfter ? 0 /* No */ : from < to || openStart > active.length ? 1 /* Yes */ : 2 /* IfCursor */;
         if (this.pendingBuffer) this.bufferMarks = active.slice();
       }
     } else if (this.doc.lineAt(this.pos).from == this.pos) {
@@ -6230,27 +6243,27 @@ class ViewUpdate {
   update.
   */
   get viewportChanged() {
-    return (this.flags & 4 /* UpdateFlag.Viewport */) > 0;
+    return (this.flags & 4 /* Viewport */) > 0;
   }
   /**
   Indicates whether the height of a block element in the editor
   changed in this update.
   */
   get heightChanged() {
-    return (this.flags & 2 /* UpdateFlag.Height */) > 0;
+    return (this.flags & 2 /* Height */) > 0;
   }
   /**
   Returns true when the document was modified or the size of the
   editor, or elements within the editor, changed.
   */
   get geometryChanged() {
-    return this.docChanged || (this.flags & (8 /* UpdateFlag.Geometry */ | 2 /* UpdateFlag.Height */)) > 0;
+    return this.docChanged || (this.flags & (8 /* Geometry */ | 2 /* Height */)) > 0;
   }
   /**
   True when this update indicates a focus change.
   */
   get focusChanged() {
-    return (this.flags & 1 /* UpdateFlag.Focus */) > 0;
+    return (this.flags & 1 /* Focus */) > 0;
   }
   /**
   Whether the document changed in this update.
@@ -6312,7 +6325,7 @@ for (let p of ["()", "[]", "{}"]) {
   Brackets[r] = -l;
 }
 function charType(ch) {
-  return ch <= 0xf7 ? LowTypes[ch] : 0x590 <= ch && ch <= 0x5f4 ? 2 /* T.R */ : 0x600 <= ch && ch <= 0x6f9 ? ArabicTypes[ch - 0x600] : 0x6ee <= ch && ch <= 0x8ac ? 4 /* T.AL */ : 0x2000 <= ch && ch <= 0x200b ? 256 /* T.NI */ : 0xfb50 <= ch && ch <= 0xfdff ? 4 /* T.AL */ : ch == 0x200c ? 256 /* T.NI */ : 1 /* T.L */;
+  return ch <= 0xf7 ? LowTypes[ch] : 0x590 <= ch && ch <= 0x5f4 ? 2 /* R */ : 0x600 <= ch && ch <= 0x6f9 ? ArabicTypes[ch - 0x600] : 0x6ee <= ch && ch <= 0x8ac ? 4 /* AL */ : 0x2000 <= ch && ch <= 0x200b ? 256 /* NI */ : 0xfb50 <= ch && ch <= 0xfdff ? 4 /* AL */ : ch == 0x200c ? 256 /* NI */ : 1 /* L */;
 }
 
 const BidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac\ufb50-\ufdff]/;
@@ -6321,12 +6334,6 @@ Represents a contiguous range of text that has a single direction
 (as in left-to-right or right-to-left).
 */
 class BidiSpan {
-  /**
-  The direction of this span.
-  */
-  get dir() {
-    return this.level % 2 ? RTL : LTR;
-  }
   /**
   @internal
   */
@@ -6352,6 +6359,12 @@ class BidiSpan {
     this.level = level;
   }
   /**
+  The direction of this span.
+  */
+  get dir() {
+    return this.level % 2 ? RTL : LTR;
+  }
+  /**
   @internal
   */
   side(end, dir) {
@@ -6380,9 +6393,9 @@ class BidiSpan {
 const types = [];
 function computeOrder(line, direction) {
   let len = line.length,
-    outerType = direction == LTR ? 1 /* T.L */ : 2 /* T.R */,
-    oppositeType = direction == LTR ? 2 /* T.R */ : 1 /* T.L */;
-  if (!line || outerType == 1 /* T.L */ && !BidiRE.test(line)) return trivialOrder(len);
+    outerType = direction == LTR ? 1 /* L */ : 2 /* R */,
+    oppositeType = direction == LTR ? 2 /* R */ : 1 /* L */;
+  if (!line || outerType == 1 /* L */ && !BidiRE.test(line)) return trivialOrder(len);
   // W1. Examine each non-spacing mark (NSM) in the level run, and
   // change the type of the NSM to the type of the previous
   // character. If the NSM is at the start of the level run, it will
@@ -6395,9 +6408,9 @@ function computeOrder(line, direction) {
   // (Left after this: L, R, EN, AN, ET, CS, NI)
   for (let i = 0, prev = outerType, prevStrong = outerType; i < len; i++) {
     let type = charType(line.charCodeAt(i));
-    if (type == 512 /* T.NSM */) type = prev;else if (type == 8 /* T.EN */ && prevStrong == 4 /* T.AL */) type = 16 /* T.AN */;
-    types[i] = type == 4 /* T.AL */ ? 2 /* T.R */ : type;
-    if (type & 7 /* T.Strong */) prevStrong = type;
+    if (type == 512 /* NSM */) type = prev;else if (type == 8 /* EN */ && prevStrong == 4 /* AL */) type = 16 /* AN */;
+    types[i] = type == 4 /* AL */ ? 2 /* R */ : type;
+    if (type & 7 /* Strong */) prevStrong = type;
     prev = type;
   }
   // W5. A sequence of European terminators adjacent to European
@@ -6410,20 +6423,20 @@ function computeOrder(line, direction) {
   // (Left after this: L, R, EN+AN, NI)
   for (let i = 0, prev = outerType, prevStrong = outerType; i < len; i++) {
     let type = types[i];
-    if (type == 128 /* T.CS */) {
-      if (i < len - 1 && prev == types[i + 1] && prev & 24 /* T.Num */) type = types[i] = prev;else types[i] = 256 /* T.NI */;
-    } else if (type == 64 /* T.ET */) {
+    if (type == 128 /* CS */) {
+      if (i < len - 1 && prev == types[i + 1] && prev & 24 /* Num */) type = types[i] = prev;else types[i] = 256 /* NI */;
+    } else if (type == 64 /* ET */) {
       let end = i + 1;
-      while (end < len && types[end] == 64 /* T.ET */) end++;
-      let replace = i && prev == 8 /* T.EN */ || end < len && types[end] == 8 /* T.EN */ ? prevStrong == 1 /* T.L */ ? 1 /* T.L */ : 8 /* T.EN */ : 256 /* T.NI */;
+      while (end < len && types[end] == 64 /* ET */) end++;
+      let replace = i && prev == 8 /* EN */ || end < len && types[end] == 8 /* EN */ ? prevStrong == 1 /* L */ ? 1 /* L */ : 8 /* EN */ : 256 /* NI */;
       for (let j = i; j < end; j++) types[j] = replace;
       i = end - 1;
-    } else if (type == 8 /* T.EN */ && prevStrong == 1 /* T.L */) {
-      types[i] = 1 /* T.L */;
+    } else if (type == 8 /* EN */ && prevStrong == 1 /* L */) {
+      types[i] = 1 /* L */;
     }
 
     prev = type;
-    if (type & 7 /* T.Strong */) prevStrong = type;
+    if (type & 7 /* Strong */) prevStrong = type;
   }
   // N0. Process bracket pairs in an isolating run sequence
   // sequentially in the logical order of the text positions of the
@@ -6438,30 +6451,30 @@ function computeOrder(line, direction) {
         for (let sJ = sI - 3; sJ >= 0; sJ -= 3) {
           if (BracketStack[sJ + 1] == -br) {
             let flags = BracketStack[sJ + 2];
-            let type = flags & 2 /* Bracketed.EmbedInside */ ? outerType : !(flags & 4 /* Bracketed.OppositeInside */) ? 0 : flags & 1 /* Bracketed.OppositeBefore */ ? oppositeType : outerType;
+            let type = flags & 2 /* EmbedInside */ ? outerType : !(flags & 4 /* OppositeInside */) ? 0 : flags & 1 /* OppositeBefore */ ? oppositeType : outerType;
             if (type) types[i] = types[BracketStack[sJ]] = type;
             sI = sJ;
             break;
           }
         }
-      } else if (BracketStack.length == 189 /* Bracketed.MaxDepth */) {
+      } else if (BracketStack.length == 189 /* MaxDepth */) {
         break;
       } else {
         BracketStack[sI++] = i;
         BracketStack[sI++] = ch;
         BracketStack[sI++] = context;
       }
-    } else if ((type = types[i]) == 2 /* T.R */ || type == 1 /* T.L */) {
+    } else if ((type = types[i]) == 2 /* R */ || type == 1 /* L */) {
       let embed = type == outerType;
-      context = embed ? 0 : 1 /* Bracketed.OppositeBefore */;
+      context = embed ? 0 : 1 /* OppositeBefore */;
       for (let sJ = sI - 3; sJ >= 0; sJ -= 3) {
         let cur = BracketStack[sJ + 2];
-        if (cur & 2 /* Bracketed.EmbedInside */) break;
+        if (cur & 2 /* EmbedInside */) break;
         if (embed) {
-          BracketStack[sJ + 2] |= 2 /* Bracketed.EmbedInside */;
+          BracketStack[sJ + 2] |= 2 /* EmbedInside */;
         } else {
-          if (cur & 4 /* Bracketed.OppositeInside */) break;
-          BracketStack[sJ + 2] |= 4 /* Bracketed.OppositeInside */;
+          if (cur & 4 /* OppositeInside */) break;
+          BracketStack[sJ + 2] |= 4 /* OppositeInside */;
         }
       }
     }
@@ -6474,12 +6487,12 @@ function computeOrder(line, direction) {
   // N2. Any remaining neutrals take the embedding direction.
   // (Left after this: L, R, EN+AN)
   for (let i = 0; i < len; i++) {
-    if (types[i] == 256 /* T.NI */) {
+    if (types[i] == 256 /* NI */) {
       let end = i + 1;
-      while (end < len && types[end] == 256 /* T.NI */) end++;
-      let beforeL = (i ? types[i - 1] : outerType) == 1 /* T.L */;
-      let afterL = (end < len ? types[end] : outerType) == 1 /* T.L */;
-      let replace = beforeL == afterL ? beforeL ? 1 /* T.L */ : 2 /* T.R */ : outerType;
+      while (end < len && types[end] == 256 /* NI */) end++;
+      let beforeL = (i ? types[i - 1] : outerType) == 1 /* L */;
+      let afterL = (end < len ? types[end] : outerType) == 1 /* L */;
+      let replace = beforeL == afterL ? beforeL ? 1 /* L */ : 2 /* R */ : outerType;
       for (let j = i; j < end; j++) types[j] = replace;
       i = end - 1;
     }
@@ -6490,16 +6503,16 @@ function computeOrder(line, direction) {
   // explicit embedding into account, we can build up the order on
   // the fly, without following the level-based algorithm.
   let order = [];
-  if (outerType == 1 /* T.L */) {
+  if (outerType == 1 /* L */) {
     for (let i = 0; i < len;) {
       let start = i,
-        rtl = types[i++] != 1 /* T.L */;
-      while (i < len && rtl == (types[i] != 1 /* T.L */)) i++;
+        rtl = types[i++] != 1 /* L */;
+      while (i < len && rtl == (types[i] != 1 /* L */)) i++;
       if (rtl) {
         for (let j = i; j > start;) {
           let end = j,
-            l = types[--j] != 2 /* T.R */;
-          while (j > start && l == (types[j - 1] != 2 /* T.R */)) j--;
+            l = types[--j] != 2 /* R */;
+          while (j > start && l == (types[j - 1] != 2 /* R */)) j--;
           order.push(new BidiSpan(j, end, l ? 2 : 1));
         }
       } else {
@@ -6509,8 +6522,8 @@ function computeOrder(line, direction) {
   } else {
     for (let i = 0; i < len;) {
       let start = i,
-        rtl = types[i++] == 2 /* T.R */;
-      while (i < len && rtl == (types[i] == 2 /* T.R */)) i++;
+        rtl = types[i++] == 2 /* R */;
+      while (i < len && rtl == (types[i] == 2 /* R */)) i++;
       order.push(new BidiSpan(start, i, rtl ? 1 : 2));
     }
   }
@@ -6640,9 +6653,6 @@ class DOMPoint {
   }
 }
 class DocView extends ContentView {
-  get length() {
-    return this.view.state.doc.length;
-  }
   constructor(view) {
     super();
     this.view = view;
@@ -6673,10 +6683,10 @@ class DocView extends ContentView {
     this.updateDeco();
     this.updateInner([new ChangedRange(0, 0, 0, view.state.doc.length)], 0);
   }
-  // Update the document view to a given state. scrollIntoView can be
-  // used as a hint to compute a new viewport that includes that
-  // position, if we know the editor is going to scroll that position
-  // into view.
+  get length() {
+    return this.view.state.doc.length;
+  }
+  // Update the document view to a given state.
   update(update) {
     let changedRanges = update.changedRanges;
     if (this.minWidth > 0 && changedRanges.length) {
@@ -6704,7 +6714,7 @@ class DocView extends ContentView {
       deco = this.updateDeco();
     let decoDiff = findChangedDeco(prevDeco, deco, update.changes);
     changedRanges = ChangedRange.extendWithRanges(changedRanges, decoDiff);
-    if (this.dirty == 0 /* Dirty.Not */ && changedRanges.length == 0) {
+    if (this.dirty == 0 /* Not */ && changedRanges.length == 0) {
       return false;
     } else {
       this.updateInner(changedRanges, update.startState.doc.length);
@@ -6736,7 +6746,7 @@ class DocView extends ContentView {
         written: false
       } : undefined;
       this.sync(this.view, track);
-      this.dirty = 0 /* Dirty.Not */;
+      this.dirty = 0 /* Not */;
       if (track && (track.written || observer.selectionRange.focusNode != track.node)) this.forceSelection = true;
       this.dom.style.height = "";
     });
@@ -6814,9 +6824,9 @@ class DocView extends ContentView {
           // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=1612076
           if (browser.gecko) {
             let nextTo = nextToUneditable(anchor.node, anchor.offset);
-            if (nextTo && nextTo != (1 /* NextTo.Before */ | 2 /* NextTo.After */)) {
-              let text = nearbyTextNode(anchor.node, anchor.offset, nextTo == 1 /* NextTo.Before */ ? 1 : -1);
-              if (text) anchor = new DOMPos(text, nextTo == 1 /* NextTo.Before */ ? 0 : text.nodeValue.length);
+            if (nextTo && nextTo != (1 /* Before */ | 2 /* After */)) {
+              let text = nearbyTextNode(anchor.node, anchor.offset, nextTo == 1 /* Before */ ? 1 : -1);
+              if (text) anchor = new DOMPos(text, nextTo == 1 /* Before */ ? 0 : text.nodeValue.length);
             }
           }
           rawSel.collapse(anchor.node, anchor.offset);
@@ -7118,7 +7128,11 @@ function computeCompositionDeco(view, changes) {
   let {
       state
     } = view,
-    text = node.nodeType == 3 ? node.nodeValue : new DOMReader([], state).readRange(node.firstChild, null).text;
+    reader = new DOMReader([], state);
+  if (node.nodeType == 3) reader.readTextNode(node);else reader.readRange(node.firstChild, null);
+  let {
+    text
+  } = reader;
   if (text.indexOf(LineBreakPlaceholder) > -1) return Decoration.none; // Don't try to preserve multi-line compositions
   if (newTo - newFrom < text.length) {
     if (state.doc.sliceString(newFrom, Math.min(state.doc.length, newFrom + text.length)) == text) newTo = newFrom + text.length;else if (state.doc.sliceString(Math.max(0, newTo - text.length), newTo) == text) newFrom = newTo - text.length;else return Decoration.none;
@@ -7175,7 +7189,7 @@ function nearbyTextNode(startNode, startOffset, side) {
 }
 function nextToUneditable(node, offset) {
   if (node.nodeType != 1) return 0;
-  return (offset && node.childNodes[offset - 1].contentEditable == "false" ? 1 /* NextTo.Before */ : 0) | (offset < node.childNodes.length && node.childNodes[offset].contentEditable == "false" ? 2 /* NextTo.After */ : 0);
+  return (offset && node.childNodes[offset - 1].contentEditable == "false" ? 1 /* Before */ : 0) | (offset < node.childNodes.length && node.childNodes[offset].contentEditable == "false" ? 2 /* After */ : 0);
 }
 class DecorationComparator$1 {
   constructor() {
@@ -7362,7 +7376,7 @@ function posAtCoords(view, coords, precise) {
   if (yOffset < 0) return 0;
   if (yOffset > docHeight) return view.state.doc.length;
   // Scan for a text block near the queried y position
-  for (let halfLine = view.defaultLineHeight / 2, bounced = false;;) {
+  for (let halfLine = view.viewState.heightOracle.textHeight / 2, bounced = false;;) {
     block = view.elementAtHeight(yOffset);
     if (block.type == BlockType.Text) break;
     for (;;) {
@@ -7435,7 +7449,8 @@ function posAtCoords(view, coords, precise) {
 function posAtCoordsImprecise(view, contentRect, block, x, y) {
   let into = Math.round((x - contentRect.left) * view.defaultCharacterWidth);
   if (view.lineWrapping && block.height > view.defaultLineHeight * 1.5) {
-    let line = Math.floor((y - block.top) / view.defaultLineHeight);
+    let textHeight = view.viewState.heightOracle.textHeight;
+    let line = Math.floor((y - block.top - (view.defaultLineHeight - textHeight) * 0.5) / textHeight);
     into += line * view.viewState.heightOracle.lineLength;
   }
   let content = view.state.sliceDoc(block.from, block.to);
@@ -7463,9 +7478,16 @@ function isSuspiciousChromeCaretResult(node, offset, x) {
   let rect = node.nodeType == 1 ? node.getBoundingClientRect() : textRange(node, 0, Math.max(node.nodeValue.length, 1)).getBoundingClientRect();
   return x - rect.left > 5;
 }
+function blockAt(view, pos) {
+  let line = view.lineBlockAt(pos);
+  if (Array.isArray(line.type)) for (let l of line.type) {
+    if (l.to > pos || l.to == pos && (l.to == line.to || l.type == BlockType.Text)) return l;
+  }
+  return line;
+}
 function moveToLineBoundary(view, start, forward, includeWrap) {
-  let line = view.state.doc.lineAt(start.head);
-  let coords = !includeWrap || !view.lineWrapping ? null : view.coordsAtPos(start.assoc < 0 && start.head > line.from ? start.head - 1 : start.head);
+  let line = blockAt(view, start.head);
+  let coords = !includeWrap || line.type != BlockType.Text || !(view.lineWrapping || line.widgetLineBreaks) ? null : view.coordsAtPos(start.assoc < 0 && start.head > line.from ? start.head - 1 : start.head);
   if (coords) {
     let editorRect = view.dom.getBoundingClientRect();
     let direction = view.textDirectionAt(line.from);
@@ -7475,9 +7497,7 @@ function moveToLineBoundary(view, start, forward, includeWrap) {
     });
     if (pos != null) return EditorSelection.cursor(pos, forward ? -1 : 1);
   }
-  let lineView = LineView.find(view.docView, start.head);
-  let end = lineView ? forward ? lineView.posAtEnd : lineView.posAtStart : forward ? line.to : line.from;
-  return EditorSelection.cursor(end, forward ? -1 : 1);
+  return EditorSelection.cursor(forward ? line.to : line.from, forward ? -1 : 1);
 }
 function moveByChar(view, start, forward, by) {
   let line = view.state.doc.lineAt(start.head),
@@ -7529,7 +7549,7 @@ function moveVertically(view, start, forward, distance) {
     startY = (dir < 0 ? line.top : line.bottom) + docTop;
   }
   let resolvedGoal = rect.left + goal;
-  let dist = distance !== null && distance !== void 0 ? distance : view.defaultLineHeight >> 1;
+  let dist = distance !== null && distance !== void 0 ? distance : view.viewState.heightOracle.textHeight >> 1;
   for (let extra = 0;; extra += 10) {
     let curY = startY + (dist + extra) * dir;
     let pos = posAtCoords(view, {
@@ -7561,10 +7581,6 @@ function skipAtoms(view, oldPos, pos) {
 
 // This will also be where dragging info and such goes
 class InputState {
-  setSelectionOrigin(origin) {
-    this.lastSelectionOrigin = origin;
-    this.lastSelectionTime = Date.now();
-  }
   constructor(view) {
     this.lastKeyCode = 0;
     this.lastKeyTime = 0;
@@ -7652,6 +7668,10 @@ class InputState {
     // issue where the composition vanishes when you press enter.
     if (browser.safari) view.contentDOM.addEventListener("input", () => null);
   }
+  setSelectionOrigin(origin) {
+    this.lastSelectionOrigin = origin;
+    this.lastSelectionTime = Date.now();
+  }
   ensureHandlers(view, plugins) {
     var _a;
     let handlers;
@@ -7799,7 +7819,6 @@ class MouseSelection {
     doc.addEventListener("mouseup", this.up = this.up.bind(this));
     this.extend = startEvent.shiftKey;
     this.multiple = view.state.facet(EditorState.allowMultipleSelections) && addsSelectionRange(view, startEvent);
-    this.dragMove = dragMovesSelection(view, startEvent);
     this.dragging = isInPrimarySelection(view, startEvent) && getClickType(startEvent) == 1 ? null : false;
   }
   start(event) {
@@ -8141,7 +8160,7 @@ function dropText(view, event, text, direct) {
   let {
     mouseSelection
   } = view.inputState;
-  let del = direct && mouseSelection && mouseSelection.dragging && mouseSelection.dragMove ? {
+  let del = direct && mouseSelection && mouseSelection.dragging && dragMovesSelection(view, event) ? {
     from: mouseSelection.dragging.from,
     to: mouseSelection.dragging.to
   } : null;
@@ -8461,34 +8480,24 @@ class BlockInfo {
   */
   height,
   /**
-  @internal
-  */
-  children,
-  /**
-  @internal
+  @internal Weird packed field that holds an array of children
+  for composite blocks, a decoration for block widgets, and a
+  number indicating the amount of widget-create line breaks for
+  text blocks.
   */
-  deco) {
+  _content) {
     this.from = from;
     this.length = length;
     this.top = top;
     this.height = height;
-    this.children = children;
-    this.deco = deco;
+    this._content = _content;
   }
   /**
   The type of element this is. When querying lines, this may be
   an array of all the blocks that make up the line.
   */
   get type() {
-    var _a, _b, _c;
-    return (_c = (_a = this.children) !== null && _a !== void 0 ? _a : (_b = this.deco) === null || _b === void 0 ? void 0 : _b.type) !== null && _c !== void 0 ? _c : BlockType.Text;
-  }
-  /**
-  If this is a widget block, this will return the widget
-  associated with it.
-  */
-  get widget() {
-    return this.deco && this.deco.widget;
+    return typeof this._content == "number" ? BlockType.Text : Array.isArray(this._content) ? this._content : this._content.type;
   }
   /**
   The end of the element as a document position.
@@ -8503,11 +8512,25 @@ class BlockInfo {
     return this.top + this.height;
   }
   /**
+  If this is a widget block, this will return the widget
+  associated with it.
+  */
+  get widget() {
+    return this._content instanceof PointDecoration ? this._content.widget : null;
+  }
+  /**
+  If this is a textblock, this holds the number of line breaks
+  that appear in widgets inside the block.
+  */
+  get widgetLineBreaks() {
+    return typeof this._content == "number" ? this._content : 0;
+  }
+  /**
   @internal
   */
   join(other) {
-    let children = (this.children || [this]).concat(other.children || [other]);
-    return new BlockInfo(this.from, this.length + other.length, this.top, this.height + other.height, children, null);
+    let content = (Array.isArray(this._content) ? this._content : [this]).concat(Array.isArray(other._content) ? other._content : [other]);
+    return new BlockInfo(this.from, this.length + other.length, this.top, this.height + other.height, content);
   }
 }
 var QueryType = /*@__PURE__*/function (QueryType) {
@@ -8527,10 +8550,10 @@ class HeightMap {
     this.flags = flags;
   }
   get outdated() {
-    return (this.flags & 2 /* Flag.Outdated */) > 0;
+    return (this.flags & 2 /* Outdated */) > 0;
   }
   set outdated(value) {
-    this.flags = (value ? 2 /* Flag.Outdated */ : 0) | this.flags & ~2 /* Flag.Outdated */;
+    this.flags = (value ? 2 /* Outdated */ : 0) | this.flags & ~2 /* Outdated */;
   }
   setHeight(oracle, height) {
     if (this.height != height) {
@@ -8632,7 +8655,7 @@ class HeightMapBlock extends HeightMap {
     this.deco = deco;
   }
   blockAt(_height, _oracle, top, offset) {
-    return new BlockInfo(offset, this.length, top, this.height, null, this.deco);
+    return new BlockInfo(offset, this.length, top, this.height, this.deco || 0);
   }
   lineAt(_value, _type, oracle, top, offset) {
     return this.blockAt(0, oracle, top, offset);
@@ -8656,11 +8679,15 @@ class HeightMapText extends HeightMapBlock {
     super(length, height, null);
     this.collapsed = 0; // Amount of collapsed content in the line
     this.widgetHeight = 0; // Maximum inline widget height
+    this.breaks = 0; // Number of widget-introduced line breaks on the line
   }
 
+  blockAt(_height, _oracle, top, offset) {
+    return new BlockInfo(offset, this.length, top, this.height, this.breaks);
+  }
   replace(_from, _to, nodes) {
     let node = nodes[0];
-    if (nodes.length == 1 && (node instanceof HeightMapText || node instanceof HeightMapGap && node.flags & 4 /* Flag.SingleLine */) && Math.abs(this.length - node.length) < 10) {
+    if (nodes.length == 1 && (node instanceof HeightMapText || node instanceof HeightMapGap && node.flags & 4 /* SingleLine */) && Math.abs(this.length - node.length) < 10) {
       if (node instanceof HeightMapGap) node = new HeightMapText(node.length, this.height);else node.height = this.height;
       if (!this.outdated) node.outdated = false;
       return node;
@@ -8672,7 +8699,7 @@ class HeightMapText extends HeightMapBlock {
     let offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     let force = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     let measured = arguments.length > 3 ? arguments[3] : undefined;
-    if (measured && measured.from <= offset && measured.more) this.setHeight(oracle, measured.heights[measured.index++]);else if (force || this.outdated) this.setHeight(oracle, Math.max(this.widgetHeight, oracle.heightForLine(this.length - this.collapsed)));
+    if (measured && measured.from <= offset && measured.more) this.setHeight(oracle, measured.heights[measured.index++]);else if (force || this.outdated) this.setHeight(oracle, Math.max(this.widgetHeight, oracle.heightForLine(this.length - this.collapsed)) + this.breaks * oracle.lineHeight);
     this.outdated = false;
     return this;
   }
@@ -8716,14 +8743,14 @@ class HeightMapGap extends HeightMap {
       let line = oracle.doc.lineAt(guess),
         lineHeight = perLine + line.length * perChar;
       let lineTop = Math.max(top, height - lineHeight / 2);
-      return new BlockInfo(line.from, line.length, lineTop, lineHeight, null, null);
+      return new BlockInfo(line.from, line.length, lineTop, lineHeight, 0);
     } else {
       let line = Math.max(0, Math.min(lastLine - firstLine, Math.floor((height - top) / perLine)));
       let {
         from,
         length
       } = oracle.doc.line(firstLine + line);
-      return new BlockInfo(from, length, top + perLine * line, perLine, null, null);
+      return new BlockInfo(from, length, top + perLine * line, perLine, 0);
     }
   }
   lineAt(value, type, oracle, top, offset) {
@@ -8733,7 +8760,7 @@ class HeightMapGap extends HeightMap {
         from,
         to
       } = oracle.doc.lineAt(value);
-      return new BlockInfo(from, to - from, 0, 0, null, null);
+      return new BlockInfo(from, to - from, 0, 0, 0);
     }
     let {
       firstLine,
@@ -8744,7 +8771,7 @@ class HeightMapGap extends HeightMap {
       lineHeight = perLine + line.length * perChar;
     let linesAbove = line.number - firstLine;
     let lineTop = top + perLine * linesAbove + perChar * (line.from - offset - linesAbove);
-    return new BlockInfo(line.from, line.length, Math.max(top, Math.min(lineTop, top + this.height - lineHeight)), lineHeight, null, null);
+    return new BlockInfo(line.from, line.length, Math.max(top, Math.min(lineTop, top + this.height - lineHeight)), lineHeight, 0);
   }
   forEachLine(from, to, oracle, top, offset, f) {
     from = Math.max(from, offset);
@@ -8761,7 +8788,7 @@ class HeightMapGap extends HeightMap {
         lineTop += perLine * linesAbove + perChar * (from - offset - linesAbove);
       }
       let lineHeight = perLine + perChar * line.length;
-      f(new BlockInfo(line.from, line.length, lineTop, lineHeight, null, null));
+      f(new BlockInfo(line.from, line.length, lineTop, lineHeight, 0));
       lineTop += lineHeight;
       pos = line.to + 1;
     }
@@ -8824,13 +8851,13 @@ class HeightMapGap extends HeightMap {
 }
 class HeightMapBranch extends HeightMap {
   constructor(left, brk, right) {
-    super(left.length + brk + right.length, left.height + right.height, brk | (left.outdated || right.outdated ? 2 /* Flag.Outdated */ : 0));
+    super(left.length + brk + right.length, left.height + right.height, brk | (left.outdated || right.outdated ? 2 /* Outdated */ : 0));
     this.left = left;
     this.right = right;
     this.size = left.size + right.size;
   }
   get break() {
-    return this.flags & 1 /* Flag.Break */;
+    return this.flags & 1 /* Break */;
   }
   blockAt(height, oracle, top, offset) {
     let mid = top + this.left.height;
@@ -8958,12 +8985,13 @@ class NodeBuilder {
   point(from, to, deco) {
     if (from < to || deco.heightRelevant) {
       let height = deco.widget ? deco.widget.estimatedHeight : 0;
+      let breaks = deco.widget ? deco.widget.lineBreaks : 0;
       if (height < 0) height = this.oracle.lineHeight;
       let len = to - from;
       if (deco.block) {
         this.addBlock(new HeightMapBlock(len, height, deco));
-      } else if (len || height >= relevantWidgetHeight) {
-        this.addLineDeco(height, len);
+      } else if (len || breaks || height >= relevantWidgetHeight) {
+        this.addLineDeco(height, breaks, len);
       }
     } else if (to > from) {
       this.span(from, to);
@@ -8987,7 +9015,7 @@ class NodeBuilder {
   }
   blankContent(from, to) {
     let gap = new HeightMapGap(to - from);
-    if (this.oracle.doc.lineAt(from).to == to) gap.flags |= 4 /* Flag.SingleLine */;
+    if (this.oracle.doc.lineAt(from).to == to) gap.flags |= 4 /* SingleLine */;
     return gap;
   }
   ensureLine() {
@@ -9007,11 +9035,12 @@ class NodeBuilder {
     this.writtenTo = this.pos = this.pos + block.length;
     if (type != BlockType.WidgetBefore) this.covering = block;
   }
-  addLineDeco(height, length) {
+  addLineDeco(height, breaks, length) {
     let line = this.ensureLine();
     line.length += length;
     line.collapsed += length;
     line.widgetHeight = Math.max(line.widgetHeight, height);
+    line.breaks += breaks;
     this.writtenTo = this.pos = this.pos + length;
   }
   finish(from) {
@@ -9157,6 +9186,14 @@ class ViewState {
     this.contentDOMHeight = 0;
     this.editorHeight = 0;
     this.editorWidth = 0;
+    this.scrollTop = 0;
+    this.scrolledToBottom = true;
+    // The vertical position (document-relative) to which to anchor the
+    // scroll position. -1 means anchor to the end of the document.
+    this.scrollAnchorPos = 0;
+    // The height at the anchor position. Set by the DOM update phase.
+    // -1 means no height available.
+    this.scrollAnchorHeight = -1;
     // See VP.MaxDOMHeight
     this.scaler = IdScaler;
     this.scrollTarget = null;
@@ -9209,7 +9246,7 @@ class ViewState {
       }
     }
     this.viewports = viewports.sort((a, b) => a.from - b.from);
-    this.scaler = this.heightMap.height <= 7000000 /* VP.MaxDOMHeight */ ? IdScaler : new BigScaler(this.heightOracle, this.heightMap, this.viewports);
+    this.scaler = this.heightMap.height <= 7000000 /* MaxDOMHeight */ ? IdScaler : new BigScaler(this.heightOracle, this.heightMap, this.viewports);
   }
   updateViewportLines() {
     this.viewportLines = [];
@@ -9225,15 +9262,23 @@ class ViewState {
     let contentChanges = update.changedRanges;
     let heightChanges = ChangedRange.extendWithRanges(contentChanges, heightRelevantDecoChanges(prevDeco, this.stateDeco, update ? update.changes : ChangeSet.empty(this.state.doc.length)));
     let prevHeight = this.heightMap.height;
+    let scrollAnchor = this.scrolledToBottom ? null : this.lineBlockAtHeight(this.scrollTop);
     this.heightMap = this.heightMap.applyChanges(this.stateDeco, update.startState.doc, this.heightOracle.setDoc(this.state.doc), heightChanges);
-    if (this.heightMap.height != prevHeight) update.flags |= 2 /* UpdateFlag.Height */;
+    if (this.heightMap.height != prevHeight) update.flags |= 2 /* Height */;
+    if (scrollAnchor) {
+      this.scrollAnchorPos = update.changes.mapPos(scrollAnchor.from, -1);
+      this.scrollAnchorHeight = scrollAnchor.top;
+    } else {
+      this.scrollAnchorPos = -1;
+      this.scrollAnchorHeight = this.heightMap.height;
+    }
     let viewport = heightChanges.length ? this.mapViewport(this.viewport, update.changes) : this.viewport;
     if (scrollTarget && (scrollTarget.range.head < viewport.from || scrollTarget.range.head > viewport.to) || !this.viewportIsAppropriate(viewport)) viewport = this.getViewport(0, scrollTarget);
-    let updateLines = !update.changes.empty || update.flags & 2 /* UpdateFlag.Height */ || viewport.from != this.viewport.from || viewport.to != this.viewport.to;
+    let updateLines = !update.changes.empty || update.flags & 2 /* Height */ || viewport.from != this.viewport.from || viewport.to != this.viewport.to;
     this.viewport = viewport;
     this.updateForViewport();
     if (updateLines) this.updateViewportLines();
-    if (this.lineGaps.length || this.viewport.to - this.viewport.from > 2000 /* LG.Margin */ << 1) this.updateLineGaps(this.ensureLineGaps(this.mapLineGaps(this.lineGaps, update.changes)));
+    if (this.lineGaps.length || this.viewport.to - this.viewport.from > 2000 /* Margin */ << 1) this.updateLineGaps(this.ensureLineGaps(this.mapLineGaps(this.lineGaps, update.changes)));
     update.flags |= this.computeVisibleRanges();
     if (scrollTarget) this.scrollTarget = scrollTarget;
     if (!this.mustEnforceCursorAssoc && update.selectionSet && update.view.lineWrapping && update.state.selection.main.empty && update.state.selection.main.assoc && !update.state.facet(nativeSelectionHidden)) this.mustEnforceCursorAssoc = true;
@@ -9257,14 +9302,20 @@ class ViewState {
     if (this.paddingTop != paddingTop || this.paddingBottom != paddingBottom) {
       this.paddingTop = paddingTop;
       this.paddingBottom = paddingBottom;
-      result |= 8 /* UpdateFlag.Geometry */ | 2 /* UpdateFlag.Height */;
+      result |= 8 /* Geometry */ | 2 /* Height */;
     }
 
     if (this.editorWidth != view.scrollDOM.clientWidth) {
       if (oracle.lineWrapping) measureContent = true;
       this.editorWidth = view.scrollDOM.clientWidth;
-      result |= 8 /* UpdateFlag.Geometry */;
+      result |= 8 /* Geometry */;
     }
+
+    if (this.scrollTop != view.scrollDOM.scrollTop) {
+      this.scrollAnchorHeight = -1;
+      this.scrollTop = view.scrollDOM.scrollTop;
+    }
+    this.scrolledToBottom = this.scrollTop > view.scrollDOM.scrollHeight - view.scrollDOM.clientHeight - 4;
     // Pixel viewport
     let pixelViewport = (this.printing ? fullPixelRange : visiblePixelRange)(dom, this.paddingTop);
     let dTop = pixelViewport.top - this.pixelViewport.top,
@@ -9280,7 +9331,7 @@ class ViewState {
     if (this.contentDOMWidth != contentWidth || this.editorHeight != view.scrollDOM.clientHeight) {
       this.contentDOMWidth = domRect.width;
       this.editorHeight = view.scrollDOM.clientHeight;
-      result |= 8 /* UpdateFlag.Geometry */;
+      result |= 8 /* Geometry */;
     }
 
     if (measureContent) {
@@ -9295,7 +9346,7 @@ class ViewState {
         refresh = lineHeight > 0 && oracle.refresh(whiteSpace, lineHeight, charWidth, textHeight, contentWidth / charWidth, lineHeights);
         if (refresh) {
           view.docView.minWidth = 0;
-          result |= 8 /* UpdateFlag.Geometry */;
+          result |= 8 /* Geometry */;
         }
       }
 
@@ -9305,14 +9356,14 @@ class ViewState {
         let heights = vp.from == this.viewport.from ? lineHeights : view.docView.measureVisibleLineHeights(vp);
         this.heightMap = (refresh ? HeightMap.empty().applyChanges(this.stateDeco, Text.empty, this.heightOracle, [new ChangedRange(0, 0, 0, view.state.doc.length)]) : this.heightMap).updateHeight(oracle, 0, refresh, new MeasuredHeights(vp.from, heights));
       }
-      if (oracle.heightChanged) result |= 2 /* UpdateFlag.Height */;
+      if (oracle.heightChanged) result |= 2 /* Height */;
     }
 
     let viewportChange = !this.viewportIsAppropriate(this.viewport, bias) || this.scrollTarget && (this.scrollTarget.range.head < this.viewport.from || this.scrollTarget.range.head > this.viewport.to);
     if (viewportChange) this.viewport = this.getViewport(bias, this.scrollTarget);
     this.updateForViewport();
-    if (result & 2 /* UpdateFlag.Height */ || viewportChange) this.updateViewportLines();
-    if (this.lineGaps.length || this.viewport.to - this.viewport.from > 2000 /* LG.Margin */ << 1) this.updateLineGaps(this.ensureLineGaps(refresh ? [] : this.lineGaps, view));
+    if (result & 2 /* Height */ || viewportChange) this.updateViewportLines();
+    if (this.lineGaps.length || this.viewport.to - this.viewport.from > 2000 /* Margin */ << 1) this.updateLineGaps(this.ensureLineGaps(refresh ? [] : this.lineGaps, view));
     result |= this.computeVisibleRanges();
     if (this.mustEnforceCursorAssoc) {
       this.mustEnforceCursorAssoc = false;
@@ -9334,14 +9385,14 @@ class ViewState {
     // This will divide VP.Margin between the top and the
     // bottom, depending on the bias (the change in viewport position
     // since the last update). It'll hold a number between 0 and 1
-    let marginTop = 0.5 - Math.max(-0.5, Math.min(0.5, bias / 1000 /* VP.Margin */ / 2));
+    let marginTop = 0.5 - Math.max(-0.5, Math.min(0.5, bias / 1000 /* Margin */ / 2));
     let map = this.heightMap,
       oracle = this.heightOracle;
     let {
       visibleTop,
       visibleBottom
     } = this;
-    let viewport = new Viewport(map.lineAt(visibleTop - marginTop * 1000 /* VP.Margin */, QueryType.ByHeight, oracle, 0, 0).from, map.lineAt(visibleBottom + (1 - marginTop) * 1000 /* VP.Margin */, QueryType.ByHeight, oracle, 0, 0).to);
+    let viewport = new Viewport(map.lineAt(visibleTop - marginTop * 1000 /* Margin */, QueryType.ByHeight, oracle, 0, 0).from, map.lineAt(visibleBottom + (1 - marginTop) * 1000 /* Margin */, QueryType.ByHeight, oracle, 0, 0).to);
     // If scrollTarget is given, make sure the viewport includes that position
     if (scrollTarget) {
       let {
@@ -9352,7 +9403,7 @@ class ViewState {
         let block = map.lineAt(head, QueryType.ByPos, oracle, 0, 0),
           topPos;
         if (scrollTarget.y == "center") topPos = (block.top + block.bottom) / 2 - viewHeight / 2;else if (scrollTarget.y == "start" || scrollTarget.y == "nearest" && head < viewport.from) topPos = block.top;else topPos = block.bottom - viewHeight;
-        viewport = new Viewport(map.lineAt(topPos - 1000 /* VP.Margin */ / 2, QueryType.ByHeight, oracle, 0, 0).from, map.lineAt(topPos + viewHeight + 1000 /* VP.Margin */ / 2, QueryType.ByHeight, oracle, 0, 0).to);
+        viewport = new Viewport(map.lineAt(topPos - 1000 /* Margin */ / 2, QueryType.ByHeight, oracle, 0, 0).from, map.lineAt(topPos + viewHeight + 1000 /* Margin */ / 2, QueryType.ByHeight, oracle, 0, 0).to);
       }
     }
     return viewport;
@@ -9381,7 +9432,7 @@ class ViewState {
       visibleTop,
       visibleBottom
     } = this;
-    return (from == 0 || top <= visibleTop - Math.max(10 /* VP.MinCoverMargin */, Math.min(-bias, 250 /* VP.MaxCoverMargin */))) && (to == this.state.doc.length || bottom >= visibleBottom + Math.max(10 /* VP.MinCoverMargin */, Math.min(bias, 250 /* VP.MaxCoverMargin */))) && top > visibleTop - 2 * 1000 /* VP.Margin */ && bottom < visibleBottom + 2 * 1000 /* VP.Margin */;
+    return (from == 0 || top <= visibleTop - Math.max(10 /* MinCoverMargin */, Math.min(-bias, 250 /* MaxCoverMargin */))) && (to == this.state.doc.length || bottom >= visibleBottom + Math.max(10 /* MinCoverMargin */, Math.min(bias, 250 /* MaxCoverMargin */))) && top > visibleTop - 2 * 1000 /* Margin */ && bottom < visibleBottom + 2 * 1000 /* Margin */;
   }
 
   mapLineGaps(gaps, changes) {
@@ -9399,7 +9450,7 @@ class ViewState {
   // the artifacts this might produce from the user.
   ensureLineGaps(current, mayMeasure) {
     let wrapping = this.heightOracle.lineWrapping;
-    let margin = wrapping ? 10000 /* LG.MarginWrap */ : 2000 /* LG.Margin */,
+    let margin = wrapping ? 10000 /* MarginWrap */ : 2000 /* Margin */,
       halfMargin = margin >> 1,
       doubleMargin = margin << 1;
     // The non-wrapping logic won't work at all in predominantly right-to-left text.
@@ -9412,8 +9463,8 @@ class ViewState {
       if (!sel.empty) avoid.push(sel.to);
       for (let pos of avoid) {
         if (pos > from && pos < to) {
-          addGap(from, pos - 10 /* LG.SelectionMargin */, line, structure);
-          addGap(pos + 10 /* LG.SelectionMargin */, to, line, structure);
+          addGap(from, pos - 10 /* SelectionMargin */, line, structure);
+          addGap(pos + 10 /* SelectionMargin */, to, line, structure);
           return;
         }
       }
@@ -9498,7 +9549,7 @@ class ViewState {
     }, 20);
     let changed = ranges.length != this.visibleRanges.length || this.visibleRanges.some((r, i) => r.from != ranges[i].from || r.to != ranges[i].to);
     this.visibleRanges = ranges;
-    return changed ? 4 /* UpdateFlag.Viewport */ : 0;
+    return changed ? 4 /* Viewport */ : 0;
   }
   lineBlockAt(pos) {
     return pos >= this.viewport.from && pos <= this.viewport.to && this.viewportLines.find(b => b.from <= pos && b.to >= pos) || scaleBlock(this.heightMap.lineAt(pos, QueryType.ByPos, this.heightOracle, 0, 0), this.scaler);
@@ -9623,7 +9674,7 @@ class BigScaler {
         domBottom: 0
       };
     });
-    this.scale = (7000000 /* VP.MaxDOMHeight */ - vpHeight) / (heightMap.height - vpHeight);
+    this.scale = (7000000 /* MaxDOMHeight */ - vpHeight) / (heightMap.height - vpHeight);
     for (let obj of this.viewports) {
       obj.domTop = domBase + (obj.top - base) * this.scale;
       domBase = obj.domBottom = obj.domTop + (obj.bottom - obj.top);
@@ -9653,7 +9704,7 @@ function scaleBlock(block, scaler) {
   if (scaler.scale == 1) return block;
   let bTop = scaler.toDOM(block.top),
     bBottom = scaler.toDOM(block.bottom);
-  return new BlockInfo(block.from, block.length, bTop, bBottom - bTop, block.children && block.children.map(b => scaleBlock(b, scaler)), block.deco);
+  return new BlockInfo(block.from, block.length, bTop, bBottom - bTop, Array.isArray(block._content) ? block._content.map(b => scaleBlock(b, scaler)) : block._content);
 }
 const theme = /*@__PURE__*/Facet.define({
   combine: strs => strs.join(" ")
@@ -10517,7 +10568,7 @@ class DOMObserver {
     let cView = this.view.docView.nearest(rec.target);
     if (!cView || cView.ignoreMutation(rec)) return null;
     cView.markDirty(rec.type == "attributes");
-    if (rec.type == "attributes") cView.dirty |= 4 /* Dirty.Attrs */;
+    if (rec.type == "attributes") cView.dirty |= 4 /* Attrs */;
     if (rec.type == "childList") {
       let childBefore = findChild(cView, rec.previousSibling || rec.target.previousSibling, -1);
       let childAfter = findChild(cView, rec.nextSibling || rec.target.nextSibling, 1);
@@ -10633,6 +10684,58 @@ line number gutter. It handles events and dispatches state
 transactions for editing actions.
 */
 class EditorView {
+  /**
+  Construct a new view. You'll want to either provide a `parent`
+  option, or put `view.dom` into your document after creating a
+  view, so that the user can see the editor.
+  */
+  constructor() {
+    let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    this.plugins = [];
+    this.pluginMap = new Map();
+    this.editorAttrs = {};
+    this.contentAttrs = {};
+    this.bidiCache = [];
+    this.destroyed = false;
+    /**
+    @internal
+    */
+    this.updateState = 2 /* Updating */;
+    /**
+    @internal
+    */
+    this.measureScheduled = -1;
+    /**
+    @internal
+    */
+    this.measureRequests = [];
+    this.contentDOM = document.createElement("div");
+    this.scrollDOM = document.createElement("div");
+    this.scrollDOM.tabIndex = -1;
+    this.scrollDOM.className = "cm-scroller";
+    this.scrollDOM.appendChild(this.contentDOM);
+    this.announceDOM = document.createElement("div");
+    this.announceDOM.style.cssText = "position: fixed; top: -10000px";
+    this.announceDOM.setAttribute("aria-live", "polite");
+    this.dom = document.createElement("div");
+    this.dom.appendChild(this.announceDOM);
+    this.dom.appendChild(this.scrollDOM);
+    this._dispatch = config.dispatch || (tr => this.update([tr]));
+    this.dispatch = this.dispatch.bind(this);
+    this._root = config.root || getRoot(config.parent) || document;
+    this.viewState = new ViewState(config.state || EditorState.create(config));
+    this.plugins = this.state.facet(viewPlugin).map(spec => new PluginInstance(spec));
+    for (let plugin of this.plugins) plugin.update(this);
+    this.observer = new DOMObserver(this);
+    this.inputState = new InputState(this);
+    this.inputState.ensureHandlers(this, this.plugins);
+    this.docView = new DocView(this);
+    this.mountStyles();
+    this.updateAttrs();
+    this.updateState = 0 /* Idle */;
+    this.requestMeasure();
+    if (config.parent) config.parent.appendChild(this.dom);
+  }
   /**
   The current editor state.
   */
@@ -10696,58 +10799,6 @@ class EditorView {
   get win() {
     return this.dom.ownerDocument.defaultView || window;
   }
-  /**
-  Construct a new view. You'll want to either provide a `parent`
-  option, or put `view.dom` into your document after creating a
-  view, so that the user can see the editor.
-  */
-  constructor() {
-    let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    this.plugins = [];
-    this.pluginMap = new Map();
-    this.editorAttrs = {};
-    this.contentAttrs = {};
-    this.bidiCache = [];
-    this.destroyed = false;
-    /**
-    @internal
-    */
-    this.updateState = 2 /* UpdateState.Updating */;
-    /**
-    @internal
-    */
-    this.measureScheduled = -1;
-    /**
-    @internal
-    */
-    this.measureRequests = [];
-    this.contentDOM = document.createElement("div");
-    this.scrollDOM = document.createElement("div");
-    this.scrollDOM.tabIndex = -1;
-    this.scrollDOM.className = "cm-scroller";
-    this.scrollDOM.appendChild(this.contentDOM);
-    this.announceDOM = document.createElement("div");
-    this.announceDOM.style.cssText = "position: fixed; top: -10000px";
-    this.announceDOM.setAttribute("aria-live", "polite");
-    this.dom = document.createElement("div");
-    this.dom.appendChild(this.announceDOM);
-    this.dom.appendChild(this.scrollDOM);
-    this._dispatch = config.dispatch || (tr => this.update([tr]));
-    this.dispatch = this.dispatch.bind(this);
-    this._root = config.root || getRoot(config.parent) || document;
-    this.viewState = new ViewState(config.state || EditorState.create(config));
-    this.plugins = this.state.facet(viewPlugin).map(spec => new PluginInstance(spec));
-    for (let plugin of this.plugins) plugin.update(this);
-    this.observer = new DOMObserver(this);
-    this.inputState = new InputState(this);
-    this.inputState.ensureHandlers(this, this.plugins);
-    this.docView = new DocView(this);
-    this.mountStyles();
-    this.updateAttrs();
-    this.updateState = 0 /* UpdateState.Idle */;
-    this.requestMeasure();
-    if (config.parent) config.parent.appendChild(this.dom);
-  }
   dispatch() {
     let tr = arguments.length == 1 && (arguments.length <= 0 ? undefined : arguments[0]) instanceof Transaction ? arguments.length <= 0 ? undefined : arguments[0] : this.state.update(...arguments);
     this._dispatch(tr, this);
@@ -10761,7 +10812,7 @@ class EditorView {
   as a primitive.
   */
   update(transactions) {
-    if (this.updateState != 0 /* UpdateState.Idle */) throw new Error("Calls to EditorView.update are not allowed while an update is in progress");
+    if (this.updateState != 0 /* Idle */) throw new Error("Calls to EditorView.update are not allowed while an update is in progress");
     let redrawn = false,
       attrsChanged = false,
       update;
@@ -10780,13 +10831,13 @@ class EditorView {
     if (transactions.some(tr => tr.annotation(isFocusChange))) {
       this.inputState.notifiedFocused = focus;
       // If a focus-change transaction is being dispatched, set this update flag.
-      focusFlag = 1 /* UpdateFlag.Focus */;
+      focusFlag = 1 /* Focus */;
     } else if (focus != this.inputState.notifiedFocused) {
       this.inputState.notifiedFocused = focus;
       // Schedule a separate focus transaction if necessary, otherwise
       // add a flag to this update
       dispatchFocus = focusChangeTransaction(state, focus);
-      if (!dispatchFocus) focusFlag = 1 /* UpdateFlag.Focus */;
+      if (!dispatchFocus) focusFlag = 1 /* Focus */;
     }
     // If there was a pending DOM change, eagerly read it and try to
     // apply it after the given transactions.
@@ -10807,7 +10858,7 @@ class EditorView {
     update.flags |= focusFlag;
     let scrollTarget = this.viewState.scrollTarget;
     try {
-      this.updateState = 2 /* UpdateState.Updating */;
+      this.updateState = 2 /* Updating */;
       for (let tr of transactions) {
         if (scrollTarget) scrollTarget = scrollTarget.map(tr.changes);
         if (tr.scrollIntoView) {
@@ -10830,7 +10881,7 @@ class EditorView {
       this.showAnnouncements(transactions);
       this.docView.updateSelection(redrawn, transactions.some(tr => tr.isUserEvent("select.pointer")));
     } finally {
-      this.updateState = 0 /* UpdateState.Idle */;
+      this.updateState = 0 /* Idle */;
     }
 
     if (update.startState.facet(theme) != update.state.facet(theme)) this.viewState.mustMeasureContent = true;
@@ -10851,12 +10902,12 @@ class EditorView {
   [`dispatch`](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch) instead.)
   */
   setState(newState) {
-    if (this.updateState != 0 /* UpdateState.Idle */) throw new Error("Calls to EditorView.setState are not allowed while an update is in progress");
+    if (this.updateState != 0 /* Idle */) throw new Error("Calls to EditorView.setState are not allowed while an update is in progress");
     if (this.destroyed) {
       this.viewState.state = newState;
       return;
     }
-    this.updateState = 2 /* UpdateState.Updating */;
+    this.updateState = 2 /* Updating */;
     let hadFocus = this.hasFocus;
     try {
       for (let plugin of this.plugins) plugin.destroy(this);
@@ -10870,7 +10921,7 @@ class EditorView {
       this.updateAttrs();
       this.bidiCache = [];
     } finally {
-      this.updateState = 0 /* UpdateState.Idle */;
+      this.updateState = 0 /* Idle */;
     }
 
     if (hadFocus) this.focus();
@@ -10910,17 +10961,29 @@ class EditorView {
     this.measureScheduled = 0; // Prevent requestMeasure calls from scheduling another animation frame
     if (flush) this.observer.forceFlush();
     let updated = null;
+    let sDOM = this.scrollDOM,
+      {
+        scrollTop
+      } = sDOM;
     let {
-      scrollHeight,
-      scrollTop,
-      clientHeight
-    } = this.scrollDOM;
-    let refHeight = scrollTop > scrollHeight - clientHeight - 4 ? scrollHeight : scrollTop;
+      scrollAnchorPos,
+      scrollAnchorHeight
+    } = this.viewState;
+    this.viewState.scrollAnchorHeight = -1;
+    if (scrollAnchorHeight < 0 || scrollTop != this.viewState.scrollTop) {
+      if (scrollTop > sDOM.scrollHeight - sDOM.clientHeight - 4) {
+        scrollAnchorPos = -1;
+        scrollAnchorHeight = this.viewState.heightMap.height;
+      } else {
+        let block = this.viewState.lineBlockAtHeight(scrollTop);
+        scrollAnchorPos = block.from;
+        scrollAnchorHeight = block.top;
+      }
+    }
     try {
       for (let i = 0;; i++) {
-        this.updateState = 1 /* UpdateState.Measuring */;
+        this.updateState = 1 /* Measuring */;
         let oldViewport = this.viewport;
-        let refBlock = this.viewState.lineBlockAtHeight(refHeight);
         let changed = this.viewState.measure(this);
         if (!changed && !this.measureRequests.length && this.viewState.scrollTarget == null) break;
         if (i > 5) {
@@ -10929,7 +10992,7 @@ class EditorView {
         }
         let measuring = [];
         // Only run measure requests in this cycle when the viewport didn't change
-        if (!(changed & 4 /* UpdateFlag.Viewport */)) [this.measureRequests, measuring] = [measuring, this.measureRequests];
+        if (!(changed & 4 /* Viewport */)) [this.measureRequests, measuring] = [measuring, this.measureRequests];
         let measured = measuring.map(m => {
           try {
             return m.read(this);
@@ -10943,7 +11006,7 @@ class EditorView {
           scrolled = false;
         update.flags |= changed;
         if (!updated) updated = update;else updated.flags |= changed;
-        this.updateState = 2 /* UpdateState.Updating */;
+        this.updateState = 2 /* Updating */;
         if (!update.empty) {
           this.updatePlugins(update);
           this.inputState.update(update);
@@ -10963,19 +11026,21 @@ class EditorView {
             this.docView.scrollIntoView(this.viewState.scrollTarget);
             this.viewState.scrollTarget = null;
             scrolled = true;
-          } else {
-            let diff = this.viewState.lineBlockAt(refBlock.from).top - refBlock.top;
+          } else if (scrollAnchorHeight > -1) {
+            let newAnchorHeight = scrollAnchorPos < 0 ? this.viewState.heightMap.height : this.viewState.lineBlockAt(scrollAnchorPos).top;
+            let diff = newAnchorHeight - scrollAnchorHeight;
             if (diff > 1 || diff < -1) {
-              this.scrollDOM.scrollTop += diff;
+              sDOM.scrollTop = scrollTop + diff;
               scrolled = true;
             }
           }
         }
         if (redrawn) this.docView.updateSelection(true);
         if (this.viewport.from == oldViewport.from && this.viewport.to == oldViewport.to && !scrolled && this.measureRequests.length == 0) break;
+        scrollAnchorHeight = -1;
       }
     } finally {
-      this.updateState = 0 /* UpdateState.Idle */;
+      this.updateState = 0 /* Idle */;
       this.measureScheduled = -1;
     }
     if (updated && !updated.empty) for (let listener of this.state.facet(updateListener)) listener(updated);
@@ -11026,8 +11091,8 @@ class EditorView {
     StyleModule.mount(this.root, this.styleModules.concat(baseTheme$1$1).reverse());
   }
   readMeasured() {
-    if (this.updateState == 2 /* UpdateState.Updating */) throw new Error("Reading the editor layout isn't allowed during an update");
-    if (this.updateState == 0 /* UpdateState.Idle */ && this.measureScheduled > -1) this.measure(false);
+    if (this.updateState == 2 /* Updating */) throw new Error("Reading the editor layout isn't allowed during an update");
+    if (this.updateState == 0 /* Idle */ && this.measureScheduled > -1) this.measure(false);
   }
   /**
   Schedule a layout measurement, optionally providing callbacks to
@@ -11797,13 +11862,6 @@ function wrappedLine(view, pos, inside) {
     type: BlockType.Text
   };
 }
-function blockAt(view, pos) {
-  let line = view.lineBlockAt(pos);
-  if (Array.isArray(line.type)) for (let l of line.type) {
-    if (l.to > pos || l.to == pos && (l.to == line.to || l.type == BlockType.Text)) return l;
-  }
-  return line;
-}
 function rectanglesForRange(view, className, range) {
   if (range.to <= view.viewport.from || range.from >= view.viewport.to) return [];
   let from = Math.max(range.from, view.viewport.from),
@@ -11820,21 +11878,19 @@ function rectanglesForRange(view, className, range) {
     endBlock = blockAt(view, to);
   let visualStart = startBlock.type == BlockType.Text ? startBlock : null;
   let visualEnd = endBlock.type == BlockType.Text ? endBlock : null;
-  if (view.lineWrapping) {
-    if (visualStart) visualStart = wrappedLine(view, from, visualStart);
-    if (visualEnd) visualEnd = wrappedLine(view, to, visualEnd);
-  }
+  if (visualStart && (view.lineWrapping || startBlock.widgetLineBreaks)) visualStart = wrappedLine(view, from, visualStart);
+  if (visualEnd && (view.lineWrapping || endBlock.widgetLineBreaks)) visualEnd = wrappedLine(view, to, visualEnd);
   if (visualStart && visualEnd && visualStart.from == visualEnd.from) {
     return pieces(drawForLine(range.from, range.to, visualStart));
   } else {
     let top = visualStart ? drawForLine(range.from, null, visualStart) : drawForWidget(startBlock, false);
     let bottom = visualEnd ? drawForLine(null, range.to, visualEnd) : drawForWidget(endBlock, true);
     let between = [];
-    if ((visualStart || startBlock).to < (visualEnd || endBlock).from - (visualStart && visualEnd ? 1 : 0)) between.push(piece(leftSide, top.bottom, rightSide, bottom.top));else if (top.bottom < bottom.top && view.elementAtHeight((top.bottom + bottom.top) / 2).type == BlockType.Text) top.bottom = bottom.top = (top.bottom + bottom.top) / 2;
+    if ((visualStart || startBlock).to < (visualEnd || endBlock).from - (visualStart && visualEnd ? 1 : 0) || startBlock.widgetLineBreaks > 1 && top.bottom + view.defaultLineHeight / 2 < bottom.top) between.push(piece(leftSide, top.bottom, rightSide, bottom.top));else if (top.bottom < bottom.top && view.elementAtHeight((top.bottom + bottom.top) / 2).type == BlockType.Text) top.bottom = bottom.top = (top.bottom + bottom.top) / 2;
     return pieces(top).concat(between).concat(pieces(bottom));
   }
   function piece(left, top, right, bottom) {
-    return new RectangleMarker(className, left - base.left, top - base.top - 0.01 /* C.Epsilon */, right - left, bottom - top + 0.01 /* C.Epsilon */);
+    return new RectangleMarker(className, left - base.left, top - base.top - 0.01 /* Epsilon */, right - left, bottom - top + 0.01 /* Epsilon */);
   }
 
   function pieces(_ref6) {
@@ -12794,12 +12850,12 @@ const tooltipPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
         continue;
       }
       let arrow = tooltip.arrow ? tView.dom.querySelector(".cm-tooltip-arrow") : null;
-      let arrowHeight = arrow ? 7 /* Arrow.Size */ : 0;
+      let arrowHeight = arrow ? 7 /* Size */ : 0;
       let width = size.right - size.left,
         height = (_a = knownHeight.get(tView)) !== null && _a !== void 0 ? _a : size.bottom - size.top;
       let offset = tView.offset || noOffset,
         ltr = this.view.textDirection == Direction.LTR;
-      let left = size.width > space.right - space.left ? ltr ? space.left : space.right - size.width : ltr ? Math.min(pos.left - (arrow ? 14 /* Arrow.Offset */ : 0) + offset.x, space.right - width) : Math.max(space.left, pos.left - width + (arrow ? 14 /* Arrow.Offset */ : 0) - offset.x);
+      let left = size.width > space.right - space.left ? ltr ? space.left : space.right - size.width : ltr ? Math.min(pos.left - (arrow ? 14 /* Offset */ : 0) + offset.x, space.right - width) : Math.max(space.left, pos.left - width + (arrow ? 14 /* Offset */ : 0) - offset.x);
       let above = !!tooltip.above;
       if (!tooltip.strictSide && (above ? pos.top - (size.bottom - size.top) - offset.y < space.top : pos.bottom + (size.bottom - size.top) + offset.y > space.bottom) && above == space.bottom - pos.bottom > pos.top - space.top) above = !above;
       let spaceVert = (above ? pos.top - space.top : space.bottom - pos.bottom) - arrowHeight;
@@ -12823,7 +12879,7 @@ const tooltipPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
         dom.style.top = top + "px";
         dom.style.left = left + "px";
       }
-      if (arrow) arrow.style.left = `${pos.left + (ltr ? offset.x : -offset.x) - (left + 14 /* Arrow.Offset */ - 7 /* Arrow.Size */)}px`;
+      if (arrow) arrow.style.left = `${pos.left + (ltr ? offset.x : -offset.x) - (left + 14 /* Offset */ - 7 /* Size */)}px`;
       if (tView.overlap !== true) others.push({
         left,
         top,
@@ -12868,8 +12924,8 @@ const baseTheme$2 = /*@__PURE__*/EditorView.baseTheme({
     color: "white"
   },
   ".cm-tooltip-arrow": {
-    height: `${7 /* Arrow.Size */}px`,
-    width: `${7 /* Arrow.Size */ * 2}px`,
+    height: `${7 /* Size */}px`,
+    width: `${7 /* Size */ * 2}px`,
     position: "absolute",
     zIndex: -1,
     overflow: "hidden",
@@ -12878,26 +12934,26 @@ const baseTheme$2 = /*@__PURE__*/EditorView.baseTheme({
       position: "absolute",
       width: 0,
       height: 0,
-      borderLeft: `${7 /* Arrow.Size */}px solid transparent`,
-      borderRight: `${7 /* Arrow.Size */}px solid transparent`
+      borderLeft: `${7 /* Size */}px solid transparent`,
+      borderRight: `${7 /* Size */}px solid transparent`
     },
     ".cm-tooltip-above &": {
-      bottom: `-${7 /* Arrow.Size */}px`,
+      bottom: `-${7 /* Size */}px`,
       "&:before": {
-        borderTop: `${7 /* Arrow.Size */}px solid #bbb`
+        borderTop: `${7 /* Size */}px solid #bbb`
       },
       "&:after": {
-        borderTop: `${7 /* Arrow.Size */}px solid #f5f5f5`,
+        borderTop: `${7 /* Size */}px solid #f5f5f5`,
         bottom: "1px"
       }
     },
     ".cm-tooltip-below &": {
-      top: `-${7 /* Arrow.Size */}px`,
+      top: `-${7 /* Size */}px`,
       "&:before": {
-        borderBottom: `${7 /* Arrow.Size */}px solid #bbb`
+        borderBottom: `${7 /* Size */}px solid #bbb`
       },
       "&:after": {
-        borderBottom: `${7 /* Arrow.Size */}px solid #f5f5f5`,
+        borderBottom: `${7 /* Size */}px solid #f5f5f5`,
         top: "1px"
       }
     }
@@ -12925,10 +12981,6 @@ const showTooltip = /*@__PURE__*/Facet.define({
 });
 const showHoverTooltip = /*@__PURE__*/Facet.define();
 class HoverTooltipHost {
-  // Needs to be static so that host tooltip instances always match
-  static create(view) {
-    return new HoverTooltipHost(view);
-  }
   constructor(view) {
     this.view = view;
     this.mounted = false;
@@ -12936,6 +12988,10 @@ class HoverTooltipHost {
     this.dom.classList.add("cm-tooltip-hover");
     this.manager = new TooltipViewManager(view, showHoverTooltip, t => this.createHostedView(t));
   }
+  // Needs to be static so that host tooltip instances always match
+  static create(view) {
+    return new HoverTooltipHost(view);
+  }
   createHostedView(tooltip) {
     let hostedView = tooltip.create(this.view);
     hostedView.dom.classList.add("cm-tooltip-section");
@@ -13054,7 +13110,7 @@ class HoverPlugin {
           pos
         } = tooltip || this.pending,
         end = (_a = tooltip === null || tooltip === void 0 ? void 0 : tooltip.end) !== null && _a !== void 0 ? _a : pos;
-      if (pos == end ? this.view.posAtCoords(this.lastMove) != pos : !isOverRange(this.view, pos, end, event.clientX, event.clientY, 6 /* Hover.MaxDist */)) {
+      if (pos == end ? this.view.posAtCoords(this.lastMove) != pos : !isOverRange(this.view, pos, end, event.clientX, event.clientY, 6 /* MaxDist */)) {
         this.view.dispatch({
           effects: this.setHover.of(null)
         });
@@ -13132,7 +13188,7 @@ function hoverTooltip(source) {
     },
     provide: f => showHoverTooltip.from(f)
   });
-  return [hoverState, ViewPlugin.define(view => new HoverPlugin(view, source, hoverState, setHover, options.hoverTime || 300 /* Hover.Time */)), showHoverTooltipHost];
+  return [hoverState, ViewPlugin.define(view => new HoverPlugin(view, source, hoverState, setHover, options.hoverTime || 300 /* Time */)), showHoverTooltipHost];
 }
 /**
 Get the active tooltip view for a given tooltip, if available.
@@ -18535,4 +18591,4 @@ function createTokenType(extra, tagStr) {
   return type.id;
 }
 
-export { rectangularSelection as $, Annotation as A, gutter as B, Compartment as C, Direction as D, EditorView as E, Facet as F, RangeSet as G, showTooltip as H, IndentContext as I, GutterMarker as J, lineNumbers as K, highlightActiveLineGutter as L, highlightSpecialChars as M, NodeProp as N, foldGutter as O, Prec as P, drawSelection as Q, RangeSetBuilder as R, StateField as S, Transaction as T, dropCursor as U, ViewPlugin as V, WidgetType as W, indentOnInput as X, syntaxHighlighting as Y, defaultHighlightStyle as Z, bracketMatching as _, EditorState as a, crosshairCursor as a0, highlightActiveLine as a1, foldKeymap as a2, styleTags as a3, tags as a4, LanguageSupport as a5, LRLanguage as a6, indentNodeProp as a7, continuedIndent as a8, flatIndent as a9, delimitedIndent as aa, foldNodeProp as ab, foldInside as ac, sublanguageProp as ad, IterMode as ae, defineLanguageFacet as af, NodeWeakMap as ag, parseMixed as ah, bracketMatchingHandle as ai, getTooltip as aj, MapMode as ak, RangeValue as al, HighlightStyle as am, Parser as an, NodeSet as ao, NodeType as ap, DefaultBufferLength as aq, Tree as ar, Tag as as, Language as at, languageDataProp as au, foldService as av, LanguageDescription as aw, ParseContext as ax, EditorSelection as b, combineConfig as c, ChangeSet as d, ChangeDesc as e, Text as f, getIndentation as g, indentUnit as h, indentString as i, countColumn as j, keymap as k, getIndentUnit as l, StateEffect as m, matchBrackets as n, findClusterBreak as o, Decoration as p, codePointAt as q, codePointSize as r, syntaxTree as s, getPanel as t, CharCategory as u, fromCodePoint as v, showPanel as w, runScopeHandlers as x, hoverTooltip as y, logException as z };
+export { RangeSet as $, Annotation as A, highlightSpecialChars as B, Compartment as C, Direction as D, EditorView as E, Facet as F, foldGutter as G, drawSelection as H, IndentContext as I, dropCursor as J, indentOnInput as K, syntaxHighlighting as L, defaultHighlightStyle as M, NodeProp as N, bracketMatching as O, Prec as P, rectangularSelection as Q, RangeSetBuilder as R, StateField as S, Transaction as T, crosshairCursor as U, ViewPlugin as V, highlightActiveLine as W, foldKeymap as X, hoverTooltip as Y, logException as Z, gutter as _, EditorState as a, showTooltip as a0, WidgetType as a1, GutterMarker as a2, styleTags as a3, tags as a4, LanguageSupport as a5, LRLanguage as a6, indentNodeProp as a7, continuedIndent as a8, flatIndent as a9, delimitedIndent as aa, foldNodeProp as ab, foldInside as ac, sublanguageProp as ad, IterMode as ae, defineLanguageFacet as af, NodeWeakMap as ag, parseMixed as ah, bracketMatchingHandle as ai, getTooltip as aj, MapMode as ak, RangeValue as al, HighlightStyle as am, Parser as an, NodeSet as ao, NodeType as ap, DefaultBufferLength as aq, Tree as ar, Tag as as, Language as at, languageDataProp as au, foldService as av, LanguageDescription as aw, ParseContext as ax, EditorSelection as b, combineConfig as c, ChangeSet as d, ChangeDesc as e, Text as f, getIndentation as g, indentUnit as h, indentString as i, countColumn as j, keymap as k, getIndentUnit as l, StateEffect as m, matchBrackets as n, findClusterBreak as o, Decoration as p, codePointAt as q, codePointSize as r, syntaxTree as s, getPanel as t, CharCategory as u, fromCodePoint as v, showPanel as w, runScopeHandlers as x, lineNumbers as y, highlightActiveLineGutter as z };