prosemirror-view 1.33.7 → 1.33.8

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.33.8 (2024-06-11)
+
+### Bug fixes
+
+When composition happens with the cursor between two text nodes, use the last mutated one to guess which one is being changed.
+
 ## 1.33.7 (2024-05-31)
 
 ### Bug fixes

package/dist/index.cjs

@@ -3247,7 +3247,9 @@ function findCompositionNode(view) {
   var textBefore = textNodeBefore$1(sel.focusNode, sel.focusOffset);
   var textAfter = textNodeAfter$1(sel.focusNode, sel.focusOffset);
   if (textBefore && textAfter && textBefore != textAfter) {
-    var descAfter = textAfter.pmViewDesc;
+    var descAfter = textAfter.pmViewDesc,
+      lastChanged = view.domObserver.lastChangedTextNode;
+    if (textBefore == lastChanged || textAfter == lastChanged) return lastChanged;
     if (!descAfter || !descAfter.isText(textAfter.nodeValue)) {
       return textAfter;
     } else if (view.input.compositionNode == textAfter) {
@@ -4111,6 +4113,7 @@ var DOMObserver = function () {
     this.currentSelection = new SelectionState();
     this.onCharData = null;
     this.suppressingSelectionUpdates = false;
+    this.lastChangedTextNode = null;
     this.observer = window.MutationObserver && new window.MutationObserver(function (mutations) {
       for (var i = 0; i < mutations.length; i++) _this11.queue.push(mutations[i]);
       if (ie && ie_version <= 11 && mutations.some(function (m) {
@@ -4321,7 +4324,11 @@ var DOMObserver = function () {
       if (mut.type == "attributes" && (desc == this.view.docView || mut.attributeName == "contenteditable" || mut.attributeName == "style" && !mut.oldValue && !mut.target.getAttribute("style"))) return null;
       if (!desc || desc.ignoreMutation(mut)) return null;
       if (mut.type == "childList") {
-        for (var i = 0; i < mut.addedNodes.length; i++) added.push(mut.addedNodes[i]);
+        for (var i = 0; i < mut.addedNodes.length; i++) {
+          var node = mut.addedNodes[i];
+          added.push(node);
+          if (node.nodeType == 3) this.lastChangedTextNode = node;
+        }
         if (desc.contentDOM && desc.contentDOM != desc.dom && !desc.contentDOM.contains(mut.target)) return {
           from: desc.posBefore,
           to: desc.posAfter
@@ -4351,6 +4358,7 @@ var DOMObserver = function () {
           to: desc.posAtEnd + desc.border
         };
       } else {
+        this.lastChangedTextNode = mut.target;
         return {
           from: desc.posAtStart,
           to: desc.posAtEnd,

package/dist/index.js

@@ -3460,7 +3460,9 @@ function findCompositionNode(view) {
     let textBefore = textNodeBefore$1(sel.focusNode, sel.focusOffset);
     let textAfter = textNodeAfter$1(sel.focusNode, sel.focusOffset);
     if (textBefore && textAfter && textBefore != textAfter) {
-        let descAfter = textAfter.pmViewDesc;
+        let descAfter = textAfter.pmViewDesc, lastChanged = view.domObserver.lastChangedTextNode;
+        if (textBefore == lastChanged || textAfter == lastChanged)
+            return lastChanged;
         if (!descAfter || !descAfter.isText(textAfter.nodeValue)) {
             return textAfter;
         }
@@ -4472,6 +4474,7 @@ class DOMObserver {
         this.currentSelection = new SelectionState;
         this.onCharData = null;
         this.suppressingSelectionUpdates = false;
+        this.lastChangedTextNode = null;
         this.observer = window.MutationObserver &&
             new window.MutationObserver(mutations => {
                 for (let i = 0; i < mutations.length; i++)
@@ -4661,8 +4664,12 @@ class DOMObserver {
         if (!desc || desc.ignoreMutation(mut))
             return null;
         if (mut.type == "childList") {
-            for (let i = 0; i < mut.addedNodes.length; i++)
-                added.push(mut.addedNodes[i]);
+            for (let i = 0; i < mut.addedNodes.length; i++) {
+                let node = mut.addedNodes[i];
+                added.push(node);
+                if (node.nodeType == 3)
+                    this.lastChangedTextNode = node;
+            }
             if (desc.contentDOM && desc.contentDOM != desc.dom && !desc.contentDOM.contains(mut.target))
                 return { from: desc.posBefore, to: desc.posAfter };
             let prev = mut.previousSibling, next = mut.nextSibling;
@@ -4689,6 +4696,7 @@ class DOMObserver {
             return { from: desc.posAtStart - desc.border, to: desc.posAtEnd + desc.border };
         }
         else { // "characterData"
+            this.lastChangedTextNode = mut.target;
             return {
                 from: desc.posAtStart,
                 to: desc.posAtEnd,

package/package.json

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

package/src/domobserver.ts

@@ -43,6 +43,7 @@ export class DOMObserver {
   currentSelection = new SelectionState
   onCharData: ((e: Event) => void) | null = null
   suppressingSelectionUpdates = false
+  lastChangedTextNode: Text | null = null
 
   constructor(
     readonly view: EditorView,
@@ -235,7 +236,11 @@ export class DOMObserver {
     if (!desc || desc.ignoreMutation(mut)) return null
 
     if (mut.type == "childList") {
-      for (let i = 0; i < mut.addedNodes.length; i++) added.push(mut.addedNodes[i])
+      for (let i = 0; i < mut.addedNodes.length; i++) {
+        let node = mut.addedNodes[i]
+        added.push(node)
+        if (node.nodeType == 3) this.lastChangedTextNode = node as Text
+      }
       if (desc.contentDOM && desc.contentDOM != desc.dom && !desc.contentDOM.contains(mut.target))
         return {from: desc.posBefore, to: desc.posAfter}
       let prev = mut.previousSibling, next = mut.nextSibling
@@ -258,6 +263,7 @@ export class DOMObserver {
     } else if (mut.type == "attributes") {
       return {from: desc.posAtStart - desc.border, to: desc.posAtEnd + desc.border}
     } else { // "characterData"
+      this.lastChangedTextNode = mut.target as Text
       return {
         from: desc.posAtStart,
         to: desc.posAtEnd,

package/src/input.ts

@@ -517,7 +517,8 @@ export function findCompositionNode(view: EditorView) {
   let textBefore = textNodeBefore(sel.focusNode, sel.focusOffset)
   let textAfter = textNodeAfter(sel.focusNode, sel.focusOffset)
   if (textBefore && textAfter && textBefore != textAfter) {
-    let descAfter = textAfter.pmViewDesc
+    let descAfter = textAfter.pmViewDesc, lastChanged = view.domObserver.lastChangedTextNode
+    if (textBefore == lastChanged || textAfter == lastChanged) return lastChanged
     if (!descAfter || !descAfter.isText(textAfter.nodeValue!)) {
       return textAfter
     } else if (view.input.compositionNode == textAfter) {