@codemirror/view 6.0.2 → 6.0.3

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 6.0.3 (2022-07-08)
+
+### Bug fixes
+
+Fix a problem where `posAtCoords` could incorrectly return the start of the next line when querying positions between lines.
+
+Fix an issue where registering a high-precedence keymap made keymap handling take precedence over other keydown event handlers.
+
+Ctrl/Cmd-clicking can now remove ranges from a multi-range selection.
+
 ## 6.0.2 (2022-06-23)
 
 ### Bug fixes

package/dist/index.cjs

@@ -3137,7 +3137,8 @@ function posAtCoords(view, { x, y }, precise, bias = -1) {
             let range = doc.caretRangeFromPoint(x, y);
             if (range) {
                 ({ startContainer: node, startOffset: offset } = range);
-                if (browser.safari && isSuspiciousCaretResult(node, offset, x))
+                if (browser.safari && isSuspiciousSafariCaretResult(node, offset, x) ||
+                    browser.chrome && isSuspiciousChromeCaretResult(node, offset, x))
                     node = undefined;
             }
         }
@@ -3164,7 +3165,7 @@ function posAtCoordsImprecise(view, contentRect, block, x, y) {
 // the space between lines as belonging to the last character of the
 // line before. This is used to detect such a result so that it can be
 // ignored (issue #401).
-function isSuspiciousCaretResult(node, offset, x) {
+function isSuspiciousSafariCaretResult(node, offset, x) {
     let len;
     if (node.nodeType != 3 || offset != (len = node.nodeValue.length))
         return false;
@@ -3173,6 +3174,22 @@ function isSuspiciousCaretResult(node, offset, x) {
             return false;
     return textRange(node, len - 1, len).getBoundingClientRect().left > x;
 }
+// Chrome will move positions between lines to the start of the next line
+function isSuspiciousChromeCaretResult(node, offset, x) {
+    if (offset != 0)
+        return false;
+    for (let cur = node;;) {
+        let parent = cur.parentNode;
+        if (!parent || parent.nodeType != 1 || parent.firstChild != cur)
+            return false;
+        if (parent.classList.contains("cm-line"))
+            break;
+        cur = parent;
+    }
+    let rect = node.nodeType == 1 ? node.getBoundingClientRect()
+        : textRange(node, 0, Math.max(node.nodeValue.length, 1)).getBoundingClientRect();
+    return x - rect.left > 5;
+}
 function moveToLineBoundary(view, start, forward, includeWrap) {
     let line = view.state.doc.lineAt(start.head);
     let coords = !includeWrap || !view.lineWrapping ? null
@@ -3731,6 +3748,8 @@ function basicMouseSelection(view, event) {
             }
             if (extend)
                 return startSel.replaceRange(startSel.main.extend(range.from, range.to));
+            else if (multiple && startSel.ranges.length > 1 && startSel.ranges.some(r => r.eq(range)))
+                return removeRange(startSel, range);
             else if (multiple)
                 return startSel.addRange(range);
             else
@@ -3738,6 +3757,12 @@ function basicMouseSelection(view, event) {
         }
     };
 }
+function removeRange(sel, range) {
+    for (let i = 0;; i++) {
+        if (sel.ranges[i].eq(range))
+            return state.EditorSelection.create(sel.ranges.slice(0, i).concat(sel.ranges.slice(i + 1)), sel.mainIndex == i ? 0 : sel.mainIndex - (sel.mainIndex > i ? 1 : 0));
+    }
+}
 handlers.dragstart = (view, event) => {
     let { selection: { main } } = view.state;
     let { mouseSelection } = view.inputState;
@@ -5222,8 +5247,8 @@ const baseTheme$1 = buildTheme("." + baseThemeID, {
     // Two animations defined so that we can switch between them to
     // restart the animation without forcing another style
     // recomputation.
-    "@keyframes cm-blink": { "0%": {}, "50%": { visibility: "hidden" }, "100%": {} },
-    "@keyframes cm-blink2": { "0%": {}, "50%": { visibility: "hidden" }, "100%": {} },
+    "@keyframes cm-blink": { "0%": {}, "50%": { opacity: 0 }, "100%": {} },
+    "@keyframes cm-blink2": { "0%": {}, "50%": { opacity: 0 }, "100%": {} },
     ".cm-cursor, .cm-dropCursor": {
         position: "absolute",
         borderLeft: "1.2px solid black",
@@ -6890,11 +6915,11 @@ function modifiers(name, event, shift) {
         name = "Shift-" + name;
     return name;
 }
-const handleKeyEvents = EditorView.domEventHandlers({
+const handleKeyEvents = state.Prec.default(EditorView.domEventHandlers({
     keydown(event, view) {
         return runHandlers(getKeymap(view.state), event, view, "editor");
     }
-});
+}));
 /**
 Facet used for registering keymaps.
 

package/dist/index.js

@@ -3131,7 +3131,8 @@ function posAtCoords(view, { x, y }, precise, bias = -1) {
             let range = doc.caretRangeFromPoint(x, y);
             if (range) {
                 ({ startContainer: node, startOffset: offset } = range);
-                if (browser.safari && isSuspiciousCaretResult(node, offset, x))
+                if (browser.safari && isSuspiciousSafariCaretResult(node, offset, x) ||
+                    browser.chrome && isSuspiciousChromeCaretResult(node, offset, x))
                     node = undefined;
             }
         }
@@ -3158,7 +3159,7 @@ function posAtCoordsImprecise(view, contentRect, block, x, y) {
 // the space between lines as belonging to the last character of the
 // line before. This is used to detect such a result so that it can be
 // ignored (issue #401).
-function isSuspiciousCaretResult(node, offset, x) {
+function isSuspiciousSafariCaretResult(node, offset, x) {
     let len;
     if (node.nodeType != 3 || offset != (len = node.nodeValue.length))
         return false;
@@ -3167,6 +3168,22 @@ function isSuspiciousCaretResult(node, offset, x) {
             return false;
     return textRange(node, len - 1, len).getBoundingClientRect().left > x;
 }
+// Chrome will move positions between lines to the start of the next line
+function isSuspiciousChromeCaretResult(node, offset, x) {
+    if (offset != 0)
+        return false;
+    for (let cur = node;;) {
+        let parent = cur.parentNode;
+        if (!parent || parent.nodeType != 1 || parent.firstChild != cur)
+            return false;
+        if (parent.classList.contains("cm-line"))
+            break;
+        cur = parent;
+    }
+    let rect = node.nodeType == 1 ? node.getBoundingClientRect()
+        : textRange(node, 0, Math.max(node.nodeValue.length, 1)).getBoundingClientRect();
+    return x - rect.left > 5;
+}
 function moveToLineBoundary(view, start, forward, includeWrap) {
     let line = view.state.doc.lineAt(start.head);
     let coords = !includeWrap || !view.lineWrapping ? null
@@ -3725,6 +3742,8 @@ function basicMouseSelection(view, event) {
             }
             if (extend)
                 return startSel.replaceRange(startSel.main.extend(range.from, range.to));
+            else if (multiple && startSel.ranges.length > 1 && startSel.ranges.some(r => r.eq(range)))
+                return removeRange(startSel, range);
             else if (multiple)
                 return startSel.addRange(range);
             else
@@ -3732,6 +3751,12 @@ function basicMouseSelection(view, event) {
         }
     };
 }
+function removeRange(sel, range) {
+    for (let i = 0;; i++) {
+        if (sel.ranges[i].eq(range))
+            return EditorSelection.create(sel.ranges.slice(0, i).concat(sel.ranges.slice(i + 1)), sel.mainIndex == i ? 0 : sel.mainIndex - (sel.mainIndex > i ? 1 : 0));
+    }
+}
 handlers.dragstart = (view, event) => {
     let { selection: { main } } = view.state;
     let { mouseSelection } = view.inputState;
@@ -5215,8 +5240,8 @@ const baseTheme$1 = /*@__PURE__*/buildTheme("." + baseThemeID, {
     // Two animations defined so that we can switch between them to
     // restart the animation without forcing another style
     // recomputation.
-    "@keyframes cm-blink": { "0%": {}, "50%": { visibility: "hidden" }, "100%": {} },
-    "@keyframes cm-blink2": { "0%": {}, "50%": { visibility: "hidden" }, "100%": {} },
+    "@keyframes cm-blink": { "0%": {}, "50%": { opacity: 0 }, "100%": {} },
+    "@keyframes cm-blink2": { "0%": {}, "50%": { opacity: 0 }, "100%": {} },
     ".cm-cursor, .cm-dropCursor": {
         position: "absolute",
         borderLeft: "1.2px solid black",
@@ -6883,11 +6908,11 @@ function modifiers(name, event, shift) {
         name = "Shift-" + name;
     return name;
 }
-const handleKeyEvents = /*@__PURE__*/EditorView.domEventHandlers({
+const handleKeyEvents = /*@__PURE__*/Prec.default(/*@__PURE__*/EditorView.domEventHandlers({
     keydown(event, view) {
         return runHandlers(getKeymap(view.state), event, view, "editor");
     }
-});
+}));
 /**
 Facet used for registering keymaps.
 

package/package.json

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