@codemirror/view 6.2.0 → 6.2.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 6.2.1 (2022-08-25)
+
+### Bug fixes
+
+Don't use the global `document` variable to track focus, since that doesn't work in another window/frame.
+
+Fix an issue where key handlers that didn't return true were sometimes called twice for the same keypress.
+
+Avoid editing glitches when using deletion keys like ctrl-d on iOS.
+
+Properly treat characters from the 'Arabic Presentation Forms-A' Unicode block as right-to-left.
+
+Work around a Firefox bug that inserts text at the wrong point for specific cross-line selections.
+
 ## 6.2.0 (2022-08-05)
 
 ### Bug fixes

package/dist/index.cjs

@@ -22,8 +22,8 @@ function getSelection(root) {
 function contains(dom, node) {
     return node ? dom == node || dom.contains(node.nodeType != 1 ? node.parentNode : node) : false;
 }
-function deepActiveElement() {
-    let elt = document.activeElement;
+function deepActiveElement(doc) {
+    let elt = doc.activeElement;
     while (elt && elt.shadowRoot)
         elt = elt.shadowRoot.activeElement;
     return elt;
@@ -762,7 +762,7 @@ class MarkView extends ContentView {
         return new MarkView(this.mark, result, length);
     }
     domAtPos(pos) {
-        return inlineDOMAtPos(this.dom, this.children, pos);
+        return inlineDOMAtPos(this, pos);
     }
     coordsAt(pos, side) {
         return coordsInChildren(this, pos, side);
@@ -913,11 +913,14 @@ class CompositionView extends WidgetView {
 // offset.
 function scanCompositionTree(pos, side, view, text, enterView, fromText) {
     if (view instanceof MarkView) {
-        for (let child of view.children) {
-            let hasComp = contains(child.dom, text);
-            let len = hasComp ? text.nodeValue.length : child.length;
-            if (pos < len || pos == len && child.getSide() <= 0)
-                return hasComp ? scanCompositionTree(pos, side, child, text, enterView, fromText) : enterView(child, pos, side);
+        for (let child = view.dom.firstChild; child; child = child.nextSibling) {
+            let desc = ContentView.get(child);
+            if (!desc)
+                return fromText(pos, side);
+            let hasComp = contains(child, text);
+            let len = desc.length + (hasComp ? text.nodeValue.length : 0);
+            if (pos < len || pos == len && desc.getSide() <= 0)
+                return hasComp ? scanCompositionTree(pos, side, desc, text, enterView, fromText) : enterView(desc, pos, side);
             pos -= len;
         }
         return enterView(view, view.length, -1);
@@ -1007,8 +1010,8 @@ function inlineSiblingRect(view, side) {
     }
     return undefined;
 }
-function inlineDOMAtPos(dom, children, pos) {
-    let i = 0;
+function inlineDOMAtPos(parent, pos) {
+    let dom = parent.dom, { children } = parent, i = 0;
     for (let off = 0; i < children.length; i++) {
         let child = children[i], end = off + child.length;
         if (end == off && child.getSide() <= 0)
@@ -1019,10 +1022,16 @@ function inlineDOMAtPos(dom, children, pos) {
             break;
         off = end;
     }
-    for (; i > 0; i--) {
-        let before = children[i - 1].dom;
-        if (before.parentNode == dom)
-            return DOMPos.after(before);
+    //  if (i) return DOMPos.after(children[i - 1].dom!)
+    for (let j = i; j > 0; j--) {
+        let prev = children[j - 1];
+        if (prev.dom.parentNode == dom)
+            return prev.domAtPos(prev.length);
+    }
+    for (let j = i; j < children.length; j++) {
+        let next = children[j];
+        if (next.dom.parentNode == dom)
+            return next.domAtPos(0);
     }
     return new DOMPos(dom, 0);
 }
@@ -1431,7 +1440,7 @@ class LineView extends ContentView {
             this.attrs = combineAttrs({ class: cls }, this.attrs || {});
     }
     domAtPos(pos) {
-        return inlineDOMAtPos(this.dom, this.children, pos);
+        return inlineDOMAtPos(this, pos);
     }
     reuseDOM(node) {
         if (node.nodeName == "DIV") {
@@ -2077,9 +2086,10 @@ function charType(ch) {
             0x600 <= ch && ch <= 0x6f9 ? ArabicTypes[ch - 0x600] :
                 0x6ee <= ch && ch <= 0x8ac ? 4 /* AL */ :
                     0x2000 <= ch && ch <= 0x200b ? 256 /* NI */ :
-                        ch == 0x200c ? 256 /* NI */ : 1 /* L */;
+                        0xfb50 <= ch && ch <= 0xfdff ? 4 /* AL */ :
+                            ch == 0x200c ? 256 /* NI */ : 1 /* L */;
 }
-const BidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;
+const BidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac\ufb50-\ufdff]/;
 /**
 Represents a contiguous range of text that has a single direction
 (as in left-to-right or right-to-left).
@@ -3458,9 +3468,10 @@ class InputState {
         // applyDOMChange, notify key handlers of it and reset to
         // the state they produce.
         let pending;
-        if (browser.ios && (pending = PendingKeys.find(key => key.keyCode == event.keyCode)) &&
-            !(event.ctrlKey || event.altKey || event.metaKey) && !event.synthetic) {
-            this.pendingIOSKey = pending;
+        if (browser.ios && !event.synthetic && !event.altKey && !event.metaKey &&
+            ((pending = PendingKeys.find(key => key.keyCode == event.keyCode)) && !event.ctrlKey ||
+                EmacsyPendingKeys.indexOf(event.key) > -1 && event.ctrlKey && !event.shiftKey)) {
+            this.pendingIOSKey = pending || event;
             setTimeout(() => this.flushIOSKey(view), 250);
             return true;
         }
@@ -3515,6 +3526,7 @@ const PendingKeys = [
     { key: "Enter", keyCode: 13, inputType: "insertParagraph" },
     { key: "Delete", keyCode: 46, inputType: "deleteContentForward" }
 ];
+const EmacsyPendingKeys = "dthko";
 // Key codes for modifier keys
 const modifierCodes = [16, 17, 18, 20, 91, 92, 224, 225];
 class MouseSelection {
@@ -5574,7 +5586,8 @@ class DOMObserver {
         let { view } = this;
         // The Selection object is broken in shadow roots in Safari. See
         // https://github.com/codemirror/dev/issues/414
-        let range = browser.safari && view.root.nodeType == 11 && deepActiveElement() == this.dom &&
+        let range = browser.safari && view.root.nodeType == 11 &&
+            deepActiveElement(this.dom.ownerDocument) == this.dom &&
             safariSelectionRangeHack(this.view) || getSelection(view.root);
         if (!range || this.selectionRange.eq(range))
             return false;
@@ -5819,7 +5832,7 @@ function safariSelectionRangeHack(view) {
         found = event.getTargetRanges()[0];
     }
     view.contentDOM.addEventListener("beforeinput", read, true);
-    document.execCommand("indent");
+    view.dom.ownerDocument.execCommand("indent");
     view.contentDOM.removeEventListener("beforeinput", read, true);
     if (!found)
         return null;
@@ -6702,7 +6715,7 @@ class EditorView {
         // or closing, which leads us to ignore selection changes from the
         // context menu because it looks like the editor isn't focused.
         // This kludges around that.
-        return (document.hasFocus() || browser.safari && ((_a = this.inputState) === null || _a === void 0 ? void 0 : _a.lastContextMenu) > Date.now() - 3e4) &&
+        return (this.dom.ownerDocument.hasFocus() || browser.safari && ((_a = this.inputState) === null || _a === void 0 ? void 0 : _a.lastContextMenu) > Date.now() - 3e4) &&
             this.root.activeElement == this.contentDOM;
     }
     /**
@@ -7117,7 +7130,7 @@ function runHandlers(map, event, view, scope) {
         }
         return false;
     };
-    let scopeObj = map[scope], baseName;
+    let scopeObj = map[scope], baseName, shiftName;
     if (scopeObj) {
         if (runFor(scopeObj[prefix + modifiers(name, event, !isChar)]))
             return true;
@@ -7125,8 +7138,8 @@ function runHandlers(map, event, view, scope) {
             (baseName = w3cKeyname.base[event.keyCode]) && baseName != name) {
             if (runFor(scopeObj[prefix + modifiers(baseName, event, true)]))
                 return true;
-            else if (event.shiftKey && w3cKeyname.shift[event.keyCode] != baseName &&
-                runFor(scopeObj[prefix + modifiers(w3cKeyname.shift[event.keyCode], event, false)]))
+            else if (event.shiftKey && (shiftName = w3cKeyname.shift[event.keyCode]) != name && shiftName != baseName &&
+                runFor(scopeObj[prefix + modifiers(shiftName, event, false)]))
                 return true;
         }
         else if (isChar && event.shiftKey) {

package/dist/index.js

@@ -18,8 +18,8 @@ function getSelection(root) {
 function contains(dom, node) {
     return node ? dom == node || dom.contains(node.nodeType != 1 ? node.parentNode : node) : false;
 }
-function deepActiveElement() {
-    let elt = document.activeElement;
+function deepActiveElement(doc) {
+    let elt = doc.activeElement;
     while (elt && elt.shadowRoot)
         elt = elt.shadowRoot.activeElement;
     return elt;
@@ -758,7 +758,7 @@ class MarkView extends ContentView {
         return new MarkView(this.mark, result, length);
     }
     domAtPos(pos) {
-        return inlineDOMAtPos(this.dom, this.children, pos);
+        return inlineDOMAtPos(this, pos);
     }
     coordsAt(pos, side) {
         return coordsInChildren(this, pos, side);
@@ -909,11 +909,14 @@ class CompositionView extends WidgetView {
 // offset.
 function scanCompositionTree(pos, side, view, text, enterView, fromText) {
     if (view instanceof MarkView) {
-        for (let child of view.children) {
-            let hasComp = contains(child.dom, text);
-            let len = hasComp ? text.nodeValue.length : child.length;
-            if (pos < len || pos == len && child.getSide() <= 0)
-                return hasComp ? scanCompositionTree(pos, side, child, text, enterView, fromText) : enterView(child, pos, side);
+        for (let child = view.dom.firstChild; child; child = child.nextSibling) {
+            let desc = ContentView.get(child);
+            if (!desc)
+                return fromText(pos, side);
+            let hasComp = contains(child, text);
+            let len = desc.length + (hasComp ? text.nodeValue.length : 0);
+            if (pos < len || pos == len && desc.getSide() <= 0)
+                return hasComp ? scanCompositionTree(pos, side, desc, text, enterView, fromText) : enterView(desc, pos, side);
             pos -= len;
         }
         return enterView(view, view.length, -1);
@@ -1003,8 +1006,8 @@ function inlineSiblingRect(view, side) {
     }
     return undefined;
 }
-function inlineDOMAtPos(dom, children, pos) {
-    let i = 0;
+function inlineDOMAtPos(parent, pos) {
+    let dom = parent.dom, { children } = parent, i = 0;
     for (let off = 0; i < children.length; i++) {
         let child = children[i], end = off + child.length;
         if (end == off && child.getSide() <= 0)
@@ -1015,10 +1018,16 @@ function inlineDOMAtPos(dom, children, pos) {
             break;
         off = end;
     }
-    for (; i > 0; i--) {
-        let before = children[i - 1].dom;
-        if (before.parentNode == dom)
-            return DOMPos.after(before);
+    //  if (i) return DOMPos.after(children[i - 1].dom!)
+    for (let j = i; j > 0; j--) {
+        let prev = children[j - 1];
+        if (prev.dom.parentNode == dom)
+            return prev.domAtPos(prev.length);
+    }
+    for (let j = i; j < children.length; j++) {
+        let next = children[j];
+        if (next.dom.parentNode == dom)
+            return next.domAtPos(0);
     }
     return new DOMPos(dom, 0);
 }
@@ -1426,7 +1435,7 @@ class LineView extends ContentView {
             this.attrs = combineAttrs({ class: cls }, this.attrs || {});
     }
     domAtPos(pos) {
-        return inlineDOMAtPos(this.dom, this.children, pos);
+        return inlineDOMAtPos(this, pos);
     }
     reuseDOM(node) {
         if (node.nodeName == "DIV") {
@@ -2071,9 +2080,10 @@ function charType(ch) {
             0x600 <= ch && ch <= 0x6f9 ? ArabicTypes[ch - 0x600] :
                 0x6ee <= ch && ch <= 0x8ac ? 4 /* AL */ :
                     0x2000 <= ch && ch <= 0x200b ? 256 /* NI */ :
-                        ch == 0x200c ? 256 /* NI */ : 1 /* L */;
+                        0xfb50 <= ch && ch <= 0xfdff ? 4 /* AL */ :
+                            ch == 0x200c ? 256 /* NI */ : 1 /* L */;
 }
-const BidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;
+const BidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac\ufb50-\ufdff]/;
 /**
 Represents a contiguous range of text that has a single direction
 (as in left-to-right or right-to-left).
@@ -3452,9 +3462,10 @@ class InputState {
         // applyDOMChange, notify key handlers of it and reset to
         // the state they produce.
         let pending;
-        if (browser.ios && (pending = PendingKeys.find(key => key.keyCode == event.keyCode)) &&
-            !(event.ctrlKey || event.altKey || event.metaKey) && !event.synthetic) {
-            this.pendingIOSKey = pending;
+        if (browser.ios && !event.synthetic && !event.altKey && !event.metaKey &&
+            ((pending = PendingKeys.find(key => key.keyCode == event.keyCode)) && !event.ctrlKey ||
+                EmacsyPendingKeys.indexOf(event.key) > -1 && event.ctrlKey && !event.shiftKey)) {
+            this.pendingIOSKey = pending || event;
             setTimeout(() => this.flushIOSKey(view), 250);
             return true;
         }
@@ -3509,6 +3520,7 @@ const PendingKeys = [
     { key: "Enter", keyCode: 13, inputType: "insertParagraph" },
     { key: "Delete", keyCode: 46, inputType: "deleteContentForward" }
 ];
+const EmacsyPendingKeys = "dthko";
 // Key codes for modifier keys
 const modifierCodes = [16, 17, 18, 20, 91, 92, 224, 225];
 class MouseSelection {
@@ -5567,7 +5579,8 @@ class DOMObserver {
         let { view } = this;
         // The Selection object is broken in shadow roots in Safari. See
         // https://github.com/codemirror/dev/issues/414
-        let range = browser.safari && view.root.nodeType == 11 && deepActiveElement() == this.dom &&
+        let range = browser.safari && view.root.nodeType == 11 &&
+            deepActiveElement(this.dom.ownerDocument) == this.dom &&
             safariSelectionRangeHack(this.view) || getSelection(view.root);
         if (!range || this.selectionRange.eq(range))
             return false;
@@ -5812,7 +5825,7 @@ function safariSelectionRangeHack(view) {
         found = event.getTargetRanges()[0];
     }
     view.contentDOM.addEventListener("beforeinput", read, true);
-    document.execCommand("indent");
+    view.dom.ownerDocument.execCommand("indent");
     view.contentDOM.removeEventListener("beforeinput", read, true);
     if (!found)
         return null;
@@ -6695,7 +6708,7 @@ class EditorView {
         // or closing, which leads us to ignore selection changes from the
         // context menu because it looks like the editor isn't focused.
         // This kludges around that.
-        return (document.hasFocus() || browser.safari && ((_a = this.inputState) === null || _a === void 0 ? void 0 : _a.lastContextMenu) > Date.now() - 3e4) &&
+        return (this.dom.ownerDocument.hasFocus() || browser.safari && ((_a = this.inputState) === null || _a === void 0 ? void 0 : _a.lastContextMenu) > Date.now() - 3e4) &&
             this.root.activeElement == this.contentDOM;
     }
     /**
@@ -7110,7 +7123,7 @@ function runHandlers(map, event, view, scope) {
         }
         return false;
     };
-    let scopeObj = map[scope], baseName;
+    let scopeObj = map[scope], baseName, shiftName;
     if (scopeObj) {
         if (runFor(scopeObj[prefix + modifiers(name, event, !isChar)]))
             return true;
@@ -7118,8 +7131,8 @@ function runHandlers(map, event, view, scope) {
             (baseName = base[event.keyCode]) && baseName != name) {
             if (runFor(scopeObj[prefix + modifiers(baseName, event, true)]))
                 return true;
-            else if (event.shiftKey && shift[event.keyCode] != baseName &&
-                runFor(scopeObj[prefix + modifiers(shift[event.keyCode], event, false)]))
+            else if (event.shiftKey && (shiftName = shift[event.keyCode]) != name && shiftName != baseName &&
+                runFor(scopeObj[prefix + modifiers(shiftName, event, false)]))
                 return true;
         }
         else if (isChar && event.shiftKey) {

package/package.json

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