prosemirror-view 1.23.3 → 1.23.4

package/dist/index.js

@@ -2081,8 +2081,8 @@ function findTextInFragment(frag, text, from, to) {
       if (!next.isText) { break }
       str += next.text;
     }
-    if (pos >= from) {
-      var found = str.lastIndexOf(text, to - childStart);
+    if (pos >= from && childStart < to) {
+      var found = str.lastIndexOf(text, to - childStart - 1);
       if (found >= 0 && found + text.length + childStart >= from)
         { return childStart + found }
     }
@@ -2153,9 +2153,13 @@ function selectionToDOM(view, force) {
   if (!editorOwnsSelection(view)) { return }
 
   if (!force && view.mouseDown && view.mouseDown.allowDefault) {
-    view.mouseDown.delayedSelectionSync = true;
-    view.domObserver.setCurSelection();
-    return
+    var domSel = view.root.getSelection(), curSel = view.domObserver.currentSelection;
+    if (domSel.anchorNode && isEquivalentPosition(domSel.anchorNode, domSel.anchorOffset,
+                                                  curSel.anchorNode, curSel.anchorOffset)) {
+      view.mouseDown.delayedSelectionSync = true;
+      view.domObserver.setCurSelection();
+      return
+    }
   }
 
   view.domObserver.disconnectSelection();
@@ -3507,9 +3511,14 @@ function dispatchEvent(view, event) {
 editHandlers.keydown = function (view, event) {
   view.shiftKey = event.keyCode == 16 || event.shiftKey;
   if (inOrNearComposition(view, event)) { return }
-  if (event.keyCode != 229) { view.domObserver.forceFlush(); }
   view.lastKeyCode = event.keyCode;
   view.lastKeyCodeTime = Date.now();
+  // Suppress enter key events on Chrome Android, because those tend
+  // to be part of a confused sequence of composition events fired,
+  // and handling them eagerly tends to corrupt the input.
+  if (result.android && result.chrome && event.keyCode == 13) { return }
+  if (event.keyCode != 229) { view.domObserver.forceFlush(); }
+
   // On iOS, if we preventDefault enter key presses, the virtual
   // keyboard gets confused. So the hack here is to set a flag that
   // makes the DOM change code recognize that what just happens should
@@ -3894,6 +3903,7 @@ function timestampFromCustomEvent() {
 }
 
 function endComposition(view, forceUpdate) {
+  if (result.android && view.domObserver.flushingSoon >= 0) { return }
   view.domObserver.forceFlush();
   clearComposition(view);
   if (forceUpdate || view.docView.dirty) {
@@ -3984,6 +3994,11 @@ function doPaste(view, text, html, e) {
 }
 
 editHandlers.paste = function (view, e) {
+  // Handling paste from JavaScript during composition is very poorly
+  // handled by browsers, so as a dodgy but preferable kludge, we just
+  // let the browser do its native thing there, except on Android,
+  // where the editor is almost always composing.
+  if (view.composing && !result.android) { return }
   var data = brokenClipboardAPI ? null : e.clipboardData;
   if (data && doPaste(view, data.getData("text/plain"), data.getData("text/html"), e)) { e.preventDefault(); }
   else { capturePaste(view, e); }
@@ -4115,6 +4130,7 @@ handlers.beforeinput = function (view, event) {
   // Very specific hack to deal with backspace sometimes failing on
   // Chrome Android when after an uneditable node.
   if (result.chrome && result.android && event.inputType == "deleteContentBackward") {
+    view.domObserver.flushSoon();
     var domChangeCount = view.domChangeCount;
     setTimeout(function () {
       if (view.domChangeCount != domChangeCount) { return } // Event already had some effect