prosemirror-view 1.30.0 → 1.30.2

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.30.2 (2023-03-13)
+
+### Bug fixes
+
+Fix an issue where `posAtCoords` could incorrectly return positions outside of a table when querying a coordinate inside it.
+
+Update the type of the `getPos` callback to include undefined in its return type. Update broken link (ViewProps -> EditorProps) Also detect iOS enter when the new block type is a less common node
+
+Fix an issue where Enter on iOS would sometimes not be handled by the library.
+
+## 1.30.1 (2023-02-04)
+
+### Bug fixes
+
+Fix a bug that caused `posAtCoords` to always return the position after a leaf node when querying a position on top of the node's element.
+
+Fix an issue where, when putting focus on the editor by clicking at the very start of the document, the editor would restore a previous selection.
+
 ## 1.30.0 (2023-01-19)
 
 ### New features

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2015-2017 by Marijn Haverbeke <marijnh@gmail.com> and others
+Copyright (C) 2015-2017 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/index.cjs

@@ -386,22 +386,31 @@ function posFromElement(view, elt, coords) {
 }
 
 function posFromCaret(view, node, offset, coords) {
-  var outside = -1;
+  var outsideBlock = -1;
 
-  for (var cur = node;;) {
+  for (var cur = node, sawBlock = false;;) {
     if (cur == view.dom) break;
     var desc = view.docView.nearestDesc(cur, true);
     if (!desc) return null;
 
-    if (desc.node.isBlock && desc.parent) {
+    if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent && !sawBlock || !desc.contentDOM)) {
       var rect = desc.dom.getBoundingClientRect();
-      if (rect.left > coords.left || rect.top > coords.top) outside = desc.posBefore;else if (rect.right < coords.left || rect.bottom < coords.top) outside = desc.posAfter;else break;
+
+      if (desc.node.isBlock && desc.parent && !sawBlock) {
+        sawBlock = true;
+        if (rect.left > coords.left || rect.top > coords.top) outsideBlock = desc.posBefore;else if (rect.right < coords.left || rect.bottom < coords.top) outsideBlock = desc.posAfter;
+      }
+
+      if (!desc.contentDOM && outsideBlock < 0) {
+        var before = desc.node.isBlock ? coords.top < (rect.top + rect.bottom) / 2 : coords.left < (rect.left + rect.right) / 2;
+        return before ? desc.posBefore : desc.posAfter;
+      }
     }
 
     cur = desc.dom.parentNode;
   }
 
-  return outside > -1 ? outside : view.docView.posFromDOM(node, offset, 1);
+  return outsideBlock > -1 ? outsideBlock : view.docView.posFromDOM(node, offset, -1);
 }
 
 function elementFromPoint(element, coords, box) {
@@ -4943,7 +4952,7 @@ var DOMObserver = function () {
 
       var readSel = null;
 
-      if (from < 0 && newSel && view.input.lastFocus > Date.now() - 200 && view.input.lastTouch < Date.now() - 300 && selectionCollapsed(sel) && (readSel = selectionFromDOM(view)) && readSel.eq(prosemirrorState.Selection.near(view.state.doc.resolve(0), 1))) {
+      if (from < 0 && newSel && view.input.lastFocus > Date.now() - 200 && Math.max(view.input.lastTouch, view.input.lastClick.time) < Date.now() - 300 && selectionCollapsed(sel) && (readSel = selectionFromDOM(view)) && readSel.eq(prosemirrorState.Selection.near(view.state.doc.resolve(0), 1))) {
         view.input.lastFocus = 0;
         selectionToDOM(view);
         this.currentSelection.set(sel);
@@ -5161,6 +5170,8 @@ function ruleFromNode(dom) {
   return null;
 }
 
+var isInline = /^(a|abbr|acronym|b|bd[io]|big|br|button|cite|code|data(list)?|del|dfn|em|i|ins|kbd|label|map|mark|meter|output|q|ruby|s|samp|small|span|strong|su[bp]|time|u|tt|var)$/i;
+
 function readDOMChange(view, from, to, typeOver, addedNodes) {
   if (from < 0) {
     var origin = view.input.lastSelectionTime > Date.now() - 50 ? view.input.lastSelectionOrigin : null;
@@ -5202,7 +5213,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
   var change = findDiff(compare.content, parse.doc.content, parse.from, preferredPos, preferredSide);
 
   if ((ios && view.input.lastIOSEnter > Date.now() - 225 || android) && addedNodes.some(function (n) {
-    return n.nodeName == "DIV" || n.nodeName == "P" || n.nodeName == "LI";
+    return n.nodeType == 1 && !isInline.test(n.nodeName);
   }) && (!change || change.endA >= change.endB) && view.someProp("handleKeyDown", function (f) {
     return f(view, keyEvent(13, "Enter"));
   })) {

package/dist/index.d.ts

@@ -601,12 +601,12 @@ declare class EditorView {
     dispatch(tr: Transaction): void;
 }
 /**
-The type of function [provided](https://prosemirror.net/docs/ref/#view.ViewProps.nodeViews) to
+The type of function [provided](https://prosemirror.net/docs/ref/#view.EditorProps.nodeViews) to
 create [node views](https://prosemirror.net/docs/ref/#view.NodeView).
 */
-declare type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number, decorations: readonly Decoration[], innerDecorations: DecorationSource) => NodeView;
+declare type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number | undefined, decorations: readonly Decoration[], innerDecorations: DecorationSource) => NodeView;
 /**
-The function types [used](https://prosemirror.net/docs/ref/#view.ViewProps.markViews) to create
+The function types [used](https://prosemirror.net/docs/ref/#view.EditorProps.markViews) to create
 mark views.
 */
 declare type MarkViewConstructor = (mark: Mark, view: EditorView, inline: boolean) => {
@@ -767,6 +767,8 @@ interface EditorProps<P = any> {
     node's display behavior. The third argument `getPos` is a
     function that can be called to get the node's current position,
     which can be useful when creating transactions to update it.
+    Note that if the node is not in the document, the position
+    returned by this function will be `undefined`.
     
     `decorations` is an array of node or inline decorations that are
     active around the node. They are automatically drawn in the
@@ -782,7 +784,7 @@ interface EditorProps<P = any> {
     inner decorations.
     
     (For backwards compatibility reasons, [mark
-    views](https://prosemirror.net/docs/ref/#view.ViewProps.markViews) can also be included in this
+    views](https://prosemirror.net/docs/ref/#view.EditorProps.markViews) can also be included in this
     object.)
     */
     nodeViews?: {

package/dist/index.js

@@ -314,25 +314,32 @@ function posFromCaret(view, node, offset, coords) {
     // of nodes to see if there are block nodes that the coordinates
     // fall outside of. If so, we take the position before/after that
     // block. If not, we call `posFromDOM` on the raw node/offset.
-    let outside = -1;
-    for (let cur = node;;) {
+    let outsideBlock = -1;
+    for (let cur = node, sawBlock = false;;) {
         if (cur == view.dom)
             break;
         let desc = view.docView.nearestDesc(cur, true);
         if (!desc)
             return null;
-        if (desc.node.isBlock && desc.parent) {
+        if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent && !sawBlock || !desc.contentDOM)) {
             let rect = desc.dom.getBoundingClientRect();
-            if (rect.left > coords.left || rect.top > coords.top)
-                outside = desc.posBefore;
-            else if (rect.right < coords.left || rect.bottom < coords.top)
-                outside = desc.posAfter;
-            else
-                break;
+            if (desc.node.isBlock && desc.parent && !sawBlock) {
+                sawBlock = true;
+                if (rect.left > coords.left || rect.top > coords.top)
+                    outsideBlock = desc.posBefore;
+                else if (rect.right < coords.left || rect.bottom < coords.top)
+                    outsideBlock = desc.posAfter;
+            }
+            if (!desc.contentDOM && outsideBlock < 0) {
+                // If we are inside a leaf, return the side of the leaf closer to the coords
+                let before = desc.node.isBlock ? coords.top < (rect.top + rect.bottom) / 2
+                    : coords.left < (rect.left + rect.right) / 2;
+                return before ? desc.posBefore : desc.posAfter;
+            }
         }
         cur = desc.dom.parentNode;
     }
-    return outside > -1 ? outside : view.docView.posFromDOM(node, offset, 1);
+    return outsideBlock > -1 ? outsideBlock : view.docView.posFromDOM(node, offset, -1);
 }
 function elementFromPoint(element, coords, box) {
     let len = element.childNodes.length;
@@ -4379,7 +4386,7 @@ class DOMObserver {
         // start of the document after focus, restore the selection from
         // the state
         if (from < 0 && newSel && view.input.lastFocus > Date.now() - 200 &&
-            view.input.lastTouch < Date.now() - 300 &&
+            Math.max(view.input.lastTouch, view.input.lastClick.time) < Date.now() - 300 &&
             selectionCollapsed(sel) && (readSel = selectionFromDOM(view)) &&
             readSel.eq(Selection.near(view.state.doc.resolve(0), 1))) {
             view.input.lastFocus = 0;
@@ -4568,6 +4575,7 @@ function ruleFromNode(dom) {
     }
     return null;
 }
+const isInline = /^(a|abbr|acronym|b|bd[io]|big|br|button|cite|code|data(list)?|del|dfn|em|i|ins|kbd|label|map|mark|meter|output|q|ruby|s|samp|small|span|strong|su[bp]|time|u|tt|var)$/i;
 function readDOMChange(view, from, to, typeOver, addedNodes) {
     if (from < 0) {
         let origin = view.input.lastSelectionTime > Date.now() - 50 ? view.input.lastSelectionOrigin : null;
@@ -4606,7 +4614,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
     view.input.lastKeyCode = null;
     let change = findDiff(compare.content, parse.doc.content, parse.from, preferredPos, preferredSide);
     if ((ios && view.input.lastIOSEnter > Date.now() - 225 || android) &&
-        addedNodes.some(n => n.nodeName == "DIV" || n.nodeName == "P" || n.nodeName == "LI") &&
+        addedNodes.some(n => n.nodeType == 1 && !isInline.test(n.nodeName)) &&
         (!change || change.endA >= change.endB) &&
         view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {
         view.input.lastIOSEnter = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-view",
-  "version": "1.30.0",
+  "version": "1.30.2",
   "description": "ProseMirror's view component",
   "type": "module",
   "main": "dist/index.cjs",
@@ -19,7 +19,7 @@
   "maintainers": [
     {
       "name": "Marijn Haverbeke",
-      "email": "marijnh@gmail.com",
+      "email": "marijn@haverbeke.berlin",
       "web": "http://marijnhaverbeke.nl"
     }
   ],

package/src/domchange.ts

@@ -76,6 +76,8 @@ function ruleFromNode(dom: DOMNode): ParseRule | null {
   return null
 }
 
+const isInline = /^(a|abbr|acronym|b|bd[io]|big|br|button|cite|code|data(list)?|del|dfn|em|i|ins|kbd|label|map|mark|meter|output|q|ruby|s|samp|small|span|strong|su[bp]|time|u|tt|var)$/i
+
 export function readDOMChange(view: EditorView, from: number, to: number, typeOver: boolean, addedNodes: readonly DOMNode[]) {
   if (from < 0) {
     let origin = view.input.lastSelectionTime > Date.now() - 50 ? view.input.lastSelectionOrigin : null
@@ -115,7 +117,7 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
 
   let change = findDiff(compare.content, parse.doc.content, parse.from, preferredPos, preferredSide)
   if ((browser.ios && view.input.lastIOSEnter > Date.now() - 225 || browser.android) &&
-      addedNodes.some(n => n.nodeName == "DIV" || n.nodeName == "P" || n.nodeName == "LI") &&
+      addedNodes.some(n => n.nodeType == 1 && !isInline.test(n.nodeName)) &&
       (!change || change.endA >= change.endB) &&
       view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {
     view.input.lastIOSEnter = 0

package/src/domcoords.ts

@@ -210,20 +210,28 @@ function posFromCaret(view: EditorView, node: Node, offset: number, coords: {top
   // of nodes to see if there are block nodes that the coordinates
   // fall outside of. If so, we take the position before/after that
   // block. If not, we call `posFromDOM` on the raw node/offset.
-  let outside = -1
-  for (let cur = node;;) {
+  let outsideBlock = -1
+  for (let cur = node, sawBlock = false;;) {
     if (cur == view.dom) break
     let desc = view.docView.nearestDesc(cur, true)
     if (!desc) return null
-    if (desc.node.isBlock && desc.parent) {
+    if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent && !sawBlock || !desc.contentDOM)) {
       let rect = (desc.dom as HTMLElement).getBoundingClientRect()
-      if (rect.left > coords.left || rect.top > coords.top) outside = desc.posBefore
-      else if (rect.right < coords.left || rect.bottom < coords.top) outside = desc.posAfter
-      else break
+      if (desc.node.isBlock && desc.parent && !sawBlock) {
+        sawBlock = true
+        if (rect.left > coords.left || rect.top > coords.top) outsideBlock = desc.posBefore
+        else if (rect.right < coords.left || rect.bottom < coords.top) outsideBlock = desc.posAfter
+      }
+      if (!desc.contentDOM && outsideBlock < 0) {
+        // If we are inside a leaf, return the side of the leaf closer to the coords
+        let before = desc.node.isBlock ? coords.top < (rect.top + rect.bottom) / 2
+          : coords.left < (rect.left + rect.right) / 2
+        return before ? desc.posBefore : desc.posAfter
+      }
     }
     cur = desc.dom.parentNode!
   }
-  return outside > -1 ? outside : view.docView.posFromDOM(node, offset, 1)
+  return outsideBlock > -1 ? outsideBlock : view.docView.posFromDOM(node, offset, -1)
 }
 
 function elementFromPoint(element: HTMLElement, coords: {top: number, left: number}, box: Rect): HTMLElement {

package/src/domobserver.ts

@@ -195,7 +195,7 @@ export class DOMObserver {
     // start of the document after focus, restore the selection from
     // the state
     if (from < 0 && newSel && view.input.lastFocus > Date.now() - 200 &&
-        view.input.lastTouch < Date.now() - 300 &&
+        Math.max(view.input.lastTouch, view.input.lastClick.time) < Date.now() - 300 &&
         selectionCollapsed(sel) && (readSel = selectionFromDOM(view)) &&
         readSel.eq(Selection.near(view.state.doc.resolve(0), 1))) {
       view.input.lastFocus = 0

package/src/index.ts

@@ -544,12 +544,12 @@ function checkStateComponent(plugin: Plugin) {
     throw new RangeError("Plugins passed directly to the view must not have a state component")
 }
 
-/// The type of function [provided](#view.ViewProps.nodeViews) to
+/// The type of function [provided](#view.EditorProps.nodeViews) to
 /// create [node views](#view.NodeView).
-export type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number,
+export type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number | undefined,
                                    decorations: readonly Decoration[], innerDecorations: DecorationSource) => NodeView
 
-/// The function types [used](#view.ViewProps.markViews) to create
+/// The function types [used](#view.EditorProps.markViews) to create
 /// mark views.
 export type MarkViewConstructor = (mark: Mark, view: EditorView, inline: boolean) => {dom: HTMLElement, contentDOM?: HTMLElement}
 
@@ -684,6 +684,8 @@ export interface EditorProps<P = any> {
   /// node's display behavior. The third argument `getPos` is a
   /// function that can be called to get the node's current position,
   /// which can be useful when creating transactions to update it.
+  /// Note that if the node is not in the document, the position
+  /// returned by this function will be `undefined`.
   ///
   /// `decorations` is an array of node or inline decorations that are
   /// active around the node. They are automatically drawn in the
@@ -699,7 +701,7 @@ export interface EditorProps<P = any> {
   /// inner decorations.
   ///
   /// (For backwards compatibility reasons, [mark
-  /// views](#view.ViewProps.markViews) can also be included in this
+  /// views](#view.EditorProps.markViews) can also be included in this
   /// object.)
   nodeViews?: {[node: string]: NodeViewConstructor}
 

package/src/#domcoords.ts#

@@ -1,482 +0,0 @@
-import {EditorState} from "prosemirror-state"
-import {nodeSize, textRange, parentNode} from "./dom"
-import * as browser from "./browser"
-import {EditorView} from "./index"
-
-export type Rect = {left: number, right: number, top: number, bottom: number}
-
-function windowRect(doc: Document): Rect {
-  return {left: 0, right: doc.documentElement.clientWidth,
-          top: 0, bottom: doc.documentElement.clientHeight}
-}
-
-function getSide(value: number | Rect, side: keyof Rect): number {
-  return typeof value == "number" ? value : value[side]
-}
-
-function clientRect(node: HTMLElement): Rect {
-  let rect = node.getBoundingClientRect()
-  // Adjust for elements with style "transform: scale()"
-  let scaleX = (rect.width / node.offsetWidth) || 1
-  let scaleY = (rect.height / node.offsetHeight) || 1
-  // Make sure scrollbar width isn't included in the rectangle
-  return {left: rect.left, right: rect.left + node.clientWidth * scaleX,
-          top: rect.top, bottom: rect.top + node.clientHeight * scaleY}
-}
-
-export function scrollRectIntoView(view: EditorView, rect: Rect, startDOM: Node) {
-  let scrollThreshold = view.someProp("scrollThreshold") || 0, scrollMargin = view.someProp("scrollMargin") || 5
-  let doc = view.dom.ownerDocument
-  for (let parent: Node | null = startDOM || view.dom;; parent = parentNode(parent)) {
-    if (!parent) break
-    if (parent.nodeType != 1) continue
-    let elt = parent as HTMLElement
-    let atTop = elt == doc.body
-    let bounding = atTop ? windowRect(doc) : clientRect(elt as HTMLElement)
-    let moveX = 0, moveY = 0
-    if (rect.top < bounding.top + getSide(scrollThreshold, "top"))
-      moveY = -(bounding.top - rect.top + getSide(scrollMargin, "top"))
-    else if (rect.bottom > bounding.bottom - getSide(scrollThreshold, "bottom"))
-      moveY = rect.bottom - bounding.bottom + getSide(scrollMargin, "bottom")
-    if (rect.left < bounding.left + getSide(scrollThreshold, "left"))
-      moveX = -(bounding.left - rect.left + getSide(scrollMargin, "left"))
-    else if (rect.right > bounding.right - getSide(scrollThreshold, "right"))
-      moveX = rect.right - bounding.right + getSide(scrollMargin, "right")
-    if (moveX || moveY) {
-      if (atTop) {
-        doc.defaultView!.scrollBy(moveX, moveY)
-      } else {
-        let startX = elt.scrollLeft, startY = elt.scrollTop
-        if (moveY) elt.scrollTop += moveY
-        if (moveX) elt.scrollLeft += moveX
-        let dX = elt.scrollLeft - startX, dY = elt.scrollTop - startY
-        rect = {left: rect.left - dX, top: rect.top - dY, right: rect.right - dX, bottom: rect.bottom - dY}
-      }
-    }
-    if (atTop) break
-  }
-}
-
-// Store the scroll position of the editor's parent nodes, along with
-// the top position of an element near the top of the editor, which
-// will be used to make sure the visible viewport remains stable even
-// when the size of the content above changes.
-export function storeScrollPos(view: EditorView): {
-  refDOM: HTMLElement,
-  refTop: number,
-  stack: {dom: HTMLElement, top: number, left: number}[]
-} {
-  let rect = view.dom.getBoundingClientRect(), startY = Math.max(0, rect.top)
-  let refDOM: HTMLElement, refTop: number
-  for (let x = (rect.left + rect.right) / 2, y = startY + 1;
-       y < Math.min(innerHeight, rect.bottom); y += 5) {
-    let dom = view.root.elementFromPoint(x, y)
-    if (!dom || dom == view.dom || !view.dom.contains(dom)) continue
-    let localRect = (dom as HTMLElement).getBoundingClientRect()
-    if (localRect.top >= startY - 20) {
-      refDOM = dom as HTMLElement
-      refTop = localRect.top
-      break
-    }
-  }
-  return {refDOM: refDOM!, refTop: refTop!, stack: scrollStack(view.dom)}
-}
-
-function scrollStack(dom: Node): {dom: HTMLElement, top: number, left: number}[] {
-  let stack = [], doc = dom.ownerDocument
-  for (let cur: Node | null = dom; cur; cur = parentNode(cur)) {
-    stack.push({dom: cur as HTMLElement, top: (cur as HTMLElement).scrollTop, left: (cur as HTMLElement).scrollLeft})
-    if (dom == doc) break
-  }
-  return stack
-}
-
-// Reset the scroll position of the editor's parent nodes to that what
-// it was before, when storeScrollPos was called.
-export function resetScrollPos({refDOM, refTop, stack}: {
-  refDOM: HTMLElement,
-  refTop: number,
-  stack: {dom: HTMLElement, top: number, left: number}[]
-}) {
-  let newRefTop = refDOM ? refDOM.getBoundingClientRect().top : 0
-  restoreScrollStack(stack, newRefTop == 0 ? 0 : newRefTop - refTop)
-}
-
-function restoreScrollStack(stack: {dom: HTMLElement, top: number, left: number}[], dTop: number) {
-  for (let i = 0; i < stack.length; i++) {
-    let {dom, top, left} = stack[i]
-    if (dom.scrollTop != top + dTop) dom.scrollTop = top + dTop
-    if (dom.scrollLeft != left) dom.scrollLeft = left
-  }
-}
-
-let preventScrollSupported: false | null | {preventScroll: boolean} = null
-// Feature-detects support for .focus({preventScroll: true}), and uses
-// a fallback kludge when not supported.
-export function focusPreventScroll(dom: HTMLElement) {
-  if ((dom as any).setActive) return (dom as any).setActive() // in IE
-  if (preventScrollSupported) return dom.focus(preventScrollSupported)
-
-  let stored = scrollStack(dom)
-  dom.focus(preventScrollSupported == null ? {
-    get preventScroll() {
-      preventScrollSupported = {preventScroll: true}
-      return true
-    }
-  } : undefined)
-  if (!preventScrollSupported) {
-    preventScrollSupported = false
-    restoreScrollStack(stored, 0)
-  }
-}
-
-function findOffsetInNode(node: HTMLElement, coords: {top: number, left: number}): {node: Node, offset: number} {
-  let closest, dxClosest = 2e8, coordsClosest: {left: number, top: number} | undefined, offset = 0
-  let rowBot = coords.top, rowTop = coords.top
-  for (let child = node.firstChild, childIndex = 0; child; child = child.nextSibling, childIndex++) {
-    let rects
-    if (child.nodeType == 1) rects = (child as HTMLElement).getClientRects()
-    else if (child.nodeType == 3) rects = textRange(child as Text).getClientRects()
-    else continue
-
-    for (let i = 0; i < rects.length; i++) {
-      let rect = rects[i]
-      if (rect.top <= rowBot && rect.bottom >= rowTop) {
-        rowBot = Math.max(rect.bottom, rowBot)
-        rowTop = Math.min(rect.top, rowTop)
-        let dx = rect.left > coords.left ? rect.left - coords.left
-            : rect.right < coords.left ? coords.left - rect.right : 0
-        if (dx < dxClosest) {
-          closest = child
-          dxClosest = dx
-          coordsClosest = dx && closest.nodeType == 3 ? {
-            left: rect.right < coords.left ? rect.right : rect.left,
-            top: coords.top
-          } : coords
-          if (child.nodeType == 1 && dx)
-            offset = childIndex + (coords.left >= (rect.left + rect.right) / 2 ? 1 : 0)
-          continue
-        }
-      }
-      if (!closest && (coords.left >= rect.right && coords.top >= rect.top ||
-                       coords.left >= rect.left && coords.top >= rect.bottom))
-        offset = childIndex + 1
-    }
-  }
-  if (closest && closest.nodeType == 3) return findOffsetInText(closest as Text, coordsClosest!)
-  if (!closest || (dxClosest && closest.nodeType == 1)) return {node, offset}
-  return findOffsetInNode(closest as HTMLElement, coordsClosest!)
-}
-
-function findOffsetInText(node: Text, coords: {top: number, left: number}) {
-  let len = node.nodeValue!.length
-  let range = document.createRange()
-  for (let i = 0; i < len; i++) {
-    range.setEnd(node, i + 1)
-    range.setStart(node, i)
-    let rect = singleRect(range, 1)
-    if (rect.top == rect.bottom) continue
-    if (inRect(coords, rect))
-      return {node, offset: i + (coords.left >= (rect.left + rect.right) / 2 ? 1 : 0)}
-  }
-  return {node, offset: 0}
-}
-
-function inRect(coords: {top: number, left: number}, rect: Rect) {
-  return coords.left >= rect.left - 1 && coords.left <= rect.right + 1&&
-    coords.top >= rect.top - 1 && coords.top <= rect.bottom + 1
-}
-
-function targetKludge(dom: HTMLElement, coords: {top: number, left: number}) {
-  let parent = dom.parentNode
-  if (parent && /^li$/i.test(parent.nodeName) && coords.left < dom.getBoundingClientRect().left)
-    return parent as HTMLElement
-  return dom
-}
-
-function posFromElement(view: EditorView, elt: HTMLElement, coords: {top: number, left: number}) {
-  let {node, offset} = findOffsetInNode(elt, coords), bias = -1
-  if (node.nodeType == 1 && !node.firstChild) {
-    let rect = (node as HTMLElement).getBoundingClientRect()
-    bias = rect.left != rect.right && coords.left > (rect.left + rect.right) / 2 ? 1 : -1
-  }
-  return view.docView.posFromDOM(node, offset, bias)
-}
-
-function posFromCaret(view: EditorView, node: Node, offset: number, coords: {top: number, left: number}) {
-  // Browser (in caretPosition/RangeFromPoint) will agressively
-  // normalize towards nearby inline nodes. Since we are interested in
-  // positions between block nodes too, we first walk up the hierarchy
-  // of nodes to see if there are block nodes that the coordinates
-  // fall outside of. If so, we take the position before/after that
-  // block. If not, we call `posFromDOM` on the raw node/offset.
-  let outsideBlock = -1, onInlineLeaf = 1
-  for (let cur = node;;) {
-    if (cur == view.dom) break
-    let desc = view.docView.nearestDesc(cur, true)
-    if (!desc) return null
-    if (desc.node.isBlock && desc.parent) {
-      let rect = (desc.dom as HTMLElement).getBoundingClientRect()
-      if (rect.left > coords.left || rect.top > coords.top) outsideBlock = desc.posBefore
-      else if (rect.right < coords.left || rect.bottom < coords.top) outsideBlock = desc.posAfter
-      else break
-    }
-    cur = desc.dom.parentNode!
-  }
-  return outsideBlock > -1 ? outsideBlock : view.docView.posFromDOM(node, offset, 1)
-}
-
-function elementFromPoint(element: HTMLElement, coords: {top: number, left: number}, box: Rect): HTMLElement {
-  let len = element.childNodes.length
-  if (len && box.top < box.bottom) {
-    for (let startI = Math.max(0, Math.min(len - 1, Math.floor(len * (coords.top - box.top) / (box.bottom - box.top)) - 2)), i = startI;;) {
-      let child = element.childNodes[i]
-      if (child.nodeType == 1) {
-        let rects = (child as HTMLElement).getClientRects()
-        for (let j = 0; j < rects.length; j++) {
-          let rect = rects[j]
-          if (inRect(coords, rect)) return elementFromPoint(child as HTMLElement, coords, rect)
-        }
-      }
-      if ((i = (i + 1) % len) == startI) break
-    }
-  }
-  return element
-}
-
-// Given an x,y position on the editor, get the position in the document.
-export function posAtCoords(view: EditorView, coords: {top: number, left: number}) {
-  let doc = view.dom.ownerDocument, node: Node | undefined, offset = 0
-  if ((doc as any).caretPositionFromPoint) {
-    try { // Firefox throws for this call in hard-to-predict circumstances (#994)
-      let pos = (doc as any).caretPositionFromPoint(coords.left, coords.top)
-      if (pos) ({offsetNode: node, offset} = pos)
-    } catch (_) {}
-  }
-  if (!node && doc.caretRangeFromPoint) {
-    let range = doc.caretRangeFromPoint(coords.left, coords.top)
-    if (range) ({startContainer: node, startOffset: offset} = range)
-  }
-
-  let elt = ((view.root as any).elementFromPoint ? view.root : doc)
-              .elementFromPoint(coords.left, coords.top) as HTMLElement
-  let pos
-  if (!elt || !view.dom.contains(elt.nodeType != 1 ? elt.parentNode : elt)) {
-    let box = view.dom.getBoundingClientRect()
-    if (!inRect(coords, box)) return null
-    elt = elementFromPoint(view.dom, coords, box)
-    if (!elt) return null
-  }
-  // Safari's caretRangeFromPoint returns nonsense when on a draggable element
-  if (browser.safari) {
-    for (let p: Node | null = elt; node && p; p = parentNode(p))
-      if ((p as HTMLElement).draggable) node = undefined
-  }
-  elt = targetKludge(elt, coords)
-  if (node) {
-    if (browser.gecko && node.nodeType == 1) {
-      // Firefox will sometimes return offsets into <input> nodes, which
-      // have no actual children, from caretPositionFromPoint (#953)
-      offset = Math.min(offset, node.childNodes.length)
-      // It'll also move the returned position before image nodes,
-      // even if those are behind it.
-      if (offset < node.childNodes.length) {
-        let next = node.childNodes[offset], box
-        if (next.nodeName == "IMG" && (box = (next as HTMLElement).getBoundingClientRect()).right <= coords.left &&
-            box.bottom > coords.top)
-          offset++
-      }
-    }
-    // Suspiciously specific kludge to work around caret*FromPoint
-    // never returning a position at the end of the document
-    if (node == view.dom && offset == node.childNodes.length - 1 && node.lastChild!.nodeType == 1 &&
-        coords.top > (node.lastChild as HTMLElement).getBoundingClientRect().bottom)
-      pos = view.state.doc.content.size
-    // Ignore positions directly after a BR, since caret*FromPoint
-    // 'round up' positions that would be more accurately placed
-    // before the BR node.
-    else if (offset == 0 || node.nodeType != 1 || node.childNodes[offset - 1].nodeName != "BR")
-      pos = posFromCaret(view, node, offset, coords)
-  }
-  if (pos == null) pos = posFromElement(view, elt, coords)
-
-  let desc = view.docView.nearestDesc(elt, true)
-  return {pos, inside: desc ? desc.posAtStart - desc.border : -1}
-}
-
-function singleRect(target: HTMLElement | Range, bias: number): DOMRect {
-  let rects = target.getClientRects()
-  return !rects.length ? target.getBoundingClientRect() : rects[bias < 0 ? 0 : rects.length - 1]
-}
-
-const BIDI = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/
-
-// Given a position in the document model, get a bounding box of the
-// character at that position, relative to the window.
-export function coordsAtPos(view: EditorView, pos: number, side: number): Rect {
-  let {node, offset, atom} = view.docView.domFromPos(pos, side < 0 ? -1 : 1)
-
-  let supportEmptyRange = browser.webkit || browser.gecko
-  if (node.nodeType == 3) {
-    // These browsers support querying empty text ranges. Prefer that in
-    // bidi context or when at the end of a node.
-    if (supportEmptyRange && (BIDI.test(node.nodeValue!) || (side < 0 ? !offset : offset == node.nodeValue!.length))) {
-      let rect = singleRect(textRange(node as Text, offset, offset), side)
-      // Firefox returns bad results (the position before the space)
-      // when querying a position directly after line-broken
-      // whitespace. Detect this situation and and kludge around it
-      if (browser.gecko && offset && /\s/.test(node.nodeValue![offset - 1]) && offset < node.nodeValue!.length) {
-        let rectBefore = singleRect(textRange(node as Text, offset - 1, offset - 1), -1)
-        if (rectBefore.top == rect.top) {
-          let rectAfter = singleRect(textRange(node as Text, offset, offset + 1), -1)
-          if (rectAfter.top != rect.top)
-            return flattenV(rectAfter, rectAfter.left < rectBefore.left)
-        }
-      }
-      return rect
-    } else {
-      let from = offset, to = offset, takeSide = side < 0 ? 1 : -1
-      if (side < 0 && !offset) { to++; takeSide = -1 }
-      else if (side >= 0 && offset == node.nodeValue!.length) { from--; takeSide = 1 }
-      else if (side < 0) { from-- }
-      else { to ++ }
-      return flattenV(singleRect(textRange(node as Text, from, to), 1), takeSide < 0)
-    }
-  }
-
-  let $dom = view.state.doc.resolve(pos - (atom || 0))
-  // Return a horizontal line in block context
-  if (!$dom.parent.inlineContent) {
-    if (atom == null && offset && (side < 0 || offset == nodeSize(node))) {
-      let before = node.childNodes[offset - 1]
-      if (before.nodeType == 1) return flattenH((before as HTMLElement).getBoundingClientRect(), false)
-    }
-    if (atom == null && offset < nodeSize(node)) {
-      let after = node.childNodes[offset]
-      if (after.nodeType == 1) return flattenH((after as HTMLElement).getBoundingClientRect(), true)
-    }
-    return flattenH((node as HTMLElement).getBoundingClientRect(), side >= 0)
-  }
-
-  // Inline, not in text node (this is not Bidi-safe)
-  if (atom == null && offset && (side < 0 || offset == nodeSize(node))) {
-    let before = node.childNodes[offset - 1]
-    let target = before.nodeType == 3 ? textRange(before as Text, nodeSize(before) - (supportEmptyRange ? 0 : 1))
-        // BR nodes tend to only return the rectangle before them.
-        // Only use them if they are the last element in their parent
-        : before.nodeType == 1 && (before.nodeName != "BR" || !before.nextSibling) ? before : null
-    if (target) return flattenV(singleRect(target as Range | HTMLElement, 1), false)
-  }
-  if (atom == null && offset < nodeSize(node)) {
-    let after = node.childNodes[offset]
-    while (after.pmViewDesc && after.pmViewDesc.ignoreForCoords) after = after.nextSibling!
-    let target = !after ? null : after.nodeType == 3 ? textRange(after as Text, 0, (supportEmptyRange ? 0 : 1))
-        : after.nodeType == 1 ? after : null
-    if (target) return flattenV(singleRect(target as Range | HTMLElement, -1), true)
-  }
-  // All else failed, just try to get a rectangle for the target node
-  return flattenV(singleRect(node.nodeType == 3 ? textRange(node as Text) : node as HTMLElement, -side), side >= 0)
-}
-
-function flattenV(rect: DOMRect, left: boolean) {
-  if (rect.width == 0) return rect
-  let x = left ? rect.left : rect.right
-  return {top: rect.top, bottom: rect.bottom, left: x, right: x}
-}
-
-function flattenH(rect: DOMRect, top: boolean) {
-  if (rect.height == 0) return rect
-  let y = top ? rect.top : rect.bottom
-  return {top: y, bottom: y, left: rect.left, right: rect.right}
-}
-
-function withFlushedState<T>(view: EditorView, state: EditorState, f: () => T): T {
-  let viewState = view.state, active = view.root.activeElement as HTMLElement
-  if (viewState != state) view.updateState(state)
-  if (active != view.dom) view.focus()
-  try {
-    return f()
-  } finally {
-    if (viewState != state) view.updateState(viewState)
-    if (active != view.dom && active) active.focus()
-  }
-}
-
-// Whether vertical position motion in a given direction
-// from a position would leave a text block.
-function endOfTextblockVertical(view: EditorView, state: EditorState, dir: "up" | "down") {
-  let sel = state.selection
-  let $pos = dir == "up" ? sel.$from : sel.$to
-  return withFlushedState(view, state, () => {
-    let {node: dom} = view.docView.domFromPos($pos.pos, dir == "up" ? -1 : 1)
-    for (;;) {
-      let nearest = view.docView.nearestDesc(dom, true)
-      if (!nearest) break
-      if (nearest.node.isBlock) { dom = nearest.contentDOM || nearest.dom; break }
-      dom = nearest.dom.parentNode!
-    }
-    let coords = coordsAtPos(view, $pos.pos, 1)
-    for (let child = dom.firstChild; child; child = child.nextSibling) {
-      let boxes
-      if (child.nodeType == 1) boxes = (child as HTMLElement).getClientRects()
-      else if (child.nodeType == 3) boxes = textRange(child as Text, 0, child.nodeValue!.length).getClientRects()
-      else continue
-      for (let i = 0; i < boxes.length; i++) {
-        let box = boxes[i]
-        if (box.bottom > box.top + 1 &&
-            (dir == "up" ? coords.top - box.top > (box.bottom - coords.top) * 2
-             : box.bottom - coords.bottom > (coords.bottom - box.top) * 2))
-          return false
-      }
-    }
-    return true
-  })
-}
-
-const maybeRTL = /[\u0590-\u08ac]/
-
-function endOfTextblockHorizontal(view: EditorView, state: EditorState, dir: "left" | "right" | "forward" | "backward") {
-  let {$head} = state.selection
-  if (!$head.parent.isTextblock) return false
-  let offset = $head.parentOffset, atStart = !offset, atEnd = offset == $head.parent.content.size
-  let sel = view.domSelection()
-  // If the textblock is all LTR, or the browser doesn't support
-  // Selection.modify (Edge), fall back to a primitive approach
-  if (!maybeRTL.test($head.parent.textContent) || !(sel as any).modify)
-    return dir == "left" || dir == "backward" ? atStart : atEnd
-
-  return withFlushedState(view, state, () => {
-    // This is a huge hack, but appears to be the best we can
-    // currently do: use `Selection.modify` to move the selection by
-    // one character, and see if that moves the cursor out of the
-    // textblock (or doesn't move it at all, when at the start/end of
-    // the document).
-    let {focusNode: oldNode, focusOffset: oldOff, anchorNode, anchorOffset} = view.domSelectionRange()
-    let oldBidiLevel = (sel as any).caretBidiLevel // Only for Firefox
-    ;(sel as any).modify("move", dir, "character")
-    let parentDOM = $head.depth ? view.docView.domAfterPos($head.before()) : view.dom
-    let {focusNode: newNode, focusOffset: newOff} = view.domSelectionRange()
-    let result = newNode && !parentDOM.contains(newNode.nodeType == 1 ? newNode : newNode.parentNode) ||
-        (oldNode == newNode && oldOff == newOff)
-    // Restore the previous selection
-    try {
-      sel.collapse(anchorNode, anchorOffset)
-      if (oldNode && (oldNode != anchorNode || oldOff != anchorOffset) && sel.extend) sel.extend(oldNode, oldOff)
-    } catch (_) {}
-    if (oldBidiLevel != null) (sel as any).caretBidiLevel = oldBidiLevel
-    return result
-  })
-}
-
-export type TextblockDir = "up" | "down" | "left" | "right" | "forward" | "backward"
-
-let cachedState: EditorState | null = null
-let cachedDir: TextblockDir | null = null
-let cachedResult: boolean = false
-export function endOfTextblock(view: EditorView, state: EditorState, dir: TextblockDir) {
-  if (cachedState == state && cachedDir == dir) return cachedResult
-  cachedState = state; cachedDir = dir
-  return cachedResult = dir == "up" || dir == "down"
-    ? endOfTextblockVertical(view, state, dir)
-    : endOfTextblockHorizontal(view, state, dir)
-}