prosemirror-view 1.33.4 → 1.33.6

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.33.6 (2024-04-30)
+
+### Bug fixes
+
+Make sure the content slice stored for an in-editor drag is the one that was transformed by `transformCopied`.
+
+## 1.33.5 (2024-04-22)
+
+### Bug fixes
+
+Fix a regression in composition handling in 1.33.3 that occurs for some IMEs when starting composition on an empty line.
+
 ## 1.33.4 (2024-04-08)
 
 ### Bug fixes

package/dist/index.cjs

@@ -2602,7 +2602,8 @@ function serializeForClipboard(view, slice) {
   }) || slice.content.textBetween(0, slice.content.size, "\n\n");
   return {
     dom: wrap,
-    text: text
+    text: text,
+    slice: slice
   };
 }
 function parseFromClipboard(view, text, html, plainText, $context) {
@@ -3248,7 +3249,7 @@ function findCompositionNode(view) {
       if (!(!descBefore || !descBefore.isText(textBefore.nodeValue))) return textAfter;
     }
   }
-  return textBefore;
+  return textBefore || textAfter;
 }
 function timestampFromCustomEvent() {
   var event = document.createEvent("Event");
@@ -3366,10 +3367,11 @@ handlers.dragstart = function (view, _event) {
     var desc = view.docView.nearestDesc(event.target, true);
     if (desc && desc.node.type.spec.draggable && desc != view.docView) node = prosemirrorState.NodeSelection.create(view.state.doc, desc.posBefore);
   }
-  var slice = (node || view.state.selection).content(),
-    _serializeForClipboar2 = serializeForClipboard(view, slice),
+  var draggedSlice = (node || view.state.selection).content();
+  var _serializeForClipboar2 = serializeForClipboard(view, draggedSlice),
     dom = _serializeForClipboar2.dom,
-    text = _serializeForClipboar2.text;
+    text = _serializeForClipboar2.text,
+    slice = _serializeForClipboar2.slice;
   event.dataTransfer.clearData();
   event.dataTransfer.setData(brokenClipboardAPI ? "Text" : "text/html", dom.innerHTML);
   event.dataTransfer.effectAllowed = "copyMove";

package/dist/index.js

@@ -2753,7 +2753,7 @@ function serializeForClipboard(view, slice) {
         firstChild.setAttribute("data-pm-slice", `${openStart} ${openEnd}${wrappers ? ` -${wrappers}` : ""} ${JSON.stringify(context)}`);
     let text = view.someProp("clipboardTextSerializer", f => f(slice, view)) ||
         slice.content.textBetween(0, slice.content.size, "\n\n");
-    return { dom: wrap, text };
+    return { dom: wrap, text, slice };
 }
 // Read a slice of content from the clipboard (or drop data).
 function parseFromClipboard(view, text, html, plainText, $context) {
@@ -3468,7 +3468,7 @@ function findCompositionNode(view) {
                 return textAfter;
         }
     }
-    return textBefore;
+    return textBefore || textAfter;
 }
 function timestampFromCustomEvent() {
     let event = document.createEvent("Event");
@@ -3625,7 +3625,8 @@ handlers.dragstart = (view, _event) => {
         if (desc && desc.node.type.spec.draggable && desc != view.docView)
             node = NodeSelection.create(view.state.doc, desc.posBefore);
     }
-    let slice = (node || view.state.selection).content(), { dom, text } = serializeForClipboard(view, slice);
+    let draggedSlice = (node || view.state.selection).content();
+    let { dom, text, slice } = serializeForClipboard(view, draggedSlice);
     event.dataTransfer.clearData();
     event.dataTransfer.setData(brokenClipboardAPI ? "Text" : "text/html", dom.innerHTML);
     // See https://github.com/ProseMirror/prosemirror/issues/1156

package/package.json

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

package/src/clipboard.ts

@@ -36,7 +36,7 @@ export function serializeForClipboard(view: EditorView, slice: Slice) {
   let text = view.someProp("clipboardTextSerializer", f => f(slice, view)) ||
       slice.content.textBetween(0, slice.content.size, "\n\n")
 
-  return {dom: wrap, text}
+  return {dom: wrap, text, slice}
 }
 
 // Read a slice of content from the clipboard (or drop data).

package/src/input.ts

@@ -526,7 +526,7 @@ export function findCompositionNode(view: EditorView) {
         return textAfter
     }
   }
-  return textBefore
+  return textBefore || textAfter
 }
 
 function timestampFromCustomEvent() {
@@ -674,7 +674,8 @@ handlers.dragstart = (view, _event) => {
     if (desc && desc.node.type.spec.draggable && desc != view.docView)
       node = NodeSelection.create(view.state.doc, desc.posBefore)
   }
-  let slice = (node || view.state.selection).content(), {dom, text} = serializeForClipboard(view, slice)
+  let draggedSlice = (node || view.state.selection).content()
+  let {dom, text, slice} = serializeForClipboard(view, draggedSlice)
   event.dataTransfer.clearData()
   event.dataTransfer.setData(brokenClipboardAPI ? "Text" : "text/html", dom.innerHTML)
   // See https://github.com/ProseMirror/prosemirror/issues/1156