prosemirror-view 1.23.3 → 1.23.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-view",
-  "version": "1.23.3",
+  "version": "1.23.4",
   "description": "ProseMirror's view component",
   "main": "dist/index.js",
   "module": "dist/index.es.js",

package/src/input.js

@@ -100,9 +100,14 @@ export function dispatchEvent(view, event) {
 editHandlers.keydown = (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 (browser.android && browser.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
@@ -477,6 +482,7 @@ function timestampFromCustomEvent() {
 }
 
 export function endComposition(view, forceUpdate) {
+  if (browser.android && view.domObserver.flushingSoon >= 0) return
   view.domObserver.forceFlush()
   clearComposition(view)
   if (forceUpdate || view.docView.dirty) {
@@ -564,6 +570,11 @@ function doPaste(view, text, html, e) {
 }
 
 editHandlers.paste = (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 && !browser.android) return
   let data = brokenClipboardAPI ? null : e.clipboardData
   if (data && doPaste(view, data.getData("text/plain"), data.getData("text/html"), e)) e.preventDefault()
   else capturePaste(view, e)
@@ -696,6 +707,7 @@ handlers.beforeinput = (view, event) => {
   // Very specific hack to deal with backspace sometimes failing on
   // Chrome Android when after an uneditable node.
   if (browser.chrome && browser.android && event.inputType == "deleteContentBackward") {
+    view.domObserver.flushSoon()
     let {domChangeCount} = view
     setTimeout(() => {
       if (view.domChangeCount != domChangeCount) return // Event already had some effect

package/src/selection.js

@@ -43,9 +43,13 @@ export function selectionToDOM(view, force) {
   if (!editorOwnsSelection(view)) return
 
   if (!force && view.mouseDown && view.mouseDown.allowDefault) {
-    view.mouseDown.delayedSelectionSync = true
-    view.domObserver.setCurSelection()
-    return
+    let 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()

package/src/viewdesc.js

@@ -1422,8 +1422,8 @@ function findTextInFragment(frag, text, from, to) {
       if (!next.isText) break
       str += next.text
     }
-    if (pos >= from) {
-      let found = str.lastIndexOf(text, to - childStart)
+    if (pos >= from && childStart < to) {
+      let found = str.lastIndexOf(text, to - childStart - 1)
       if (found >= 0 && found + text.length + childStart >= from)
         return childStart + found
     }