prosemirror-view 1.28.0 → 1.28.2

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.28.2 (2022-09-24)
+
+### Bug fixes
+
+Avoid a crash in selection updates in a hidden editor on Safari.
+
+## 1.28.1 (2022-09-21)
+
+### Bug fixes
+
+Fix an issue where the editor would reset its scroll position to the top of the document for any state reconfiguration, even if the document was unchanged.
+
 ## 1.28.0 (2022-09-09)
 
 ### Bug fixes

package/dist/index.cjs

@@ -1102,7 +1102,12 @@ var ViewDesc = function () {
         domSel.collapse(anchorDOM.node, anchorDOM.offset);
 
         try {
-          if (anchor != head) domSel.extend(headDOM.node, headDOM.offset);
+          if (anchor != head) {
+            try {
+              domSel.extend(headDOM.node, headDOM.offset);
+            } catch (_) {}
+          }
+
           domSelExtended = true;
         } catch (err) {
           if (!(err instanceof DOMException)) throw err;
@@ -5423,6 +5428,7 @@ var EditorView = function () {
     key: "update",
     value: function update(props) {
       if (props.handleDOMEvents != this._props.handleDOMEvents) ensureListeners(this);
+      var prevProps = this._props;
       this._props = props;
 
       if (props.plugins) {
@@ -5430,7 +5436,7 @@ var EditorView = function () {
         this.directPlugins = props.plugins;
       }
 
-      this.updateStateInner(props.state, true);
+      this.updateStateInner(props.state, prevProps);
     }
   }, {
     key: "setProps",
@@ -5452,11 +5458,11 @@ var EditorView = function () {
   }, {
     key: "updateState",
     value: function updateState(state) {
-      this.updateStateInner(state, this.state.plugins != state.plugins);
+      this.updateStateInner(state, this._props);
     }
   }, {
     key: "updateStateInner",
-    value: function updateStateInner(state, reconfigured) {
+    value: function updateStateInner(state, prevProps) {
       var prev = this.state,
           redraw = false,
           updateSel = false;
@@ -5467,15 +5473,18 @@ var EditorView = function () {
       }
 
       this.state = state;
+      var pluginsChanged = prev.plugins != state.plugins || this._props.plugins != prevProps.plugins;
 
-      if (reconfigured) {
+      if (pluginsChanged || this._props.plugins != prevProps.plugins || this._props.nodeViews != prevProps.nodeViews) {
         var nodeViews = buildNodeViews(this);
 
         if (changedNodeViews(nodeViews, this.nodeViews)) {
           this.nodeViews = nodeViews;
           redraw = true;
         }
+      }
 
+      if (pluginsChanged || prevProps.handleDOMEvents != this._props.handleDOMEvents) {
         ensureListeners(this);
       }
 
@@ -5483,7 +5492,7 @@ var EditorView = function () {
       updateCursorWrapper(this);
       var innerDeco = viewDecorations(this),
           outerDeco = computeDocDeco(this);
-      var scroll = reconfigured ? "reset" : state.scrollToSelection > prev.scrollToSelection ? "to selection" : "preserve";
+      var scroll = prev.plugins != state.plugins && !prev.doc.eq(state.doc) ? "reset" : state.scrollToSelection > prev.scrollToSelection ? "to selection" : "preserve";
       var updateDoc = redraw || !this.docView.matchesNode(state.doc, outerDeco, innerDeco);
       if (updateDoc || !state.selection.eq(prev.selection)) updateSel = true;
       var oldScrollPos = scroll == "preserve" && updateSel && this.dom.style.overflowAnchor == null && storeScrollPos(this);

package/dist/index.js

@@ -957,8 +957,14 @@ class ViewDesc {
         if ((domSel.extend || anchor == head) && !brKludge) {
             domSel.collapse(anchorDOM.node, anchorDOM.offset);
             try {
-                if (anchor != head)
-                    domSel.extend(headDOM.node, headDOM.offset);
+                if (anchor != head) {
+                    // This can crash on Safari if the editor is hidden, and
+                    // there was no selection. (#1308)
+                    try {
+                        domSel.extend(headDOM.node, headDOM.offset);
+                    }
+                    catch (_) { }
+                }
                 domSelExtended = true;
             }
             catch (err) {
@@ -4907,12 +4913,13 @@ class EditorView {
     update(props) {
         if (props.handleDOMEvents != this._props.handleDOMEvents)
             ensureListeners(this);
+        let prevProps = this._props;
         this._props = props;
         if (props.plugins) {
             props.plugins.forEach(checkStateComponent);
             this.directPlugins = props.plugins;
         }
-        this.updateStateInner(props.state, true);
+        this.updateStateInner(props.state, prevProps);
     }
     /**
     Update the view by updating existing props object with the object
@@ -4933,9 +4940,9 @@ class EditorView {
     other props.
     */
     updateState(state) {
-        this.updateStateInner(state, this.state.plugins != state.plugins);
+        this.updateStateInner(state, this._props);
     }
-    updateStateInner(state, reconfigured) {
+    updateStateInner(state, prevProps) {
         let prev = this.state, redraw = false, updateSel = false;
         // When stored marks are added, stop composition, so that they can
         // be displayed.
@@ -4944,18 +4951,21 @@ class EditorView {
             updateSel = true;
         }
         this.state = state;
-        if (reconfigured) {
+        let pluginsChanged = prev.plugins != state.plugins || this._props.plugins != prevProps.plugins;
+        if (pluginsChanged || this._props.plugins != prevProps.plugins || this._props.nodeViews != prevProps.nodeViews) {
             let nodeViews = buildNodeViews(this);
             if (changedNodeViews(nodeViews, this.nodeViews)) {
                 this.nodeViews = nodeViews;
                 redraw = true;
             }
+        }
+        if (pluginsChanged || prevProps.handleDOMEvents != this._props.handleDOMEvents) {
             ensureListeners(this);
         }
         this.editable = getEditable(this);
         updateCursorWrapper(this);
         let innerDeco = viewDecorations(this), outerDeco = computeDocDeco(this);
-        let scroll = reconfigured ? "reset"
+        let scroll = prev.plugins != state.plugins && !prev.doc.eq(state.doc) ? "reset"
             : state.scrollToSelection > prev.scrollToSelection ? "to selection" : "preserve";
         let updateDoc = redraw || !this.docView.matchesNode(state.doc, outerDeco, innerDeco);
         if (updateDoc || !state.selection.eq(prev.selection))

package/package.json

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

package/src/index.ts

@@ -124,12 +124,13 @@ export class EditorView {
   /// the DOM.
   update(props: DirectEditorProps) {
     if (props.handleDOMEvents != this._props.handleDOMEvents) ensureListeners(this)
+    let prevProps = this._props
     this._props = props
     if (props.plugins) {
       props.plugins.forEach(checkStateComponent)
       this.directPlugins = props.plugins
     }
-    this.updateStateInner(props.state, true)
+    this.updateStateInner(props.state, prevProps)
   }
 
   /// Update the view by updating existing props object with the object
@@ -146,10 +147,10 @@ export class EditorView {
   /// Update the editor's `state` prop, without touching any of the
   /// other props.
   updateState(state: EditorState) {
-    this.updateStateInner(state, this.state.plugins != state.plugins)
+    this.updateStateInner(state, this._props)
   }
 
-  private updateStateInner(state: EditorState, reconfigured: boolean) {
+  private updateStateInner(state: EditorState, prevProps: DirectEditorProps) {
     let prev = this.state, redraw = false, updateSel = false
     // When stored marks are added, stop composition, so that they can
     // be displayed.
@@ -158,12 +159,15 @@ export class EditorView {
       updateSel = true
     }
     this.state = state
-    if (reconfigured) {
+    let pluginsChanged = prev.plugins != state.plugins || this._props.plugins != prevProps.plugins
+    if (pluginsChanged || this._props.plugins != prevProps.plugins || this._props.nodeViews != prevProps.nodeViews) {
       let nodeViews = buildNodeViews(this)
       if (changedNodeViews(nodeViews, this.nodeViews)) {
         this.nodeViews = nodeViews
         redraw = true
       }
+    }
+    if (pluginsChanged || prevProps.handleDOMEvents != this._props.handleDOMEvents) {
       ensureListeners(this)
     }
 
@@ -171,7 +175,7 @@ export class EditorView {
     updateCursorWrapper(this)
     let innerDeco = viewDecorations(this), outerDeco = computeDocDeco(this)
 
-    let scroll = reconfigured ? "reset"
+    let scroll = prev.plugins != state.plugins && !prev.doc.eq(state.doc) ? "reset"
         : (state as any).scrollToSelection > (prev as any).scrollToSelection ? "to selection" : "preserve"
     let updateDoc = redraw || !this.docView.matchesNode(state.doc, outerDeco, innerDeco)
     if (updateDoc || !state.selection.eq(prev.selection)) updateSel = true

package/src/viewdesc.ts

@@ -419,7 +419,12 @@ export class ViewDesc {
     if ((domSel.extend || anchor == head) && !brKludge) {
       domSel.collapse(anchorDOM.node, anchorDOM.offset)
       try {
-        if (anchor != head) domSel.extend(headDOM.node, headDOM.offset)
+        if (anchor != head) {
+          // This can crash on Safari if the editor is hidden, and
+          // there was no selection. (#1308)
+          try { domSel.extend(headDOM.node, headDOM.offset) }
+          catch (_) {}
+        }
         domSelExtended = true
       } catch (err) {
         // In some cases with Chrome the selection is empty after calling