prosemirror-view 1.33.10 → 1.34.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 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
+
+Delete the selection on composition start when on a mark boundary to force Chrome to apply the correct style to the composition.
+
+When the browser starts a composition and the selection spans across blocks, start by clearing it to make sure the composed text node lands in a valid position.
+
 ## 1.33.10 (2024-08-13)
 
 ### Bug fixes

package/dist/index.cjs

@@ -2219,13 +2219,7 @@ function selectCursorWrapper(view) {
   var node = view.cursorWrapper.dom,
     img = node.nodeName == "IMG";
   if (img) range.setStart(node.parentNode, domIndex(node) + 1);else range.setStart(node, 0);
-  var sel = view.state.selection;
-  if (sel.empty) {
-    range.collapse(true);
-  } else {
-    var end = view.domAtPos(sel.to);
-    range.setEnd(end.node, end.offset);
-  }
+  range.collapse(true);
   domSel.removeAllRanges();
   domSel.addRange(range);
   if (!img && !view.state.selection.visible && ie && ie_version <= 11) {
@@ -3205,7 +3199,7 @@ editHandlers.compositionstart = editHandlers.compositionupdate = function (view)
       endComposition(view, true);
       view.markCursor = null;
     } else {
-      endComposition(view);
+      endComposition(view, !state.selection.empty);
       if (gecko && state.selection.empty && $pos.parentOffset && !$pos.textOffset && $pos.nodeBefore.marks.length) {
         var sel = view.domSelectionRange();
         for (var node = sel.focusNode, offset = sel.focusOffset; node && node.nodeType == 1 && offset != 0;) {
@@ -3276,13 +3270,13 @@ function timestampFromCustomEvent() {
   return event.timeStamp;
 }
 function endComposition(view) {
-  var forceUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var restarting = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (android && view.domObserver.flushingSoon >= 0) return;
   view.domObserver.forceFlush();
   clearComposition(view);
-  if (forceUpdate || view.docView && view.docView.dirty) {
+  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 view.updateState(view.state);
+    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);
     return true;
   }
   return false;
@@ -3822,6 +3816,11 @@ var DecorationSet = function () {
       }
       return result;
     }
+  }, {
+    key: "forEachSet",
+    value: function forEachSet(f) {
+      f(this);
+    }
   }], [{
     key: "create",
     value: function create(doc, decorations) {
@@ -3885,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) {

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

@@ -2290,14 +2290,7 @@ function selectCursorWrapper(view) {
         range.setStart(node.parentNode, domIndex(node) + 1);
     else
         range.setStart(node, 0);
-    let sel = view.state.selection;
-    if (sel.empty) {
-        range.collapse(true);
-    }
-    else {
-        let end = view.domAtPos(sel.to);
-        range.setEnd(end.node, end.offset);
-    }
+    range.collapse(true);
     domSel.removeAllRanges();
     domSel.addRange(range);
     // Kludge to kill 'control selection' in IE11 when selecting an
@@ -3419,7 +3412,7 @@ editHandlers.compositionstart = editHandlers.compositionupdate = view => {
             view.markCursor = null;
         }
         else {
-            endComposition(view);
+            endComposition(view, !state.selection.empty);
             // In firefox, if the cursor is after but outside a marked node,
             // the inserted text won't inherit the marks. So this moves it
             // inside if necessary.
@@ -3500,15 +3493,17 @@ function timestampFromCustomEvent() {
 /**
 @internal
 */
-function endComposition(view, forceUpdate = false) {
+function endComposition(view, restarting = false) {
     if (android && view.domObserver.flushingSoon >= 0)
         return;
     view.domObserver.forceFlush();
     clearComposition(view);
-    if (forceUpdate || view.docView && view.docView.dirty) {
+    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());
         else
             view.updateState(view.state);
         return true;
@@ -4165,6 +4160,7 @@ class DecorationSet {
         }
         return result;
     }
+    forEachSet(f) { f(this); }
 }
 /**
 The empty set of decorations.
@@ -4240,6 +4236,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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-view",
-  "version": "1.33.10",
+  "version": "1.34.0",
   "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/input.ts

@@ -463,7 +463,7 @@ editHandlers.compositionstart = editHandlers.compositionupdate = view => {
       endComposition(view, true)
       view.markCursor = null
     } else {
-      endComposition(view)
+      endComposition(view, !state.selection.empty)
       // In firefox, if the cursor is after but outside a marked node,
       // the inserted text won't inherit the marks. So this moves it
       // inside if necessary.
@@ -539,13 +539,14 @@ function timestampFromCustomEvent() {
 }
 
 /// @internal
-export function endComposition(view: EditorView, forceUpdate = false) {
+export function endComposition(view: EditorView, restarting = false) {
   if (browser.android && view.domObserver.flushingSoon >= 0) return
   view.domObserver.forceFlush()
   clearComposition(view)
-  if (forceUpdate || view.docView && view.docView.dirty) {
+  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())
     else view.updateState(view.state)
     return true
   }

package/src/selection.ts

@@ -140,13 +140,7 @@ function selectCursorWrapper(view: EditorView) {
   let node = view.cursorWrapper!.dom, img = node.nodeName == "IMG"
   if (img) range.setStart(node.parentNode!, domIndex(node) + 1)
   else range.setStart(node, 0)
-  let sel = view.state.selection
-  if (sel.empty) {
-    range.collapse(true)
-  } else {
-    let end = view.domAtPos(sel.to)
-    range.setEnd(end.node, end.offset)
-  }
+  range.collapse(true)
   domSel.removeAllRanges()
   domSel.addRange(range)
   // Kludge to kill 'control selection' in IE11 when selecting an