@pierre/diffs 1.3.1 → 1.3.2

package/dist/edit/index.d.ts

@@ -1,5 +1,6 @@
 import { EditorChange, EditorChangeEvent, Position, Range, TextEdit } from "../types.js";
+import { EditorCommand, EditorKeymap, EditorShortcut, KeyboardKey, KeyboardModifier } from "../editor/command.js";
 import { TextDocument, TextDocumentChange } from "../editor/textDocument.js";
 import { IStateStorage, PersistStateStorage } from "../editor/stateStorage.js";
 import { Editor, EditorFocusOptions, EditorOptions } from "../editor/editor.js";
-export { Editor, type EditorChange, type EditorChangeEvent, EditorFocusOptions, EditorOptions, type IStateStorage, type PersistStateStorage, type Position, type Range, TextDocument, TextDocumentChange, type TextEdit };
+export { Editor, type EditorChange, type EditorChangeEvent, type EditorCommand, EditorFocusOptions, type EditorKeymap, EditorOptions, type EditorShortcut, type IStateStorage, type KeyboardKey, type KeyboardModifier, type PersistStateStorage, type Position, type Range, TextDocument, TextDocumentChange, type TextEdit };

package/dist/editor/command.d.ts

@@ -1,7 +1,15 @@
 //#region src/editor/command.d.ts
 type EditorCommand = 'indent' | 'outdent' | 'indentLess' | 'indentMore' | 'undo' | 'redo' | 'selectAll' | 'findNextMatch' | 'openSearchPanel' | 'openSearchReplacePanel' | 'moveLineUp' | 'moveLineDown' | 'copyLineUp' | 'copyLineDown' | 'simplifySelection' | 'insertBlankLine' | 'deleteHardLineForward' | 'toggleComment' | 'toggleBlockComment' | 'moveCursorToDocStart' | 'moveCursorToDocEnd' | 'expandSelectionDocStart' | 'expandSelectionDocEnd';
