@codemirror/view 6.1.0 → 6.1.1

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 6.1.1 (2022-07-25)
+
+### Bug fixes
+
+Make `highlightSpecialChars` replace directional isolate characters by default.
+
+The editor will now try to suppress browsers' native behavior of resetting the selection in the editable content when the editable element is focused (programmatically, with tab, etc).
+
+Fix a CSS issue that made it possible, when the gutters were wide enough, for them to overlap with the content.
+
 ## 6.1.0 (2022-07-19)
 
 ### New features

package/dist/index.cjs

@@ -268,6 +268,31 @@ function clearAttributes(node) {
     while (node.attributes.length)
         node.removeAttributeNode(node.attributes[0]);
 }
+function atElementStart(doc, selection) {
+    let node = selection.focusNode, offset = selection.focusOffset;
+    if (!node || selection.anchorNode != node || selection.anchorOffset != offset)
+        return false;
+    for (;;) {
+        if (offset) {
+            if (node.nodeType != 1)
+                return false;
+            let prev = node.childNodes[offset - 1];
+            if (prev.contentEditable == "false")
+                offset--;
+            else {
+                node = prev;
+                offset = maxOffset(node);
+            }
+        }
+        else if (node == doc) {
+            return true;
+        }
+        else {
+            offset = domIndex(node);
+            node = node.parentNode;
+        }
+    }
+}
 
 class DOMPos {
     constructor(node, offset, precise = true) {
@@ -3289,6 +3314,10 @@ class InputState {
     constructor(view) {
         this.lastKeyCode = 0;
         this.lastKeyTime = 0;
+        this.lastTouchTime = 0;
+        this.lastFocusTime = 0;
+        this.lastScrollTop = 0;
+        this.lastScrollLeft = 0;
         this.chromeScrollHack = -1;
         // On iOS, some keys need to have their default behavior happen
         // (after which we retroactively handle them and reset the DOM) to
@@ -3390,6 +3419,8 @@ class InputState {
         return false;
     }
     runScrollHandlers(view, event) {
+        this.lastScrollTop = view.scrollDOM.scrollTop;
+        this.lastScrollLeft = view.scrollDOM.scrollLeft;
         for (let set of this.customHandlers) {
             let handler = set.handlers.scroll;
             if (handler) {
@@ -3634,9 +3665,8 @@ handlers.keydown = (view, event) => {
     else if (modifierCodes.indexOf(event.keyCode) < 0)
         view.inputState.lastEscPress = 0;
 };
-let lastTouch = 0;
 handlers.touchstart = (view, e) => {
-    lastTouch = Date.now();
+    view.inputState.lastTouchTime = Date.now();
     view.inputState.setSelectionOrigin("select.pointer");
 };
 handlers.touchmove = view => {
@@ -3644,7 +3674,7 @@ handlers.touchmove = view => {
 };
 handlers.mousedown = (view, event) => {
     view.observer.flush();
-    if (lastTouch > Date.now() - 2000 && getClickType(event) == 1)
+    if (view.inputState.lastTouchTime > Date.now() - 2000 && getClickType(event) == 1)
         return; // Ignore touch interaction
     let style = null;
     for (let makeStyle of view.state.facet(mouseSelectionStyle)) {
@@ -3898,7 +3928,15 @@ function updateForFocusChange(view) {
             view.update([]);
     }, 10);
 }
-handlers.focus = updateForFocusChange;
+handlers.focus = view => {
+    view.inputState.lastFocusTime = Date.now();
+    // When focusing reset the scroll position, move it back to where it was
+    if (!view.scrollDOM.scrollTop && (view.inputState.lastScrollTop || view.inputState.lastScrollLeft)) {
+        view.scrollDOM.scrollTop = view.inputState.lastScrollTop;
+        view.scrollDOM.scrollLeft = view.inputState.lastScrollLeft;
+    }
+    updateForFocusChange(view);
+};
 handlers.blur = view => {
     view.observer.clearSelectionRange();
     updateForFocusChange(view);
@@ -5269,6 +5307,7 @@ const baseTheme$1 = buildTheme("." + baseThemeID, {
     "&light .cm-specialChar": { color: "red" },
     "&dark .cm-specialChar": { color: "#f78" },
     ".cm-gutters": {
+        flexShrink: 0,
         display: "flex",
         height: "100%",
         boxSizing: "border-box",
@@ -5525,15 +5564,28 @@ class DOMObserver {
             this.flush(false);
     }
     readSelectionRange() {
-        let { root } = this.view;
+        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 && root.nodeType == 11 && deepActiveElement() == this.view.contentDOM &&
-            safariSelectionRangeHack(this.view) || getSelection(root);
+        let range = browser.safari && view.root.nodeType == 11 && deepActiveElement() == this.dom &&
+            safariSelectionRangeHack(this.view) || getSelection(view.root);
         if (!range || this.selectionRange.eq(range))
             return false;
+        let local = hasSelection(this.dom, range);
+        // Detect the situation where the browser has, on focus, moved the
+        // selection to the start of the content element. Reset it to the
+        // position from the editor state.
+        if (local && !this.selectionChanged && this.selectionRange.focusNode &&
+            view.inputState.lastFocusTime > Date.now() - 200 &&
+            view.inputState.lastTouchTime < Date.now() - 300 &&
+            atElementStart(this.dom, range)) {
+            view.docView.updateSelection();
+            return false;
+        }
         this.selectionRange.setRange(range);
-        return this.selectionChanged = true;
+        if (local)
+            this.selectionChanged = true;
+        return true;
     }
     setSelectionRange(anchor, head) {
         this.selectionRange.set(anchor.node, anchor.offset, head.node, head.offset);
@@ -5620,7 +5672,7 @@ class DOMObserver {
                 this.delayedAndroidKey = null;
                 this.delayedFlush = -1;
                 if (!this.flush())
-                    dispatchKey(this.view.contentDOM, key.key, key.keyCode);
+                    dispatchKey(this.dom, key.key, key.keyCode);
             });
         // Since backspace beforeinput is sometimes signalled spuriously,
         // Enter always takes precedence.
@@ -5674,6 +5726,7 @@ class DOMObserver {
         let newSel = this.selectionChanged && hasSelection(this.dom, this.selectionRange);
         if (from < 0 && !newSel)
             return;
+        this.view.inputState.lastFocusTime = 0;
         this.selectionChanged = false;
         let startState = this.view.state;
         let handled = this.onChange(from, to, typeOver);
@@ -7495,7 +7548,7 @@ class MatchDecorator {
 }
 
 const UnicodeRegexpSupport = /x/.unicode != null ? "gu" : "g";
-const Specials = new RegExp("[\u0000-\u0008\u000a-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\u202d\u202e\ufeff\ufff9-\ufffc]", UnicodeRegexpSupport);
+const Specials = new RegExp("[\u0000-\u0008\u000a-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\u202d\u202e\u2066\u2067\u2069\ufeff\ufff9-\ufffc]", UnicodeRegexpSupport);
 const Names = {
     0: "null",
     7: "bell",
@@ -7512,6 +7565,9 @@ const Names = {
     8232: "line separator",
     8237: "left-to-right override",
     8238: "right-to-left override",
+    8294: "left-to-right isolate",
+    8295: "right-to-left isolate",
+    8297: "pop directional isolate",
     8233: "paragraph separator",
     65279: "zero width no-break space",
     65532: "object replacement"

package/dist/index.js

@@ -264,6 +264,31 @@ function clearAttributes(node) {
     while (node.attributes.length)
         node.removeAttributeNode(node.attributes[0]);
 }
+function atElementStart(doc, selection) {
+    let node = selection.focusNode, offset = selection.focusOffset;
+    if (!node || selection.anchorNode != node || selection.anchorOffset != offset)
+        return false;
+    for (;;) {
+        if (offset) {
+            if (node.nodeType != 1)
+                return false;
+            let prev = node.childNodes[offset - 1];
+            if (prev.contentEditable == "false")
+                offset--;
+            else {
+                node = prev;
+                offset = maxOffset(node);
+            }
+        }
+        else if (node == doc) {
+            return true;
+        }
+        else {
+            offset = domIndex(node);
+            node = node.parentNode;
+        }
+    }
+}
 
 class DOMPos {
     constructor(node, offset, precise = true) {
@@ -3283,6 +3308,10 @@ class InputState {
     constructor(view) {
         this.lastKeyCode = 0;
         this.lastKeyTime = 0;
+        this.lastTouchTime = 0;
+        this.lastFocusTime = 0;
+        this.lastScrollTop = 0;
+        this.lastScrollLeft = 0;
         this.chromeScrollHack = -1;
         // On iOS, some keys need to have their default behavior happen
         // (after which we retroactively handle them and reset the DOM) to
@@ -3384,6 +3413,8 @@ class InputState {
         return false;
     }
     runScrollHandlers(view, event) {
+        this.lastScrollTop = view.scrollDOM.scrollTop;
+        this.lastScrollLeft = view.scrollDOM.scrollLeft;
         for (let set of this.customHandlers) {
             let handler = set.handlers.scroll;
             if (handler) {
@@ -3628,9 +3659,8 @@ handlers.keydown = (view, event) => {
     else if (modifierCodes.indexOf(event.keyCode) < 0)
         view.inputState.lastEscPress = 0;
 };
-let lastTouch = 0;
 handlers.touchstart = (view, e) => {
-    lastTouch = Date.now();
+    view.inputState.lastTouchTime = Date.now();
     view.inputState.setSelectionOrigin("select.pointer");
 };
 handlers.touchmove = view => {
@@ -3638,7 +3668,7 @@ handlers.touchmove = view => {
 };
 handlers.mousedown = (view, event) => {
     view.observer.flush();
-    if (lastTouch > Date.now() - 2000 && getClickType(event) == 1)
+    if (view.inputState.lastTouchTime > Date.now() - 2000 && getClickType(event) == 1)
         return; // Ignore touch interaction
     let style = null;
     for (let makeStyle of view.state.facet(mouseSelectionStyle)) {
@@ -3892,7 +3922,15 @@ function updateForFocusChange(view) {
             view.update([]);
     }, 10);
 }
-handlers.focus = updateForFocusChange;
+handlers.focus = view => {
+    view.inputState.lastFocusTime = Date.now();
+    // When focusing reset the scroll position, move it back to where it was
+    if (!view.scrollDOM.scrollTop && (view.inputState.lastScrollTop || view.inputState.lastScrollLeft)) {
+        view.scrollDOM.scrollTop = view.inputState.lastScrollTop;
+        view.scrollDOM.scrollLeft = view.inputState.lastScrollLeft;
+    }
+    updateForFocusChange(view);
+};
 handlers.blur = view => {
     view.observer.clearSelectionRange();
     updateForFocusChange(view);
@@ -5262,6 +5300,7 @@ const baseTheme$1 = /*@__PURE__*/buildTheme("." + baseThemeID, {
     "&light .cm-specialChar": { color: "red" },
     "&dark .cm-specialChar": { color: "#f78" },
     ".cm-gutters": {
+        flexShrink: 0,
         display: "flex",
         height: "100%",
         boxSizing: "border-box",
@@ -5518,15 +5557,28 @@ class DOMObserver {
             this.flush(false);
     }
     readSelectionRange() {
-        let { root } = this.view;
+        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 && root.nodeType == 11 && deepActiveElement() == this.view.contentDOM &&
-            safariSelectionRangeHack(this.view) || getSelection(root);
+        let range = browser.safari && view.root.nodeType == 11 && deepActiveElement() == this.dom &&
+            safariSelectionRangeHack(this.view) || getSelection(view.root);
         if (!range || this.selectionRange.eq(range))
             return false;
+        let local = hasSelection(this.dom, range);
+        // Detect the situation where the browser has, on focus, moved the
+        // selection to the start of the content element. Reset it to the
+        // position from the editor state.
+        if (local && !this.selectionChanged && this.selectionRange.focusNode &&
+            view.inputState.lastFocusTime > Date.now() - 200 &&
+            view.inputState.lastTouchTime < Date.now() - 300 &&
+            atElementStart(this.dom, range)) {
+            view.docView.updateSelection();
+            return false;
+        }
         this.selectionRange.setRange(range);
-        return this.selectionChanged = true;
+        if (local)
+            this.selectionChanged = true;
+        return true;
     }
     setSelectionRange(anchor, head) {
         this.selectionRange.set(anchor.node, anchor.offset, head.node, head.offset);
@@ -5613,7 +5665,7 @@ class DOMObserver {
                 this.delayedAndroidKey = null;
                 this.delayedFlush = -1;
                 if (!this.flush())
-                    dispatchKey(this.view.contentDOM, key.key, key.keyCode);
+                    dispatchKey(this.dom, key.key, key.keyCode);
             });
         // Since backspace beforeinput is sometimes signalled spuriously,
         // Enter always takes precedence.
@@ -5667,6 +5719,7 @@ class DOMObserver {
         let newSel = this.selectionChanged && hasSelection(this.dom, this.selectionRange);
         if (from < 0 && !newSel)
             return;
+        this.view.inputState.lastFocusTime = 0;
         this.selectionChanged = false;
         let startState = this.view.state;
         let handled = this.onChange(from, to, typeOver);
@@ -7488,7 +7541,7 @@ class MatchDecorator {
 }
 
 const UnicodeRegexpSupport = /x/.unicode != null ? "gu" : "g";
-const Specials = /*@__PURE__*/new RegExp("[\u0000-\u0008\u000a-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\u202d\u202e\ufeff\ufff9-\ufffc]", UnicodeRegexpSupport);
+const Specials = /*@__PURE__*/new RegExp("[\u0000-\u0008\u000a-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\u202d\u202e\u2066\u2067\u2069\ufeff\ufff9-\ufffc]", UnicodeRegexpSupport);
 const Names = {
     0: "null",
     7: "bell",
@@ -7505,6 +7558,9 @@ const Names = {
     8232: "line separator",
     8237: "left-to-right override",
     8238: "right-to-left override",
+    8294: "left-to-right isolate",
+    8295: "right-to-left isolate",
+    8297: "pop directional isolate",
     8233: "paragraph separator",
     65279: "zero width no-break space",
     65532: "object replacement"

package/package.json

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