prosemirror-view 1.23.7 → 1.23.10

package/package.json

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

package/src/decoration.js

@@ -512,9 +512,10 @@ function mapChildren(oldChildren, newLocal, mapping, node, offset, oldOffset, op
   let shift = (oldStart, oldEnd, newStart, newEnd) => {
     for (let i = 0; i < children.length; i += 3) {
       let end = children[i + 1], dSize
-      if (end == -1 || oldStart > end + oldOffset) continue
-      if (oldEnd >= children[i] + oldOffset) {
-        children[i + 1] = -1
+      if (end < 0 || oldStart > end + oldOffset) continue
+      let start = children[i] + oldOffset
+      if (oldEnd >= start) {
+        children[i + 1] = oldStart <= start ? -2 : -1
       } else if (newStart >= offset && (dSize = (newEnd - newStart) - (oldEnd - oldStart))) {
         children[i] += dSize
         children[i + 1] += dSize
@@ -526,7 +527,12 @@ function mapChildren(oldChildren, newLocal, mapping, node, offset, oldOffset, op
   // Find the child nodes that still correspond to a single node,
   // recursively call mapInner on them and update their positions.
   let mustRebuild = false
-  for (let i = 0; i < children.length; i += 3) if (children[i + 1] == -1) { // Touched nodes
+  for (let i = 0; i < children.length; i += 3) if (children[i + 1] < 0) { // Touched nodes
+    if (children[i + 1] == -2) {
+      mustRebuild = true
+      children[i + 1] = -1
+      continue
+    }
     let from = mapping.map(oldChildren[i] + oldOffset), fromLocal = from - offset
     if (fromLocal < 0 || fromLocal >= node.content.size) {
       mustRebuild = true

package/src/domchange.js

@@ -93,6 +93,7 @@ export function readDOMChange(view, from, to, typeOver, addedNodes) {
 
   let sel = view.state.selection
   let parse = parseBetween(view, from, to)
+
   // Chrome sometimes leaves the cursor before the inserted text when
   // composing after a cursor wrapper. This moves it forward.
   if (browser.chrome && view.cursorWrapper && parse.sel && parse.sel.anchor == view.cursorWrapper.deco.from) {
@@ -138,9 +139,11 @@ export function readDOMChange(view, from, to, typeOver, addedNodes) {
   if (view.state.selection.from < view.state.selection.to &&
       change.start == change.endB &&
       view.state.selection instanceof TextSelection) {
-    if (change.start > view.state.selection.from && change.start <= view.state.selection.from + 2) {
+    if (change.start > view.state.selection.from && change.start <= view.state.selection.from + 2 &&
+        view.state.selection.from >= parse.from) {
       change.start = view.state.selection.from
-    } else if (change.endA < view.state.selection.to && change.endA >= view.state.selection.to - 2) {
+    } else if (change.endA < view.state.selection.to && change.endA >= view.state.selection.to - 2 &&
+               view.state.selection.to <= parse.to) {
       change.endB += (view.state.selection.to - change.endA)
       change.endA = view.state.selection.to
     }

package/src/index.js

@@ -428,6 +428,7 @@ function updateCursorWrapper(view) {
     let dom = document.createElement("img")
     dom.className = "ProseMirror-separator"
     dom.setAttribute("mark-placeholder", "true")
+    dom.setAttribute("alt", "")
     view.cursorWrapper = {dom, deco: Decoration.widget(view.state.selection.head, dom, {raw: true, marks: view.markCursor})}
   } else {
     view.cursorWrapper = null

package/src/viewdesc.js

@@ -1267,7 +1267,10 @@ class ViewTreeUpdater {
       this.index++
     } else {
       let dom = document.createElement(nodeName)
-      if (nodeName == "IMG") dom.className = "ProseMirror-separator"
+      if (nodeName == "IMG") {
+        dom.className = "ProseMirror-separator"
+        dom.alt = ""
+      }
       if (nodeName == "BR") dom.className = "ProseMirror-trailingBreak"
       this.top.children.splice(this.index++, 0, new TrailingHackViewDesc(this.top, nothing, dom, null))
       this.changed = true
@@ -1426,10 +1429,13 @@ function findTextInFragment(frag, text, from, to) {
       if (!next.isText) break
       str += next.text
     }
-    if (pos >= from && childStart < to) {
-      let found = str.lastIndexOf(text, to - childStart - 1)
+    if (pos >= from) {
+      let found = childStart < to ? str.lastIndexOf(text, to - childStart - 1) : -1
       if (found >= 0 && found + text.length + childStart >= from)
         return childStart + found
+      if (from == to && str.length >= (to + text.length) - childStart &&
+          str.slice(to - childStart, to - childStart + text.length) == text)
+        return to
     }
   }
   return -1