@codemirror/view 6.2.5 → 6.3.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 6.3.0 (2022-09-28)
+
+### Bug fixes
+
+Reduce the amount of wrap-point jittering when scrolling through a very long wrapped line.
+
+Fix an issue where scrolling to content that wasn't currently drawn due to being on a very long line would often fail to scroll to the right position.
+
+Suppress double-space-adds-period behavior on Chrome Mac when it behaves weirdly next to widget.
+
+### New features
+
+Key binding objects with an `any` property will now add handlers that are called for any key, within the ordering of the keybindings.
+
 ## 6.2.5 (2022-09-24)
 
 ### Bug fixes

package/dist/index.cjs

@@ -4827,7 +4827,7 @@ class ViewState {
         this.updateForViewport();
         if (updateLines)
             this.updateViewportLines();
-        if (this.lineGaps.length || this.viewport.to - this.viewport.from > 4000 /* LG.DoubleMargin */)
+        if (this.lineGaps.length || this.viewport.to - this.viewport.from > (2000 /* LG.Margin */ << 1))
             this.updateLineGaps(this.ensureLineGaps(this.mapLineGaps(this.lineGaps, update.changes)));
         update.flags |= this.computeVisibleRanges();
         if (scrollTarget)
@@ -4908,8 +4908,8 @@ class ViewState {
         this.updateForViewport();
         if ((result & 2 /* UpdateFlag.Height */) || viewportChange)
             this.updateViewportLines();
-        if (this.lineGaps.length || this.viewport.to - this.viewport.from > 4000 /* LG.DoubleMargin */)
-            this.updateLineGaps(this.ensureLineGaps(refresh ? [] : this.lineGaps));
+        if (this.lineGaps.length || this.viewport.to - this.viewport.from > (2000 /* LG.Margin */ << 1))
+            this.updateLineGaps(this.ensureLineGaps(refresh ? [] : this.lineGaps, view));
         result |= this.computeVisibleRanges();
         if (this.mustEnforceCursorAssoc) {
             this.mustEnforceCursorAssoc = false;
@@ -4980,46 +4980,82 @@ class ViewState {
     // since actual DOM coordinates aren't always available and
     // predictable. Relies on generous margins (see LG.Margin) to hide
     // the artifacts this might produce from the user.
-    ensureLineGaps(current) {
+    ensureLineGaps(current, mayMeasure) {
+        let wrapping = this.heightOracle.lineWrapping;
+        let margin = wrapping ? 10000 /* LG.MarginWrap */ : 2000 /* LG.Margin */, halfMargin = margin >> 1, doubleMargin = margin << 1;
+        // The non-wrapping logic won't work at all in predominantly right-to-left text.
+        if (this.defaultTextDirection != exports.Direction.LTR && !wrapping)
+            return [];
         let gaps = [];
-        // This won't work at all in predominantly right-to-left text.
-        if (this.defaultTextDirection != exports.Direction.LTR)
-            return gaps;
+        let addGap = (from, to, line, structure) => {
+            if (to - from < halfMargin)
+                return;
+            let sel = this.state.selection.main, avoid = [sel.from];
+            if (!sel.empty)
+                avoid.push(sel.to);
+            for (let pos of avoid) {
+                if (pos > from && pos < to) {
+                    addGap(from, pos - 10 /* LG.SelectionMargin */, line, structure);
+                    addGap(pos + 10 /* LG.SelectionMargin */, to, line, structure);
+                    return;
+                }
+            }
+            let gap = find(current, gap => gap.from >= line.from && gap.to <= line.to &&
+                Math.abs(gap.from - from) < halfMargin && Math.abs(gap.to - to) < halfMargin &&
+                !avoid.some(pos => gap.from < pos && gap.to > pos));
+            if (!gap) {
+                // When scrolling down, snap gap ends to line starts to avoid shifts in wrapping
+                if (to < line.to && mayMeasure && wrapping &&
+                    mayMeasure.visibleRanges.some(r => r.from <= to && r.to >= to)) {
+                    let lineStart = mayMeasure.moveToLineBoundary(state.EditorSelection.cursor(to), false, true).head;
+                    if (lineStart > from)
+                        to = lineStart;
+                }
+                gap = new LineGap(from, to, this.gapSize(line, from, to, structure));
+            }
+            gaps.push(gap);
+        };
         for (let line of this.viewportLines) {
-            if (line.length < 4000 /* LG.DoubleMargin */)
+            if (line.length < doubleMargin)
                 continue;
             let structure = lineStructure(line.from, line.to, this.stateDeco);
-            if (structure.total < 4000 /* LG.DoubleMargin */)
+            if (structure.total < doubleMargin)
                 continue;
+            let target = this.scrollTarget ? this.scrollTarget.range.head : null;
             let viewFrom, viewTo;
-            if (this.heightOracle.lineWrapping) {
-                let marginHeight = (2000 /* LG.Margin */ / this.heightOracle.lineLength) * this.heightOracle.lineHeight;
-                viewFrom = findPosition(structure, (this.visibleTop - line.top - marginHeight) / line.height);
-                viewTo = findPosition(structure, (this.visibleBottom - line.top + marginHeight) / line.height);
+            if (wrapping) {
+                let marginHeight = (margin / this.heightOracle.lineLength) * this.heightOracle.lineHeight;
+                let top, bot;
+                if (target != null) {
+                    top = Math.max(line.from, target - margin);
+                    bot = Math.min(line.to, target + margin);
+                }
+                else {
+                    top = (this.visibleTop - line.top - marginHeight) / line.height;
+                    bot = (this.visibleBottom - line.top + marginHeight) / line.height;
+                }
+                viewFrom = findPosition(structure, top);
+                viewTo = findPosition(structure, bot);
             }
             else {
-                let totalWidth = structure.total * this.heightOracle.charWidth;
-                let marginWidth = 2000 /* LG.Margin */ * this.heightOracle.charWidth;
-                viewFrom = findPosition(structure, (this.pixelViewport.left - marginWidth) / totalWidth);
-                viewTo = findPosition(structure, (this.pixelViewport.right + marginWidth) / totalWidth);
+                let left, right;
+                if (target != null) {
+                    left = Math.max(line.from, target - doubleMargin);
+                    right = Math.min(line.to, target + doubleMargin);
+                }
+                else {
+                    let totalWidth = structure.total * this.heightOracle.charWidth;
+                    let marginWidth = margin * this.heightOracle.charWidth;
+                    left = (this.pixelViewport.left - marginWidth) / totalWidth;
+                    right = (this.pixelViewport.right + marginWidth) / totalWidth;
+                }
+                viewFrom = findPosition(structure, left);
+                viewTo = findPosition(structure, right);
             }
-            let outside = [];
             if (viewFrom > line.from)
-                outside.push({ from: line.from, to: viewFrom });
+                addGap(line.from, viewFrom, line, structure);
             if (viewTo < line.to)
-                outside.push({ from: viewTo, to: line.to });
-            let sel = this.state.selection.main;
-            // Make sure the gaps don't cover a selection end
-            if (sel.from >= line.from && sel.from <= line.to)
-                cutRange(outside, sel.from - 10 /* LG.SelectionMargin */, sel.from + 10 /* LG.SelectionMargin */);
-            if (!sel.empty && sel.to >= line.from && sel.to <= line.to)
-                cutRange(outside, sel.to - 10 /* LG.SelectionMargin */, sel.to + 10 /* LG.SelectionMargin */);
-            for (let { from, to } of outside)
-                if (to - from > 1000 /* LG.HalfMargin */) {
-                    gaps.push(find(current, gap => gap.from >= line.from && gap.to <= line.to &&
-                        Math.abs(gap.from - from) < 1000 /* LG.HalfMargin */ && Math.abs(gap.to - to) < 1000 /* LG.HalfMargin */) ||
-                        new LineGap(from, to, this.gapSize(line, from, to, structure)));
-                }
+                addGap(viewTo, line.to, line, structure);
         }
         return gaps;
     }
@@ -5117,20 +5153,6 @@ function findFraction(structure, pos) {
     }
     return counted / structure.total;
 }
-function cutRange(ranges, from, to) {
-    for (let i = 0; i < ranges.length; i++) {
-        let r = ranges[i];
-        if (r.from < to && r.to > from) {
-            let pieces = [];
-            if (r.from < from)
-                pieces.push({ from: r.from, to: from });
-            if (r.to > to)
-                pieces.push({ from: to, to: r.to });
-            ranges.splice(i, 1, ...pieces);
-            i += pieces.length - 1;
-        }
-    }
-}
 function find(array, f) {
     for (let val of array)
         if (f(val))
@@ -5902,24 +5924,29 @@ function applyDOMChange(view, start, end, typeOver) {
     }
     if (!change && !newSel)
         return false;
-    // Heuristic to notice typing over a selected character
-    if (!change && typeOver && !sel.empty && newSel && newSel.main.empty)
+    if (!change && typeOver && !sel.empty && newSel && newSel.main.empty) {
+        // Heuristic to notice typing over a selected character
         change = { from: sel.from, to: sel.to, insert: view.state.doc.slice(sel.from, sel.to) };
-    // If the change is inside the selection and covers most of it,
-    // assume it is a selection replace (with identical characters at
-    // the start/end not included in the diff)
+    }
     else if (change && change.from >= sel.from && change.to <= sel.to &&
         (change.from != sel.from || change.to != sel.to) &&
-        (sel.to - sel.from) - (change.to - change.from) <= 4)
+        (sel.to - sel.from) - (change.to - change.from) <= 4) {
+        // If the change is inside the selection and covers most of it,
+        // assume it is a selection replace (with identical characters at
+        // the start/end not included in the diff)
         change = {
             from: sel.from, to: sel.to,
             insert: view.state.doc.slice(sel.from, change.from).append(change.insert).append(view.state.doc.slice(change.to, sel.to))
         };
-    // Detect insert-period-on-double-space Mac behavior, and transform
-    // it into a regular space insert.
+    }
     else if ((browser.mac || browser.android) && change && change.from == change.to && change.from == sel.head - 1 &&
-        change.insert.toString() == ".")
+        /^\. ?$/.test(change.insert.toString())) {
+        // Detect insert-period-on-double-space Mac and Android behavior,
+        // and transform it into a regular space insert.
+        if (newSel && change.insert.length == 2)
+            newSel = state.EditorSelection.single(newSel.main.anchor - 1, newSel.main.head - 1);
         change = { from: sel.from, to: sel.to, insert: state.Text.of([" "]) };
+    }
     if (change) {
         let startState = view.state;
         if (browser.ios && view.inputState.flushIOSKey(view))
@@ -7093,6 +7120,7 @@ function buildKeymap(bindings, platform = currentPlatform) {
             throw new Error("Key binding " + name + " is used both as a regular binding and as a multi-stroke prefix");
     };
     let add = (scope, key, command, preventDefault) => {
+        var _a, _b;
         let scopeObj = bound[scope] || (bound[scope] = Object.create(null));
         let parts = key.split(/ (?!$)/).map(k => normalizeKeyName(k, platform));
         for (let i = 1; i < parts.length; i++) {
@@ -7101,7 +7129,7 @@ function buildKeymap(bindings, platform = currentPlatform) {
             if (!scopeObj[prefix])
                 scopeObj[prefix] = {
                     preventDefault: true,
-                    commands: [(view) => {
+                    run: [(view) => {
                             let ourObj = storedPrefix = { view, prefix, scope };
                             setTimeout(() => { if (storedPrefix == ourObj)
                                 storedPrefix = null; }, PrefixTimeout);
@@ -7111,16 +7139,26 @@ function buildKeymap(bindings, platform = currentPlatform) {
         }
         let full = parts.join(" ");
         checkPrefix(full, false);
-        let binding = scopeObj[full] || (scopeObj[full] = { preventDefault: false, commands: [] });
-        binding.commands.push(command);
+        let binding = scopeObj[full] || (scopeObj[full] = { preventDefault: false, run: ((_b = (_a = scopeObj._any) === null || _a === void 0 ? void 0 : _a.run) === null || _b === void 0 ? void 0 : _b.slice()) || [] });
+        if (command)
+            binding.run.push(command);
         if (preventDefault)
             binding.preventDefault = true;
     };
     for (let b of bindings) {
+        let scopes = b.scope ? b.scope.split(" ") : ["editor"];
+        if (b.any)
+            for (let scope of scopes) {
+                let scopeObj = bound[scope] || (bound[scope] = Object.create(null));
+                if (!scopeObj._any)
+                    scopeObj._any = { preventDefault: false, run: [] };
+                for (let key in scopeObj)
+                    scopeObj[key].run.push(b.any);
+            }
         let name = b[platform] || b.key;
         if (!name)
             continue;
-        for (let scope of b.scope ? b.scope.split(" ") : ["editor"]) {
+        for (let scope of scopes) {
             add(scope, name, b.run, b.preventDefault);
             if (b.shift)
                 add(scope, "Shift-" + name, b.shift, b.preventDefault);
@@ -7137,11 +7175,15 @@ function runHandlers(map, event, view, scope) {
         if (fallthrough = modifierCodes.indexOf(event.keyCode) < 0)
             storedPrefix = null;
     }
+    let ran = new Set;
     let runFor = (binding) => {
         if (binding) {
-            for (let cmd of binding.commands)
-                if (cmd(view))
-                    return true;
+            for (let cmd of binding.run)
+                if (!ran.has(cmd)) {
+                    ran.add(cmd);
+                    if (cmd(view, event))
+                        return true;
+                }
             if (binding.preventDefault)
                 fallthrough = true;
         }
@@ -7163,6 +7205,8 @@ function runHandlers(map, event, view, scope) {
             if (runFor(scopeObj[prefix + modifiers(name, event, true)]))
                 return true;
         }
+        if (runFor(scopeObj._any))
+            return true;
     }
     return fallthrough;
 }

package/dist/index.d.ts

@@ -1219,7 +1219,7 @@ interface KeyBinding {
     command function returns `false`, further bindings will be tried
     for the key.
     */
-    run: Command;
+    run?: Command;
     /**
     When given, this defines a second binding, using the (possibly
     platform-specific) key name prefixed with `Shift-` to activate
@@ -1227,6 +1227,11 @@ interface KeyBinding {
     */
     shift?: Command;
     /**
+    When this property is present, the function is called for every
+    key that is not a multi-stroke prefix.
+    */
+    any?: (view: EditorView, event: KeyboardEvent) => boolean;
+    /**
     By default, key bindings apply when focus is on the editor
     content (the `"editor"` scope). Some extensions, mostly those
     that define their own panels, might want to allow you to

package/dist/index.js

@@ -4820,7 +4820,7 @@ class ViewState {
         this.updateForViewport();
         if (updateLines)
             this.updateViewportLines();
-        if (this.lineGaps.length || this.viewport.to - this.viewport.from > 4000 /* LG.DoubleMargin */)
+        if (this.lineGaps.length || this.viewport.to - this.viewport.from > (2000 /* LG.Margin */ << 1))
             this.updateLineGaps(this.ensureLineGaps(this.mapLineGaps(this.lineGaps, update.changes)));
         update.flags |= this.computeVisibleRanges();
         if (scrollTarget)
@@ -4901,8 +4901,8 @@ class ViewState {
         this.updateForViewport();
         if ((result & 2 /* UpdateFlag.Height */) || viewportChange)
             this.updateViewportLines();
-        if (this.lineGaps.length || this.viewport.to - this.viewport.from > 4000 /* LG.DoubleMargin */)
-            this.updateLineGaps(this.ensureLineGaps(refresh ? [] : this.lineGaps));
+        if (this.lineGaps.length || this.viewport.to - this.viewport.from > (2000 /* LG.Margin */ << 1))
+            this.updateLineGaps(this.ensureLineGaps(refresh ? [] : this.lineGaps, view));
         result |= this.computeVisibleRanges();
         if (this.mustEnforceCursorAssoc) {
             this.mustEnforceCursorAssoc = false;
@@ -4973,46 +4973,82 @@ class ViewState {
     // since actual DOM coordinates aren't always available and
     // predictable. Relies on generous margins (see LG.Margin) to hide
     // the artifacts this might produce from the user.
-    ensureLineGaps(current) {
+    ensureLineGaps(current, mayMeasure) {
+        let wrapping = this.heightOracle.lineWrapping;
+        let margin = wrapping ? 10000 /* LG.MarginWrap */ : 2000 /* LG.Margin */, halfMargin = margin >> 1, doubleMargin = margin << 1;
+        // The non-wrapping logic won't work at all in predominantly right-to-left text.
+        if (this.defaultTextDirection != Direction.LTR && !wrapping)
+            return [];
         let gaps = [];
-        // This won't work at all in predominantly right-to-left text.
-        if (this.defaultTextDirection != Direction.LTR)
-            return gaps;
+        let addGap = (from, to, line, structure) => {
+            if (to - from < halfMargin)
+                return;
+            let sel = this.state.selection.main, avoid = [sel.from];
+            if (!sel.empty)
+                avoid.push(sel.to);
+            for (let pos of avoid) {
+                if (pos > from && pos < to) {
+                    addGap(from, pos - 10 /* LG.SelectionMargin */, line, structure);
+                    addGap(pos + 10 /* LG.SelectionMargin */, to, line, structure);
+                    return;
+                }
+            }
+            let gap = find(current, gap => gap.from >= line.from && gap.to <= line.to &&
+                Math.abs(gap.from - from) < halfMargin && Math.abs(gap.to - to) < halfMargin &&
+                !avoid.some(pos => gap.from < pos && gap.to > pos));
+            if (!gap) {
+                // When scrolling down, snap gap ends to line starts to avoid shifts in wrapping
+                if (to < line.to && mayMeasure && wrapping &&
+                    mayMeasure.visibleRanges.some(r => r.from <= to && r.to >= to)) {
+                    let lineStart = mayMeasure.moveToLineBoundary(EditorSelection.cursor(to), false, true).head;
+                    if (lineStart > from)
+                        to = lineStart;
+                }
+                gap = new LineGap(from, to, this.gapSize(line, from, to, structure));
+            }
+            gaps.push(gap);
+        };
         for (let line of this.viewportLines) {
-            if (line.length < 4000 /* LG.DoubleMargin */)
+            if (line.length < doubleMargin)
                 continue;
             let structure = lineStructure(line.from, line.to, this.stateDeco);
-            if (structure.total < 4000 /* LG.DoubleMargin */)
+            if (structure.total < doubleMargin)
                 continue;
+            let target = this.scrollTarget ? this.scrollTarget.range.head : null;
             let viewFrom, viewTo;
-            if (this.heightOracle.lineWrapping) {
-                let marginHeight = (2000 /* LG.Margin */ / this.heightOracle.lineLength) * this.heightOracle.lineHeight;
-                viewFrom = findPosition(structure, (this.visibleTop - line.top - marginHeight) / line.height);
-                viewTo = findPosition(structure, (this.visibleBottom - line.top + marginHeight) / line.height);
+            if (wrapping) {
+                let marginHeight = (margin / this.heightOracle.lineLength) * this.heightOracle.lineHeight;
+                let top, bot;
+                if (target != null) {
+                    top = Math.max(line.from, target - margin);
+                    bot = Math.min(line.to, target + margin);
+                }
+                else {
+                    top = (this.visibleTop - line.top - marginHeight) / line.height;
+                    bot = (this.visibleBottom - line.top + marginHeight) / line.height;
+                }
+                viewFrom = findPosition(structure, top);
+                viewTo = findPosition(structure, bot);
             }
             else {
-                let totalWidth = structure.total * this.heightOracle.charWidth;
-                let marginWidth = 2000 /* LG.Margin */ * this.heightOracle.charWidth;
-                viewFrom = findPosition(structure, (this.pixelViewport.left - marginWidth) / totalWidth);
-                viewTo = findPosition(structure, (this.pixelViewport.right + marginWidth) / totalWidth);
+                let left, right;
+                if (target != null) {
+                    left = Math.max(line.from, target - doubleMargin);
+                    right = Math.min(line.to, target + doubleMargin);
+                }
+                else {
+                    let totalWidth = structure.total * this.heightOracle.charWidth;
+                    let marginWidth = margin * this.heightOracle.charWidth;
+                    left = (this.pixelViewport.left - marginWidth) / totalWidth;
+                    right = (this.pixelViewport.right + marginWidth) / totalWidth;
+                }
+                viewFrom = findPosition(structure, left);
+                viewTo = findPosition(structure, right);
             }
-            let outside = [];
             if (viewFrom > line.from)
-                outside.push({ from: line.from, to: viewFrom });
+                addGap(line.from, viewFrom, line, structure);
             if (viewTo < line.to)
-                outside.push({ from: viewTo, to: line.to });
-            let sel = this.state.selection.main;
-            // Make sure the gaps don't cover a selection end
-            if (sel.from >= line.from && sel.from <= line.to)
-                cutRange(outside, sel.from - 10 /* LG.SelectionMargin */, sel.from + 10 /* LG.SelectionMargin */);
-            if (!sel.empty && sel.to >= line.from && sel.to <= line.to)
-                cutRange(outside, sel.to - 10 /* LG.SelectionMargin */, sel.to + 10 /* LG.SelectionMargin */);
-            for (let { from, to } of outside)
-                if (to - from > 1000 /* LG.HalfMargin */) {
-                    gaps.push(find(current, gap => gap.from >= line.from && gap.to <= line.to &&
-                        Math.abs(gap.from - from) < 1000 /* LG.HalfMargin */ && Math.abs(gap.to - to) < 1000 /* LG.HalfMargin */) ||
-                        new LineGap(from, to, this.gapSize(line, from, to, structure)));
-                }
+                addGap(viewTo, line.to, line, structure);
         }
         return gaps;
     }
@@ -5110,20 +5146,6 @@ function findFraction(structure, pos) {
     }
     return counted / structure.total;
 }
-function cutRange(ranges, from, to) {
-    for (let i = 0; i < ranges.length; i++) {
-        let r = ranges[i];
-        if (r.from < to && r.to > from) {
-            let pieces = [];
-            if (r.from < from)
-                pieces.push({ from: r.from, to: from });
-            if (r.to > to)
-                pieces.push({ from: to, to: r.to });
-            ranges.splice(i, 1, ...pieces);
-            i += pieces.length - 1;
-        }
-    }
-}
 function find(array, f) {
     for (let val of array)
         if (f(val))
@@ -5895,24 +5917,29 @@ function applyDOMChange(view, start, end, typeOver) {
     }
     if (!change && !newSel)
         return false;
-    // Heuristic to notice typing over a selected character
-    if (!change && typeOver && !sel.empty && newSel && newSel.main.empty)
+    if (!change && typeOver && !sel.empty && newSel && newSel.main.empty) {
+        // Heuristic to notice typing over a selected character
         change = { from: sel.from, to: sel.to, insert: view.state.doc.slice(sel.from, sel.to) };
-    // If the change is inside the selection and covers most of it,
-    // assume it is a selection replace (with identical characters at
-    // the start/end not included in the diff)
+    }
     else if (change && change.from >= sel.from && change.to <= sel.to &&
         (change.from != sel.from || change.to != sel.to) &&
-        (sel.to - sel.from) - (change.to - change.from) <= 4)
+        (sel.to - sel.from) - (change.to - change.from) <= 4) {
+        // If the change is inside the selection and covers most of it,
+        // assume it is a selection replace (with identical characters at
+        // the start/end not included in the diff)
         change = {
             from: sel.from, to: sel.to,
             insert: view.state.doc.slice(sel.from, change.from).append(change.insert).append(view.state.doc.slice(change.to, sel.to))
         };
-    // Detect insert-period-on-double-space Mac behavior, and transform
-    // it into a regular space insert.
+    }
     else if ((browser.mac || browser.android) && change && change.from == change.to && change.from == sel.head - 1 &&
-        change.insert.toString() == ".")
+        /^\. ?$/.test(change.insert.toString())) {
+        // Detect insert-period-on-double-space Mac and Android behavior,
+        // and transform it into a regular space insert.
+        if (newSel && change.insert.length == 2)
+            newSel = EditorSelection.single(newSel.main.anchor - 1, newSel.main.head - 1);
         change = { from: sel.from, to: sel.to, insert: Text.of([" "]) };
+    }
     if (change) {
         let startState = view.state;
         if (browser.ios && view.inputState.flushIOSKey(view))
@@ -7086,6 +7113,7 @@ function buildKeymap(bindings, platform = currentPlatform) {
             throw new Error("Key binding " + name + " is used both as a regular binding and as a multi-stroke prefix");
     };
     let add = (scope, key, command, preventDefault) => {
+        var _a, _b;
         let scopeObj = bound[scope] || (bound[scope] = Object.create(null));
         let parts = key.split(/ (?!$)/).map(k => normalizeKeyName(k, platform));
         for (let i = 1; i < parts.length; i++) {
@@ -7094,7 +7122,7 @@ function buildKeymap(bindings, platform = currentPlatform) {
             if (!scopeObj[prefix])
                 scopeObj[prefix] = {
                     preventDefault: true,
-                    commands: [(view) => {
+                    run: [(view) => {
                             let ourObj = storedPrefix = { view, prefix, scope };
                             setTimeout(() => { if (storedPrefix == ourObj)
                                 storedPrefix = null; }, PrefixTimeout);
@@ -7104,16 +7132,26 @@ function buildKeymap(bindings, platform = currentPlatform) {
         }
         let full = parts.join(" ");
         checkPrefix(full, false);
-        let binding = scopeObj[full] || (scopeObj[full] = { preventDefault: false, commands: [] });
-        binding.commands.push(command);
+        let binding = scopeObj[full] || (scopeObj[full] = { preventDefault: false, run: ((_b = (_a = scopeObj._any) === null || _a === void 0 ? void 0 : _a.run) === null || _b === void 0 ? void 0 : _b.slice()) || [] });
+        if (command)
+            binding.run.push(command);
         if (preventDefault)
             binding.preventDefault = true;
     };
     for (let b of bindings) {
+        let scopes = b.scope ? b.scope.split(" ") : ["editor"];
+        if (b.any)
+            for (let scope of scopes) {
+                let scopeObj = bound[scope] || (bound[scope] = Object.create(null));
+                if (!scopeObj._any)
+                    scopeObj._any = { preventDefault: false, run: [] };
+                for (let key in scopeObj)
+                    scopeObj[key].run.push(b.any);
+            }
         let name = b[platform] || b.key;
         if (!name)
             continue;
-        for (let scope of b.scope ? b.scope.split(" ") : ["editor"]) {
+        for (let scope of scopes) {
             add(scope, name, b.run, b.preventDefault);
             if (b.shift)
                 add(scope, "Shift-" + name, b.shift, b.preventDefault);
@@ -7130,11 +7168,15 @@ function runHandlers(map, event, view, scope) {
         if (fallthrough = modifierCodes.indexOf(event.keyCode) < 0)
             storedPrefix = null;
     }
+    let ran = new Set;
     let runFor = (binding) => {
         if (binding) {
-            for (let cmd of binding.commands)
-                if (cmd(view))
-                    return true;
+            for (let cmd of binding.run)
+                if (!ran.has(cmd)) {
+                    ran.add(cmd);
+                    if (cmd(view, event))
+                        return true;
+                }
             if (binding.preventDefault)
                 fallthrough = true;
         }
@@ -7156,6 +7198,8 @@ function runHandlers(map, event, view, scope) {
             if (runFor(scopeObj[prefix + modifiers(name, event, true)]))
                 return true;
         }
+        if (runFor(scopeObj._any))
+            return true;
     }
     return fallthrough;
 }

package/package.json

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