prosemirror-view 1.32.0 → 1.32.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.32.2 (2023-10-27)
+
+### Bug fixes
+
+Check for text/uri-list data on the clipboard or in the drop event when pasting or dropping content, since some types of copying on Apple devices use this format.
+
+## 1.32.1 (2023-10-13)
+
+### Bug fixes
+
+Work around a Chrome issue where it didn't draw a selection for inline leaf nodes when selecting across them.
+
+Override the native behavior when shift-selecting horizontally across non-text inline nodes, since most browsers behave poorly here.
+
 ## 1.32.0 (2023-09-27)
 
 ### Bug fixes

package/dist/index.cjs

@@ -2746,24 +2746,31 @@ function selectHorizontally(view, dir, mods) {
   var sel = view.state.selection;
 
   if (sel instanceof prosemirrorState.TextSelection) {
-    if (!sel.empty || mods.indexOf("s") > -1) {
+    if (mods.indexOf("s") > -1) {
+      var $head = sel.$head,
+          node = $head.textOffset ? null : dir < 0 ? $head.nodeBefore : $head.nodeAfter;
+      if (!node || node.isText || !node.isLeaf) return false;
+      var $newHead = view.state.doc.resolve($head.pos + node.nodeSize * (dir < 0 ? -1 : 1));
+      return apply(view, new prosemirrorState.TextSelection(sel.$anchor, $newHead));
+    } else if (!sel.empty) {
       return false;
     } else if (view.endOfTextblock(dir > 0 ? "forward" : "backward")) {
       var next = moveSelectionBlock(view.state, dir);
       if (next && next instanceof prosemirrorState.NodeSelection) return apply(view, next);
       return false;
     } else if (!(mac && mods.indexOf("m") > -1)) {
-      var $head = sel.$head,
-          node = $head.textOffset ? null : dir < 0 ? $head.nodeBefore : $head.nodeAfter,
+      var _$head = sel.$head,
+          _node = _$head.textOffset ? null : dir < 0 ? _$head.nodeBefore : _$head.nodeAfter,
           desc;
-      if (!node || node.isText) return false;
-      var nodePos = dir < 0 ? $head.pos - node.nodeSize : $head.pos;
-      if (!(node.isAtom || (desc = view.docView.descAt(nodePos)) && !desc.contentDOM)) return false;
 
-      if (prosemirrorState.NodeSelection.isSelectable(node)) {
-        return apply(view, new prosemirrorState.NodeSelection(dir < 0 ? view.state.doc.resolve($head.pos - node.nodeSize) : $head));
+      if (!_node || _node.isText) return false;
+      var nodePos = dir < 0 ? _$head.pos - _node.nodeSize : _$head.pos;
+      if (!(_node.isAtom || (desc = view.docView.descAt(nodePos)) && !desc.contentDOM)) return false;
+
+      if (prosemirrorState.NodeSelection.isSelectable(_node)) {
+        return apply(view, new prosemirrorState.NodeSelection(dir < 0 ? view.state.doc.resolve(_$head.pos - _node.nodeSize) : _$head));
       } else if (webkit) {
-        return apply(view, new prosemirrorState.TextSelection(view.state.doc.resolve(dir < 0 ? nodePos : nodePos + node.nodeSize)));
+        return apply(view, new prosemirrorState.TextSelection(view.state.doc.resolve(dir < 0 ? nodePos : nodePos + _node.nodeSize)));
       } else {
         return false;
       }
@@ -2783,7 +2790,6 @@ function nodeLen(node) {
 }
 
 function isIgnorable(dom, dir) {
-  if (dom.contentEditable == "false") return true;
   var desc = dom.pmViewDesc;
   return desc && desc.size == 0 && (dir < 0 || dom.nextSibling || dom.nodeName != "BR");
 }
@@ -3206,7 +3212,7 @@ function parseFromClipboard(view, text, html, plainText, $context) {
 
       for (var node = slice.content.firstChild; openStart < slice.openStart && !node.type.spec.isolating; openStart++, node = node.firstChild) {}
 
-      for (var _node = slice.content.lastChild; openEnd < slice.openEnd && !_node.type.spec.isolating; openEnd++, _node = _node.lastChild) {}
+      for (var _node2 = slice.content.lastChild; openEnd < slice.openEnd && !_node2.type.spec.isolating; openEnd++, _node2 = _node2.lastChild) {}
 
       slice = closeSlice(slice, openStart, openEnd);
     }
@@ -3987,12 +3993,19 @@ function doPaste(view, text, html, preferPlain, event) {
   return true;
 }
 
+function getText(clipboardData) {
+  var text = clipboardData.getData("text/html") || clipboardData.getData("Text");
+  if (text) return text;
+  var uris = clipboardData.getData("text/uri-list");
+  return uris ? uris.replace(/\r?\n/g, " ") : "";
+}
+
 editHandlers.paste = function (view, _event) {
   var event = _event;
   if (view.composing && !android) return;
   var data = brokenClipboardAPI ? null : event.clipboardData;
   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);
+  if (data && doPaste(view, getText(data), data.getData("text/html"), plain, event)) event.preventDefault();else capturePaste(view, event);
 };
 
 var Dragging = _createClass(function Dragging(slice, move) {
@@ -4056,7 +4069,7 @@ editHandlers.drop = function (view, _event) {
       slice = f(slice, view);
     });
   } else {
-    slice = parseFromClipboard(view, event.dataTransfer.getData(brokenClipboardAPI ? "Text" : "text/plain"), brokenClipboardAPI ? null : event.dataTransfer.getData("text/html"), false, $mouse);
+    slice = parseFromClipboard(view, getText(event.dataTransfer), brokenClipboardAPI ? null : event.dataTransfer.getData("text/html"), false, $mouse);
   }
 
   var move = !!(dragging && !event[dragCopyModifier]);

package/dist/index.js

@@ -2328,7 +2328,14 @@ function apply(view, sel) {
 function selectHorizontally(view, dir, mods) {
     let sel = view.state.selection;
     if (sel instanceof TextSelection) {
-        if (!sel.empty || mods.indexOf("s") > -1) {
+        if (mods.indexOf("s") > -1) {
+            let { $head } = sel, node = $head.textOffset ? null : dir < 0 ? $head.nodeBefore : $head.nodeAfter;
+            if (!node || node.isText || !node.isLeaf)
+                return false;
+            let $newHead = view.state.doc.resolve($head.pos + node.nodeSize * (dir < 0 ? -1 : 1));
+            return apply(view, new TextSelection(sel.$anchor, $newHead));
+        }
+        else if (!sel.empty) {
             return false;
         }
         else if (view.endOfTextblock(dir > 0 ? "forward" : "backward")) {
@@ -2372,8 +2379,6 @@ function nodeLen(node) {
     return node.nodeType == 3 ? node.nodeValue.length : node.childNodes.length;
 }
 function isIgnorable(dom, dir) {
-    if (dom.contentEditable == "false")
-        return true;
     let desc = dom.pmViewDesc;
     return desc && desc.size == 0 && (dir < 0 || dom.nextSibling || dom.nodeName != "BR");
 }
@@ -3517,6 +3522,13 @@ function doPaste(view, text, html, preferPlain, event) {
     view.dispatch(tr.scrollIntoView().setMeta("paste", true).setMeta("uiEvent", "paste"));
     return true;
 }
+function getText(clipboardData) {
+    let text = clipboardData.getData("text/html") || clipboardData.getData("Text");
+    if (text)
+        return text;
+    let uris = clipboardData.getData("text/uri-list");
+    return uris ? uris.replace(/\r?\n/g, " ") : "";
+}
 editHandlers.paste = (view, _event) => {
     let event = _event;
     // Handling paste from JavaScript during composition is very poorly
@@ -3527,7 +3539,7 @@ editHandlers.paste = (view, _event) => {
         return;
     let data = brokenClipboardAPI ? null : event.clipboardData;
     let plain = view.input.shiftKey && view.input.lastKeyCode != 45;
-    if (data && doPaste(view, data.getData("text/plain"), data.getData("text/html"), plain, event))
+    if (data && doPaste(view, getText(data), data.getData("text/html"), plain, event))
         event.preventDefault();
     else
         capturePaste(view, event);
@@ -3589,7 +3601,7 @@ editHandlers.drop = (view, _event) => {
         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);
+        slice = parseFromClipboard(view, getText(event.dataTransfer), brokenClipboardAPI ? null : event.dataTransfer.getData("text/html"), false, $mouse);
     }
     let move = !!(dragging && !event[dragCopyModifier]);
     if (view.someProp("handleDrop", f => f(view, event, slice || Slice.empty, move))) {

package/package.json

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

package/src/capturekeys.ts

@@ -19,7 +19,12 @@ function apply(view: EditorView, sel: Selection) {
 function selectHorizontally(view: EditorView, dir: number, mods: string) {
   let sel = view.state.selection
   if (sel instanceof TextSelection) {
-    if (!sel.empty || mods.indexOf("s") > -1) {
+    if (mods.indexOf("s") > -1) {
+      let {$head} = sel, node = $head.textOffset ? null : dir < 0 ? $head.nodeBefore : $head.nodeAfter
+      if (!node || node.isText || !node.isLeaf) return false
+      let $newHead = view.state.doc.resolve($head.pos + node.nodeSize * (dir < 0 ? -1 : 1))
+      return apply(view, new TextSelection(sel.$anchor, $newHead))
+    } else if (!sel.empty) {
       return false
     } else if (view.endOfTextblock(dir > 0 ? "forward" : "backward")) {
       let next = moveSelectionBlock(view.state, dir)
@@ -55,7 +60,6 @@ function nodeLen(node: Node) {
 }
 
 function isIgnorable(dom: Node, dir: number) {
-  if ((dom as HTMLElement).contentEditable == "false") return true
   let desc = dom.pmViewDesc
   return desc && desc.size == 0 && (dir < 0 || dom.nextSibling || dom.nodeName != "BR")
 }

package/src/input.ts

@@ -608,6 +608,13 @@ export function doPaste(view: EditorView, text: string, html: string | null, pre
   return true
 }
 
+function getText(clipboardData: DataTransfer) {
+  let text = clipboardData.getData("text/html") || clipboardData.getData("Text")
+  if (text) return text
+  let uris = clipboardData.getData("text/uri-list")
+  return uris ? uris.replace(/\r?\n/g, " ") : ""
+}
+
 editHandlers.paste = (view, _event) => {
   let event = _event as ClipboardEvent
   // Handling paste from JavaScript during composition is very poorly
@@ -617,7 +624,7 @@ editHandlers.paste = (view, _event) => {
   if (view.composing && !browser.android) return
   let data = brokenClipboardAPI ? null : event.clipboardData
   let plain = view.input.shiftKey && view.input.lastKeyCode != 45
-  if (data && doPaste(view, data.getData("text/plain"), data.getData("text/html"), plain, event))
+  if (data && doPaste(view, getText(data), data.getData("text/html"), plain, event))
     event.preventDefault()
   else
     capturePaste(view, event)
@@ -678,7 +685,7 @@ editHandlers.drop = (view, _event) => {
   if (slice) {
     view.someProp("transformPasted", f => { slice = f(slice!, view) })
   } else {
-    slice = parseFromClipboard(view, event.dataTransfer.getData(brokenClipboardAPI ? "Text" : "text/plain"),
+    slice = parseFromClipboard(view, getText(event.dataTransfer),
                                brokenClipboardAPI ? null : event.dataTransfer.getData("text/html"), false, $mouse)
   }
   let move = !!(dragging && !event[dragCopyModifier])

package/style/prosemirror.css

@@ -23,6 +23,9 @@
 .ProseMirror-hideselection *::-moz-selection { background: transparent; }
 .ProseMirror-hideselection { caret-color: transparent; }
 
+/* See https://github.com/ProseMirror/prosemirror/issues/1421#issuecomment-1759320191 */
+.ProseMirror [draggable][contenteditable=false] { user-select: text }
+
 .ProseMirror-selectednode {
   outline: 2px solid #8cf;
 }