@vuu-ui/vuu-codemirror 0.8.4-debug → 0.8.5-debug

package/cjs/index.js

@@ -3951,6 +3951,9 @@ function atElementStart(doc2, selection) {
     }
   }
 }
+function isScrolledToBottom(elt) {
+  return elt.scrollTop > Math.max(1, elt.scrollHeight - elt.clientHeight - 4);
+}
 var DOMPos = class {
   constructor(node, offset, precise = true) {
     this.node = node;
@@ -3998,7 +4001,7 @@ var ContentView = class {
       let prev = null, next;
       for (let child of this.children) {
         if (child.dirty) {
-          if (!child.dom && (next = prev ? prev.nextSibling : parent.firstChild)) {
+          if (!child.dom && (next = prev ? prev.nextSibling : parent.firstChild) && next != view.docView.compositionNode) {
             let contentView = ContentView.get(next);
             if (!contentView || !contentView.parent && contentView.canReuseDOM(child))
               child.reuseDOM(next);
@@ -6062,6 +6065,7 @@ var DocView = class extends ContentView {
     super();
     this.view = view;
     this.compositionDeco = Decoration.none;
+    this.compositionNode = null;
     this.decorations = [];
     this.dynamicDecorationMap = [];
     this.minWidth = 0;
@@ -6091,10 +6095,7 @@ var DocView = class extends ContentView {
         this.minWidthTo = update.changes.mapPos(this.minWidthTo, 1);
       }
     }
-    if (this.view.inputState.composing < 0)
-      this.compositionDeco = Decoration.none;
-    else if (update.transactions.length || this.dirty)
-      this.compositionDeco = computeCompositionDeco(this.view, update.changes);
+    ({ deco: this.compositionDeco, node: this.compositionNode } = this.view.inputState.composing < 0 ? noComp : computeCompositionDeco(this.view, update.changes));
     if ((browser.ie || browser.chrome) && !this.compositionDeco.size && update && update.state.doc.lines != update.startState.doc.lines)
       this.forceSelection = true;
     let prevDeco = this.decorations, deco = this.updateDeco();
@@ -6445,10 +6446,11 @@ function compositionSurroundingNode(view) {
     return { from, to: from + cView.length, node: cView.dom, text: textNode };
   }
 }
+var noComp = { deco: Decoration.none, node: null };
 function computeCompositionDeco(view, changes) {
   let surrounding = compositionSurroundingNode(view);
   if (!surrounding)
-    return Decoration.none;
+    return noComp;
   let { from, to, node, text: textNode } = surrounding;
   let newFrom = changes.mapPos(from, 1), newTo = Math.max(newFrom, changes.mapPos(to, -1));
   let { state } = view, reader = new DOMReader([], state);
@@ -6458,23 +6460,24 @@ function computeCompositionDeco(view, changes) {
     reader.readRange(node.firstChild, null);
   let { text } = reader;
   if (text.indexOf(LineBreakPlaceholder) > -1)
-    return Decoration.none;
+    return noComp;
   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;
+      return noComp;
   } else if (state.doc.sliceString(newFrom, newTo) != text) {
-    return Decoration.none;
+    return noComp;
   }
   let topView = ContentView.get(node);
   if (topView instanceof CompositionView)
     topView = topView.widget.topView;
   else if (topView)
     topView.parent = null;
-  return Decoration.set(Decoration.replace({ widget: new CompositionWidget(node, textNode, topView), inclusive: true }).range(newFrom, newTo));
+  let deco = Decoration.set(Decoration.replace({ widget: new CompositionWidget(node, textNode, topView), inclusive: true }).range(newFrom, newTo));
+  return { deco, node };
 }
 var CompositionWidget = class extends WidgetType {
   constructor(top2, text, topView) {
@@ -7064,6 +7067,7 @@ var InputState = class {
 var PendingKeys = [
   { key: "Backspace", keyCode: 8, inputType: "deleteContentBackward" },
   { key: "Enter", keyCode: 13, inputType: "insertParagraph" },
+  { key: "Enter", keyCode: 13, inputType: "insertLineBreak" },
   { key: "Delete", keyCode: 46, inputType: "deleteContentForward" }
 ];
 var EmacsyPendingKeys = "dthko";
@@ -7295,7 +7299,7 @@ handlers.mousedown = (view, event) => {
   if (!style && event.button == 0)
     style = basicMouseSelection(view, event);
   if (style) {
-    let mustFocus = view.root.activeElement != view.contentDOM;
+    let mustFocus = !view.hasFocus;
     view.inputState.startMouseSelection(new MouseSelection(view, event, style, mustFocus));
     if (mustFocus)
       view.observer.ignore(() => focusPreventScroll(view.contentDOM));
@@ -8413,7 +8417,7 @@ var ViewState = class {
     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);
+    let scrollAnchor = this.scrolledToBottom ? null : this.scrollAnchorAt(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;
@@ -8467,7 +8471,7 @@ var ViewState = class {
       this.scrollAnchorHeight = -1;
       this.scrollTop = view.scrollDOM.scrollTop;
     }
-    this.scrolledToBottom = this.scrollTop > view.scrollDOM.scrollHeight - view.scrollDOM.clientHeight - 4;
+    this.scrolledToBottom = isScrolledToBottom(view.scrollDOM);
     let pixelViewport = (this.printing ? fullPixelRange : visiblePixelRange)(dom, this.paddingTop);
     let dTop = pixelViewport.top - this.pixelViewport.top, dBottom = pixelViewport.bottom - this.pixelViewport.bottom;
     this.pixelViewport = pixelViewport;
@@ -8700,6 +8704,10 @@ var ViewState = class {
   lineBlockAtHeight(height) {
     return scaleBlock(this.heightMap.lineAt(this.scaler.fromDOM(height), QueryType.ByHeight, this.heightOracle, 0, 0), this.scaler);
   }
+  scrollAnchorAt(scrollTop) {
+    let block = this.lineBlockAtHeight(scrollTop + 8);
+    return block.from >= this.viewport.from || this.viewportLines[0].top - scrollTop > 200 ? block : this.viewportLines[0];
+  }
   elementAtHeight(height) {
     return scaleBlock(this.heightMap.blockAt(this.scaler.fromDOM(height), this.heightOracle, 0, 0), this.scaler);
   }
@@ -9941,21 +9949,22 @@ var EditorView = class {
     let updated = null;
     let sDOM = this.scrollDOM, { scrollTop } = sDOM;
     let { scrollAnchorPos, scrollAnchorHeight } = this.viewState;
+    if (scrollTop != this.viewState.scrollTop)
+      scrollAnchorHeight = -1;
     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++) {
+        if (scrollAnchorHeight < 0) {
+          if (isScrolledToBottom(sDOM)) {
+            scrollAnchorPos = -1;
+            scrollAnchorHeight = this.viewState.heightMap.height;
+          } else {
+            let block = this.viewState.scrollAnchorAt(scrollTop);
+            scrollAnchorPos = block.from;
+            scrollAnchorHeight = block.top;
+          }
+        }
         this.updateState = 1;
-        let oldViewport = this.viewport;
         let changed = this.viewState.measure(this);
         if (!changed && !this.measureRequests.length && this.viewState.scrollTarget == null)
           break;
@@ -9974,7 +9983,7 @@ var EditorView = class {
             return BadMeasure;
           }
         });
-        let update = ViewUpdate.create(this, this.state, []), redrawn = false, scrolled = false;
+        let update = ViewUpdate.create(this, this.state, []), redrawn = false;
         update.flags |= changed;
         if (!updated)
           updated = update;
@@ -9997,25 +10006,26 @@ var EditorView = class {
               logException(this.state, e);
             }
           }
-        if (this.viewState.editorHeight) {
-          if (this.viewState.scrollTarget) {
-            this.docView.scrollIntoView(this.viewState.scrollTarget);
-            this.viewState.scrollTarget = null;
-            scrolled = true;
-          } 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) {
-              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)
+        if (!update.viewportChanged && this.measureRequests.length == 0) {
+          if (this.viewState.editorHeight) {
+            if (this.viewState.scrollTarget) {
+              this.docView.scrollIntoView(this.viewState.scrollTarget);
+              this.viewState.scrollTarget = null;
+              continue;
+            } else {
+              let newAnchorHeight = scrollAnchorPos < 0 ? this.viewState.heightMap.height : this.viewState.lineBlockAt(scrollAnchorPos).top;
+              let diff = newAnchorHeight - scrollAnchorHeight;
+              if (diff > 1 || diff < -1) {
+                scrollTop = sDOM.scrollTop = scrollTop + diff;
+                scrollAnchorHeight = -1;
+                continue;
+              }
+            }
+          }
           break;
-        scrollAnchorHeight = -1;
+        }
       }
     } finally {
       this.updateState = 0;