prosemirror-view 1.31.4 → 1.31.6

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 1.31.6 (2023-07-14)
+
+### Bug fixes
+
+Fix a bug that caused `posAtCoords` to return incorrect results for coordinates over inline-decorated text.
+
+Don't try to scroll fixed-positioned elements into view by scrolling their parent elements.
+
+## 1.31.5 (2023-06-19)
+
+### Bug fixes
+
+Fix a bug where the editor accidentally blocked shift-delete when the whole document is selected.
+
+Bring back workaround for an issue where Firefox draws the cursor in the wrong place in a code block.
+
+Fix an issue where Shift-Insert pastes pasted plain text (because Shift was being held).
+
+Fix an issue where selecting across paragraph and starting a composition would update the state as if Enter was pressed and disrupt the composition.
+
 ## 1.31.4 (2023-05-31)
 
 ### Bug fixes

package/dist/index.cjs

@@ -238,7 +238,7 @@ function scrollRectIntoView(view, rect, startDOM) {
       }
     }
 
-    if (atTop) break;
+    if (atTop || /^(fixed|sticky)$/.test(getComputedStyle(parent).position)) break;
   }
 }
 
@@ -441,7 +441,7 @@ function posFromCaret(view, node, offset, coords) {
         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 (!desc.contentDOM && outsideBlock < 0 && !desc.node.isText) {
         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;
       }
@@ -1134,6 +1134,21 @@ var ViewDesc = function () {
 
         if (node.nodeType == 3) {
           brKludge = !!(_offset && node.nodeValue[_offset - 1] == "\n");
+
+          if (brKludge && _offset == node.nodeValue.length) {
+            for (var scan = node, after; scan; scan = scan.parentNode) {
+              if (after = scan.nextSibling) {
+                if (after.nodeName == "BR") anchorDOM = headDOM = {
+                  node: after.parentNode,
+                  offset: domIndex(after) + 1
+                };
+                break;
+              }
+
+              var desc = scan.pmViewDesc;
+              if (desc && desc.node && desc.node.isBlock) break;
+            }
+          }
         } else {
           var prev = node.childNodes[_offset - 1];
           brKludge = prev && (prev.nodeName == "BR" || prev.contentEditable == "false");
@@ -1141,8 +1156,8 @@ var ViewDesc = function () {
       }
 
       if (gecko && domSel.focusNode && domSel.focusNode != headDOM.node && domSel.focusNode.nodeType == 1) {
-        var after = domSel.focusNode.childNodes[domSel.focusOffset];
-        if (after && after.contentEditable == "false") force = true;
+        var _after2 = domSel.focusNode.childNodes[domSel.focusOffset];
+        if (_after2 && _after2.contentEditable == "false") force = true;
       }
 
       if (!(force || brKludge && safari) && isEquivalentPosition(anchorDOM.node, anchorDOM.offset, domSel.anchorNode, domSel.anchorOffset) && isEquivalentPosition(headDOM.node, headDOM.offset, domSel.focusNode, domSel.focusOffset)) return;
@@ -1378,7 +1393,7 @@ var MarkViewDesc = function (_ViewDesc3) {
       return {
         mark: this.mark.type.name,
         attrs: this.mark.attrs,
-        contentElement: this.contentDOM || undefined
+        contentElement: this.contentDOM
       };
     }
   }, {
@@ -2991,7 +3006,7 @@ function captureKeyDown(view, event) {
 
   if (code == 8 || mac && code == 72 && mods == "c") {
     return stopNativeHorizontalDelete(view, -1) || skipIgnoredNodes(view, -1);
-  } else if (code == 46 || mac && code == 68 && mods == "c") {
+  } else if (code == 46 && !event.shiftKey || mac && code == 68 && mods == "c") {
     return stopNativeHorizontalDelete(view, 1) || skipIgnoredNodes(view, 1);
   } else if (code == 13 || code == 27) {
     return true;
@@ -3895,10 +3910,11 @@ function capturePaste(view, event) {
   if (!plainText) target.contentEditable = "true";
   target.style.cssText = "position: fixed; left: -10000px; top: 10px";
   target.focus();
+  var plain = view.input.shiftKey && view.input.lastKeyCode != 45;
   setTimeout(function () {
     view.focus();
     if (target.parentNode) target.parentNode.removeChild(target);
-    if (plainText) doPaste(view, target.value, null, view.input.shiftKey, event);else doPaste(view, target.textContent, target.innerHTML, view.input.shiftKey, event);
+    if (plainText) doPaste(view, target.value, null, plain, event);else doPaste(view, target.textContent, target.innerHTML, plain, event);
   }, 50);
 }
 
@@ -3909,7 +3925,7 @@ function doPaste(view, text, html, preferPlain, event) {
   })) return true;
   if (!slice) return false;
   var singleNode = sliceSingleNode(slice);
-  var tr = singleNode ? view.state.tr.replaceSelectionWith(singleNode, view.input.shiftKey) : view.state.tr.replaceSelection(slice);
+  var tr = singleNode ? view.state.tr.replaceSelectionWith(singleNode, preferPlain) : view.state.tr.replaceSelection(slice);
   view.dispatch(tr.scrollIntoView().setMeta("paste", true).setMeta("uiEvent", "paste"));
   return true;
 }
@@ -3918,7 +3934,8 @@ editHandlers.paste = function (view, _event) {
   var event = _event;
   if (view.composing && !android) return;
   var data = brokenClipboardAPI ? null : event.clipboardData;
-  if (data && doPaste(view, data.getData("text/plain"), data.getData("text/html"), view.input.shiftKey, event)) event.preventDefault();else capturePaste(view, event);
+  var plain = view.input.shiftKey && view.input.lastKeyCode != 45;
+  if (data && doPaste(view, data.getData("text/plain"), data.getData("text/html"), plain, event)) event.preventDefault();else capturePaste(view, event);
 };
 
 var Dragging = _createClass(function Dragging(slice, move) {
@@ -5372,7 +5389,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
 
   if ((ios && view.input.lastIOSEnter > Date.now() - 225 && (!inlineChange || addedNodes.some(function (n) {
     return n.nodeName == "DIV" || n.nodeName == "P";
-  })) || !inlineChange && $from.pos < parse.doc.content.size && (nextSel = prosemirrorState.Selection.findFrom(parse.doc.resolve($from.pos + 1), 1, true)) && nextSel.head == $to.pos) && view.someProp("handleKeyDown", function (f) {
+  })) || !inlineChange && $from.pos < parse.doc.content.size && !$from.sameParent($to) && (nextSel = prosemirrorState.Selection.findFrom(parse.doc.resolve($from.pos + 1), 1, true)) && nextSel.head == $to.pos) && view.someProp("handleKeyDown", function (f) {
     return f(view, keyEvent(13, "Enter"));
   })) {
     view.input.lastIOSEnter = 0;

package/dist/index.js

@@ -182,7 +182,7 @@ function scrollRectIntoView(view, rect, startDOM) {
                 rect = { left: rect.left - dX, top: rect.top - dY, right: rect.right - dX, bottom: rect.bottom - dY };
             }
         }
-        if (atTop)
+        if (atTop || /^(fixed|sticky)$/.test(getComputedStyle(parent).position))
             break;
     }
 }
