prosemirror-view 1.28.2 → 1.29.0

package/dist/index.js

@@ -2,27 +2,6 @@ import { TextSelection, NodeSelection, Selection, AllSelection } from 'prosemirr
 import { DOMSerializer, Fragment, Mark, Slice, DOMParser } from 'prosemirror-model';
 import { dropPoint } from 'prosemirror-transform';
 
-const nav = typeof navigator != "undefined" ? navigator : null;
-const doc = typeof document != "undefined" ? document : null;
-const agent = (nav && nav.userAgent) || "";
-const ie_edge = /Edge\/(\d+)/.exec(agent);
-const ie_upto10 = /MSIE \d/.exec(agent);
-const ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(agent);
-const ie = !!(ie_upto10 || ie_11up || ie_edge);
-const ie_version = ie_upto10 ? document.documentMode : ie_11up ? +ie_11up[1] : ie_edge ? +ie_edge[1] : 0;
-const gecko = !ie && /gecko\/(\d+)/i.test(agent);
-gecko && +(/Firefox\/(\d+)/.exec(agent) || [0, 0])[1];
-const _chrome = !ie && /Chrome\/(\d+)/.exec(agent);
-const chrome = !!_chrome;
-const chrome_version = _chrome ? +_chrome[1] : 0;
-const safari = !ie && !!nav && /Apple Computer/.test(nav.vendor);
-// Is true for both iOS and iPadOS for convenience
-const ios = safari && (/Mobile\/\w+/.test(agent) || !!nav && nav.maxTouchPoints > 2);
-const mac = ios || (nav ? /Mac/.test(nav.platform) : false);
-const android = /Android \d/.test(agent);
-const webkit = !!doc && "webkitFontSmoothing" in doc.documentElement.style;
-const webkit_version = webkit ? +(/\bAppleWebKit\/(\d+)/.exec(navigator.userAgent) || [0, 0])[1] : 0;
-
 const domIndex = function (node) {
     for (var index = 0;; index++) {
         node = node.previousSibling;
@@ -100,10 +79,7 @@ function hasBlockDesc(dom) {
 // Work around Chrome issue https://bugs.chromium.org/p/chromium/issues/detail?id=447523
 // (isCollapsed inappropriately returns true in shadow dom)
 const selectionCollapsed = function (domSel) {
-    let collapsed = domSel.isCollapsed;
-    if (collapsed && chrome && domSel.rangeCount && !domSel.getRangeAt(0).collapsed)
-        collapsed = false;
-    return collapsed;
+    return domSel.focusNode && isEquivalentPosition(domSel.focusNode, domSel.focusOffset, domSel.anchorNode, domSel.anchorOffset);
 };
 function keyEvent(keyCode, key) {
     let event = document.createEvent("Event");
@@ -112,6 +88,33 @@ function keyEvent(keyCode, key) {
     event.key = event.code = key;
     return event;
 }
+function deepActiveElement(doc) {
+    let elt = doc.activeElement;
+    while (elt && elt.shadowRoot)
+        elt = elt.shadowRoot.activeElement;
+    return elt;
+}
+
+const nav = typeof navigator != "undefined" ? navigator : null;
+const doc = typeof document != "undefined" ? document : null;
+const agent = (nav && nav.userAgent) || "";
+const ie_edge = /Edge\/(\d+)/.exec(agent);
+const ie_upto10 = /MSIE \d/.exec(agent);
+const ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(agent);
+const ie = !!(ie_upto10 || ie_11up || ie_edge);
+const ie_version = ie_upto10 ? document.documentMode : ie_11up ? +ie_11up[1] : ie_edge ? +ie_edge[1] : 0;
+const gecko = !ie && /gecko\/(\d+)/i.test(agent);
+gecko && +(/Firefox\/(\d+)/.exec(agent) || [0, 0])[1];
+const _chrome = !ie && /Chrome\/(\d+)/.exec(agent);
+const chrome = !!_chrome;
+const chrome_version = _chrome ? +_chrome[1] : 0;
+const safari = !ie && !!nav && /Apple Computer/.test(nav.vendor);
+// Is true for both iOS and iPadOS for convenience
+const ios = safari && (/Mobile\/\w+/.test(agent) || !!nav && nav.maxTouchPoints > 2);
+const mac = ios || (nav ? /Mac/.test(nav.platform) : false);
+const android = /Android \d/.test(agent);
+const webkit = !!doc && "webkitFontSmoothing" in doc.documentElement.style;
+const webkit_version = webkit ? +(/\bAppleWebKit\/(\d+)/.exec(navigator.userAgent) || [0, 0])[1] : 0;
 
 function windowRect(doc) {
     return { left: 0, right: doc.documentElement.clientWidth,
@@ -580,16 +583,21 @@ function endOfTextblockHorizontal(view, state, dir) {
         // 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 oldRange = sel.getRangeAt(0), oldNode = sel.focusNode, oldOff = sel.focusOffset;
+        let { focusNode: oldNode, focusOffset: oldOff, anchorNode, anchorOffset } = view.domSelectionRange();
         let oldBidiLevel = sel.caretBidiLevel // Only for Firefox
         ;
         sel.modify("move", dir, "character");
         let parentDOM = $head.depth ? view.docView.domAfterPos($head.before()) : view.dom;
-        let result = !parentDOM.contains(sel.focusNode.nodeType == 1 ? sel.focusNode : sel.focusNode.parentNode) ||
-            (oldNode == sel.focusNode && oldOff == sel.focusOffset);
+        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
-        sel.removeAllRanges();
-        sel.addRange(oldRange);
+        try {
+            sel.collapse(anchorNode, anchorOffset);
+            if (oldNode && (oldNode != anchorNode || oldOff != anchorOffset) && sel.extend)
+                sel.extend(oldNode, oldOff);
+        }
+        catch (_) { }
         if (oldBidiLevel != null)
             sel.caretBidiLevel = oldBidiLevel;
         return result;
@@ -957,24 +965,17 @@ class ViewDesc {
         if ((domSel.extend || anchor == head) && !brKludge) {
             domSel.collapse(anchorDOM.node, anchorDOM.offset);
             try {
-                if (anchor != head) {
-                    // This can crash on Safari if the editor is hidden, and
-                    // there was no selection. (#1308)
-                    try {
-                        domSel.extend(headDOM.node, headDOM.offset);
-                    }
-                    catch (_) { }
-                }
+                if (anchor != head)
+                    domSel.extend(headDOM.node, headDOM.offset);
                 domSelExtended = true;
             }
-            catch (err) {
+            catch (_) {
                 // In some cases with Chrome the selection is empty after calling
                 // collapse, even when it should be valid. This appears to be a bug, but
                 // it is difficult to isolate. If this happens fallback to the old path
                 // without using extend.
-                if (!(err instanceof DOMException))
-                    throw err;
-                // declare global: DOMException
+                // Similarly, this could crash on Safari if the editor is hidden, and
+                // there was no selection.
             }
         }
         if (!domSelExtended) {
@@ -1295,7 +1296,7 @@ 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.domSelection();
+        let sel = view.domSelectionRange();
         let textNode = nearbyTextNode(sel.focusNode, sel.focusOffset);
         if (!textNode || !this.dom.contains(textNode.parentNode))
             return null;
@@ -2031,7 +2032,7 @@ function replaceNodes(nodes, from, to, view, replacement) {
 }
 
 function selectionFromDOM(view, origin = null) {
-    let domSel = view.domSelection(), doc = view.state.doc;
+    let domSel = view.domSelectionRange(), doc = view.state.doc;
     if (!domSel.focusNode)
         return null;
     let nearestDesc = view.docView.nearestDesc(domSel.focusNode), inWidget = nearestDesc && nearestDesc.size == 0;
@@ -2075,7 +2076,7 @@ function selectionToDOM(view, force = false) {
     // in Safari. And the drag selection delay is to workarond issues
     // which only present in Chrome.
     if (!force && view.input.mouseDown && view.input.mouseDown.allowDefault && chrome) {
-        let domSel = view.domSelection(), curSel = view.domObserver.currentSelection;
+        let domSel = view.domSelectionRange(), curSel = view.domObserver.currentSelection;
         if (domSel.anchorNode && curSel.anchorNode &&
             isEquivalentPosition(domSel.anchorNode, domSel.anchorOffset, curSel.anchorNode, curSel.anchorOffset)) {
             view.input.mouseDown.delayedSelectionSync = true;
@@ -2150,7 +2151,7 @@ function resetEditable(element) {
 function removeClassOnSelectionChange(view) {
     let doc = view.dom.ownerDocument;
     doc.removeEventListener("selectionchange", view.input.hideSelectionGuard);
-    let domSel = view.domSelection();
+    let domSel = view.domSelectionRange();
     let node = domSel.anchorNode, offset = domSel.anchorOffset;
     doc.addEventListener("selectionchange", view.input.hideSelectionGuard = () => {
         if (domSel.anchorNode != node || domSel.anchorOffset != offset) {
@@ -2214,7 +2215,7 @@ function hasFocusAndSelection(view) {
     return hasSelection(view);
 }
 function hasSelection(view) {
-    let sel = view.domSelection();
+    let sel = view.domSelectionRange();
     if (!sel.anchorNode)
         return false;
     try {
@@ -2230,7 +2231,7 @@ function hasSelection(view) {
 }
 function anchorInRightPlace(view) {
     let anchorDOM = view.docView.domFromPos(view.state.selection.anchor, 0);
-    let domSel = view.domSelection();
+    let domSel = view.domSelectionRange();
     return isEquivalentPosition(anchorDOM.node, anchorDOM.offset, domSel.anchorNode, domSel.anchorOffset);
 }
 
@@ -2297,7 +2298,7 @@ function isIgnorable(dom) {
 // Make sure the cursor isn't directly after one or more ignored
 // nodes, which will confuse the browser's cursor motion logic.
 function skipIgnoredNodesLeft(view) {
-    let sel = view.domSelection();
+    let sel = view.domSelectionRange();
     let node = sel.focusNode, offset = sel.focusOffset;
     if (!node)
         return;
@@ -2349,14 +2350,14 @@ function skipIgnoredNodesLeft(view) {
         }
     }
     if (force)
-        setSelFocus(view, sel, node, offset);
+        setSelFocus(view, node, offset);
     else if (moveNode)
-        setSelFocus(view, sel, moveNode, moveOffset);
+        setSelFocus(view, moveNode, moveOffset);
 }
 // Make sure the cursor isn't directly before one or more ignored
 // nodes.
 function skipIgnoredNodesRight(view) {
-    let sel = view.domSelection();
+    let sel = view.domSelectionRange();
     let node = sel.focusNode, offset = sel.focusOffset;
     if (!node)
         return;
@@ -2398,13 +2399,14 @@ function skipIgnoredNodesRight(view) {
         }
     }
     if (moveNode)
-        setSelFocus(view, sel, moveNode, moveOffset);
+        setSelFocus(view, moveNode, moveOffset);
 }
 function isBlockNode(dom) {
     let desc = dom.pmViewDesc;
     return desc && desc.node && desc.node.isBlock;
 }
-function setSelFocus(view, sel, node, offset) {
+function setSelFocus(view, node, offset) {
+    let sel = view.domSelection();
     if (selectionCollapsed(sel)) {
         let range = document.createRange();
         range.setEnd(node, offset);
@@ -2480,7 +2482,7 @@ function switchEditable(view, node, state) {
 function safariDownArrowBug(view) {
     if (!safari || view.state.selection.$head.parentOffset > 0)
         return false;
-    let { focusNode, focusOffset } = view.domSelection();
+    let { focusNode, focusOffset } = view.domSelectionRange();
     if (focusNode && focusNode.nodeType == 1 && focusOffset == 0 &&
         focusNode.firstChild && focusNode.firstChild.contentEditable == "false") {
         let child = focusNode.firstChild;
@@ -2538,7 +2540,7 @@ function captureKeyDown(view, event) {
 }
 
 function serializeForClipboard(view, slice) {
-    view.someProp("transformCopied", f => { slice = f(slice); });
+    view.someProp("transformCopied", f => { slice = f(slice, view); });
     let context = [], { content, openStart, openEnd } = slice;
     while (openStart > 1 && openEnd > 1 && content.childCount == 1 && content.firstChild.childCount == 1) {
         openStart--;
@@ -2563,7 +2565,7 @@ function serializeForClipboard(view, slice) {
     }
     if (firstChild && firstChild.nodeType == 1)
         firstChild.setAttribute("data-pm-slice", `${openStart} ${openEnd}${wrappers ? ` -${wrappers}` : ""} ${JSON.stringify(context)}`);
-    let text = view.someProp("clipboardTextSerializer", f => f(slice)) ||
+    let text = view.someProp("clipboardTextSerializer", f => f(slice, view)) ||
         slice.content.textBetween(0, slice.content.size, "\n\n");
     return { dom: wrap, text };
 }
@@ -2575,10 +2577,10 @@ function parseFromClipboard(view, text, html, plainText, $context) {
         return null;
     let asText = text && (plainText || inCode || !html);
     if (asText) {
-        view.someProp("transformPastedText", f => { text = f(text, inCode || plainText); });
+        view.someProp("transformPastedText", f => { text = f(text, inCode || plainText, view); });
         if (inCode)
             return text ? new Slice(Fragment.from(view.state.schema.text(text.replace(/\r\n?/g, "\n"))), 0, 0) : Slice.empty;
-        let parsed = view.someProp("clipboardTextParser", f => f(text, $context, plainText));
+        let parsed = view.someProp("clipboardTextParser", f => f(text, $context, plainText, view));
         if (parsed) {
             slice = parsed;
         }
@@ -2594,7 +2596,7 @@ function parseFromClipboard(view, text, html, plainText, $context) {
         }
     }
     else {
-        view.someProp("transformPastedHTML", f => { html = f(html); });
+        view.someProp("transformPastedHTML", f => { html = f(html, view); });
         dom = readHTML(html);
         if (webkit)
             restoreReplacedSpaces(dom);
@@ -2602,8 +2604,14 @@ function parseFromClipboard(view, text, html, plainText, $context) {
     let contextNode = dom && dom.querySelector("[data-pm-slice]");
     let sliceData = contextNode && /^(\d+) (\d+)(?: -(\d+))? (.*)/.exec(contextNode.getAttribute("data-pm-slice") || "");
     if (sliceData && sliceData[3])
-        for (let i = +sliceData[3]; i > 0 && dom.firstChild; i--)
-            dom = dom.firstChild;
+        for (let i = +sliceData[3]; i > 0; i--) {
+            let child = dom.firstChild;
+            while (child && child.nodeType != 1)
+                child = child.nextSibling;
+            if (!child)
+                break;
+            dom = child;
+        }
     if (!slice) {
         let parser = view.someProp("clipboardParser") || view.someProp("domParser") || DOMParser.fromSchema(view.state.schema);
         slice = parser.parseSlice(dom, {
@@ -2629,7 +2637,7 @@ function parseFromClipboard(view, text, html, plainText, $context) {
             slice = closeSlice(slice, openStart, openEnd);
         }
     }
-    view.someProp("transformPasted", f => { slice = f(slice); });
+    view.someProp("transformPasted", f => { slice = f(slice, view); });
     return slice;
 }
 const inlineParents = /^(a|abbr|acronym|b|cite|code|del|em|i|ins|kbd|label|output|q|ruby|s|samp|span|strong|sub|sup|time|u|tt|var)$/i;
@@ -3206,13 +3214,13 @@ editHandlers.compositionstart = editHandlers.compositionupdate = view => {
             // the inserted text won't inherit the marks. So this moves it
             // inside if necessary.
             if (gecko && state.selection.empty && $pos.parentOffset && !$pos.textOffset && $pos.nodeBefore.marks.length) {
-                let sel = view.domSelection();
+                let sel = view.domSelectionRange();
                 for (let node = sel.focusNode, offset = sel.focusOffset; node && node.nodeType == 1 && offset != 0;) {
                     let before = offset < 0 ? node.lastChild : node.childNodes[offset - 1];
                     if (!before)
                         break;
                     if (before.nodeType == 3) {
-                        sel.collapse(before, before.nodeValue.length);
+                        view.domSelection().collapse(before, before.nodeValue.length);
                         break;
                     }
                     else {
@@ -3419,7 +3427,7 @@ editHandlers.drop = (view, _event) => {
     let $mouse = view.state.doc.resolve(eventPos.pos);
     let slice = dragging && dragging.slice;
     if (slice) {
-        view.someProp("transformPasted", f => { slice = f(slice); });
+        view.someProp("transformPasted", f => { slice = f(slice, view); });
     }
     else {
         slice = parseFromClipboard(view, event.dataTransfer.getData(brokenClipboardAPI ? "Text" : "text/plain"), brokenClipboardAPI ? null : event.dataTransfer.getData("text/html"), false, $mouse);
@@ -3468,7 +3476,7 @@ handlers.focus = view => {
         view.domObserver.start();
         view.focused = true;
         setTimeout(() => {
-            if (view.docView && view.hasFocus() && !view.domObserver.currentSelection.eq(view.domSelection()))
+            if (view.docView && view.hasFocus() && !view.domObserver.currentSelection.eq(view.domSelectionRange()))
                 selectionToDOM(view);
         }, 20);
     }
@@ -4300,7 +4308,7 @@ class DOMObserver {
         // us a selection change event before the DOM changes are
         // reported.
         if (ie && ie_version <= 11 && !this.view.state.selection.empty) {
-            let sel = this.view.domSelection();
+            let sel = this.view.domSelectionRange();
             // Selection.isCollapsed isn't reliable on IE
             if (sel.focusNode && isEquivalentPosition(sel.focusNode, sel.focusOffset, sel.anchorNode, sel.anchorOffset))
                 return this.flushSoon();
@@ -4308,13 +4316,20 @@ class DOMObserver {
         this.flush();
     }
     setCurSelection() {
-        this.currentSelection.set(this.view.domSelection());
+        this.currentSelection.set(this.view.domSelectionRange());
     }
     ignoreSelectionChange(sel) {
-        if (sel.rangeCount == 0)
+        if (!sel.focusNode)
             return true;
-        let container = sel.getRangeAt(0).commonAncestorContainer;
-        let desc = this.view.docView.nearestDesc(container);
+        let ancestors = new Set, container;
+        for (let scan = sel.focusNode; scan; scan = parentNode(scan))
+            ancestors.add(scan);
+        for (let scan = sel.anchorNode; scan; scan = parentNode(scan))
+            if (ancestors.has(scan)) {
+                container = scan;
+                break;
+            }
+        let desc = container && this.view.docView.nearestDesc(container);
         if (desc && desc.ignoreMutation({
             type: "selection",
             target: container.nodeType == 3 ? container.parentNode : container
@@ -4332,7 +4347,7 @@ class DOMObserver {
             mutations = this.queue.concat(mutations);
             this.queue.length = 0;
         }
-        let sel = view.domSelection();
+        let sel = view.domSelectionRange();
         let newSel = !this.suppressingSelectionUpdates && !this.currentSelection.eq(sel) && hasFocusAndSelection(view) && !this.ignoreSelectionChange(sel);
         let from = -1, to = -1, typeOver = false, added = [];
         if (view.editable) {
@@ -4449,6 +4464,33 @@ function checkCSS(view) {
         cssCheckWarned = true;
     }
 }
+// Used to work around a Safari Selection/shadow DOM bug
+// Based on https://github.com/codemirror/dev/issues/414 fix
+function safariShadowSelectionRange(view) {
+    let found;
+    function read(event) {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+        found = event.getTargetRanges()[0];
+    }
+    // Because Safari (at least in 2018-2022) doesn't provide regular
+    // access to the selection inside a shadowRoot, we have to perform a
+    // ridiculous hack to get at it—using `execCommand` to trigger a
+    // `beforeInput` event so that we can read the target range from the
+    // event.
+    view.dom.addEventListener("beforeinput", read, true);
+    document.execCommand("indent");
+    view.dom.removeEventListener("beforeinput", read, true);
+    let anchorNode = found.startContainer, anchorOffset = found.startOffset;
+    let focusNode = found.endContainer, focusOffset = found.endOffset;
+    let currentAnchor = view.domAtPos(view.state.selection.anchor);
+    // Since such a range doesn't distinguish between anchor and head,
+    // use a heuristic that flips it around if its end matches the
+    // current anchor.
+    if (isEquivalentPosition(currentAnchor.node, currentAnchor.offset, focusNode, focusOffset))
+        [anchorNode, anchorOffset, focusNode, focusOffset] = [focusNode, focusOffset, anchorNode, anchorOffset];
+    return { anchorNode, anchorOffset, focusNode, focusOffset };
+}
 
 // Note that all referencing and parsing is done with the
 // start-of-operation selection and document, since that's the one
@@ -4457,7 +4499,7 @@ function checkCSS(view) {
 // readDOMChange.
 function parseBetween(view, from_, to_) {
     let { node: parent, fromOffset, toOffset, from, to } = view.docView.parseRange(from_, to_);
-    let domSel = view.domSelection();
+    let domSel = view.domSelectionRange();
     let find;
     let anchor = domSel.anchorNode;
     if (anchor && view.dom.contains(anchor.nodeType == 1 ? anchor : anchor.parentNode)) {
@@ -4557,7 +4599,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") &&
+        addedNodes.some(n => n.nodeName == "DIV" || n.nodeName == "P" || n.nodeName == "LI") &&
         (!change || change.endA >= change.endB) &&
         view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {
         view.input.lastIOSEnter = 0;
@@ -4985,7 +5027,7 @@ class EditorView {
                 // Chrome sometimes starts misreporting the selection, so this
                 // tracks that and forces a selection reset when our update
                 // did write to the node.
-                let chromeKludge = chrome ? (this.trackWrites = this.domSelection().focusNode) : null;
+                let chromeKludge = chrome ? (this.trackWrites = this.domSelectionRange().focusNode) : null;
                 if (redraw || !this.docView.update(state.doc, outerDeco, innerDeco, this)) {
                     this.docView.updateOuterDeco([]);
                     this.docView.destroy();
@@ -4999,7 +5041,8 @@ class EditorView {
             // can cause a spurious DOM selection update, disrupting mouse
             // drag selection.
             if (forceSelUpdate ||
-                !(this.input.mouseDown && this.domObserver.currentSelection.eq(this.domSelection()) && anchorInRightPlace(this))) {
+                !(this.input.mouseDown && this.domObserver.currentSelection.eq(this.domSelectionRange()) &&
+                    anchorInRightPlace(this))) {
                 selectionToDOM(this, forceSelUpdate);
             }
             else {
@@ -5023,7 +5066,7 @@ class EditorView {
     @internal
     */
     scrollToSelection() {
-        let startDOM = this.domSelection().focusNode;
+        let startDOM = this.domSelectionRange().focusNode;
         if (this.someProp("handleScrollToSelection", f => f(this))) ;
         else if (this.state.selection instanceof NodeSelection) {
             let target = this.docView.domAfterPos(this.state.selection.from);
@@ -5261,6 +5304,13 @@ class EditorView {
     /**
     @internal
     */
+    domSelectionRange() {
+        return safari && this.root.nodeType === 11 && deepActiveElement(this.dom.ownerDocument) == this.dom
+            ? safariShadowSelectionRange(this) : this.domSelection();
+    }
+    /**
+    @internal
+    */
     domSelection() {
         return this.root.getSelection();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-view",
-  "version": "1.28.2",
+  "version": "1.29.0",
   "description": "ProseMirror's view component",
   "type": "module",
   "main": "dist/index.cjs",

package/src/capturekeys.ts

@@ -1,7 +1,7 @@
 import {Selection, NodeSelection, TextSelection, AllSelection, EditorState} from "prosemirror-state"
 import {EditorView} from "./index"
 import * as browser from "./browser"
-import {domIndex, selectionCollapsed, DOMSelection} from "./dom"
+import {domIndex, selectionCollapsed} from "./dom"
 import {selectionToDOM} from "./selection"
 
 function moveSelectionBlock(state: EditorState, dir: number) {
@@ -62,7 +62,7 @@ function isIgnorable(dom: Node) {
 // Make sure the cursor isn't directly after one or more ignored
 // nodes, which will confuse the browser's cursor motion logic.
 function skipIgnoredNodesLeft(view: EditorView) {
-  let sel = view.domSelection()
+  let sel = view.domSelectionRange()
   let node = sel.focusNode!, offset = sel.focusOffset
   if (!node) return
   let moveNode, moveOffset: number | undefined, force = false
@@ -103,14 +103,14 @@ function skipIgnoredNodesLeft(view: EditorView) {
       }
     }
   }
-  if (force) setSelFocus(view, sel, node, offset)
-  else if (moveNode) setSelFocus(view, sel, moveNode, moveOffset!)
+  if (force) setSelFocus(view, node, offset)
+  else if (moveNode) setSelFocus(view, moveNode, moveOffset!)
 }
 
 // Make sure the cursor isn't directly before one or more ignored
 // nodes.
 function skipIgnoredNodesRight(view: EditorView) {
-  let sel = view.domSelection()
+  let sel = view.domSelectionRange()
   let node = sel.focusNode!, offset = sel.focusOffset
   if (!node) return
   let len = nodeLen(node)
@@ -144,7 +144,7 @@ function skipIgnoredNodesRight(view: EditorView) {
       }
     }
   }
-  if (moveNode) setSelFocus(view, sel, moveNode, moveOffset!)
+  if (moveNode) setSelFocus(view, moveNode, moveOffset!)
 }
 
 function isBlockNode(dom: Node) {
@@ -152,7 +152,8 @@ function isBlockNode(dom: Node) {
   return desc && desc.node && desc.node.isBlock
 }
 
-function setSelFocus(view: EditorView, sel: DOMSelection, node: Node, offset: number) {
+function setSelFocus(view: EditorView, node: Node, offset: number) {
+  let sel = view.domSelection()
   if (selectionCollapsed(sel)) {
     let range = document.createRange()
     range.setEnd(node, offset)
@@ -222,7 +223,7 @@ function switchEditable(view: EditorView, node: HTMLElement, state: string) {
 // after it
 function safariDownArrowBug(view: EditorView) {
   if (!browser.safari || view.state.selection.$head.parentOffset > 0) return false
-  let {focusNode, focusOffset} = view.domSelection()
+  let {focusNode, focusOffset} = view.domSelectionRange()
   if (focusNode && focusNode.nodeType == 1 && focusOffset == 0 &&
       focusNode.firstChild && (focusNode.firstChild as HTMLElement).contentEditable == "false") {
     let child = focusNode.firstChild as HTMLElement

package/src/clipboard.ts

@@ -3,7 +3,7 @@ import * as browser from "./browser"
 import {EditorView} from "./index"
 
 export function serializeForClipboard(view: EditorView, slice: Slice) {
-  view.someProp("transformCopied", f => { slice = f(slice!) })
+  view.someProp("transformCopied", f => { slice = f(slice!, view) })
 
   let context = [], {content, openStart, openEnd} = slice
   while (openStart > 1 && openEnd > 1 && content.childCount == 1 && content.firstChild!.childCount == 1) {
@@ -33,7 +33,7 @@ export function serializeForClipboard(view: EditorView, slice: Slice) {
     (firstChild as HTMLElement).setAttribute(
       "data-pm-slice", `${openStart} ${openEnd}${wrappers ? ` -${wrappers}` : ""} ${JSON.stringify(context)}`)
 
-  let text = view.someProp("clipboardTextSerializer", f => f(slice)) ||
+  let text = view.someProp("clipboardTextSerializer", f => f(slice, view)) ||
       slice.content.textBetween(0, slice.content.size, "\n\n")
 
   return {dom: wrap, text}
@@ -46,9 +46,9 @@ export function parseFromClipboard(view: EditorView, text: string, html: string
   if (!html && !text) return null
   let asText = text && (plainText || inCode || !html)
   if (asText) {
-    view.someProp("transformPastedText", f => { text = f(text, inCode || plainText) })
+    view.someProp("transformPastedText", f => { text = f(text, inCode || plainText, view) })
     if (inCode) return text ? new Slice(Fragment.from(view.state.schema.text(text.replace(/\r\n?/g, "\n"))), 0, 0) : Slice.empty
-    let parsed = view.someProp("clipboardTextParser", f => f(text, $context, plainText))
+    let parsed = view.someProp("clipboardTextParser", f => f(text, $context, plainText, view))
     if (parsed) {
       slice = parsed
     } else {
@@ -61,15 +61,19 @@ export function parseFromClipboard(view: EditorView, text: string, html: string
       })
     }
   } else {
-    view.someProp("transformPastedHTML", f => { html = f(html!) })
+    view.someProp("transformPastedHTML", f => { html = f(html!, view) })
     dom = readHTML(html!)
     if (browser.webkit) restoreReplacedSpaces(dom)
   }
 
   let contextNode = dom && dom.querySelector("[data-pm-slice]")
   let sliceData = contextNode && /^(\d+) (\d+)(?: -(\d+))? (.*)/.exec(contextNode.getAttribute("data-pm-slice") || "")
-  if (sliceData && sliceData[3]) for (let i = +sliceData[3]; i > 0 && dom!.firstChild; i--)
-    dom = dom!.firstChild as HTMLElement
+  if (sliceData && sliceData[3]) for (let i = +sliceData[3]; i > 0; i--) {
+    let child = dom!.firstChild
+    while (child && child.nodeType != 1) child = child.nextSibling
+    if (!child) break
+    dom = child as HTMLElement
+  }
 
   if (!slice) {
     let parser = view.someProp("clipboardParser") || view.someProp("domParser") || DOMParser.fromSchema(view.state.schema)
@@ -97,7 +101,7 @@ export function parseFromClipboard(view: EditorView, text: string, html: string
     }
   }
 
-  view.someProp("transformPasted", f => { slice = f(slice!) })
+  view.someProp("transformPasted", f => { slice = f(slice!, view) })
   return slice
 }
 

package/src/dom.ts

@@ -1,7 +1,9 @@
-import * as browser from "./browser"
-
 export type DOMNode = InstanceType<typeof window.Node>
 export type DOMSelection = InstanceType<typeof window.Selection>
+export type DOMSelectionRange = {
+  focusNode: DOMNode | null, focusOffset: number,
+  anchorNode: DOMNode | null, anchorOffset: number
+}
 
 export const domIndex = function(node: Node) {
   for (var index = 0;; index++) {
@@ -10,7 +12,7 @@ export const domIndex = function(node: Node) {
   }
 }
 
-export const parentNode = function(node: Node) {
+export const parentNode = function(node: Node): Node | null {
   let parent = (node as HTMLSlotElement).assignedSlot || node.parentNode
   return parent && parent.nodeType == 11 ? (parent as ShadowRoot).host : parent
 }
@@ -80,11 +82,9 @@ function hasBlockDesc(dom: Node) {
 
 // Work around Chrome issue https://bugs.chromium.org/p/chromium/issues/detail?id=447523
 // (isCollapsed inappropriately returns true in shadow dom)
-export const selectionCollapsed = function(domSel: Selection) {
-  let collapsed = domSel.isCollapsed
-  if (collapsed && browser.chrome && domSel.rangeCount && !domSel.getRangeAt(0).collapsed)
-    collapsed = false
-  return collapsed
+export const selectionCollapsed = function(domSel: DOMSelectionRange) {
+  return domSel.focusNode && isEquivalentPosition(domSel.focusNode, domSel.focusOffset,
+                                                  domSel.anchorNode!, domSel.anchorOffset)
 }
 
 export function keyEvent(keyCode: number, key: string) {
@@ -94,3 +94,9 @@ export function keyEvent(keyCode: number, key: string) {
   ;(event as any).key = (event as any).code = key
   return event
 }
+
+export function deepActiveElement(doc: Document) {
+  let elt = doc.activeElement
+  while (elt && elt.shadowRoot) elt = elt.shadowRoot.activeElement
+  return elt
+}

package/src/domchange.ts

@@ -15,7 +15,7 @@ import {EditorView} from "./index"
 function parseBetween(view: EditorView, from_: number, to_: number) {
   let {node: parent, fromOffset, toOffset, from, to} = view.docView.parseRange(from_, to_)
 
-  let domSel = view.domSelection()
+  let domSel = view.domSelectionRange()
   let find: {node: DOMNode, offset: number, pos?: number}[] | undefined
   let anchor = domSel.anchorNode
   if (anchor && view.dom.contains(anchor.nodeType == 1 ? anchor : anchor.parentNode)) {
@@ -111,7 +111,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") &&
+      addedNodes.some(n => n.nodeName == "DIV" || n.nodeName == "P" || n.nodeName == "LI") &&
       (!change || change.endA >= change.endB) &&
       view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {
     view.input.lastIOSEnter = 0