@codemirror/view 6.0.1 → 6.1.0

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 6.1.0 (2022-07-19)
+
+### New features
+
+`MatchDecorator` now supports a `decorate` option that can be used to customize the way decorations are added for each match.
+
+## 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
+
+Fix a CSS issue that broke horizontal scroll width stabilization.
+
+Fix a bug where `defaultLineHeight` could get an incorrect value in very narrow editors.
+
 ## 6.0.1 (2022-06-17)
 
 ### Bug fixes

package/dist/index.cjs

@@ -2726,6 +2726,7 @@ class DocView extends ContentView {
         // If no workable line exists, force a layout of a measurable element
         let dummy = document.createElement("div"), lineHeight, charWidth;
         dummy.className = "cm-line";
+        dummy.style.width = "99999px";
         dummy.textContent = "abc def ghi jkl mno pqr stu";
         this.view.observer.ignore(() => {
             this.dom.appendChild(dummy);
@@ -3136,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;
             }
         }
@@ -3163,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;
@@ -3172,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
@@ -3730,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
@@ -3737,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;
@@ -5166,6 +5192,7 @@ const baseTheme$1 = buildTheme("." + baseThemeID, {
     ".cm-content": {
         margin: 0,
         flexGrow: 2,
+        flexShrink: 0,
         minHeight: "100%",
         display: "block",
         whiteSpace: "pre",
@@ -5181,7 +5208,8 @@ const baseTheme$1 = buildTheme("." + baseThemeID, {
         whiteSpace_fallback: "pre-wrap",
         whiteSpace: "break-spaces",
         wordBreak: "break-word",
-        overflowWrap: "anywhere"
+        overflowWrap: "anywhere",
+        flexShrink: 1
     },
     "&light .cm-content": { caretColor: "black" },
     "&dark .cm-content": { caretColor: "white" },
@@ -5219,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",
@@ -6887,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.
 
@@ -7353,7 +7381,7 @@ function iterMatches(doc, re, from, to, f) {
     for (let cursor = doc.iterRange(from, to), pos = from, m; !cursor.next().done; pos += cursor.value.length) {
         if (!cursor.lineBreak)
             while (m = re.exec(cursor.value))
-                f(pos + m.index, pos + m.index + m[0].length, m);
+                f(pos + m.index, m);
     }
 }
 function matchRanges(view, maxLength) {
@@ -7383,11 +7411,20 @@ class MatchDecorator {
     Create a decorator.
     */
     constructor(config) {
-        let { regexp, decoration, boundary, maxLength = 1000 } = config;
+        const { regexp, decoration, decorate, boundary, maxLength = 1000 } = config;
         if (!regexp.global)
             throw new RangeError("The regular expression given to MatchDecorator should have its 'g' flag set");
         this.regexp = regexp;
-        this.getDeco = typeof decoration == "function" ? decoration : () => decoration;
+        if (decorate) {
+            this.addMatch = (match, view, from, add) => decorate(add, from, from + match[0].length, match, view);
+        }
+        else if (decoration) {
+            let getDeco = typeof decoration == "function" ? decoration : () => decoration;
+            this.addMatch = (match, view, from, add) => add(from, from + match[0].length, getDeco(match, view, from));
+        }
+        else {
+            throw new RangeError("Either 'decorate' or 'decoration' should be provided to MatchDecorator");
+        }
         this.boundary = boundary;
         this.maxLength = maxLength;
     }
@@ -7397,9 +7434,9 @@ class MatchDecorator {
     plugin.
     */
     createDeco(view) {
-        let build = new state.RangeSetBuilder();
+        let build = new state.RangeSetBuilder(), add = build.add.bind(build);
         for (let { from, to } of matchRanges(view, this.maxLength))
-            iterMatches(view.state.doc, this.regexp, from, to, (a, b, m) => build.add(a, b, this.getDeco(m, view, a)));
+            iterMatches(view.state.doc, this.regexp, from, to, (from, m) => this.addMatch(m, view, from, add));
         return build.finish();
     }
     /**
@@ -7441,15 +7478,14 @@ class MatchDecorator {
                         }
                 }
                 let ranges = [], m;
+                let add = (from, to, deco) => ranges.push(deco.range(from, to));
                 if (fromLine == toLine) {
                     this.regexp.lastIndex = start - fromLine.from;
-                    while ((m = this.regexp.exec(fromLine.text)) && m.index < end - fromLine.from) {
-                        let pos = m.index + fromLine.from;
-                        ranges.push(this.getDeco(m, view, pos).range(pos, pos + m[0].length));
-                    }
+                    while ((m = this.regexp.exec(fromLine.text)) && m.index < end - fromLine.from)
+                        this.addMatch(m, view, m.index + fromLine.from, add);
                 }
                 else {
-                    iterMatches(view.state.doc, this.regexp, start, end, (from, to, m) => ranges.push(this.getDeco(m, view, from).range(from, to)));
+                    iterMatches(view.state.doc, this.regexp, start, end, (from, m) => this.addMatch(m, view, from, add));
                 }
                 deco = deco.update({ filterFrom: start, filterTo: end, filter: (from, to) => from < start || to > end, add: ranges });
             }

package/dist/index.d.ts

@@ -1357,7 +1357,7 @@ represent a matching configuration.
 */
 declare class MatchDecorator {
     private regexp;
-    private getDeco;
+    private addMatch;
     private boundary;
     private maxLength;
     /**
@@ -1374,7 +1374,18 @@ declare class MatchDecorator {
         The decoration to apply to matches, either directly or as a
         function of the match.
         */
-        decoration: Decoration | ((match: RegExpExecArray, view: EditorView, pos: number) => Decoration);
+        decoration?: Decoration | ((match: RegExpExecArray, view: EditorView, pos: number) => Decoration);
+        /**
+        Customize the way decorations are added for matches. This
+        function, when given, will be called for matches and should
+        call `add` to create decorations for them. Note that the
+        decorations should appear *in* the given range, and the
+        function should have no side effects beyond calling `add`.
+        
+        The `decoration` option is ignored when `decorate` is
+        provided.
+        */
+        decorate?: (add: (from: number, to: number, decoration: Decoration) => void, from: number, to: number, match: RegExpExecArray, view: EditorView) => void;
         /**
         By default, changed lines are re-matched entirely. You can
         provide a boundary expression, which should match single

package/dist/index.js

@@ -2720,6 +2720,7 @@ class DocView extends ContentView {
         // If no workable line exists, force a layout of a measurable element
         let dummy = document.createElement("div"), lineHeight, charWidth;
         dummy.className = "cm-line";
+        dummy.style.width = "99999px";
         dummy.textContent = "abc def ghi jkl mno pqr stu";
         this.view.observer.ignore(() => {
             this.dom.appendChild(dummy);
@@ -3130,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;
             }
         }
@@ -3157,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;
@@ -3166,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
@@ -3724,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
@@ -3731,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;
@@ -5159,6 +5185,7 @@ const baseTheme$1 = /*@__PURE__*/buildTheme("." + baseThemeID, {
     ".cm-content": {
         margin: 0,
         flexGrow: 2,
+        flexShrink: 0,
         minHeight: "100%",
         display: "block",
         whiteSpace: "pre",
@@ -5174,7 +5201,8 @@ const baseTheme$1 = /*@__PURE__*/buildTheme("." + baseThemeID, {
         whiteSpace_fallback: "pre-wrap",
         whiteSpace: "break-spaces",
         wordBreak: "break-word",
-        overflowWrap: "anywhere"
+        overflowWrap: "anywhere",
+        flexShrink: 1
     },
     "&light .cm-content": { caretColor: "black" },
     "&dark .cm-content": { caretColor: "white" },
@@ -5212,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",
@@ -6880,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.
 
@@ -7346,7 +7374,7 @@ function iterMatches(doc, re, from, to, f) {
     for (let cursor = doc.iterRange(from, to), pos = from, m; !cursor.next().done; pos += cursor.value.length) {
         if (!cursor.lineBreak)
             while (m = re.exec(cursor.value))
-                f(pos + m.index, pos + m.index + m[0].length, m);
+                f(pos + m.index, m);
     }
 }
 function matchRanges(view, maxLength) {
@@ -7376,11 +7404,20 @@ class MatchDecorator {
     Create a decorator.
     */
     constructor(config) {
-        let { regexp, decoration, boundary, maxLength = 1000 } = config;
+        const { regexp, decoration, decorate, boundary, maxLength = 1000 } = config;
         if (!regexp.global)
             throw new RangeError("The regular expression given to MatchDecorator should have its 'g' flag set");
         this.regexp = regexp;
-        this.getDeco = typeof decoration == "function" ? decoration : () => decoration;
+        if (decorate) {
+            this.addMatch = (match, view, from, add) => decorate(add, from, from + match[0].length, match, view);
+        }
+        else if (decoration) {
+            let getDeco = typeof decoration == "function" ? decoration : () => decoration;
+            this.addMatch = (match, view, from, add) => add(from, from + match[0].length, getDeco(match, view, from));
+        }
+        else {
+            throw new RangeError("Either 'decorate' or 'decoration' should be provided to MatchDecorator");
+        }
         this.boundary = boundary;
         this.maxLength = maxLength;
     }
@@ -7390,9 +7427,9 @@ class MatchDecorator {
     plugin.
     */
     createDeco(view) {
-        let build = new RangeSetBuilder();
+        let build = new RangeSetBuilder(), add = build.add.bind(build);
         for (let { from, to } of matchRanges(view, this.maxLength))
-            iterMatches(view.state.doc, this.regexp, from, to, (a, b, m) => build.add(a, b, this.getDeco(m, view, a)));
+            iterMatches(view.state.doc, this.regexp, from, to, (from, m) => this.addMatch(m, view, from, add));
         return build.finish();
     }
     /**
@@ -7434,15 +7471,14 @@ class MatchDecorator {
                         }
                 }
                 let ranges = [], m;
+                let add = (from, to, deco) => ranges.push(deco.range(from, to));
                 if (fromLine == toLine) {
                     this.regexp.lastIndex = start - fromLine.from;
-                    while ((m = this.regexp.exec(fromLine.text)) && m.index < end - fromLine.from) {
-                        let pos = m.index + fromLine.from;
-                        ranges.push(this.getDeco(m, view, pos).range(pos, pos + m[0].length));
-                    }
+                    while ((m = this.regexp.exec(fromLine.text)) && m.index < end - fromLine.from)
+                        this.addMatch(m, view, m.index + fromLine.from, add);
                 }
                 else {
-                    iterMatches(view.state.doc, this.regexp, start, end, (from, to, m) => ranges.push(this.getDeco(m, view, from).range(from, to)));
+                    iterMatches(view.state.doc, this.regexp, start, end, (from, m) => this.addMatch(m, view, from, add));
                 }
                 deco = deco.update({ filterFrom: start, filterTo: end, filter: (from, to) => from < start || to > end, add: ranges });
             }

package/package.json

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