-declare function resolveEditorCommandFromKeyboardEvent(event: KeyboardEvent, isMac?: boolean): EditorCommand | undefined;
+type KeyboardKey = 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' | 'l' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | '`' | '-' | '=' | ',' | '.' | '/' | ';' | "'" | '[' | ']' | '\\' | 'Space' | 'Tab' | 'Enter' | 'Escape' | 'Backspace' | 'Delete' | 'ArrowUp' | 'ArrowDown' | 'ArrowLeft' | 'ArrowRight' | 'Home' | 'End' | 'PageUp' | 'PageDown' | 'F1' | 'F2' | 'F3' | 'F4' | 'F5' | 'F6' | 'F7' | 'F8' | 'F9' | 'F10' | 'F11' | 'F12';
+type KeyboardModifier = 'cmdOrCtrl' | 'shift' | 'alt' | 'ctrl' | 'cmd';
+type EditorShortcut = KeyboardKey | `${KeyboardModifier}+${KeyboardKey}` | `${KeyboardModifier}+${KeyboardModifier}+${KeyboardKey}`;
+/** Later groups take precedence when bindings overlap. */
+type EditorKeymap = ReadonlyArray<{
+  /** Undefined applies on every platform. */readonly platform?: 'mac' | 'windows' | 'linux';
+  readonly bindings: Readonly<Partial<Record<EditorShortcut, EditorCommand>>>;
+}>;
+declare function resolveEditorCommandFromKeyboardEvent(event: KeyboardEvent, keymap?: EditorKeymap, isMac?: boolean): EditorCommand | undefined;
 declare function resolveFindAgainShortcut(event: KeyboardEvent, isMac?: boolean): 'next' | 'previous' | undefined;
 //#endregion
-export { EditorCommand, resolveEditorCommandFromKeyboardEvent, resolveFindAgainShortcut };
+export { EditorCommand, EditorKeymap, EditorShortcut, KeyboardKey, KeyboardModifier, resolveEditorCommandFromKeyboardEvent, resolveFindAgainShortcut };
 //# sourceMappingURL=command.d.ts.map

package/dist/editor/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","names":[],"sources":["../../src/editor/command.ts"],"mappings":";KAEY,aAAA;AAAA,iBA8BI,qCAAA,CACd,KAAA,EAAO,aAAA,EACP,KAAA,aACC,aAAa;AAAA,iBAqIA,wBAAA,CACd,KAAA,EAAO,aAAa,EACpB,KAAA"}
+{"version":3,"file":"command.d.ts","names":[],"sources":["../../src/editor/command.ts"],"mappings":";KAEY,aAAA;AAAA,KAyBA,WAAA;AAAA,KA2EA,gBAAA;AAAA,KAEA,cAAA,GACR,WAAA,MACG,gBAAA,IAAoB,WAAA,QACpB,gBAAA,IAAoB,gBAAA,IAAoB,WAAA;;KAGnC,YAAA,GAAe,aAAA;EAnFf,oDAqFD,QAAA;EAAA,SACA,QAAA,EAAU,QAAA,CAAS,OAAA,CAAQ,MAAA,CAAO,cAAA,EAAgB,aAAA;AAAA;AAAA,iBAsI7C,qCAAA,CACd,KAAA,EAAO,aAAA,EACP,MAAA,GAAS,YAAA,EACT,KAAA,aACC,aAAA;AAAA,iBA8Ca,wBAAA,CACd,KAAA,EAAO,aAAa,EACpB,KAAA"}

package/dist/editor/command.js

@@ -1,48 +1,121 @@
 import { isMacLike } from "../utils/platform.js";
 import { isPrimaryModifier } from "./platform.js";
 //#region src/editor/command.ts
-const SHORTCUTS = {
-	a: "selectAll",
-	d: "findNextMatch"
-};
-function resolveEditorCommandFromKeyboardEvent(event, isMac = isMacLike()) {
-	const hasPrimaryModifier = isPrimaryModifier(event, isMac);
-	const { shiftKey, altKey, key } = event;
-	const normalizedKey = key.length === 1 ? key.toLowerCase() : key;
-	if (isMac && event.ctrlKey && !event.metaKey && !shiftKey && !altKey && (normalizedKey === "k" || event.code === "KeyK")) return "deleteHardLineForward";
-	if (!event.metaKey && !event.ctrlKey && shiftKey && altKey && (normalizedKey === "a" || event.code === "KeyA")) return "toggleBlockComment";
-	if (!event.metaKey && !event.ctrlKey && shiftKey && altKey) {
-		if (normalizedKey === "ArrowUp") return "copyLineUp";
-		if (normalizedKey === "ArrowDown") return "copyLineDown";
-	}
-	if (!event.metaKey && !event.ctrlKey && !shiftKey && !altKey && normalizedKey === "Escape") return "simplifySelection";
-	if (!event.metaKey && !shiftKey) {
-		if (!event.ctrlKey && altKey && normalizedKey === "ArrowUp") return "moveLineUp";
-		if (!event.ctrlKey && altKey && normalizedKey === "ArrowDown") return "moveLineDown";
-		if ((isMac || navigator.platform.includes("Linux")) && event.ctrlKey && altKey) {
-			if (normalizedKey === "p" || event.code === "KeyP") return "moveLineUp";
-			if (normalizedKey === "n" || event.code === "KeyN") return "moveLineDown";
+const compiledEditorKeymaps = /* @__PURE__ */ new WeakMap();
+const compiledDefaultKeymap = getCompiledEditorKeymap([
+	{ bindings: {
+		Tab: "indent",
+		"shift+Tab": "outdent",
+		"cmdOrCtrl+[": "indentLess",
+		"cmdOrCtrl+]": "indentMore",
+		"cmdOrCtrl+z": "undo",
+		"cmdOrCtrl+shift+z": "redo",
+		"cmdOrCtrl+a": "selectAll",
+		"cmdOrCtrl+d": "findNextMatch",
+		"cmdOrCtrl+f": "openSearchPanel",
+		"cmdOrCtrl+alt+f": "openSearchReplacePanel",
+		"alt+ArrowUp": "moveLineUp",
+		"alt+ArrowDown": "moveLineDown",
+		"shift+alt+ArrowUp": "copyLineUp",
+		"shift+alt+ArrowDown": "copyLineDown",
+		Escape: "simplifySelection",
+		"cmdOrCtrl+Enter": "insertBlankLine",
+		"cmdOrCtrl+/": "toggleComment",
+		"shift+alt+a": "toggleBlockComment",
+		"cmdOrCtrl+Home": "moveCursorToDocStart",
+		"cmdOrCtrl+End": "moveCursorToDocEnd",
+		"cmdOrCtrl+shift+Home": "expandSelectionDocStart",
+		"cmdOrCtrl+shift+End": "expandSelectionDocEnd"
+	} },
+	{
+		platform: "mac",
+		bindings: {
+			"ctrl+k": "deleteHardLineForward",
+			"ctrl+alt+p": "moveLineUp",
+			"ctrl+alt+n": "moveLineDown",
+			"cmd+ArrowUp": "moveCursorToDocStart",
+			"cmd+ArrowDown": "moveCursorToDocEnd",
+			"cmd+shift+ArrowUp": "expandSelectionDocStart",
+			"cmd+shift+ArrowDown": "expandSelectionDocEnd"
+		}
+	},
+	{
+		platform: "windows",
+		bindings: { "ctrl+y": "redo" }
+	},
+	{
+		platform: "linux",
+		bindings: {
+			"ctrl+y": "redo",
+			"ctrl+alt+p": "moveLineUp",
+			"ctrl+alt+n": "moveLineDown"
 		}
 	}
-	if (hasPrimaryModifier && (normalizedKey === "f" || event.code === "KeyF")) return altKey ? "openSearchReplacePanel" : "openSearchPanel";
-	if (altKey) return;
-	if (!hasPrimaryModifier && normalizedKey === "Tab") return shiftKey ? "outdent" : "indent";
-	if (!hasPrimaryModifier) return;
-	if (!shiftKey && normalizedKey === "Enter") return "insertBlankLine";
-	if (!shiftKey && (normalizedKey === "/" || event.code === "Slash")) return "toggleComment";
-	if (!shiftKey && normalizedKey === "[") return "indentLess";
-	if (!shiftKey && normalizedKey === "]") return "indentMore";
-	if (normalizedKey === "z") return shiftKey ? "redo" : "undo";
-	if (!isMac && normalizedKey === "y") return "redo";
-	if (normalizedKey === "Home" || isMac && normalizedKey === "ArrowUp") {
-		if (shiftKey) return "expandSelectionDocStart";
-		return "moveCursorToDocStart";
+]);
+const keyboardCodeKeys = {
+	Backquote: "`",
+	Minus: "-",
+	Equal: "=",
+	Comma: ",",
+	Period: ".",
+	Slash: "/",
+	Semicolon: ";",
+	Quote: "'",
+	BracketLeft: "[",
+	BracketRight: "]",
+	Backslash: "\\",
+	Space: "Space"
+};
+function getCompiledEditorKeymap(keymap) {
+	let compiledKeymap = compiledEditorKeymaps.get(keymap);
+	if (compiledKeymap === void 0) {
+		compiledKeymap = {
+			mac: /* @__PURE__ */ new Map(),
+			windows: /* @__PURE__ */ new Map(),
+			linux: /* @__PURE__ */ new Map()
+		};
+		for (const entry of keymap) for (const shortcut of Object.keys(entry.bindings)) {
+			const command = entry.bindings[shortcut];
+			if (command === void 0) continue;
+			const parts = shortcut.split("+");
+			const shortcutKey = parts.pop();
+			for (const platform of [
+				"mac",
+				"windows",
+				"linux"
+			]) {
+				if (entry.platform !== void 0 && entry.platform !== platform) continue;
+				let modifiers = 0;
+				for (const modifier of parts) if (modifier === "alt") modifiers |= 1;
+				else if (modifier === "ctrl") modifiers |= 2;
+				else if (modifier === "cmd") modifiers |= 4;
+				else if (modifier === "shift") modifiers |= 8;
+				else if (modifier === "cmdOrCtrl") modifiers |= platform === "mac" ? 4 : 2;
+				let bindings = compiledKeymap[platform].get(modifiers);
+				if (bindings === void 0) {
+					bindings = /* @__PURE__ */ new Map();
+					compiledKeymap[platform].set(modifiers, bindings);
+				}
+				bindings.set(shortcutKey, command);
+			}
+		}
+		compiledEditorKeymaps.set(keymap, compiledKeymap);
 	}
-	if (normalizedKey === "End" || isMac && normalizedKey === "ArrowDown") {
-		if (shiftKey) return "expandSelectionDocEnd";
-		return "moveCursorToDocEnd";
+	return compiledKeymap;
+}
+function resolveEditorCommandFromKeyboardEvent(event, keymap, isMac = isMacLike()) {
+	const eventKey = event.key === " " ? "Space" : event.key.length === 1 ? event.key.toLowerCase() : event.key;
+	const code = event.code ?? "";
+	const codeKey = code.startsWith("Key") && code.length === 4 ? code.slice(3).toLowerCase() : code.startsWith("Digit") && code.length === 6 ? code.slice(5) : keyboardCodeKeys[code];
+	const platform = isMac ? "mac" : globalThis.navigator?.platform.includes("Linux") === true ? "linux" : "windows";
+	const modifiers = (event.altKey ? 1 : 0) | (event.ctrlKey ? 2 : 0) | (event.metaKey ? 4 : 0) | (event.shiftKey ? 8 : 0);
+	if (keymap !== void 0) {
+		const bindings = getCompiledEditorKeymap(keymap)[platform].get(modifiers);
+		const command = bindings?.get(eventKey) ?? (codeKey === void 0 ? void 0 : bindings?.get(codeKey));
+		if (command !== void 0) return command;
 	}
-	return SHORTCUTS[normalizedKey];
+	const bindings = compiledDefaultKeymap[platform].get(modifiers);
+	return bindings?.get(eventKey) ?? (codeKey === void 0 ? void 0 : bindings?.get(codeKey));
 }
 function resolveFindAgainShortcut(event, isMac = isMacLike()) {
 	if (event.altKey) return;

package/dist/editor/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","names":[],"sources":["../../src/editor/command.ts"],"sourcesContent":["import { isMacLike, isPrimaryModifier } from './platform';\n\nexport type EditorCommand =\n  | 'indent'\n  | 'outdent'\n  | 'indentLess'\n  | 'indentMore'\n  | 'undo'\n  | 'redo'\n  | 'selectAll'\n  | 'findNextMatch'\n  | 'openSearchPanel'\n  | 'openSearchReplacePanel'\n  | 'moveLineUp'\n  | 'moveLineDown'\n  | 'copyLineUp'\n  | 'copyLineDown'\n  | 'simplifySelection'\n  | 'insertBlankLine'\n  | 'deleteHardLineForward'\n  | 'toggleComment'\n  | 'toggleBlockComment'\n  | 'moveCursorToDocStart'\n  | 'moveCursorToDocEnd'\n  | 'expandSelectionDocStart'\n  | 'expandSelectionDocEnd';\n\nconst SHORTCUTS: Partial<Record<string, EditorCommand>> = {\n  a: 'selectAll',\n  d: 'findNextMatch',\n};\n\nexport function resolveEditorCommandFromKeyboardEvent(\n  event: KeyboardEvent,\n  isMac: boolean = isMacLike()\n): EditorCommand | undefined {\n  const hasPrimaryModifier = isPrimaryModifier(event, isMac);\n  const { shiftKey, altKey, key } = event;\n\n  const normalizedKey = key.length === 1 ? key.toLowerCase() : key;\n\n  // Safari and Firefox do not report macOS control+k as a beforeinput action,\n  // so resolve the native delete-to-line-end shortcut from keydown instead.\n  if (\n    isMac &&\n    event.ctrlKey &&\n    !event.metaKey &&\n    !shiftKey &&\n    !altKey &&\n    (normalizedKey === 'k' || event.code === 'KeyK')\n  ) {\n    return 'deleteHardLineForward';\n  }\n\n  if (\n    !event.metaKey &&\n    !event.ctrlKey &&\n    shiftKey &&\n    altKey &&\n    (normalizedKey === 'a' || event.code === 'KeyA')\n  ) {\n    return 'toggleBlockComment';\n  }\n\n  if (!event.metaKey && !event.ctrlKey && shiftKey && altKey) {\n    if (normalizedKey === 'ArrowUp') {\n      return 'copyLineUp';\n    }\n    if (normalizedKey === 'ArrowDown') {\n      return 'copyLineDown';\n    }\n  }\n\n  if (\n    !event.metaKey &&\n    !event.ctrlKey &&\n    !shiftKey &&\n    !altKey &&\n    normalizedKey === 'Escape'\n  ) {\n    return 'simplifySelection';\n  }\n\n  if (!event.metaKey && !shiftKey) {\n    if (!event.ctrlKey && altKey && normalizedKey === 'ArrowUp') {\n      return 'moveLineUp';\n    }\n    if (!event.ctrlKey && altKey && normalizedKey === 'ArrowDown') {\n      return 'moveLineDown';\n    }\n    if (\n      (isMac || navigator.platform.includes('Linux')) &&\n      event.ctrlKey &&\n      altKey\n    ) {\n      if (normalizedKey === 'p' || event.code === 'KeyP') {\n        return 'moveLineUp';\n      }\n      if (normalizedKey === 'n' || event.code === 'KeyN') {\n        return 'moveLineDown';\n      }\n    }\n  }\n\n  // cmd/ctrl+f opens the search panel in find mode; adding alt opens it in\n  // find/replace mode. macOS emits a dead key for Option+F (key === 'ƒ'), so\n  // fall back to event.code to detect the physical F key.\n  if (hasPrimaryModifier && (normalizedKey === 'f' || event.code === 'KeyF')) {\n    return altKey ? 'openSearchReplacePanel' : 'openSearchPanel';\n  }\n\n  if (altKey) {\n    return undefined;\n  }\n\n  if (!hasPrimaryModifier && normalizedKey === 'Tab') {\n    return shiftKey ? 'outdent' : 'indent';\n  }\n\n  if (!hasPrimaryModifier) {\n    return undefined;\n  }\n\n  if (!shiftKey && normalizedKey === 'Enter') {\n    return 'insertBlankLine';\n  }\n\n  if (!shiftKey && (normalizedKey === '/' || event.code === 'Slash')) {\n    return 'toggleComment';\n  }\n\n  if (!shiftKey && normalizedKey === '[') {\n    return 'indentLess';\n  }\n\n  if (!shiftKey && normalizedKey === ']') {\n    return 'indentMore';\n  }\n\n  if (normalizedKey === 'z') {\n    return shiftKey ? 'redo' : 'undo';\n  }\n\n  if (!isMac && normalizedKey === 'y') {\n    return 'redo';\n  }\n\n  if (normalizedKey === 'Home' || (isMac && normalizedKey === 'ArrowUp')) {\n    if (shiftKey) {\n      return 'expandSelectionDocStart';\n    }\n    return 'moveCursorToDocStart';\n  }\n\n  if (normalizedKey === 'End' || (isMac && normalizedKey === 'ArrowDown')) {\n    if (shiftKey) {\n      return 'expandSelectionDocEnd';\n    }\n    return 'moveCursorToDocEnd';\n  }\n\n  return SHORTCUTS[normalizedKey];\n}\n\n// Detects the native \"find again\" shortcut (cmd/ctrl+g for next, adding shift\n// for previous) so the find/replace panel can override the browser default and\n// step through matches. macOS can emit a dead key for the physical G, so fall\n// back to event.code like the cmd+f handling above.\nexport function resolveFindAgainShortcut(\n  event: KeyboardEvent,\n  isMac: boolean = isMacLike()\n): 'next' | 'previous' | undefined {\n  if (event.altKey) {\n    return undefined;\n  }\n  if (!isPrimaryModifier(event, isMac)) {\n    return undefined;\n  }\n  const normalizedKey =\n    event.key.length === 1 ? event.key.toLowerCase() : event.key;\n  if (normalizedKey === 'g' || event.code === 'KeyG') {\n    return event.shiftKey ? 'previous' : 'next';\n  }\n  return undefined;\n}\n"],"mappings":";;;AA2BA,MAAM,YAAoD;CACxD,GAAG;CACH,GAAG;AACL;AAEA,SAAgB,sCACd,OACA,QAAiB,UAAU,GACA;CAC3B,MAAM,qBAAqB,kBAAkB,OAAO,KAAK;CACzD,MAAM,EAAE,UAAU,QAAQ,QAAQ;CAElC,MAAM,gBAAgB,IAAI,WAAW,IAAI,IAAI,YAAY,IAAI;CAI7D,IACE,SACA,MAAM,WACN,CAAC,MAAM,WACP,CAAC,YACD,CAAC,WACA,kBAAkB,OAAO,MAAM,SAAS,SAEzC,OAAO;CAGT,IACE,CAAC,MAAM,WACP,CAAC,MAAM,WACP,YACA,WACC,kBAAkB,OAAO,MAAM,SAAS,SAEzC,OAAO;CAGT,IAAI,CAAC,MAAM,WAAW,CAAC,MAAM,WAAW,YAAY,QAAQ;EAC1D,IAAI,kBAAkB,WACpB,OAAO;EAET,IAAI,kBAAkB,aACpB,OAAO;CAEX;CAEA,IACE,CAAC,MAAM,WACP,CAAC,MAAM,WACP,CAAC,YACD,CAAC,UACD,kBAAkB,UAElB,OAAO;CAGT,IAAI,CAAC,MAAM,WAAW,CAAC,UAAU;EAC/B,IAAI,CAAC,MAAM,WAAW,UAAU,kBAAkB,WAChD,OAAO;EAET,IAAI,CAAC,MAAM,WAAW,UAAU,kBAAkB,aAChD,OAAO;EAET,KACG,SAAS,UAAU,SAAS,SAAS,OAAO,MAC7C,MAAM,WACN,QACA;GACA,IAAI,kBAAkB,OAAO,MAAM,SAAS,QAC1C,OAAO;GAET,IAAI,kBAAkB,OAAO,MAAM,SAAS,QAC1C,OAAO;EAEX;CACF;CAKA,IAAI,uBAAuB,kBAAkB,OAAO,MAAM,SAAS,SACjE,OAAO,SAAS,2BAA2B;CAG7C,IAAI,QACF;CAGF,IAAI,CAAC,sBAAsB,kBAAkB,OAC3C,OAAO,WAAW,YAAY;CAGhC,IAAI,CAAC,oBACH;CAGF,IAAI,CAAC,YAAY,kBAAkB,SACjC,OAAO;CAGT,IAAI,CAAC,aAAa,kBAAkB,OAAO,MAAM,SAAS,UACxD,OAAO;CAGT,IAAI,CAAC,YAAY,kBAAkB,KACjC,OAAO;CAGT,IAAI,CAAC,YAAY,kBAAkB,KACjC,OAAO;CAGT,IAAI,kBAAkB,KACpB,OAAO,WAAW,SAAS;CAG7B,IAAI,CAAC,SAAS,kBAAkB,KAC9B,OAAO;CAGT,IAAI,kBAAkB,UAAW,SAAS,kBAAkB,WAAY;EACtE,IAAI,UACF,OAAO;EAET,OAAO;CACT;CAEA,IAAI,kBAAkB,SAAU,SAAS,kBAAkB,aAAc;EACvE,IAAI,UACF,OAAO;EAET,OAAO;CACT;CAEA,OAAO,UAAU;AACnB;AAMA,SAAgB,yBACd,OACA,QAAiB,UAAU,GACM;CACjC,IAAI,MAAM,QACR;CAEF,IAAI,CAAC,kBAAkB,OAAO,KAAK,GACjC;CAIF,KADE,MAAM,IAAI,WAAW,IAAI,MAAM,IAAI,YAAY,IAAI,MAAM,SACrC,OAAO,MAAM,SAAS,QAC1C,OAAO,MAAM,WAAW,aAAa;AAGzC"}
+{"version":3,"file":"command.js","names":[],"sources":["../../src/editor/command.ts"],"sourcesContent":["import { isMacLike, isPrimaryModifier } from './platform';\n\nexport type EditorCommand =\n  | 'indent'\n  | 'outdent'\n  | 'indentLess'\n  | 'indentMore'\n  | 'undo'\n  | 'redo'\n  | 'selectAll'\n  | 'findNextMatch'\n  | 'openSearchPanel'\n  | 'openSearchReplacePanel'\n  | 'moveLineUp'\n  | 'moveLineDown'\n  | 'copyLineUp'\n  | 'copyLineDown'\n  | 'simplifySelection'\n  | 'insertBlankLine'\n  | 'deleteHardLineForward'\n  | 'toggleComment'\n  | 'toggleBlockComment'\n  | 'moveCursorToDocStart'\n  | 'moveCursorToDocEnd'\n  | 'expandSelectionDocStart'\n  | 'expandSelectionDocEnd';\n\nexport type KeyboardKey =\n  | 'a'\n  | 'b'\n  | 'c'\n  | 'd'\n  | 'e'\n  | 'f'\n  | 'g'\n  | 'h'\n  | 'i'\n  | 'j'\n  | 'k'\n  | 'l'\n  | 'm'\n  | 'n'\n  | 'o'\n  | 'p'\n  | 'q'\n  | 'r'\n  | 's'\n  | 't'\n  | 'u'\n  | 'v'\n  | 'w'\n  | 'x'\n  | 'y'\n  | 'z'\n  | '0'\n  | '1'\n  | '2'\n  | '3'\n  | '4'\n  | '5'\n  | '6'\n  | '7'\n  | '8'\n  | '9'\n  | '`'\n  | '-'\n  | '='\n  | ','\n  | '.'\n  | '/'\n  | ';'\n  | \"'\"\n  | '['\n  | ']'\n  | '\\\\'\n  | 'Space'\n  | 'Tab'\n  | 'Enter'\n  | 'Escape'\n  | 'Backspace'\n  | 'Delete'\n  | 'ArrowUp'\n  | 'ArrowDown'\n  | 'ArrowLeft'\n  | 'ArrowRight'\n  | 'Home'\n  | 'End'\n  | 'PageUp'\n  | 'PageDown'\n  | 'F1'\n  | 'F2'\n  | 'F3'\n  | 'F4'\n  | 'F5'\n  | 'F6'\n  | 'F7'\n  | 'F8'\n  | 'F9'\n  | 'F10'\n  | 'F11'\n  | 'F12';\n\nexport type KeyboardModifier = 'cmdOrCtrl' | 'shift' | 'alt' | 'ctrl' | 'cmd';\n\nexport type EditorShortcut =\n  | KeyboardKey\n  | `${KeyboardModifier}+${KeyboardKey}`\n  | `${KeyboardModifier}+${KeyboardModifier}+${KeyboardKey}`;\n\n/** Later groups take precedence when bindings overlap. */\nexport type EditorKeymap = ReadonlyArray<{\n  /** Undefined applies on every platform. */\n  readonly platform?: 'mac' | 'windows' | 'linux';\n  readonly bindings: Readonly<Partial<Record<EditorShortcut, EditorCommand>>>;\n}>;\n\ntype CompiledEditorKeymap = Record<\n  'mac' | 'windows' | 'linux',\n  Map<number, Map<KeyboardKey, EditorCommand>>\n>;\n\nconst compiledEditorKeymaps = new WeakMap<EditorKeymap, CompiledEditorKeymap>();\n\nconst defaultKeymap = [\n  {\n    bindings: {\n      Tab: 'indent',\n      'shift+Tab': 'outdent',\n      'cmdOrCtrl+[': 'indentLess',\n      'cmdOrCtrl+]': 'indentMore',\n      'cmdOrCtrl+z': 'undo',\n      'cmdOrCtrl+shift+z': 'redo',\n      'cmdOrCtrl+a': 'selectAll',\n      'cmdOrCtrl+d': 'findNextMatch',\n      'cmdOrCtrl+f': 'openSearchPanel',\n      'cmdOrCtrl+alt+f': 'openSearchReplacePanel',\n      'alt+ArrowUp': 'moveLineUp',\n      'alt+ArrowDown': 'moveLineDown',\n      'shift+alt+ArrowUp': 'copyLineUp',\n      'shift+alt+ArrowDown': 'copyLineDown',\n      Escape: 'simplifySelection',\n      'cmdOrCtrl+Enter': 'insertBlankLine',\n      'cmdOrCtrl+/': 'toggleComment',\n      'shift+alt+a': 'toggleBlockComment',\n      'cmdOrCtrl+Home': 'moveCursorToDocStart',\n      'cmdOrCtrl+End': 'moveCursorToDocEnd',\n      'cmdOrCtrl+shift+Home': 'expandSelectionDocStart',\n      'cmdOrCtrl+shift+End': 'expandSelectionDocEnd',\n    },\n  },\n  {\n    platform: 'mac',\n    bindings: {\n      'ctrl+k': 'deleteHardLineForward',\n      'ctrl+alt+p': 'moveLineUp',\n      'ctrl+alt+n': 'moveLineDown',\n      'cmd+ArrowUp': 'moveCursorToDocStart',\n      'cmd+ArrowDown': 'moveCursorToDocEnd',\n      'cmd+shift+ArrowUp': 'expandSelectionDocStart',\n      'cmd+shift+ArrowDown': 'expandSelectionDocEnd',\n    },\n  },\n  {\n    platform: 'windows',\n    bindings: {\n      'ctrl+y': 'redo',\n    },\n  },\n  {\n    platform: 'linux',\n    bindings: {\n      'ctrl+y': 'redo',\n      'ctrl+alt+p': 'moveLineUp',\n      'ctrl+alt+n': 'moveLineDown',\n    },\n  },\n] satisfies EditorKeymap;\n\nconst compiledDefaultKeymap = getCompiledEditorKeymap(defaultKeymap);\n\nconst keyboardCodeKeys: Partial<Record<string, KeyboardKey>> = {\n  Backquote: '`',\n  Minus: '-',\n  Equal: '=',\n  Comma: ',',\n  Period: '.',\n  Slash: '/',\n  Semicolon: ';',\n  Quote: \"'\",\n  BracketLeft: '[',\n  BracketRight: ']',\n  Backslash: '\\\\',\n  Space: 'Space',\n};\n\nfunction getCompiledEditorKeymap(keymap: EditorKeymap): CompiledEditorKeymap {\n  let compiledKeymap = compiledEditorKeymaps.get(keymap);\n  if (compiledKeymap === undefined) {\n    compiledKeymap = {\n      mac: new Map(),\n      windows: new Map(),\n      linux: new Map(),\n    };\n\n    // Compile once so keydown resolves by modifier mask and key without\n    // scanning or splitting every configured shortcut.\n    for (const entry of keymap) {\n      for (const shortcut of Object.keys(entry.bindings) as EditorShortcut[]) {\n        const command = entry.bindings[shortcut];\n        if (command === undefined) {\n          continue;\n        }\n        const parts = shortcut.split('+');\n        const shortcutKey = parts.pop() as KeyboardKey;\n\n        for (const platform of ['mac', 'windows', 'linux'] as const) {\n          if (entry.platform !== undefined && entry.platform !== platform) {\n            continue;\n          }\n          let modifiers = 0;\n          for (const modifier of parts as KeyboardModifier[]) {\n            if (modifier === 'alt') {\n              modifiers |= 1;\n            } else if (modifier === 'ctrl') {\n              modifiers |= 2;\n            } else if (modifier === 'cmd') {\n              modifiers |= 4;\n            } else if (modifier === 'shift') {\n              modifiers |= 8;\n            } else if (modifier === 'cmdOrCtrl') {\n              modifiers |= platform === 'mac' ? 4 : 2;\n            }\n          }\n          let bindings = compiledKeymap[platform].get(modifiers);\n          if (bindings === undefined) {\n            bindings = new Map();\n            compiledKeymap[platform].set(modifiers, bindings);\n          }\n          bindings.set(shortcutKey, command);\n        }\n      }\n    }\n    compiledEditorKeymaps.set(keymap, compiledKeymap);\n  }\n  return compiledKeymap;\n}\n\nexport function resolveEditorCommandFromKeyboardEvent(\n  event: KeyboardEvent,\n  keymap?: EditorKeymap,\n  isMac: boolean = isMacLike()\n): EditorCommand | undefined {\n  const eventKey =\n    event.key === ' '\n      ? 'Space'\n      : event.key.length === 1\n        ? event.key.toLowerCase()\n        : event.key;\n  const code = event.code ?? '';\n  const codeKey =\n    code.startsWith('Key') && code.length === 4\n      ? (code.slice(3).toLowerCase() as KeyboardKey)\n      : code.startsWith('Digit') && code.length === 6\n        ? (code.slice(5) as KeyboardKey)\n        : keyboardCodeKeys[code];\n  const platform = isMac\n    ? 'mac'\n    : globalThis.navigator?.platform.includes('Linux') === true\n      ? 'linux'\n      : 'windows';\n  const modifiers =\n    (event.altKey ? 1 : 0) |\n    (event.ctrlKey ? 2 : 0) |\n    (event.metaKey ? 4 : 0) |\n    (event.shiftKey ? 8 : 0);\n\n  if (keymap !== undefined) {\n    const bindings = getCompiledEditorKeymap(keymap)[platform].get(modifiers);\n    const command =\n      bindings?.get(eventKey as KeyboardKey) ??\n      (codeKey === undefined ? undefined : bindings?.get(codeKey));\n    if (command !== undefined) {\n      return command;\n    }\n  }\n\n  const bindings = compiledDefaultKeymap[platform].get(modifiers);\n  return (\n    bindings?.get(eventKey as KeyboardKey) ??\n    (codeKey === undefined ? undefined : bindings?.get(codeKey))\n  );\n}\n\n// Detects the native \"find again\" shortcut (cmd/ctrl+g for next, adding shift\n// for previous) so the find/replace panel can override the browser default and\n// step through matches. macOS can emit a dead key for the physical G, so fall\n// back to event.code like the cmd+f handling above.\nexport function resolveFindAgainShortcut(\n  event: KeyboardEvent,\n  isMac: boolean = isMacLike()\n): 'next' | 'previous' | undefined {\n  if (event.altKey) {\n    return undefined;\n  }\n  if (!isPrimaryModifier(event, isMac)) {\n    return undefined;\n  }\n  const normalizedKey =\n    event.key.length === 1 ? event.key.toLowerCase() : event.key;\n  if (normalizedKey === 'g' || event.code === 'KeyG') {\n    return event.shiftKey ? 'previous' : 'next';\n  }\n  return undefined;\n}\n"],"mappings":";;;AAyHA,MAAM,wCAAwB,IAAI,QAA4C;AAyD9E,MAAM,wBAAwB,wBAAwB;CAtDpD,EACE,UAAU;EACR,KAAK;EACL,aAAa;EACb,eAAe;EACf,eAAe;EACf,eAAe;EACf,qBAAqB;EACrB,eAAe;EACf,eAAe;EACf,eAAe;EACf,mBAAmB;EACnB,eAAe;EACf,iBAAiB;EACjB,qBAAqB;EACrB,uBAAuB;EACvB,QAAQ;EACR,mBAAmB;EACnB,eAAe;EACf,eAAe;EACf,kBAAkB;EAClB,iBAAiB;EACjB,wBAAwB;EACxB,uBAAuB;CACzB,EACF;CACA;EACE,UAAU;EACV,UAAU;GACR,UAAU;GACV,cAAc;GACd,cAAc;GACd,eAAe;GACf,iBAAiB;GACjB,qBAAqB;GACrB,uBAAuB;EACzB;CACF;CACA;EACE,UAAU;EACV,UAAU,EACR,UAAU,OACZ;CACF;CACA;EACE,UAAU;EACV,UAAU;GACR,UAAU;GACV,cAAc;GACd,cAAc;EAChB;CACF;AAGgE,CAAC;AAEnE,MAAM,mBAAyD;CAC7D,WAAW;CACX,OAAO;CACP,OAAO;CACP,OAAO;CACP,QAAQ;CACR,OAAO;CACP,WAAW;CACX,OAAO;CACP,aAAa;CACb,cAAc;CACd,WAAW;CACX,OAAO;AACT;AAEA,SAAS,wBAAwB,QAA4C;CAC3E,IAAI,iBAAiB,sBAAsB,IAAI,MAAM;CACrD,IAAI,mBAAmB,KAAA,GAAW;EAChC,iBAAiB;GACf,qBAAK,IAAI,IAAI;GACb,yBAAS,IAAI,IAAI;GACjB,uBAAO,IAAI,IAAI;EACjB;EAIA,KAAK,MAAM,SAAS,QAClB,KAAK,MAAM,YAAY,OAAO,KAAK,MAAM,QAAQ,GAAuB;GACtE,MAAM,UAAU,MAAM,SAAS;GAC/B,IAAI,YAAY,KAAA,GACd;GAEF,MAAM,QAAQ,SAAS,MAAM,GAAG;GAChC,MAAM,cAAc,MAAM,IAAI;GAE9B,KAAK,MAAM,YAAY;IAAC;IAAO;IAAW;GAAO,GAAY;IAC3D,IAAI,MAAM,aAAa,KAAA,KAAa,MAAM,aAAa,UACrD;IAEF,IAAI,YAAY;IAChB,KAAK,MAAM,YAAY,OACrB,IAAI,aAAa,OACf,aAAa;SACR,IAAI,aAAa,QACtB,aAAa;SACR,IAAI,aAAa,OACtB,aAAa;SACR,IAAI,aAAa,SACtB,aAAa;SACR,IAAI,aAAa,aACtB,aAAa,aAAa,QAAQ,IAAI;IAG1C,IAAI,WAAW,eAAe,SAAS,CAAC,IAAI,SAAS;IACrD,IAAI,aAAa,KAAA,GAAW;KAC1B,2BAAW,IAAI,IAAI;KACnB,eAAe,SAAS,CAAC,IAAI,WAAW,QAAQ;IAClD;IACA,SAAS,IAAI,aAAa,OAAO;GACnC;EACF;EAEF,sBAAsB,IAAI,QAAQ,cAAc;CAClD;CACA,OAAO;AACT;AAEA,SAAgB,sCACd,OACA,QACA,QAAiB,UAAU,GACA;CAC3B,MAAM,WACJ,MAAM,QAAQ,MACV,UACA,MAAM,IAAI,WAAW,IACnB,MAAM,IAAI,YAAY,IACtB,MAAM;CACd,MAAM,OAAO,MAAM,QAAQ;CAC3B,MAAM,UACJ,KAAK,WAAW,KAAK,KAAK,KAAK,WAAW,IACrC,KAAK,MAAM,CAAC,CAAC,CAAC,YAAY,IAC3B,KAAK,WAAW,OAAO,KAAK,KAAK,WAAW,IACzC,KAAK,MAAM,CAAC,IACb,iBAAiB;CACzB,MAAM,WAAW,QACb,QACA,WAAW,WAAW,SAAS,SAAS,OAAO,MAAM,OACnD,UACA;CACN,MAAM,aACH,MAAM,SAAS,IAAI,MACnB,MAAM,UAAU,IAAI,MACpB,MAAM,UAAU,IAAI,MACpB,MAAM,WAAW,IAAI;CAExB,IAAI,WAAW,KAAA,GAAW;EACxB,MAAM,WAAW,wBAAwB,MAAM,CAAC,CAAC,SAAS,CAAC,IAAI,SAAS;EACxE,MAAM,UACJ,UAAU,IAAI,QAAuB,MACpC,YAAY,KAAA,IAAY,KAAA,IAAY,UAAU,IAAI,OAAO;EAC5D,IAAI,YAAY,KAAA,GACd,OAAO;CAEX;CAEA,MAAM,WAAW,sBAAsB,SAAS,CAAC,IAAI,SAAS;CAC9D,OACE,UAAU,IAAI,QAAuB,MACpC,YAAY,KAAA,IAAY,KAAA,IAAY,UAAU,IAAI,OAAO;AAE9D;AAMA,SAAgB,yBACd,OACA,QAAiB,UAAU,GACM;CACjC,IAAI,MAAM,QACR;CAEF,IAAI,CAAC,kBAAkB,OAAO,KAAK,GACjC;CAIF,KADE,MAAM,IAAI,WAAW,IAAI,MAAM,IAAI,YAAY,IAAI,MAAM,SACrC,OAAO,MAAM,SAAS,QAC1C,OAAO,MAAM,WAAW,aAAa;AAGzC"}

package/dist/editor/editor.d.ts

@@ -1,4 +1,5 @@
 import { DiffLineAnnotation, DiffsEditableComponent, DiffsEditor, EditableInstance, EditorChangeEvent, EditorState, FileContents, LineAnnotation, Range, TextEdit } from "../types.js";
+import { EditorKeymap } from "./command.js";
 import { LanguageConfigMap } from "./languages.js";
 import { Marker } from "./marker.js";
 import { AutoSurround } from "./selection.js";
@@ -9,6 +10,8 @@ import { PersistStateStorage } from "./stateStorage.js";
 interface EditorOptions<LAnnotation> {
   /** The maximum number of entries to keep in the undo stack. */
   historyMaxEntries?: number;
+  /** Custom keymap groups checked before defaults; later groups take precedence. */
+  keymap?: EditorKeymap;
   /**
    * Preserve each file's document and item-local editor state when switching files.
    * Every editable file must provide a unique, stable `cacheKey`.

package/dist/editor/editor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor.d.ts","names":[],"sources":["../../src/editor/editor.ts"],"mappings":";;;;;;;;UAuLiB,aAAA;;EAEf,iBAAA;EAF4B;;;;EAO5B,YAAA;EA4B+B;;;;EAvB/B,mBAAA,GAAsB,mBAAA;EA+BZ;EA7BV,gBAAA;EA8BgB;EA5BhB,aAAA;EAkCqB;;;;EA7BrB,YAAA,GAAe,YAAA;EAgCN;EA9BT,qBAAA,GAAwB,iBAAA;EA8BE;;;;EAzB1B,sBAAA;EAhBsB;;;;;EAsBtB,SAAA;IACE,QAAA,GAAW,IAAA,cAAkB,OAAA;EAAA;EAD/B;EAIA,qBAAA,IACE,OAAA,EAAS,sBAAA,CAAuB,WAAA,MAC7B,WAAA;EALQ;EAOb,QAAA,IACE,MAAA,EAAQ,MAAA,CAAO,WAAA,GACf,YAAA,EAAc,sBAAA,CAAuB,WAAA;EANvC;EASA,QAAA,IACE,IAAA,EAAM,YAAA,EACN,eAAA,EACI,cAAA,CAAe,WAAA,MACf,kBAAA,CAAmB,WAAA,iBAEvB,KAAA,EAAO,iBAAA,CAAkB,WAAA;EAdO;EAiBlC,OAAA;EAhBK;EAkBL,MAAA;EAEA,OAAA;AAAA;AAAA,UAGe,kBAAA,SAA2B,YAAY;EAnBtC;EAqBhB,UAAA;EArBE;EAuBF,SAAA;EAnBQ;EAqBR,MAAA;AAAA;AAAA,cAmBW,MAAA,yBAA+B,WAAA,CAAY,WAAA;EAAA;EAkJtD,WAAA,CAAY,OAAA,GAAS,aAAA,CAAc,WAAA;EAInC,UAAA,CAAW,OAAA,EAAS,aAAA,CAAc,WAAA;EAkClC,IAAA,WAAe,sBAAA,CAAuB,WAAA,GACpC,YAAA,EAAc,gBAAA,CAAiB,CAAA;EA5NN;;;;;;AAOpB;AAGT;;;EA4OE,UAAA,CAAW,KAAA,EAAO,QAAA,IAAY,aAAA;EA5OY;EAAA,IA+StC,OAAA;EA3SJ;EAAA,IAgTI,OAAA;EA9SE;EAmTN,IAAA;EAhSW;EAqSX,IAAA;EAIA,OAAA,IAAW,YAAA;EAcX,OAAA;EAIA,QAAA,IAAY,WAAA;EAaZ,QAAA;IAAW,UAAA;IAAY;EAAA,GAAQ,WAAA;EAgB/B,aAAA,CACE,UAAA,GAAa,KAAA;IAAU,SAAA;EAAA;EAoCzB,UAAA,CAAW,OAAA,EAAS,MAAA;EA6BpB,KAAA,CAAM,OAAA,GAAU,kBAAA;EAmChB,IAAA;EAOA,OAAA,CAAQ,OAAA;EA3JG;EA8OX,aAAA,CAAc,IAAA,EAAM,YAAA,GAAe,YAAA;EA/MxB;EA2OX,+BAAA;EA3O+B;EAsP/B,+BAAA;EAjMoB;EAgNpB,gBAAA,EAAkB,WAAA,CAAY,WAAA;AAAA"}
+{"version":3,"file":"editor.d.ts","names":[],"sources":["../../src/editor/editor.ts"],"mappings":";;;;;;;;;UAwLiB,aAAA;;EAEf,iBAAA;EAF4B;EAI5B,MAAA,GAAS,YAAA;EAAA;;;;EAKT,YAAA;EAgCkC;;;;EA3BlC,mBAAA,GAAsB,mBAAA;EAgCiB;EA9BvC,gBAAA;EAkCQ;EAhCR,aAAA;EAkCM;;;;EA7BN,YAAA,GAAe,YAAA;EAgCW;EA9B1B,qBAAA,GAAwB,iBAAA;EAzBK;;;;EA8B7B,sBAAA;EAhBA;;;;;EAsBA,SAAA;IACE,QAAA,GAAW,IAAA,cAAkB,OAAA;EAAA;EAP/B;EAUA,qBAAA,IACE,OAAA,EAAS,sBAAA,CAAuB,WAAA,MAC7B,WAAA;EALH;EAOF,QAAA,IACE,MAAA,EAAQ,MAAA,CAAO,WAAA,GACf,YAAA,EAAc,sBAAA,CAAuB,WAAA;EATR;EAY/B,QAAA,IACE,IAAA,EAAM,YAAA,EACN,eAAA,EACI,cAAA,CAAe,WAAA,MACf,kBAAA,CAAmB,WAAA,iBAEvB,KAAA,EAAO,iBAAA,CAAkB,WAAA;EAdhB;EAiBX,OAAA;EAjBE;EAmBF,MAAA;EAEA,OAAA;AAAA;AAAA,UAGe,kBAAA,SAA2B,YAAY;EApBpD;EAsBF,UAAA;EArBuC;EAuBvC,SAAA;EApBA;EAsBA,MAAA;AAAA;AAAA,cAmBW,MAAA,yBAA+B,WAAA,CAAY,WAAA;EAAA;EAkJtD,WAAA,CAAY,OAAA,GAAS,aAAA,CAAc,WAAA;EAInC,UAAA,CAAW,OAAA,EAAS,aAAA,CAAc,WAAA;EAkClC,IAAA,WAAe,sBAAA,CAAuB,WAAA,GACpC,YAAA,EAAc,gBAAA,CAAiB,CAAA;EA5NxB;;;;;;;AAOF;AAGT;;EA4OE,UAAA,CAAW,KAAA,EAAO,QAAA,IAAY,aAAA;EA5OwB;EAAA,IA+SlD,OAAA;EA7SJ;EAAA,IAkTI,OAAA;EA9SJ;EAmTA,IAAA;EAnTM;EAwTN,IAAA;EAIA,OAAA,IAAW,YAAA;EAcX,OAAA;EAIA,QAAA,IAAY,WAAA;EAaZ,QAAA;IAAW,UAAA;IAAY;EAAA,GAAQ,WAAA;EAgB/B,aAAA,CACE,UAAA,GAAa,KAAA;IAAU,SAAA;EAAA;EAoCzB,UAAA,CAAW,OAAA,EAAS,MAAA;EA6BpB,KAAA,CAAM,OAAA,GAAU,kBAAA;EAmChB,IAAA;EAOA,OAAA,CAAQ,OAAA;EAjPU;EAoUlB,aAAA,CAAc,IAAA,EAAM,YAAA,GAAe,YAAA;EA5NvB;EAwPZ,+BAAA;EA3OuB;EAsPvB,+BAAA;EArOe;EAoPf,gBAAA,EAAkB,WAAA,CAAY,WAAA;AAAA"}

package/dist/editor/editor.js

@@ -865,19 +865,22 @@ var Editor = class {
 				}
 			}, { passive: true }),
 			addEventListener(contentEl, "keydown", (e) => {
-				if (e.key === "Escape") {
-					e.preventDefault();
-					this.#searchPanel?.close();
-					this.#searchPanel = void 0;
-					this.#retainSearchPanelFocus = false;
-					this.#selectionAction?.cleanup();
-					this.#selectionAction = void 0;
-					this.#runCommand("simplifySelection");
-					return;
-				}
 				if (!targetIsContentElement(e)) return;
 				this.#canMountSelectionAction = true;
 				this.#suppressNativeSelectionSync = false;
+				const command = resolveEditorCommandFromKeyboardEvent(e, this.#options.keymap);
+				if (command !== void 0) {
+					e.preventDefault();
+					if (command === "simplifySelection") {
+						this.#searchPanel?.close();
+						this.#searchPanel = void 0;
+						this.#retainSearchPanelFocus = false;
+						this.#selectionAction?.cleanup();
+						this.#selectionAction = void 0;
+					}
+					this.#runCommand(command);
+					return;
+				}
 				const mvShortcut = isMoveCursorShortcut(e);
 				const textDocument = this.#textDocument;
 				if (this.#selections !== void 0 && this.#selections.length > 0 && mvShortcut !== void 0 && textDocument !== void 0) {
@@ -910,11 +913,6 @@ var Editor = class {
 						return;
 					}
 				}
-				const command = resolveEditorCommandFromKeyboardEvent(e);
-				if (command !== void 0) {
-					e.preventDefault();
-					this.#runCommand(command);
-				}
 			}),
 			addEventListener(contentEl, "copy", (e) => {
 				if (!targetIsContentElement(e)) return;
@@ -2343,17 +2341,17 @@ var Editor = class {
 				top,
 				bottom: top + popoverHeight,
 				left,
-				anchorTop
+				anchorTop,
+				rowTop
 			};
 		};
 		const preferredGeometry = candidateGeometry(preferred);
-		const fallbackGeometry = candidateGeometry(fallback);
 		const lineCount = textDocument.lineCount;
 		const atDocumentEdge = isBackward ? head.line < 3 : head.line >= lineCount - 3;
-		const canUseFallback = this.#isLineVisible(fallback.anchor.line);
+		const fallbackGeometry = this.#isLineVisible(fallback.anchor.line) ? candidateGeometry(fallback) : void 0;
 		const popoverManager = this.#getPopoverManager();
 		const viewport = popoverManager.getPlacementBounds();
-		const useFallback = canUseFallback && popoverManager.choosePlacement({
+		const useFallback = fallbackGeometry !== void 0 && popoverManager.choosePlacement({
 			preferred: preferredGeometry,
 			fallback: fallbackGeometry,
 			viewport,
@@ -2361,10 +2359,13 @@ var Editor = class {
 			atDocumentEdge,
 			placementKey: SELECTION_ACTION_POPOVER_PLACEMENT_KEY
 		}) === "fallback";
-		if (!canUseFallback) popoverManager.setPlacement("preferred", SELECTION_ACTION_POPOVER_PLACEMENT_KEY);
+		if (fallbackGeometry === void 0) popoverManager.setPlacement("preferred", SELECTION_ACTION_POPOVER_PLACEMENT_KEY);
 		const { placeAbove } = useFallback ? fallback : preferred;
-		const { left, anchorTop } = useFallback ? fallbackGeometry : preferredGeometry;
-		this.#selectionAction.reposition(left, anchorTop, this.#getGutterWidth(), placeAbove, viewport);
+		const { left, anchorTop } = useFallback && fallbackGeometry !== void 0 ? fallbackGeometry : preferredGeometry;
+		const selectionTop = isBackward ? preferredGeometry.rowTop : fallbackGeometry?.rowTop ?? -Infinity;
+		const selectionBottom = (isBackward ? fallbackGeometry?.rowTop ?? Infinity : preferredGeometry.rowTop) + (primarySelection.end.line > primarySelection.start.line && primarySelection.end.character === 0 ? 0 : lineHeight);
+		const isSelectionVisible = viewport === void 0 || selectionBottom > viewport.top && selectionTop < viewport.bottom;
+		this.#selectionAction.reposition(left, anchorTop, this.#getGutterWidth(), placeAbove, isSelectionVisible, viewport);
 	}
 	#openSearchPanel(mode) {
 		if (this.#searchPanel !== void 0) {