prosemirror-view 1.38.1 → 1.39.0

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.39.0 (2025-04-04)
+
+### Bug fixes
+
+Fix an issue where, with some types of schemas, pressing Enter on Android with a Chinese keyboard wouldn't properly detect the Enter press.
+
+### New features
+
+The new `dragCopies` prop can be used to configure whether a drag event inside the editor copies or moves content.
+
 ## 1.38.1 (2025-03-04)
 
 ### Bug fixes

package/dist/index.cjs

@@ -3411,6 +3411,7 @@ editHandlers.paste = function (view, _event) {
   if (view.composing && !android) return;
   var data = brokenClipboardAPI ? null : event.clipboardData;
   var plain = view.input.shiftKey && view.input.lastKeyCode != 45;
+  console.log("paste event", !!data, view.state.selection.from, view.state.selection.to);
   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, node) {
@@ -3420,6 +3421,12 @@ var Dragging = _createClass(function Dragging(slice, move, node) {
   this.node = node;
 });
 var dragCopyModifier = mac ? "altKey" : "ctrlKey";
+function dragMoves(view, event) {
+  var moves = view.someProp("dragCopies", function (test) {
+    return !test(event);
+  });
+  return moves != null ? moves : !event[dragCopyModifier];
+}
 handlers.dragstart = function (view, _event) {
   var event = _event;
   var mouseDown = view.input.mouseDown;
@@ -3443,7 +3450,7 @@ handlers.dragstart = function (view, _event) {
   event.dataTransfer.setData(brokenClipboardAPI ? "Text" : "text/html", dom.innerHTML);
   event.dataTransfer.effectAllowed = "copyMove";
   if (!brokenClipboardAPI) event.dataTransfer.setData("text/plain", text);
-  view.dragging = new Dragging(slice, !event[dragCopyModifier], node);
+  view.dragging = new Dragging(slice, dragMoves(view, event), node);
 };
 handlers.dragend = function (view) {
   var dragging = view.dragging;
@@ -3470,7 +3477,7 @@ editHandlers.drop = function (view, _event) {
   } else {
     slice = parseFromClipboard(view, getText(event.dataTransfer), brokenClipboardAPI ? null : event.dataTransfer.getData("text/html"), false, $mouse);
   }
-  var move = !!(dragging && !event[dragCopyModifier]);
+  var move = !!(dragging && dragMoves(view, event));
   if (view.someProp("handleDrop", function (f) {
     return f(view, event, slice || prosemirrorModel.Slice.empty, move);
   })) {
@@ -4662,7 +4669,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
   var nextSel;
   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 && !$from.sameParent($to) && (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) || !$from.parent.inlineContent) && (nextSel = prosemirrorState.Selection.findFrom(parse.doc.resolve($from.pos + 1), 1, true)) && nextSel.head > $from.pos) && view.someProp("handleKeyDown", function (f) {
     return f(view, keyEvent(13, "Enter"));
   })) {
     view.input.lastIOSEnter = 0;

package/dist/index.d.cts

@@ -699,6 +699,12 @@ interface EditorProps<P = any> {
     */
     handleScrollToSelection?: (this: P, view: EditorView) => boolean;
     /**
+    Determines whether an in-editor drag event should copy or move
+    the selection. When not given, the event's `altKey` property is
+    used on macOS, `ctrlKey` on other platforms.
+    */
+    dragCopies?: (event: DragEvent) => boolean;
+    /**
     Can be used to override the way a selection is created when
     reading a DOM selection between the given anchor and head.
     */

package/dist/index.d.ts

@@ -699,6 +699,12 @@ interface EditorProps<P = any> {
     */
     handleScrollToSelection?: (this: P, view: EditorView) => boolean;
     /**
+    Determines whether an in-editor drag event should copy or move
+    the selection. When not given, the event's `altKey` property is
+    used on macOS, `ctrlKey` on other platforms.
+    */
+    dragCopies?: (event: DragEvent) => boolean;
+    /**
     Can be used to override the way a selection is created when
     reading a DOM selection between the given anchor and head.
     */

package/dist/index.js

@@ -3663,6 +3663,7 @@ editHandlers.paste = (view, _event) => {
         return;
     let data = brokenClipboardAPI ? null : event.clipboardData;
     let plain = view.input.shiftKey && view.input.lastKeyCode != 45;
+    console.log("paste event", !!data, view.state.selection.from, view.state.selection.to);
     if (data && doPaste(view, getText(data), data.getData("text/html"), plain, event))
         event.preventDefault();
     else
@@ -3676,6 +3677,10 @@ class Dragging {
     }
 }
 const dragCopyModifier = mac ? "altKey" : "ctrlKey";
+function dragMoves(view, event) {
+    let moves = view.someProp("dragCopies", test => !test(event));
+    return moves != null ? moves : !event[dragCopyModifier];
+}
 handlers.dragstart = (view, _event) => {
     let event = _event;
     let mouseDown = view.input.mouseDown;
@@ -3705,7 +3710,7 @@ handlers.dragstart = (view, _event) => {
     event.dataTransfer.effectAllowed = "copyMove";
     if (!brokenClipboardAPI)
         event.dataTransfer.setData("text/plain", text);
-    view.dragging = new Dragging(slice, !event[dragCopyModifier], node);
+    view.dragging = new Dragging(slice, dragMoves(view, event), node);
 };
 handlers.dragend = view => {
     let dragging = view.dragging;
@@ -3732,7 +3737,7 @@ editHandlers.drop = (view, _event) => {
     else {
         slice = parseFromClipboard(view, getText(event.dataTransfer), brokenClipboardAPI ? null : event.dataTransfer.getData("text/html"), false, $mouse);
     }
-    let move = !!(dragging && !event[dragCopyModifier]);
+    let move = !!(dragging && dragMoves(view, event));
     if (view.someProp("handleDrop", f => f(view, event, slice || Slice.empty, move))) {
         event.preventDefault();
         return;
@@ -5017,9 +5022,10 @@ 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 && !$from.sameParent($to) &&
+        (!inlineChange && $from.pos < parse.doc.content.size &&
+            (!$from.sameParent($to) || !$from.parent.inlineContent) &&
             (nextSel = Selection.findFrom(parse.doc.resolve($from.pos + 1), 1, true)) &&
-            nextSel.head == $to.pos)) &&
+            nextSel.head > $from.pos)) &&
         view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {
         view.input.lastIOSEnter = 0;
         return;

package/package.json

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

package/src/domchange.ts

@@ -181,9 +181,10 @@ 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 && !$from.sameParent($to) &&
+       (!inlineChange && $from.pos < parse.doc.content.size &&
+        (!$from.sameParent($to) || !$from.parent.inlineContent) &&
         (nextSel = Selection.findFrom(parse.doc.resolve($from.pos + 1), 1, true)) &&
-        nextSel.head == $to.pos)) &&
+        nextSel.head > $from.pos)) &&
       view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {
     view.input.lastIOSEnter = 0
     return

package/src/index.ts

@@ -51,7 +51,7 @@ export class EditorView {
   private prevDirectPlugins: readonly Plugin[] = []
   private pluginViews: PluginView[] = []
   /// @internal
-  domObserver!: DOMObserver
+  declare domObserver: DOMObserver
   /// Holds `true` when a hack node is needed in Firefox to prevent the
   /// [space is eaten issue](https://github.com/ProseMirror/prosemirror/issues/651)
   /// @internal
@@ -673,6 +673,11 @@ export interface EditorProps<P = any> {
   /// handlers or the default behavior should be tried.
   handleScrollToSelection?: (this: P, view: EditorView) => boolean
 
+  /// Determines whether an in-editor drag event should copy or move
+  /// the selection. When not given, the event's `altKey` property is
+  /// used on macOS, `ctrlKey` on other platforms.
+  dragCopies?: (event: DragEvent) => boolean
+
   /// Can be used to override the way a selection is created when
   /// reading a DOM selection between the given anchor and head.
   createSelectionBetween?: (this: P, view: EditorView, anchor: ResolvedPos, head: ResolvedPos) => Selection | null

package/src/input.ts

@@ -648,6 +648,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
+  console.log("paste event", !!data, view.state.selection.from, view.state.selection.to)
   if (data && doPaste(view, getText(data), data.getData("text/html"), plain, event))
     event.preventDefault()
   else
@@ -660,6 +661,11 @@ export class Dragging {
 
 const dragCopyModifier: keyof DragEvent = browser.mac ? "altKey" : "ctrlKey"
 
+function dragMoves(view: EditorView, event: DragEvent) {
+  let moves = view.someProp("dragCopies", test => !test(event))
+  return moves != null ? moves : !event[dragCopyModifier]
+}
+
 handlers.dragstart = (view, _event) => {
   let event = _event as DragEvent
   let mouseDown = view.input.mouseDown
@@ -687,7 +693,7 @@ handlers.dragstart = (view, _event) => {
   // See https://github.com/ProseMirror/prosemirror/issues/1156
   event.dataTransfer.effectAllowed = "copyMove"
   if (!brokenClipboardAPI) event.dataTransfer.setData("text/plain", text)
-  view.dragging = new Dragging(slice, !event[dragCopyModifier], node)
+  view.dragging = new Dragging(slice, dragMoves(view, event), node)
 }
 
 handlers.dragend = view => {
@@ -716,7 +722,7 @@ editHandlers.drop = (view, _event) => {
     slice = parseFromClipboard(view, getText(event.dataTransfer),
                                brokenClipboardAPI ? null : event.dataTransfer.getData("text/html"), false, $mouse)
   }
-  let move = !!(dragging && !event[dragCopyModifier])
+  let move = !!(dragging && dragMoves(view, event))
   if (view.someProp("handleDrop", f => f(view, event, slice || Slice.empty, move))) {
     event.preventDefault()
     return

package/src/viewdesc.ts

@@ -135,7 +135,7 @@ const NOT_DIRTY = 0, CHILD_DIRTY = 1, CONTENT_DIRTY = 2, NODE_DIRTY = 3
 // basic structure and shared methods.
 export class ViewDesc {
   dirty = NOT_DIRTY
-  node!: Node | null
+  declare node: Node | null
 
   constructor(
     public parent: ViewDesc | undefined,