prosemirror-view 1.33.0 → 1.33.2

package/src/decoration.ts

@@ -413,7 +413,6 @@ export class DecorationSet implements DecorationSource {
     return local.length || children.length ? new DecorationSet(local, children) : empty
   }
 
-  /// @internal
   forChild(offset: number, node: Node): DecorationSet | DecorationGroup {
     if (this == empty) return this
     if (node.isLeaf) return DecorationSet.empty

package/src/dom.ts

@@ -29,6 +29,10 @@ export const textRange = function(node: Text, from?: number, to?: number) {
   return range
 }
 
+export const clearReusedRange = function() {
+  reusedRange = null;
+}
+
 // Scans forward and backward through DOM positions equivalent to the
 // given one to see if the two are in the same place (i.e. after a
 // text node vs at the end of that text node)
@@ -63,6 +67,38 @@ export function nodeSize(node: Node) {
   return node.nodeType == 3 ? node.nodeValue!.length : node.childNodes.length
 }
 
+export function textNodeBefore(node: Node, offset: number) {
+  for (;;) {
+    if (node.nodeType == 3 && offset) return node as Text
+    if (node.nodeType == 1 && offset > 0) {
+      if ((node as HTMLElement).contentEditable != "false") return null
+      node = node.childNodes[offset - 1]
+      offset = nodeSize(node)
+    } else if (node.parentNode && !hasBlockDesc(node)) {
+      offset = domIndex(node)
+      node = node.parentNode
+    } else {
+      return null
+    }
+  }
+}
+
+export function textNodeAfter(node: Node, offset: number) {
+  for (;;) {
+    if (node.nodeType == 3 && offset < node.nodeValue!.length) return node as Text
+    if (node.nodeType == 1 && offset < node.childNodes.length) {
+      if ((node as HTMLElement).contentEditable != "false") return null
+      node = node.childNodes[offset]
+      offset = 0
+    } else if (node.parentNode && !hasBlockDesc(node)) {
+      offset = domIndex(node) + 1
+      node = node.parentNode
+    } else {
+      return null
+    }
+  }
+}
+
 export function isOnEdge(node: Node, offset: number, parent: Node) {
   for (let atStart = offset == 0, atEnd = offset == nodeSize(node); atStart || atEnd;) {
     if (node == parent) return true

package/src/domchange.ts

@@ -143,13 +143,6 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
       return
     }
   }
-  // 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 &&
-      parse.sel.head == parse.sel.anchor) {
-    let size = change.endB - change.start
-    parse.sel = {anchor: parse.sel.anchor + size, head: parse.sel.anchor + size}
-  }
 
   view.input.domChangeCount++
   // Handle the case where overwriting a selection by typing matches
