prosemirror-view 1.29.0 → 1.29.2

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.29.2 (2023-01-17)
+
+### Bug fixes
+
+Make sure enter key handlers are called on Chrome Android when the cursor is in a position where the native behavior of Enter doesn't change the document.
+
+Fix a crash that could occur when starting a composition at the end of a non-inclusive mark.
+
+Fix a bug in (vertical) `endOfTextblock` that caused it to return falsely positive results inside textblocks that had a separate `contentDOM`.
+
+## 1.29.1 (2022-11-14)
+
+### Bug fixes
+
+Fix a problem when returning decorations from an outer editor from the `decorations` prop.
+
 ## 1.29.0 (2022-10-12)
 
 ### Bug fixes

package/README.md

@@ -19,7 +19,7 @@ This code is released under an
 [MIT license](https://github.com/prosemirror/prosemirror/tree/master/LICENSE).
 There's a [forum](http://discuss.prosemirror.net) for general
 discussion and support requests, and the
-[Github bug tracker](https://github.com/prosemirror/prosemirror/issues)
+[GitHub bug tracker](https://github.com/prosemirror/prosemirror/issues)
 is the place to report issues.
 
 We aim to be an inclusive, welcoming community. To make that explicit,

package/dist/index.cjs

@@ -628,7 +628,7 @@ function endOfTextblockVertical(view, state, dir) {
       if (!nearest) break;
 
       if (nearest.node.isBlock) {
-        dom = nearest.dom;
+        dom = nearest.contentDOM || nearest.dom;
         break;
       }
 
@@ -2045,7 +2045,9 @@ var ViewTreeUpdater = function () {
         var found = -1;
 
         for (var i = this.index; i < Math.min(this.index + 3, this.top.children.length); i++) {
-          if (this.top.children[i].matchesMark(marks[depth])) {
+          var next = this.top.children[i];
+
+          if (next.matchesMark(marks[depth]) && !this.isLocked(next.dom)) {
             found = i;
             break;
           }
@@ -2132,7 +2134,7 @@ var ViewTreeUpdater = function () {
 
           if (_preMatch != null && _preMatch != index) return false;
           var nextDOM = next.dom;
-          var locked = this.lock && (nextDOM == this.lock || nextDOM.nodeType == 1 && nextDOM.contains(this.lock.parentNode)) && !(node.isText && next.node && next.node.isText && next.nodeDOM.nodeValue == node.text && next.dirty != NODE_DIRTY && sameOuterDeco(outerDeco, next.outerDeco));
+          var locked = this.isLocked(nextDOM) && !(node.isText && next.node && next.node.isText && next.nodeDOM.nodeValue == node.text && next.dirty != NODE_DIRTY && sameOuterDeco(outerDeco, next.outerDeco));
 
           if (!locked && next.update(node, outerDeco, innerDeco, view)) {
             this.destroyBetween(this.index, i);
@@ -2201,6 +2203,11 @@ var ViewTreeUpdater = function () {
         this.changed = true;
       }
     }
+  }, {
+    key: "isLocked",
+    value: function isLocked(node) {
+      return this.lock && (node == this.lock || node.nodeType == 1 && node.contains(this.lock.parentNode));
+    }
   }]);
 
   return ViewTreeUpdater;
@@ -3346,7 +3353,7 @@ editHandlers.keypress = function (view, _event) {
 
   if (!(sel instanceof prosemirrorState.TextSelection) || !sel.$from.sameParent(sel.$to)) {
     var text = String.fromCharCode(event.charCode);
-    if (!view.someProp("handleTextInput", function (f) {
+    if (!/[\r\n]/.test(text) && !view.someProp("handleTextInput", function (f) {
       return f(view, sel.$from.pos, sel.$to.pos, text);
     })) view.dispatch(view.state.tr.insertText(text).scrollIntoView());
     event.preventDefault();
@@ -4442,7 +4449,11 @@ var DecorationGroup = function () {
           return members[0];
 
         default:
-          return new DecorationGroup(members);
+          return new DecorationGroup(members.every(function (m) {
+            return m instanceof DecorationSet;
+          }) ? members : members.reduce(function (r, m) {
+            return r.concat(m instanceof DecorationSet ? m : m.members);
+          }, []));
       }
     }
   }]);
@@ -5156,6 +5167,10 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
     var newSel = selectionFromDOM(view, origin);
 
     if (newSel && !view.state.selection.eq(newSel)) {
+      if (chrome && android && view.input.lastKeyCode === 13 && Date.now() - 100 < view.input.lastKeyCodeTime && view.someProp("handleKeyDown", function (f) {
+        return f(view, keyEvent(13, "Enter"));
+      })) return;
+
       var _tr = view.state.tr.setSelection(newSel);
 
       if (origin == "pointer") _tr.setMeta("pointer", true);else if (origin == "key") _tr.scrollIntoView();

package/dist/index.js

@@ -541,7 +541,7 @@ function endOfTextblockVertical(view, state, dir) {
             if (!nearest)
                 break;
             if (nearest.node.isBlock) {
-                dom = nearest.dom;
+                dom = nearest.contentDOM || nearest.dom;
                 break;
             }
             dom = nearest.dom.parentNode;
@@ -1679,7 +1679,8 @@ class ViewTreeUpdater {
             this.stack.push(this.top, this.index + 1);
             let found = -1;
             for (let i = this.index; i < Math.min(this.index + 3, this.top.children.length); i++) {
-                if (this.top.children[i].matchesMark(marks[depth])) {
+                let next = this.top.children[i];
+                if (next.matchesMark(marks[depth]) && !this.isLocked(next.dom)) {
                     found = i;
                     break;
                 }
@@ -1765,7 +1766,7 @@ class ViewTreeUpdater {
                 // Can't update if nextDOM is or contains this.lock, except if
                 // it's a text node whose content already matches the new text
                 // and whose decorations match the new ones.
-                let locked = this.lock && (nextDOM == this.lock || nextDOM.nodeType == 1 && nextDOM.contains(this.lock.parentNode)) &&
+                let locked = this.isLocked(nextDOM) &&
                     !(node.isText && next.node && next.node.isText && next.nodeDOM.nodeValue == node.text &&
                         next.dirty != NODE_DIRTY && sameOuterDeco(outerDeco, next.outerDeco));
                 if (!locked && next.update(node, outerDeco, innerDeco, view)) {
@@ -1835,6 +1836,9 @@ class ViewTreeUpdater {
             this.changed = true;
         }
     }
+    isLocked(node) {
+        return this.lock && (node == this.lock || node.nodeType == 1 && node.contains(this.lock.parentNode));
+    }
 }
 // Iterate from the end of the fragment and array of descs to find
 // directly matching ones, in order to avoid overeagerly reusing those
@@ -2921,7 +2925,7 @@ editHandlers.keypress = (view, _event) => {
     let sel = view.state.selection;
     if (!(sel instanceof TextSelection) || !sel.$from.sameParent(sel.$to)) {
         let text = String.fromCharCode(event.charCode);
-        if (!view.someProp("handleTextInput", f => f(view, sel.$from.pos, sel.$to.pos, text)))
+        if (!/[\r\n]/.test(text) && !view.someProp("handleTextInput", f => f(view, sel.$from.pos, sel.$to.pos, text)))
             view.dispatch(view.state.tr.insertText(text).scrollIntoView());
         event.preventDefault();
     }
@@ -3976,7 +3980,8 @@ class DecorationGroup {
         switch (members.length) {
             case 0: return empty;
             case 1: return members[0];
-            default: return new DecorationGroup(members);
+            default: return new DecorationGroup(members.every(m => m instanceof DecorationSet) ? members :
+                members.reduce((r, m) => r.concat(m instanceof DecorationSet ? m : m.members), []));
         }
     }
 }
@@ -4570,6 +4575,10 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
         let origin = view.input.lastSelectionTime > Date.now() - 50 ? view.input.lastSelectionOrigin : null;
         let newSel = selectionFromDOM(view, origin);
         if (newSel && !view.state.selection.eq(newSel)) {
+            if (chrome && android &&
+                view.input.lastKeyCode === 13 && Date.now() - 100 < view.input.lastKeyCodeTime &&
+                view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter"))))
+                return;
             let tr = view.state.tr.setSelection(newSel);
             if (origin == "pointer")
                 tr.setMeta("pointer", true);

package/package.json

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

package/src/decoration.ts

@@ -528,11 +528,14 @@ class DecorationGroup implements DecorationSource {
 
   // Create a group for the given array of decoration sets, or return
   // a single set when possible.
-  static from(members: readonly DecorationSet[]): DecorationSet | DecorationGroup {
+  static from(members: readonly DecorationSource[]): DecorationSource {
     switch (members.length) {
       case 0: return empty
       case 1: return members[0]
-      default: return new DecorationGroup(members)
+      default: return new DecorationGroup(
+        members.every(m => m instanceof DecorationSet) ? members as DecorationSet[] :
+          members.reduce((r, m) => r.concat(m instanceof DecorationSet ? m : (m as DecorationGroup).members),
+                         [] as DecorationSet[]))
     }
   }
 }
@@ -753,8 +756,8 @@ function insertAhead(array: Decoration[], i: number, deco: Decoration) {
 }
 
 // Get the decorations associated with the current props of a view.
-export function viewDecorations(view: EditorView): DecorationSet | DecorationGroup {
-  let found = []
+export function viewDecorations(view: EditorView): DecorationSource {
+  let found: DecorationSource[] = []
   view.someProp("decorations", f => {
     let result = f(view.state)
     if (result && result != empty) found.push(result)

package/src/domchange.ts

@@ -81,6 +81,10 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
     let origin = view.input.lastSelectionTime > Date.now() - 50 ? view.input.lastSelectionOrigin : null
     let newSel = selectionFromDOM(view, origin)
     if (newSel && !view.state.selection.eq(newSel)) {
+      if (browser.chrome && browser.android &&
+          view.input.lastKeyCode === 13 && Date.now() - 100 < view.input.lastKeyCodeTime &&
+          view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter"))))
+        return
       let tr = view.state.tr.setSelection(newSel)
       if (origin == "pointer") tr.setMeta("pointer", true)
       else if (origin == "key") tr.scrollIntoView()

package/src/domcoords.ts

@@ -413,7 +413,7 @@ function endOfTextblockVertical(view: EditorView, state: EditorState, dir: "up"
     for (;;) {
       let nearest = view.docView.nearestDesc(dom, true)
       if (!nearest) break
-      if (nearest.node!.isBlock) { dom = nearest.dom; break }
+      if (nearest.node!.isBlock) { dom = nearest.contentDOM || nearest.dom; break }
       dom = nearest.dom.parentNode!
     }
     let coords = coordsAtPos(view, $pos.pos, 1)

package/src/input.ts

@@ -147,7 +147,7 @@ editHandlers.keypress = (view, _event) => {
   let sel = view.state.selection
   if (!(sel instanceof TextSelection) || !sel.$from.sameParent(sel.$to)) {
     let text = String.fromCharCode(event.charCode)
-    if (!view.someProp("handleTextInput", f => f(view, sel.$from.pos, sel.$to.pos, text)))
+    if (!/[\r\n]/.test(text) && !view.someProp("handleTextInput", f => f(view, sel.$from.pos, sel.$to.pos, text)))
       view.dispatch(view.state.tr.insertText(text).scrollIntoView())
     event.preventDefault()
   }

package/src/viewdesc.ts

@@ -1150,7 +1150,8 @@ class ViewTreeUpdater {
       this.stack.push(this.top, this.index + 1)
       let found = -1
       for (let i = this.index; i < Math.min(this.index + 3, this.top.children.length); i++) {
-        if (this.top.children[i].matchesMark(marks[depth])) { found = i; break }
+        let next = this.top.children[i]
+        if (next.matchesMark(marks[depth]) && !this.isLocked(next.dom)) { found = i; break }
       }
       if (found > -1) {
         if (found > this.index) {
@@ -1230,7 +1231,7 @@ class ViewTreeUpdater {
         // Can't update if nextDOM is or contains this.lock, except if
         // it's a text node whose content already matches the new text
         // and whose decorations match the new ones.
-        let locked = this.lock && (nextDOM == this.lock || nextDOM.nodeType == 1 && nextDOM.contains(this.lock.parentNode)) &&
+        let locked = this.isLocked(nextDOM) &&
             !(node.isText && next.node && next.node.isText && next.nodeDOM.nodeValue == node.text &&
               next.dirty != NODE_DIRTY && sameOuterDeco(outerDeco, next.outerDeco))
         if (!locked && next.update(node, outerDeco, innerDeco, view)) {
@@ -1299,6 +1300,10 @@ class ViewTreeUpdater {
       this.changed = true
     }
   }
+
+  isLocked(node: DOMNode) {
+    return this.lock && (node == this.lock || node.nodeType == 1 && node.contains(this.lock.parentNode))
+  }
 }
 
 // Iterate from the end of the fragment and array of descs to find