@onereach/ui-components 4.3.9-beta.2650.0 → 4.3.9

package/dist/bundled/{v2/index-e0b25cea.js → v3/index-cf2c3c27.js}

@@ -4589,6 +4589,9 @@ class ContentView {
   get isWidget() {
     return false;
   }
+  get isHidden() {
+    return false;
+  }
   merge(from, to, source, hasStart, openStart, openEnd) {
     return false;
   }
@@ -4926,7 +4929,7 @@ class WidgetView extends ContentView {
   become(other) {
     if (other.length == this.length && other instanceof WidgetView && other.side == this.side) {
       if (this.widget.constructor == other.widget.constructor) {
-        if (!this.widget.eq(other.widget)) this.markDirty(true);
+        if (!this.widget.compare(other.widget)) this.markDirty(true);
         if (this.dom && !this.prevWidget) this.prevWidget = this.widget;
         this.widget = other.widget;
         return true;
@@ -4952,7 +4955,7 @@ class WidgetView extends ContentView {
     return text ? text.slice(start, start + this.length) : Text.empty;
   }
   domAtPos(pos) {
-    return pos == 0 ? DOMPos.before(this.dom) : DOMPos.after(this.dom, pos == this.length);
+    return (this.length ? pos == 0 : this.side > 0) ? DOMPos.before(this.dom) : DOMPos.after(this.dom, pos == this.length);
   }
   domBoundsAround() {
     return null;
@@ -4973,6 +4976,9 @@ class WidgetView extends ContentView {
   get isWidget() {
     return true;
   }
+  get isHidden() {
+    return this.widget.isHidden;
+  }
   destroy() {
     super.destroy();
     if (this.dom) this.widget.destroy(this.dom);
@@ -5112,6 +5118,9 @@ class WidgetBufferView extends ContentView {
   get overrideDOMText() {
     return Text.empty;
   }
+  get isHidden() {
+    return true;
+  }
 }
 TextView.prototype.children = WidgetView.prototype.children = WidgetBufferView.prototype.children = noChildren;
 function inlineSiblingRect(view, side) {
@@ -5186,7 +5195,7 @@ function coordsInChildren(view, pos, side) {
       if (end >= pos) {
         if (child.children.length) {
           scan(child, pos - off);
-        } else if (!after && (end > pos || off == end && child.getSide() > 0)) {
+        } else if ((!after || after instanceof WidgetBufferView && side > 0) && (end > pos || off == end && child.getSide() > 0)) {
           after = child;
           afterPos = pos - off;
         } else if (off < pos || off == end && child.getSide() < 0) {
@@ -5292,6 +5301,12 @@ class WidgetType {
     return null;
   }
   /**
+  @internal
+  */
+  get isHidden() {
+    return false;
+  }
+  /**
   This is called when the an instance of the widget is removed
   from the editor view.
   */
@@ -5713,7 +5728,7 @@ class BlockWidgetView extends ContentView {
   }
   become(other) {
     if (other instanceof BlockWidgetView && other.type == this.type && other.widget.constructor == this.widget.constructor) {
-      if (!other.widget.eq(this.widget)) this.markDirty(true);
+      if (!other.widget.compare(this.widget)) this.markDirty(true);
       if (this.dom && !this.prevWidget) this.prevWidget = this.widget;
       this.widget = other.widget;
       this.length = other.length;
@@ -5843,7 +5858,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) this.pendingBuffer = 0 /* Buf.No */;
+        if (this.pendingBuffer == 2 /* Buf.IfCursor */ && !cursorBefore && !view.isEditable) this.pendingBuffer = 0 /* Buf.No */;
         this.flushBuffer(active);
         if (cursorBefore) {
           line.append(wrapMarks(new WidgetBufferView(1), active), openStart);
@@ -5897,6 +5912,9 @@ class NullWidget extends WidgetType {
   updateDOM(elt) {
     return elt.nodeName.toLowerCase() == this.tag;
   }
+  get isHidden() {
+    return true;
+  }
 }
 const clickAddsSelectionRange = /*@__PURE__*/Facet.define();
 const dragMovesSelection$1 = /*@__PURE__*/Facet.define();
@@ -6707,7 +6725,7 @@ class DocView extends ContentView {
     let head = main.empty ? anchor : this.domAtPos(main.head);
     // Always reset on Firefox when next to an uneditable node to
     // avoid invisible cursor bugs (#111)
-    if (browser.gecko && main.empty && betweenUneditable(anchor)) {
+    if (browser.gecko && main.empty && !this.compositionDeco.size && betweenUneditable(anchor)) {
       let dummy = document.createTextNode("");
       this.view.observer.ignore(() => anchor.node.insertBefore(dummy, anchor.node.childNodes[anchor.offset] || null));
       anchor = head = new DOMPos(dummy, 0);
@@ -7518,7 +7536,15 @@ class InputState {
     // first, false means first has already been marked for this
     // composition)
     this.compositionFirstChange = null;
+    // End time of the previous composition
     this.compositionEndedAt = 0;
+    // Used in a kludge to detect when an Enter keypress should be
+    // considered part of the composition on Safari, which fires events
+    // in the wrong order
+    this.compositionPendingKey = false;
+    // Used to categorize changes as part of a composition, even when
+    // the mutation events fire shortly after the compositionend event
+    this.compositionPendingChange = false;
     this.mouseSelection = null;
     let handleEvent = (handler, event) => {
       if (this.ignoreDuringComposition(event)) return;
@@ -7656,8 +7682,8 @@ class InputState {
     // compositionend and keydown events are sometimes emitted in the
     // wrong order. The key event should still be ignored, even when
     // it happens after the compositionend event.
-    if (browser.safari && !browser.ios && Date.now() - this.compositionEndedAt < 100) {
-      this.compositionEndedAt = 0;
+    if (browser.safari && !browser.ios && this.compositionPendingKey && Date.now() - this.compositionEndedAt < 100) {
+      this.compositionPendingKey = false;
       return true;
     }
     return false;
@@ -7693,8 +7719,9 @@ const PendingKeys = [{
 const EmacsyPendingKeys = "dthko";
 // Key codes for modifier keys
 const modifierCodes = [16, 17, 18, 20, 91, 92, 224, 225];
+const dragScrollMargin = 6;
 function dragScrollSpeed(dist) {
-  return dist * 0.7 + 8;
+  return Math.max(0, dist) * 0.7 + 8;
 }
 class MouseSelection {
   constructor(view, startEvent, style, mustSelect) {
@@ -7737,8 +7764,8 @@ class MouseSelection {
       right: this.view.win.innerWidth,
       bottom: this.view.win.innerHeight
     };
-    if (event.clientX <= rect.left) sx = -dragScrollSpeed(rect.left - event.clientX);else if (event.clientX >= rect.right) sx = dragScrollSpeed(event.clientX - rect.right);
-    if (event.clientY <= rect.top) sy = -dragScrollSpeed(rect.top - event.clientY);else if (event.clientY >= rect.bottom) sy = dragScrollSpeed(event.clientY - rect.bottom);
+    if (event.clientX <= rect.left + dragScrollMargin) sx = -dragScrollSpeed(rect.left - event.clientX);else if (event.clientX >= rect.right - dragScrollMargin) sx = dragScrollSpeed(event.clientX - rect.right);
+    if (event.clientY <= rect.top + dragScrollMargin) sy = -dragScrollSpeed(rect.top - event.clientY);else if (event.clientY >= rect.bottom - dragScrollMargin) sy = dragScrollSpeed(event.clientY - rect.bottom);
     this.setScrollSpeed(sx, sy);
   }
   up(event) {
@@ -7983,7 +8010,8 @@ function basicMouseSelection(view, event) {
       }
     },
     get(event, extend, multiple) {
-      let cur = queryPos(view, event);
+      let cur = queryPos(view, event),
+        removed;
       let range = rangeForClick(view, cur.pos, cur.bias, type);
       if (start.pos != cur.pos && !extend) {
         let startRange = rangeForClick(view, start.pos, start.bias, type);
@@ -7991,14 +8019,19 @@ function basicMouseSelection(view, event) {
           to = Math.max(startRange.to, range.to);
         range = from < range.from ? EditorSelection.range(from, to) : EditorSelection.range(to, from);
       }
-      if (extend) return startSel.replaceRange(startSel.main.extend(range.from, range.to));else if (multiple && startSel.ranges.length > 1 && startSel.ranges.some(r => r.eq(range))) return removeRange(startSel, range);else if (multiple) return startSel.addRange(range);else return EditorSelection.create([range]);
+      if (extend) return startSel.replaceRange(startSel.main.extend(range.from, range.to));else if (multiple && type == 1 && startSel.ranges.length > 1 && (removed = removeRangeAround(startSel, cur.pos))) return removed;else if (multiple) return startSel.addRange(range);else return EditorSelection.create([range]);
     }
   };
 }
-function removeRange(sel, range) {
-  for (let i = 0;; i++) {
-    if (sel.ranges[i].eq(range)) return EditorSelection.create(sel.ranges.slice(0, i).concat(sel.ranges.slice(i + 1)), sel.mainIndex == i ? 0 : sel.mainIndex - (sel.mainIndex > i ? 1 : 0));
+function removeRangeAround(sel, pos) {
+  for (let i = 0; i < sel.ranges.length; i++) {
+    let {
+      from,
+      to
+    } = sel.ranges[i];
+    if (from <= pos && to >= pos) return EditorSelection.create(sel.ranges.slice(0, i).concat(sel.ranges.slice(i + 1)), sel.mainIndex == i ? 0 : sel.mainIndex - (sel.mainIndex > i ? 1 : 0));
   }
+  return null;
 }
 handlers.dragstart = (view, event) => {
   let {
@@ -8195,6 +8228,8 @@ handlers.compositionstart = handlers.compositionupdate = view => {
 handlers.compositionend = view => {
   view.inputState.composing = -1;
   view.inputState.compositionEndedAt = Date.now();
+  view.inputState.compositionPendingKey = true;
+  view.inputState.compositionPendingChange = view.observer.pendingRecords().length > 0;
   view.inputState.compositionFirstChange = null;
   if (browser.chrome && browser.android) view.observer.flushSoon();
   setTimeout(() => {
@@ -9906,7 +9941,7 @@ function applyDOMChange(view, domChange) {
       tr = startState.replaceSelection(view.state.toText(before + change.insert.sliceString(0, undefined, view.state.lineBreak) + after));
     } else {
       let changes = startState.changes(change);
-      let mainSel = newSel && !startState.selection.main.eq(newSel.main) && newSel.main.to <= changes.newLength ? newSel.main : undefined;
+      let mainSel = newSel && newSel.main.to <= changes.newLength ? newSel.main : undefined;
       // Try to apply a composition change to all cursors
       if (startState.selection.ranges.length > 1 && view.inputState.composing >= 0 && change.to <= sel.to && change.to >= sel.to - 10) {
         let replaced = view.state.sliceDoc(change.from, change.to);
@@ -9947,7 +9982,8 @@ function applyDOMChange(view, domChange) {
       }
     }
     let userEvent = "input.type";
-    if (view.composing) {
+    if (view.composing || view.inputState.compositionPendingChange && view.inputState.compositionEndedAt > Date.now() - 50) {
+      view.inputState.compositionPendingChange = false;
       userEvent += ".compose";
       if (view.inputState.compositionFirstChange) {
         userEvent += ".start";
@@ -10299,9 +10335,12 @@ class DOMObserver {
     }
     this.flush();
   }
+  pendingRecords() {
+    for (let mut of this.observer.takeRecords()) this.queue.push(mut);
+    return this.queue;
+  }
   processRecords() {
-    let records = this.queue;
-    for (let mut of this.observer.takeRecords()) records.push(mut);
+    let records = this.pendingRecords();
     if (records.length) this.queue = [];
     let from = -1,
       to = -1,