prosemirror-view 1.31.0 → 1.31.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.31.2 (2023-05-10)
+
+### Bug fixes
+
+Fix a bug that broke backspace after empty lines in code blocks on Firefox.
+
+Make it possible for the `attributes` prop to override the `translate` attribute.
+
+## 1.31.1 (2023-05-01)
+
+### Bug fixes
+
+Fix a bug that could cause a view crash on some kind of document updates.
+
 ## 1.31.0 (2023-04-26)
 
 ### Bug fixes

package/dist/index.cjs

@@ -1134,21 +1134,6 @@ var ViewDesc = function () {
 
         if (node.nodeType == 3) {
           brKludge = !!(_offset && node.nodeValue[_offset - 1] == "\n");
-
-          if (brKludge && _offset == node.nodeValue.length) {
-            for (var scan = node, after; scan; scan = scan.parentNode) {
-              if (after = scan.nextSibling) {
-                if (after.nodeName == "BR") anchorDOM = headDOM = {
-                  node: after.parentNode,
-                  offset: domIndex(after) + 1
-                };
-                break;
-              }
-
-              var desc = scan.pmViewDesc;
-              if (desc && desc.node && desc.node.isBlock) break;
-            }
-          }
         } else {
           var prev = node.childNodes[_offset - 1];
           brKludge = prev && (prev.nodeName == "BR" || prev.contentEditable == "false");
@@ -1156,8 +1141,8 @@ var ViewDesc = function () {
       }
 
       if (gecko && domSel.focusNode && domSel.focusNode != headDOM.node && domSel.focusNode.nodeType == 1) {
-        var _after2 = domSel.focusNode.childNodes[domSel.focusOffset];
-        if (_after2 && _after2.contentEditable == "false") force = true;
+        var after = domSel.focusNode.childNodes[domSel.focusOffset];
+        if (after && after.contentEditable == "false") force = true;
       }
 
       if (!(force || brKludge && safari) && isEquivalentPosition(anchorDOM.node, anchorDOM.offset, domSel.anchorNode, domSel.anchorOffset) && isEquivalentPosition(headDOM.node, headDOM.offset, domSel.focusNode, domSel.focusOffset)) return;
@@ -2190,6 +2175,9 @@ var ViewTreeUpdater = function () {
             return true;
           } else if (!locked && (updated = this.recreateWrapper(next, node, outerDeco, innerDeco, view, pos))) {
             this.top.children[this.index] = updated;
+            updated.dirty = CONTENT_DIRTY;
+            updated.updateChildren(view, pos + 1);
+            updated.dirty = NOT_DIRTY;
             this.changed = true;
             this.index++;
             return true;
@@ -2224,9 +2212,6 @@ var ViewTreeUpdater = function () {
         _iterator.f();
       }
 
-      wrapper.dirty = CONTENT_DIRTY;
-      wrapper.updateChildren(view, pos + 1);
-      wrapper.dirty = NOT_DIRTY;
       return wrapper;
     }
   }, {
@@ -5959,17 +5944,13 @@ function computeDocDeco(view) {
   var attrs = Object.create(null);
   attrs["class"] = "ProseMirror";
   attrs.contenteditable = String(view.editable);
-  attrs.translate = "no";
   view.someProp("attributes", function (value) {
     if (typeof value == "function") value = value(view.state);
     if (value) for (var attr in value) {
-      if (attr == "class") attrs["class"] += " " + value[attr];
-
-      if (attr == "style") {
-        attrs.style = (attrs.style ? attrs.style + ";" : "") + value[attr];
-      } else if (!attrs[attr] && attr != "contenteditable" && attr != "nodeName") attrs[attr] = String(value[attr]);
+      if (attr == "class") attrs["class"] += " " + value[attr];else if (attr == "style") attrs.style = (attrs.style ? attrs.style + ";" : "") + value[attr];else if (!attrs[attr] && attr != "contenteditable" && attr != "nodeName") attrs[attr] = String(value[attr]);
     }
   });
+  if (!attrs.translate) attrs.translate = "no";
   return [Decoration.node(0, view.state.doc.content.size, attrs)];
 }
 

package/dist/index.js

@@ -957,19 +957,6 @@ class ViewDesc {
             let { node, offset } = anchorDOM;
             if (node.nodeType == 3) {
                 brKludge = !!(offset && node.nodeValue[offset - 1] == "\n");
-                // Issue #1128
-                if (brKludge && offset == node.nodeValue.length) {
-                    for (let scan = node, after; scan; scan = scan.parentNode) {
-                        if (after = scan.nextSibling) {
-                            if (after.nodeName == "BR")
-                                anchorDOM = headDOM = { node: after.parentNode, offset: domIndex(after) + 1 };
-                            break;
-                        }
-                        let desc = scan.pmViewDesc;
-                        if (desc && desc.node && desc.node.isBlock)
-                            break;
-                    }
-                }
             }
             else {
                 let prev = node.childNodes[offset - 1];
@@ -1808,6 +1795,9 @@ class ViewTreeUpdater {
                 }
                 else if (!locked && (updated = this.recreateWrapper(next, node, outerDeco, innerDeco, view, pos))) {
                     this.top.children[this.index] = updated;
+                    updated.dirty = CONTENT_DIRTY;
+                    updated.updateChildren(view, pos + 1);
+                    updated.dirty = NOT_DIRTY;
                     this.changed = true;
                     this.index++;
                     return true;
@@ -1830,9 +1820,6 @@ class ViewTreeUpdater {
         next.children = [];
         for (let ch of wrapper.children)
             ch.parent = wrapper;
-        wrapper.dirty = CONTENT_DIRTY;
-        wrapper.updateChildren(view, pos + 1);
-        wrapper.dirty = NOT_DIRTY;
         return wrapper;
     }
     // Insert the node as a newly created node desc.
@@ -5435,7 +5422,6 @@ function computeDocDeco(view) {
     let attrs = Object.create(null);
     attrs.class = "ProseMirror";
     attrs.contenteditable = String(view.editable);
-    attrs.translate = "no";
     view.someProp("attributes", value => {
         if (typeof value == "function")
             value = value(view.state);
@@ -5443,13 +5429,14 @@ function computeDocDeco(view) {
             for (let attr in value) {
                 if (attr == "class")
                     attrs.class += " " + value[attr];
-                if (attr == "style") {
+                else if (attr == "style")
                     attrs.style = (attrs.style ? attrs.style + ";" : "") + value[attr];
-                }
                 else if (!attrs[attr] && attr != "contenteditable" && attr != "nodeName")
                     attrs[attr] = String(value[attr]);
             }
     });
+    if (!attrs.translate)
+        attrs.translate = "no";
     return [Decoration.node(0, view.state.doc.content.size, attrs)];
 }
 function updateCursorWrapper(view) {

package/package.json

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

package/src/index.ts

@@ -478,20 +478,19 @@ function computeDocDeco(view: EditorView) {
   let attrs = Object.create(null)
   attrs.class = "ProseMirror"
   attrs.contenteditable = String(view.editable)
-  attrs.translate = "no"
 
   view.someProp("attributes", value => {
     if (typeof value == "function") value = value(view.state)
     if (value) for (let attr in value) {
       if (attr == "class")
         attrs.class += " " + value[attr]
-      if (attr == "style") {
+      else if (attr == "style")
         attrs.style = (attrs.style ? attrs.style + ";" : "") + value[attr]
-      }
       else if (!attrs[attr] && attr != "contenteditable" && attr != "nodeName")
         attrs[attr] = String(value[attr])
     }
   })
+  if (!attrs.translate) attrs.translate = "no"
 
   return [Decoration.node(0, view.state.doc.content.size, attrs)]
 }

package/src/viewdesc.ts

@@ -385,18 +385,6 @@ export class ViewDesc {
       let {node, offset} = anchorDOM
       if (node.nodeType == 3) {
         brKludge = !!(offset && node.nodeValue![offset - 1] == "\n")
-        // Issue #1128
-        if (brKludge && offset == node.nodeValue!.length) {
-          for (let scan: DOMNode | null = node, after; scan; scan = scan.parentNode) {
-            if (after = scan.nextSibling) {
-              if (after.nodeName == "BR")
-                anchorDOM = headDOM = {node: after.parentNode!, offset: domIndex(after) + 1}
-              break
-            }
-            let desc = scan.pmViewDesc
-            if (desc && desc.node && desc.node.isBlock) break
-          }
-        }
       } else {
         let prev = node.childNodes[offset - 1]
         brKludge = prev && (prev.nodeName == "BR" || (prev as HTMLElement).contentEditable == "false")
@@ -1244,6 +1232,9 @@ class ViewTreeUpdater {
           return true
         } else if (!locked && (updated = this.recreateWrapper(next, node, outerDeco, innerDeco, view, pos))) {
           this.top.children[this.index] = updated
+          updated.dirty = CONTENT_DIRTY
+          updated.updateChildren(view, pos + 1)
+          updated.dirty = NOT_DIRTY
           this.changed = true
           this.index++
           return true
@@ -1265,9 +1256,7 @@ class ViewTreeUpdater {
     wrapper.children = next.children
     next.children = []
     for (let ch of wrapper.children) ch.parent = wrapper
-    wrapper.dirty = CONTENT_DIRTY
-    wrapper.updateChildren(view, pos + 1)
-    wrapper.dirty = NOT_DIRTY
+   
     return wrapper
   }