prosemirror-view 1.32.1 → 1.32.3

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.32.3 (2023-11-01)
+
+### Bug fixes
+
+Fix a bug where, in some situations, pasting plain text pasted HTML markup.
+
+## 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

package/dist/index.cjs

@@ -3993,12 +3993,19 @@ function doPaste(view, text, html, preferPlain, event) {
   return true;
 }
 
+function getText(clipboardData) {
+  var text = clipboardData.getData("text/plain") || 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) {
@@ -4062,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

@@ -3522,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/plain") || 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
@@ -3532,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);
@@ -3594,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.1",
+  "version": "1.32.3",
   "description": "ProseMirror's view component",
   "type": "module",
   "main": "dist/index.cjs",

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/plain") || 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])