@codemirror/view 6.2.4 → 6.2.5

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 6.2.5 (2022-09-24)
+
+### Bug fixes
+
+Don't override double/triple tap behavior on touch screen devices, so that the mobile selection menu pops up properly.
+
+Fix an issue where updating the selection could crash on Safari when the editor was hidden.
+
 ## 6.2.4 (2022-09-16)
 
 ### Bug fixes

package/dist/index.cjs

@@ -100,7 +100,7 @@ function windowRect(win) {
         top: 0, bottom: win.innerHeight };
 }
 function scrollRectIntoView(dom, rect, side, x, y, xMargin, yMargin, ltr) {
-    let doc = dom.ownerDocument, win = doc.defaultView;
+    let doc = dom.ownerDocument, win = doc.defaultView || window;
     for (let cur = dom; cur;) {
         if (cur.nodeType == 1) { // Element
             let bounding, top = cur == doc.body;
@@ -350,7 +350,7 @@ class ContentView {
                 if (child.dirty) {
                     if (!child.dom && (next = prev ? prev.nextSibling : parent.firstChild)) {
                         let contentView = ContentView.get(next);
-                        if (!contentView || !contentView.parent && contentView.constructor == child.constructor)
+                        if (!contentView || !contentView.parent && contentView.canReuseDOM(child))
                             child.reuseDOM(next);
                     }
                     child.sync(track);
@@ -508,6 +508,7 @@ class ContentView {
         return false;
     }
     become(other) { return false; }
+    canReuseDOM(other) { return other.constructor == this.constructor; }
     // When this is a zero-length view with a side, this should return a
     // number <= 0 to indicate it is before its position, or a
     // number > 0 when after its position.
@@ -911,6 +912,7 @@ class CompositionView extends WidgetView {
         (_a = this.widget.topView) === null || _a === void 0 ? void 0 : _a.destroy();
     }
     get isEditable() { return true; }
+    canReuseDOM() { return true; }
 }
 // Uses the old structure of a chunk of content view frozen for
 // composition to try and find a reasonable DOM location for the given
@@ -2639,7 +2641,13 @@ class DocView extends ContentView {
                     // (one where the focus is before the anchor), but not all
                     // browsers support it yet.
                     rawSel.collapse(anchor.node, anchor.offset);
-                    rawSel.extend(head.node, head.offset);
+                    // Safari will ignore the call above when the editor is
+                    // hidden, and then raise an error on the call to extend
+                    // (#940).
+                    try {
+                        rawSel.extend(head.node, head.offset);
+                    }
+                    catch (_) { }
                 }
                 else {
                     // Primitive (IE) way
@@ -3692,7 +3700,7 @@ handlers.touchmove = view => {
 handlerOptions.touchstart = handlerOptions.touchmove = { passive: true };
 handlers.mousedown = (view, event) => {
     view.observer.flush();
-    if (view.inputState.lastTouchTime > Date.now() - 2000 && getClickType(event) == 1)
+    if (view.inputState.lastTouchTime > Date.now() - 2000)
         return; // Ignore touch interaction
     let style = null;
     for (let makeStyle of view.state.facet(mouseSelectionStyle)) {
@@ -4663,7 +4671,7 @@ class DecorationComparator {
 
 function visiblePixelRange(dom, paddingTop) {
     let rect = dom.getBoundingClientRect();
-    let doc = dom.ownerDocument, win = doc.defaultView;
+    let doc = dom.ownerDocument, win = doc.defaultView || window;
     let left = Math.max(0, rect.left), right = Math.min(win.innerWidth, rect.right);
     let top = Math.max(0, rect.top), bottom = Math.min(win.innerHeight, rect.bottom);
     for (let parent = dom.parentNode; parent && parent != doc.body;) {
@@ -6738,7 +6746,7 @@ class EditorView {
     setRoot(root) {
         if (this._root != root) {
             this._root = root;
-            this.observer.setWindow((root.nodeType == 9 ? root : root.ownerDocument).defaultView);
+            this.observer.setWindow((root.nodeType == 9 ? root : root.ownerDocument).defaultView || window);
             this.mountStyles();
         }
     }

package/dist/index.js

@@ -96,7 +96,7 @@ function windowRect(win) {
         top: 0, bottom: win.innerHeight };
 }
 function scrollRectIntoView(dom, rect, side, x, y, xMargin, yMargin, ltr) {
-    let doc = dom.ownerDocument, win = doc.defaultView;
+    let doc = dom.ownerDocument, win = doc.defaultView || window;
     for (let cur = dom; cur;) {
         if (cur.nodeType == 1) { // Element
             let bounding, top = cur == doc.body;
@@ -346,7 +346,7 @@ class ContentView {
                 if (child.dirty) {
                     if (!child.dom && (next = prev ? prev.nextSibling : parent.firstChild)) {
                         let contentView = ContentView.get(next);
-                        if (!contentView || !contentView.parent && contentView.constructor == child.constructor)
+                        if (!contentView || !contentView.parent && contentView.canReuseDOM(child))
                             child.reuseDOM(next);
                     }
                     child.sync(track);
@@ -504,6 +504,7 @@ class ContentView {
         return false;
     }
     become(other) { return false; }
+    canReuseDOM(other) { return other.constructor == this.constructor; }
     // When this is a zero-length view with a side, this should return a
     // number <= 0 to indicate it is before its position, or a
     // number > 0 when after its position.
@@ -907,6 +908,7 @@ class CompositionView extends WidgetView {
         (_a = this.widget.topView) === null || _a === void 0 ? void 0 : _a.destroy();
     }
     get isEditable() { return true; }
+    canReuseDOM() { return true; }
 }
 // Uses the old structure of a chunk of content view frozen for
 // composition to try and find a reasonable DOM location for the given
@@ -2633,7 +2635,13 @@ class DocView extends ContentView {
                     // (one where the focus is before the anchor), but not all
                     // browsers support it yet.
                     rawSel.collapse(anchor.node, anchor.offset);
-                    rawSel.extend(head.node, head.offset);
+                    // Safari will ignore the call above when the editor is
+                    // hidden, and then raise an error on the call to extend
+                    // (#940).
+                    try {
+                        rawSel.extend(head.node, head.offset);
+                    }
+                    catch (_) { }
                 }
                 else {
                     // Primitive (IE) way
@@ -3686,7 +3694,7 @@ handlers.touchmove = view => {
 handlerOptions.touchstart = handlerOptions.touchmove = { passive: true };
 handlers.mousedown = (view, event) => {
     view.observer.flush();
-    if (view.inputState.lastTouchTime > Date.now() - 2000 && getClickType(event) == 1)
+    if (view.inputState.lastTouchTime > Date.now() - 2000)
         return; // Ignore touch interaction
     let style = null;
     for (let makeStyle of view.state.facet(mouseSelectionStyle)) {
@@ -4656,7 +4664,7 @@ class DecorationComparator {
 
 function visiblePixelRange(dom, paddingTop) {
     let rect = dom.getBoundingClientRect();
-    let doc = dom.ownerDocument, win = doc.defaultView;
+    let doc = dom.ownerDocument, win = doc.defaultView || window;
     let left = Math.max(0, rect.left), right = Math.min(win.innerWidth, rect.right);
     let top = Math.max(0, rect.top), bottom = Math.min(win.innerHeight, rect.bottom);
     for (let parent = dom.parentNode; parent && parent != doc.body;) {
@@ -6731,7 +6739,7 @@ class EditorView {
     setRoot(root) {
         if (this._root != root) {
             this._root = root;
-            this.observer.setWindow((root.nodeType == 9 ? root : root.ownerDocument).defaultView);
+            this.observer.setWindow((root.nodeType == 9 ? root : root.ownerDocument).defaultView || window);
             this.mountStyles();
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/view",
-  "version": "6.2.4",
+  "version": "6.2.5",
   "description": "DOM view component for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",