prosemirror-view 1.39.1 → 1.39.3

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.39.3 (2025-05-14)
+
+### Bug fixes
+
+Fix an issue where clicks using different mouse buttons could be grouped into a single double- or triple-click.
+
+Only delete the selection when starting a composition when it crosses block boundaries.
+
+## 1.39.2 (2025-04-22)
+
+### Bug fixes
+
+Default to using `trustedTypes.defaultPolicy` for clipboard input, when available.
+
+Fix an issue where pasting multiple lines from the virtual keyboard on Android would have only the effect of an enter press.
+
 ## 1.39.1 (2025-04-04)
 
 ## 1.39.0 (2025-04-04)

package/dist/index.cjs

@@ -2813,7 +2813,7 @@ var _policy = null;
 function maybeWrapTrusted(html) {
   var trustedTypes = window.trustedTypes;
   if (!trustedTypes) return html;
-  if (!_policy) _policy = trustedTypes.createPolicy("ProseMirrorClipboard", {
+  if (!_policy) _policy = trustedTypes.defaultPolicy || trustedTypes.createPolicy("ProseMirrorClipboard", {
     createHTML: function createHTML(s) {
       return s;
     }
@@ -2879,7 +2879,8 @@ var InputState = _createClass(function InputState() {
     time: 0,
     x: 0,
     y: 0,
-    type: ""
+    type: "",
+    button: 0
   };
   this.lastSelectionOrigin = null;
   this.lastSelectionTime = 0;
@@ -3105,14 +3106,15 @@ handlers.mousedown = function (view, _event) {
   var flushed = forceDOMFlush(view);
   var now = Date.now(),
     type = "singleClick";
-  if (now - view.input.lastClick.time < 500 && isNear(event, view.input.lastClick) && !event[selectNodeModifier]) {
+  if (now - view.input.lastClick.time < 500 && isNear(event, view.input.lastClick) && !event[selectNodeModifier] && view.input.lastClick.button == event.button) {
     if (view.input.lastClick.type == "singleClick") type = "doubleClick";else if (view.input.lastClick.type == "doubleClick") type = "tripleClick";
   }
   view.input.lastClick = {
     time: now,
     x: event.clientX,
     y: event.clientY,
-    type: type
+    type: type,
+    button: event.button
   };
   var pos = view.posAtCoords(eventCoords(event));
   if (!pos) return;
@@ -3329,8 +3331,9 @@ function endComposition(view) {
   view.domObserver.forceFlush();
   clearComposition(view);
   if (restarting || view.docView && view.docView.dirty) {
-    var sel = selectionFromDOM(view);
-    if (sel && !sel.eq(view.state.selection)) view.dispatch(view.state.tr.setSelection(sel));else if ((view.markCursor || restarting) && !view.state.selection.empty) view.dispatch(view.state.tr.deleteSelection());else view.updateState(view.state);
+    var sel = selectionFromDOM(view),
+      cur = view.state.selection;
+    if (sel && !sel.eq(cur)) view.dispatch(view.state.tr.setSelection(sel));else if ((view.markCursor || restarting) && !cur.$from.node(cur.$from.sharedDepth(cur.to)).inlineContent) view.dispatch(view.state.tr.deleteSelection());else view.updateState(view.state);
     return true;
   }
   return false;
@@ -4668,7 +4671,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) || !$from.parent.inlineContent) && (nextSel = prosemirrorState.Selection.findFrom(parse.doc.resolve($from.pos + 1), 1, true)) && nextSel.head > $from.pos) && view.someProp("handleKeyDown", function (f) {
+  })) || !inlineChange && $from.pos < parse.doc.content.size && (!$from.sameParent($to) || !$from.parent.inlineContent) && !/\S/.test(parse.doc.textBetween($from.pos, $to.pos, "", "")) && (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.js

@@ -2984,7 +2984,7 @@ function maybeWrapTrusted(html) {
     // innerHTML, even on a detached document. This wraps the string in
     // a way that makes the browser allow us to use its parser again.
     if (!_policy)
-        _policy = trustedTypes.createPolicy("ProseMirrorClipboard", { createHTML: (s) => s });
+        _policy = trustedTypes.defaultPolicy || trustedTypes.createPolicy("ProseMirrorClipboard", { createHTML: (s) => s });
     return _policy.createHTML(html);
 }
 function readHTML(html) {
@@ -3047,7 +3047,7 @@ class InputState {
         this.mouseDown = null;
         this.lastKeyCode = null;
         this.lastKeyCodeTime = 0;
-        this.lastClick = { time: 0, x: 0, y: 0, type: "" };
+        this.lastClick = { time: 0, x: 0, y: 0, type: "", button: 0 };
         this.lastSelectionOrigin = null;
         this.lastSelectionTime = 0;
         this.lastIOSEnter = 0;
@@ -3289,13 +3289,14 @@ handlers.mousedown = (view, _event) => {
     view.input.shiftKey = event.shiftKey;
     let flushed = forceDOMFlush(view);
     let now = Date.now(), type = "singleClick";
-    if (now - view.input.lastClick.time < 500 && isNear(event, view.input.lastClick) && !event[selectNodeModifier]) {
+    if (now - view.input.lastClick.time < 500 && isNear(event, view.input.lastClick) && !event[selectNodeModifier] &&
+        view.input.lastClick.button == event.button) {
         if (view.input.lastClick.type == "singleClick")
             type = "doubleClick";
         else if (view.input.lastClick.type == "doubleClick")
             type = "tripleClick";
     }
-    view.input.lastClick = { time: now, x: event.clientX, y: event.clientY, type };
+    view.input.lastClick = { time: now, x: event.clientX, y: event.clientY, type, button: event.button };
     let pos = view.posAtCoords(eventCoords(event));
     if (!pos)
         return;
@@ -3552,10 +3553,10 @@ function endComposition(view, restarting = false) {
     view.domObserver.forceFlush();
     clearComposition(view);
     if (restarting || view.docView && view.docView.dirty) {
-        let sel = selectionFromDOM(view);
-        if (sel && !sel.eq(view.state.selection))
+        let sel = selectionFromDOM(view), cur = view.state.selection;
+        if (sel && !sel.eq(cur))
             view.dispatch(view.state.tr.setSelection(sel));
-        else if ((view.markCursor || restarting) && !view.state.selection.empty)
+        else if ((view.markCursor || restarting) && !cur.$from.node(cur.$from.sharedDepth(cur.to)).inlineContent)
             view.dispatch(view.state.tr.deleteSelection());
         else
             view.updateState(view.state);
@@ -5023,6 +5024,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
         (!inlineChange || addedNodes.some(n => n.nodeName == "DIV" || n.nodeName == "P"))) ||
         (!inlineChange && $from.pos < parse.doc.content.size &&
             (!$from.sameParent($to) || !$from.parent.inlineContent) &&
+            !/\S/.test(parse.doc.textBetween($from.pos, $to.pos, "", "")) &&
             (nextSel = Selection.findFrom(parse.doc.resolve($from.pos + 1), 1, true)) &&
             nextSel.head > $from.pos)) &&
         view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {

package/package.json

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

package/src/clipboard.ts

@@ -212,7 +212,8 @@ function maybeWrapTrusted(html: string): string {
   // With the require-trusted-types-for CSP, Chrome will block
   // innerHTML, even on a detached document. This wraps the string in
   // a way that makes the browser allow us to use its parser again.
-  if (!_policy) _policy = trustedTypes.createPolicy("ProseMirrorClipboard", {createHTML: (s: string) => s})
+  if (!_policy)
+    _policy = trustedTypes.defaultPolicy || trustedTypes.createPolicy("ProseMirrorClipboard", {createHTML: (s: string) => s})
   return _policy.createHTML(html)
 }
 

package/src/domchange.ts

@@ -183,6 +183,7 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
         (!inlineChange || addedNodes.some(n => n.nodeName == "DIV" || n.nodeName == "P"))) ||
        (!inlineChange && $from.pos < parse.doc.content.size &&
         (!$from.sameParent($to) || !$from.parent.inlineContent) &&
+        !/\S/.test(parse.doc.textBetween($from.pos, $to.pos, "", "")) &&
         (nextSel = Selection.findFrom(parse.doc.resolve($from.pos + 1), 1, true)) &&
         nextSel.head > $from.pos)) &&
       view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {

package/src/input.ts

@@ -21,7 +21,7 @@ export class InputState {
   mouseDown: MouseDown | null = null
   lastKeyCode: number | null = null
   lastKeyCodeTime = 0
-  lastClick = {time: 0, x: 0, y: 0, type: ""}
+  lastClick = {time: 0, x: 0, y: 0, type: "", button: 0}
   lastSelectionOrigin: string | null = null
   lastSelectionTime = 0
   lastIOSEnter = 0
@@ -278,11 +278,12 @@ handlers.mousedown = (view, _event) => {
   view.input.shiftKey = event.shiftKey
   let flushed = forceDOMFlush(view)
   let now = Date.now(), type = "singleClick"
-  if (now - view.input.lastClick.time < 500 && isNear(event, view.input.lastClick) && !event[selectNodeModifier]) {
+  if (now - view.input.lastClick.time < 500 && isNear(event, view.input.lastClick) && !event[selectNodeModifier] &&
+      view.input.lastClick.button == event.button) {
     if (view.input.lastClick.type == "singleClick") type = "doubleClick"
     else if (view.input.lastClick.type == "doubleClick") type = "tripleClick"
   }
-  view.input.lastClick = {time: now, x: event.clientX, y: event.clientY, type}
+  view.input.lastClick = {time: now, x: event.clientX, y: event.clientY, type, button: event.button}
 
   let pos = view.posAtCoords(eventCoords(event))
   if (!pos) return
@@ -544,9 +545,9 @@ export function endComposition(view: EditorView, restarting = false) {
   view.domObserver.forceFlush()
   clearComposition(view)
   if (restarting || view.docView && view.docView.dirty) {
-    let sel = selectionFromDOM(view)
-    if (sel && !sel.eq(view.state.selection)) view.dispatch(view.state.tr.setSelection(sel))
-    else if ((view.markCursor || restarting) && !view.state.selection.empty) view.dispatch(view.state.tr.deleteSelection())
+    let sel = selectionFromDOM(view), cur = view.state.selection
+    if (sel && !sel.eq(cur)) view.dispatch(view.state.tr.setSelection(sel))
+    else if ((view.markCursor || restarting) && !cur.$from.node(cur.$from.sharedDepth(cur.to)).inlineContent) view.dispatch(view.state.tr.deleteSelection())
     else view.updateState(view.state)
     return true
   }