prosemirror-view 1.33.11 → 1.34.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.34.1 (2024-08-26)
+
+### Bug fixes
+
+Fix null dereferences caused by the behavior of Chrome's newly supported `caretPositionFromPoint` method.
+
+Fix an issue where on Android, with GBoard, enter presses in code blocks while a spell correction was selected didn't insert a new line.
+
+## 1.34.0 (2024-08-23)
+
+### New features
+
+The `DecorationGroup` interface now has a `forEachSet` method to iterate though the contained decoration sets.
+
 ## 1.33.11 (2024-08-19)
 
 ### Bug fixes

package/dist/index.cjs

@@ -135,7 +135,7 @@ function caretFromPoint(doc, x, y) {
       var pos = doc.caretPositionFromPoint(x, y);
       if (pos) return {
         node: pos.offsetNode,
-        offset: pos.offset
+        offset: Math.min(nodeSize(pos.offsetNode), pos.offset)
       };
     } catch (_) {}
   }
@@ -143,7 +143,7 @@ function caretFromPoint(doc, x, y) {
     var range = doc.caretRangeFromPoint(x, y);
     if (range) return {
       node: range.startContainer,
-      offset: range.startOffset
+      offset: Math.min(nodeSize(range.startContainer), range.startOffset)
     };
   }
 }
@@ -3816,6 +3816,11 @@ var DecorationSet = function () {
       }
       return result;
     }