@@ -356,7 +356,7 @@ function posFromCaret(view, node, offset, coords) {
                 else if (rect.right < coords.left || rect.bottom < coords.top)
                     outsideBlock = desc.posAfter;
             }
-            if (!desc.contentDOM && outsideBlock < 0) {
+            if (!desc.contentDOM && outsideBlock < 0 && !desc.node.isText) {
                 // 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;
@@ -957,6 +957,19 @@ class ViewDesc {
             let { node, offset } = anchorDOM;
             if (node.nodeType == 3) {
                 brKludge = !!(offset && node.nodeValue[offset - 1] == "\n");
+                // Issue #1128
+                if (brKludge && offset == node.nodeValue.length) {
+                    for (let scan = node, after; scan; scan = scan.parentNode) {
+                        if (after = scan.nextSibling) {
+                            if (after.nodeName == "BR")
+                                anchorDOM = headDOM = { node: after.parentNode, offset: domIndex(after) + 1 };
+                            break;
+                        }
+                        let desc = scan.pmViewDesc;
+                        if (desc && desc.node && desc.node.isBlock)
+                            break;
+                    }
+                }
             }
             else {
                 let prev = node.childNodes[offset - 1];
@@ -1132,7 +1145,7 @@ class MarkViewDesc extends ViewDesc {
     parseRule() {
         if ((this.dirty & NODE_DIRTY) || this.mark.type.spec.reparseInView)
             return null;
-        return { mark: this.mark.type.name, attrs: this.mark.attrs, contentElement: this.contentDOM || undefined };
+        return { mark: this.mark.type.name, attrs: this.mark.attrs, contentElement: this.contentDOM };
     }
     matchesMark(mark) { return this.dirty != NODE_DIRTY && this.mark.eq(mark); }
     markDirty(from, to) {
@@ -2586,7 +2599,7 @@ function captureKeyDown(view, event) {
     if (code == 8 || (mac && code == 72 && mods == "c")) { // Backspace, Ctrl-h on Mac
         return stopNativeHorizontalDelete(view, -1) || skipIgnoredNodes(view, -1);
     }
-    else if (code == 46 || (mac && code == 68 && mods == "c")) { // Delete, Ctrl-d on Mac
+    else if ((code == 46 && !event.shiftKey) || (mac && code == 68 && mods == "c")) { // Delete, Ctrl-d on Mac
         return stopNativeHorizontalDelete(view, 1) || skipIgnoredNodes(view, 1);
     }
     else if (code == 13 || code == 27) { // Enter, Esc
@@ -3414,14 +3427,15 @@ function capturePaste(view, event) {
         target.contentEditable = "true";
     target.style.cssText = "position: fixed; left: -10000px; top: 10px";
     target.focus();
+    let plain = view.input.shiftKey && view.input.lastKeyCode != 45;
     setTimeout(() => {
         view.focus();
         if (target.parentNode)
             target.parentNode.removeChild(target);
         if (plainText)
-            doPaste(view, target.value, null, view.input.shiftKey, event);
+            doPaste(view, target.value, null, plain, event);
         else
-            doPaste(view, target.textContent, target.innerHTML, view.input.shiftKey, event);
+            doPaste(view, target.textContent, target.innerHTML, plain, event);
     }, 50);
 }
 function doPaste(view, text, html, preferPlain, event) {
@@ -3432,7 +3446,7 @@ function doPaste(view, text, html, preferPlain, event) {
         return false;
     let singleNode = sliceSingleNode(slice);
     let tr = singleNode
-        ? view.state.tr.replaceSelectionWith(singleNode, view.input.shiftKey)
+        ? view.state.tr.replaceSelectionWith(singleNode, preferPlain)
         : view.state.tr.replaceSelection(slice);
     view.dispatch(tr.scrollIntoView().setMeta("paste", true).setMeta("uiEvent", "paste"));
     return true;
@@ -3446,7 +3460,8 @@ editHandlers.paste = (view, _event) => {
     if (view.composing && !android)
         return;
     let data = brokenClipboardAPI ? null : event.clipboardData;
-    if (data && doPaste(view, data.getData("text/plain"), data.getData("text/html"), view.input.shiftKey, event))
+    let plain = view.input.shiftKey && view.input.lastKeyCode != 45;
+    if (data && doPaste(view, data.getData("text/plain"), data.getData("text/html"), plain, event))
         event.preventDefault();
     else
         capturePaste(view, event);
@@ -4752,7 +4767,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
     // as being an iOS enter press), just dispatch an Enter key instead.
     if (((ios && view.input.lastIOSEnter > Date.now() - 225 &&
         (!inlineChange || addedNodes.some(n => n.nodeName == "DIV" || n.nodeName == "P"))) ||
-        (!inlineChange && $from.pos < parse.doc.content.size &&
+        (!inlineChange && $from.pos < parse.doc.content.size && !$from.sameParent($to) &&
             (nextSel = Selection.findFrom(parse.doc.resolve($from.pos + 1), 1, true)) &&
             nextSel.head == $to.pos)) &&
         view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {

package/package.json

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

package/src/capturekeys.ts

@@ -278,7 +278,7 @@ export function captureKeyDown(view: EditorView, event: KeyboardEvent) {
   let code = event.keyCode, mods = getMods(event)
   if (code == 8 || (browser.mac && code == 72 && mods == "c")) { // Backspace, Ctrl-h on Mac
     return stopNativeHorizontalDelete(view, -1) || skipIgnoredNodes(view, -1)
-  } else if (code == 46 || (browser.mac && code == 68 && mods == "c")) { // Delete, Ctrl-d on Mac
+  } else if ((code == 46 && !event.shiftKey) || (browser.mac && code == 68 && mods == "c")) { // Delete, Ctrl-d on Mac
     return stopNativeHorizontalDelete(view, 1) || skipIgnoredNodes(view, 1)
   } else if (code == 13 || code == 27) { // Enter, Esc
     return true

package/src/domchange.ts

@@ -185,7 +185,7 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
   // as being an iOS enter press), just dispatch an Enter key instead.
   if (((browser.ios && view.input.lastIOSEnter > Date.now() - 225 &&
         (!inlineChange || addedNodes.some(n => n.nodeName == "DIV" || n.nodeName == "P"))) ||
-       (!inlineChange && $from.pos < parse.doc.content.size &&
+       (!inlineChange && $from.pos < parse.doc.content.size && !$from.sameParent($to) &&
         (nextSel = Selection.findFrom(parse.doc.resolve($from.pos + 1), 1, true)) &&
         nextSel.head == $to.pos)) &&
       view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {

package/src/domcoords.ts

@@ -53,7 +53,7 @@ export function scrollRectIntoView(view: EditorView, rect: Rect, startDOM: Node)
         rect = {left: rect.left - dX, top: rect.top - dY, right: rect.right - dX, bottom: rect.bottom - dY}
       }
     }
-    if (atTop) break
+    if (atTop || /^(fixed|sticky)$/.test(getComputedStyle(parent as HTMLElement).position)) break
   }
 }
 
@@ -227,7 +227,7 @@ function posFromCaret(view: EditorView, node: Node, offset: number, coords: {top
         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 (!desc.contentDOM && outsideBlock < 0 && !desc.node.isText) {
         // 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

package/src/input.ts

@@ -582,11 +582,12 @@ function capturePaste(view: EditorView, event: ClipboardEvent) {
   if (!plainText) target.contentEditable = "true"
   target.style.cssText = "position: fixed; left: -10000px; top: 10px"
   target.focus()
+  let plain = view.input.shiftKey && view.input.lastKeyCode != 45
   setTimeout(() => {
     view.focus()
     if (target.parentNode) target.parentNode.removeChild(target)
-    if (plainText) doPaste(view, (target as HTMLTextAreaElement).value, null, view.input.shiftKey, event)
-    else doPaste(view, target.textContent!, target.innerHTML, view.input.shiftKey, event)
+    if (plainText) doPaste(view, (target as HTMLTextAreaElement).value, null, plain, event)
+    else doPaste(view, target.textContent!, target.innerHTML, plain, event)
   }, 50)
 }
 
@@ -597,7 +598,7 @@ export function doPaste(view: EditorView, text: string, html: string | null, pre
 
   let singleNode = sliceSingleNode(slice)
   let tr = singleNode
-    ? view.state.tr.replaceSelectionWith(singleNode, view.input.shiftKey)
+    ? view.state.tr.replaceSelectionWith(singleNode, preferPlain)
     : view.state.tr.replaceSelection(slice)
   view.dispatch(tr.scrollIntoView().setMeta("paste", true).setMeta("uiEvent", "paste"))
   return true
@@ -611,7 +612,8 @@ editHandlers.paste = (view, _event) => {
   // where the editor is almost always composing.
   if (view.composing && !browser.android) return
   let data = brokenClipboardAPI ? null : event.clipboardData
-  if (data && doPaste(view, data.getData("text/plain"), data.getData("text/html"), view.input.shiftKey, event))
+  let plain = view.input.shiftKey && view.input.lastKeyCode != 45
+  if (data && doPaste(view, data.getData("text/plain"), data.getData("text/html"), plain, event))
     event.preventDefault()
   else
     capturePaste(view, event)

package/src/viewdesc.ts

@@ -385,6 +385,18 @@ export class ViewDesc {
       let {node, offset} = anchorDOM
       if (node.nodeType == 3) {
         brKludge = !!(offset && node.nodeValue![offset - 1] == "\n")
+        // Issue #1128
+        if (brKludge && offset == node.nodeValue!.length) {
+          for (let scan: DOMNode | null = node, after; scan; scan = scan.parentNode) {
+            if (after = scan.nextSibling) {
+              if (after.nodeName == "BR")
+                anchorDOM = headDOM = {node: after.parentNode!, offset: domIndex(after) + 1}
+              break
+            }
+            let desc = scan.pmViewDesc
+            if (desc && desc.node && desc.node.isBlock) break
+          }
+        }
       } else {
         let prev = node.childNodes[offset - 1]
         brKludge = prev && (prev.nodeName == "BR" || (prev as HTMLElement).contentEditable == "false")
@@ -550,7 +562,7 @@ class CompositionViewDesc extends ViewDesc {
 // some cases they will be split more often than would appear
 // necessary.
 class MarkViewDesc extends ViewDesc {
-  constructor(parent: ViewDesc, readonly mark: Mark, dom: DOMNode, contentDOM: HTMLElement | null) {
+  constructor(parent: ViewDesc, readonly mark: Mark, dom: DOMNode, contentDOM: HTMLElement) {
     super(parent, [], dom, contentDOM)
   }
 
@@ -564,7 +576,7 @@ class MarkViewDesc extends ViewDesc {
 
   parseRule(): ParseRule | null {
     if ((this.dirty & NODE_DIRTY) || this.mark.type.spec.reparseInView) return null
-    return {mark: this.mark.type.name, attrs: this.mark.attrs, contentElement: this.contentDOM || undefined}
+    return {mark: this.mark.type.name, attrs: this.mark.attrs, contentElement: this.contentDOM!}
   }
 
   matchesMark(mark: Mark) { return this.dirty != NODE_DIRTY && this.mark.eq(mark) }