@@ -197,7 +190,7 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
   }
   // Same for backspace
   if (view.state.selection.anchor > change.start &&
-      looksLikeJoin(doc, change.start, change.endA, $from, $to) &&
+      looksLikeBackspace(doc, change.start, change.endA, $from, $to) &&
       view.someProp("handleKeyDown", f => f(view, keyEvent(8, "Backspace")))) {
     if (browser.android && browser.chrome) view.domObserver.suppressSelectionUpdates() // #820
     return
@@ -304,15 +297,21 @@ function isMarkChange(cur: Fragment, prev: Fragment) {
   if (Fragment.from(updated).eq(cur)) return {mark, type}
 }
 
-function looksLikeJoin(old: Node, start: number, end: number, $newStart: ResolvedPos, $newEnd: ResolvedPos) {
-  if (!$newStart.parent.isTextblock ||
-      // The content must have shrunk
+function looksLikeBackspace(old: Node, start: number, end: number, $newStart: ResolvedPos, $newEnd: ResolvedPos) {
+  if (// The content must have shrunk
       end - start <= $newEnd.pos - $newStart.pos ||
       // newEnd must point directly at or after the end of the block that newStart points into
       skipClosingAndOpening($newStart, true, false) < $newEnd.pos)
     return false
 
   let $start = old.resolve(start)
+
+  // Handle the case where, rather than joining blocks, the change just removed an entire block
+  if (!$newStart.parent.isTextblock) {
+    let after = $start.nodeAfter
+    return after != null && end == start + after.nodeSize
+  }
+
   // Start must be at the end of a block
   if ($start.parentOffset < $start.parent.content.size || !$start.parent.isTextblock)
     return false

package/src/domcoords.ts

@@ -6,6 +6,11 @@ import {EditorView} from "./index"
 export type Rect = {left: number, right: number, top: number, bottom: number}
 
 function windowRect(doc: Document): Rect {
+  let vp = doc.defaultView && doc.defaultView.visualViewport
+  if (vp) return {
+    left: 0, right: vp.width,
+    top: 0, bottom: vp.height
+  }
   return {left: 0, right: doc.documentElement.clientWidth,
           top: 0, bottom: doc.documentElement.clientHeight}
 }

package/src/index.ts

@@ -10,7 +10,7 @@ import {selectionToDOM, anchorInRightPlace, syncNodeSelection} from "./selection
 import {Decoration, viewDecorations, DecorationSource} from "./decoration"
 import {DOMObserver, safariShadowSelectionRange} from "./domobserver"
 import {readDOMChange} from "./domchange"
-import {DOMSelection, DOMNode, DOMSelectionRange, deepActiveElement} from "./dom"
+import {DOMSelection, DOMNode, DOMSelectionRange, deepActiveElement, clearReusedRange} from "./dom"
 import * as browser from "./browser"
 
 export {Decoration, DecorationSet, DecorationAttrs, DecorationSource} from "./decoration"
@@ -198,7 +198,7 @@ export class EditorView {
         // did write to the node.
         let chromeKludge = browser.chrome ? (this.trackWrites = this.domSelectionRange().focusNode) : null
         if (redraw || !this.docView.update(state.doc, outerDeco, innerDeco, this)) {
-          this.docView.updateOuterDeco([])
+          this.docView.updateOuterDeco(outerDeco)
           this.docView.destroy()
           this.docView = docViewDesc(state.doc, outerDeco, innerDeco, this.dom, this)
         }
@@ -457,6 +457,7 @@ export class EditorView {
     }
     this.docView.destroy()
     ;(this as any).docView = null
+    clearReusedRange();
   }
 
   /// This is true when the view has been

package/src/viewdesc.ts

@@ -1,7 +1,7 @@
 import {DOMSerializer, Fragment, Mark, Node, ParseRule} from "prosemirror-model"
 import {TextSelection} from "prosemirror-state"
 
-import {domIndex, isEquivalentPosition, nodeSize, DOMNode} from "./dom"
+import {domIndex, isEquivalentPosition, DOMNode, textNodeBefore, textNodeAfter} from "./dom"
 import * as browser from "./browser"
 import {Decoration, DecorationSource, WidgetConstructor, WidgetType, NodeType} from "./decoration"
 import {EditorView} from "./index"
@@ -760,7 +760,14 @@ export class NodeViewDesc extends ViewDesc {
     let {from, to} = view.state.selection
     if (!(view.state.selection instanceof TextSelection) || from < pos || to > pos + this.node.content.size) return null
     let sel = view.domSelectionRange()
-    let textNode = nearbyTextNode(sel.focusNode!, sel.focusOffset)
+    let textBefore = textNodeBefore(sel.focusNode!, sel.focusOffset)
+    let textAfter = textNodeAfter(sel.focusNode!, sel.focusOffset)
+    let textNode = textBefore || textAfter
+    if (textBefore && textAfter && textBefore != textAfter) {
+      let descAfter = textAfter.pmViewDesc
+      if (!descAfter || descAfter instanceof TextViewDesc && descAfter.node.text != textAfter.nodeValue)
+        textNode = textAfter
+    }
     if (!textNode || !this.dom.contains(textNode.parentNode)) return null
 
     if (this.node.inlineContent) {
@@ -1470,23 +1477,6 @@ function iosHacks(dom: HTMLElement) {
   }
 }
 
-function nearbyTextNode(node: DOMNode, offset: number): Text | null {
-  for (;;) {
-    if (node.nodeType == 3) return node as Text
-    if (node.nodeType == 1 && offset > 0) {
-      if (node.childNodes.length > offset && node.childNodes[offset].nodeType == 3)
-        return node.childNodes[offset] as Text
-      node = node.childNodes[offset - 1]
-      offset = nodeSize(node)
-    } else if (node.nodeType == 1 && offset < node.childNodes.length) {
-      node = node.childNodes[offset]
-      offset = 0
-    } else {
-      return null
-    }
-  }
-}
-
 // Find a piece of text in an inline fragment, overlapping from-to
 function findTextInFragment(frag: Fragment, text: string, from: number, to: number) {
   for (let i = 0, pos = 0; i < frag.childCount && pos <= to;) {