fix(editor): let global shortcuts override CodeMirror bindings

This commit is contained in:
Melody Ruch authored and GitHub committed 2026-08-18 15:24:16 +08:00
1 parent 9051ad35b8
commit f0cc5aefcf
4 files changed
+110 -2

No files matched your search

@@ -0,0 +1,12 @@
import type { KeyBinding } from "@codemirror/view";
import { normalizeShortcutSettings, SHORTCUT_DEFINITIONS, shortcutToCodeMirrorKey, type ShortcutSettings } from "@/lib/editor/shortcutRegistry";
const indentBracketKeys = new Set(["Mod-[", "Mod-]"]);
const globalShortcutDefinitions = SHORTCUT_DEFINITIONS.filter((definition) => definition.scope === "global");
export function defaultKeymapForGlobalShortcuts(defaultKeymap: readonly KeyBinding[], shortcuts?: Partial<ShortcutSettings>): KeyBinding[] {
const normalizedShortcuts = normalizeShortcutSettings(shortcuts);
const occupiedGlobalKeys = new Set(globalShortcutDefinitions.map((definition) => shortcutToCodeMirrorKey(normalizedShortcuts[definition.id])).filter(Boolean));
return defaultKeymap.filter((binding) => !binding.key || !indentBracketKeys.has(binding.key) || !occupiedGlobalKeys.has(binding.key));
}