+  }, {
+    key: "forEachSet",
+    value: function forEachSet(f) {
+      f(this);
+    }
   }], [{
     key: "create",
     value: function create(doc, decorations) {
@@ -3879,6 +3884,11 @@ var DecorationGroup = function () {
       }
       return result ? removeOverlap(sorted ? result : result.sort(byPos)) : none;
     }
+  }, {
+    key: "forEachSet",
+    value: function forEachSet(f) {
+      for (var i = 0; i < this.members.length; i++) this.members[i].forEachSet(f);
+    }
   }], [{
     key: "from",
     value: function from(members) {
@@ -4550,6 +4560,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
   }
   view.input.lastKeyCode = null;
   var change = findDiff(compare.content, parse.doc.content, parse.from, preferredPos, preferredSide);
+  if (change) view.input.domChangeCount++;
   if ((ios && view.input.lastIOSEnter > Date.now() - 225 || android) && addedNodes.some(function (n) {
     return n.nodeType == 1 && !isInline.test(n.nodeName);
   }) && (!change || change.endA >= change.endB) && view.someProp("handleKeyDown", function (f) {
@@ -4577,7 +4588,6 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
       return;
     }
   }
-  view.input.domChangeCount++;
   if (view.state.selection.from < view.state.selection.to && change.start == change.endB && view.state.selection instanceof prosemirrorState.TextSelection) {
     if (change.start > view.state.selection.from && change.start <= view.state.selection.from + 2 && view.state.selection.from >= parse.from) {
       change.start = view.state.selection.from;

package/dist/index.d.cts

@@ -160,6 +160,10 @@ interface DecorationSource {
     Extract a DecorationSource containing decorations for the given child node at the given offset.
     */
     forChild(offset: number, child: Node): DecorationSource;
+    /**
+    Call the given function for each decoration set in the group.
+    */
+    forEachSet(f: (set: DecorationSet) => void): void;
 }
 /**
 A collection of [decorations](https://prosemirror.net/docs/ref/#view.Decoration), organized in such
@@ -215,6 +219,7 @@ declare class DecorationSet implements DecorationSource {
     The empty set of decorations.
     */
     static empty: DecorationSet;
+    forEachSet(f: (set: DecorationSet) => void): void;
 }
 declare class DecorationGroup implements DecorationSource {
     readonly members: readonly DecorationSet[];
@@ -224,6 +229,7 @@ declare class DecorationGroup implements DecorationSource {
     eq(other: DecorationGroup): boolean;
     locals(node: Node): readonly any[];
     static from(members: readonly DecorationSource[]): DecorationSource;
+    forEachSet(f: (set: DecorationSet) => void): void;
 }
 
 declare global {

package/dist/index.d.ts

@@ -160,6 +160,10 @@ interface DecorationSource {
     Extract a DecorationSource containing decorations for the given child node at the given offset.
     */
     forChild(offset: number, child: Node): DecorationSource;
+    /**
+    Call the given function for each decoration set in the group.
+    */
+    forEachSet(f: (set: DecorationSet) => void): void;
 }
 /**
 A collection of [decorations](https://prosemirror.net/docs/ref/#view.Decoration), organized in such
@@ -215,6 +219,7 @@ declare class DecorationSet implements DecorationSource {
     The empty set of decorations.
     */
     static empty: DecorationSet;
+    forEachSet(f: (set: DecorationSet) => void): void;
 }
 declare class DecorationGroup implements DecorationSource {
     readonly members: readonly DecorationSet[];
@@ -224,6 +229,7 @@ declare class DecorationGroup implements DecorationSource {
     eq(other: DecorationGroup): boolean;
     locals(node: Node): readonly any[];
     static from(members: readonly DecorationSource[]): DecorationSource;
+    forEachSet(f: (set: DecorationSet) => void): void;
 }
 
 declare global {

package/dist/index.js

@@ -139,15 +139,18 @@ function caretFromPoint(doc, x, y) {
     if (doc.caretPositionFromPoint) {
         try { // Firefox throws for this call in hard-to-predict circumstances (#994)
             let pos = doc.caretPositionFromPoint(x, y);
+            // Clip the offset, because Chrome will return a text offset
+            // into <input> nodes, which can't be treated as a regular DOM
+            // offset
             if (pos)
-                return { node: pos.offsetNode, offset: pos.offset };
+                return { node: pos.offsetNode, offset: Math.min(nodeSize(pos.offsetNode), pos.offset) };
         }
         catch (_) { }
     }
     if (doc.caretRangeFromPoint) {
         let range = doc.caretRangeFromPoint(x, y);
         if (range)
-            return { node: range.startContainer, offset: range.startOffset };
+            return { node: range.startContainer, offset: Math.min(nodeSize(range.startContainer), range.startOffset) };
     }
 }
 
@@ -4160,6 +4163,7 @@ class DecorationSet {
         }
         return result;
     }
+    forEachSet(f) { f(this); }
 }
 /**
 The empty set of decorations.
@@ -4235,6 +4239,10 @@ class DecorationGroup {
                 members.reduce((r, m) => r.concat(m instanceof DecorationSet ? m : m.members), []));
         }
     }
+    forEachSet(f) {
+        for (let i = 0; i < this.members.length; i++)
+            this.members[i].forEachSet(f);
+    }
 }
 function mapChildren(oldChildren, newLocal, mapping, node, offset, oldOffset, options) {
     let children = oldChildren.slice();
@@ -4897,6 +4905,8 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
     }
     view.input.lastKeyCode = null;
     let change = findDiff(compare.content, parse.doc.content, parse.from, preferredPos, preferredSide);
+    if (change)
+        view.input.domChangeCount++;
     if ((ios && view.input.lastIOSEnter > Date.now() - 225 || android) &&
         addedNodes.some(n => n.nodeType == 1 && !isInline.test(n.nodeName)) &&
         (!change || change.endA >= change.endB) &&
@@ -4922,7 +4932,6 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
             return;
         }
     }
-    view.input.domChangeCount++;
     // Handle the case where overwriting a selection by typing matches
     // the start or end of the selected content, creating a change
     // that's smaller than what was actually overwritten.

package/package.json

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

package/src/decoration.ts

@@ -262,6 +262,8 @@ export interface DecorationSource {
   forChild(offset: number, child: Node): DecorationSource
   /// @internal
   eq(other: DecorationSource): boolean
+  /// Call the given function for each decoration set in the group.
+  forEachSet(f: (set: DecorationSet) => void): void
 }
 
 /// A collection of [decorations](#view.Decoration), organized in such
@@ -475,6 +477,8 @@ export class DecorationSet implements DecorationSource {
 
   /// @internal
   static removeOverlap = removeOverlap
+
+  forEachSet(f: (set: DecorationSet) => void) { f(this) }
 }
 
 const empty = DecorationSet.empty
@@ -542,6 +546,10 @@ class DecorationGroup implements DecorationSource {
                          [] as DecorationSet[]))
     }
   }
+
+  forEachSet(f: (set: DecorationSet) => void) {
+    for (let i = 0; i < this.members.length; i++) this.members[i].forEachSet(f)
+  }
 }
 
 function mapChildren(

package/src/dom.ts

@@ -141,11 +141,14 @@ export function caretFromPoint(doc: Document, x: number, y: number): {node: Node
   if ((doc as any).caretPositionFromPoint) {
     try { // Firefox throws for this call in hard-to-predict circumstances (#994)
       let pos = (doc as any).caretPositionFromPoint(x, y)
-      if (pos) return {node: pos.offsetNode, offset: pos.offset}
+      // Clip the offset, because Chrome will return a text offset
+      // into <input> nodes, which can't be treated as a regular DOM
+      // offset
+      if (pos) return {node: pos.offsetNode, offset: Math.min(nodeSize(pos.offsetNode), pos.offset)}
     } catch (_) {}
   }
   if (doc.caretRangeFromPoint) {
     let range = doc.caretRangeFromPoint(x, y)
-    if (range) return {node: range.startContainer, offset: range.startOffset}
+    if (range) return {node: range.startContainer, offset: Math.min(nodeSize(range.startContainer), range.startOffset)}
   }
 }

package/src/domchange.ts

@@ -120,6 +120,7 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
   view.input.lastKeyCode = null
 
   let change = findDiff(compare.content, parse.doc.content, parse.from, preferredPos, preferredSide)
+  if (change) view.input.domChangeCount++
   if ((browser.ios && view.input.lastIOSEnter > Date.now() - 225 || browser.android) &&
       addedNodes.some(n => n.nodeType == 1 && !isInline.test(n.nodeName)) &&
       (!change || change.endA >= change.endB) &&
@@ -144,7 +145,6 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
     }
   }
 
-  view.input.domChangeCount++
   // Handle the case where overwriting a selection by typing matches
   // the start or end of the selected content, creating a change
   // that's smaller than what was actually overwritten.