ton/pi_harness
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(tui): parse legacy alt-prefixed symbols (#6523)

Browse Source
This commit is contained in:
Rafał Krzyważnia
2026-07-11 15:20:08 +02:00
committed by GitHub
parent 5416b1834a
commit 8479bd8474
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/tui/src/keys.ts
+6 -5
View File
@@ -1159,8 +1159,8 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
if (data === `\x1b${rawCtrl}`) return true; if (data === `\x1b${rawCtrl}`) return true;
} }
if (modifier === MODIFIERS.alt && !_kittyProtocolActive && (isLetter || isDigit)) { if (modifier === MODIFIERS.alt && !_kittyProtocolActive && (isLetter || isDigit || SYMBOL_KEYS.has(key))) {
// Legacy: alt+letter/digit is ESC followed by the key // Legacy: alt+printable key is ESC followed by the key
if (data === `\x1b${key}`) return true; if (data === `\x1b${key}`) return true;
} }
@@ -1296,9 +1296,10 @@ export function parseKey(data: string): string | undefined {
if (code >= 1 && code <= 26) { if (code >= 1 && code <= 26) {
return `ctrl+alt+${String.fromCharCode(code + 96)}`; return `ctrl+alt+${String.fromCharCode(code + 96)}`;
} }
// Legacy alt+letter/digit (ESC followed by the key) // Legacy alt+letter/digit/symbol (ESC followed by the key)
if ((code >= 97 && code <= 122) || (code >= 48 && code <= 57)) { const key = String.fromCharCode(code);
return `alt+${String.fromCharCode(code)}`; if ((code >= 97 && code <= 122) || (code >= 48 && code <= 57) || SYMBOL_KEYS.has(key)) {
return `alt+${key}`;
} }
} }
if (data === "\x1b[A") return "up"; if (data === "\x1b[A") return "up";
packages/tui/test/keys.test.ts
+8
View File
@@ -431,6 +431,10 @@ describe("matchesKey", () => {
assert.strictEqual(parseKey("\x1ba"), "alt+a"); assert.strictEqual(parseKey("\x1ba"), "alt+a");
assert.strictEqual(matchesKey("\x1b1", "alt+1"), true); assert.strictEqual(matchesKey("\x1b1", "alt+1"), true);
assert.strictEqual(parseKey("\x1b1"), "alt+1"); assert.strictEqual(parseKey("\x1b1"), "alt+1");
assert.strictEqual(matchesKey("\x1b,", "alt+,"), true);
assert.strictEqual(parseKey("\x1b,"), "alt+,");
assert.strictEqual(matchesKey("\x1b.", "alt+."), true);
assert.strictEqual(parseKey("\x1b."), "alt+.");
assert.strictEqual(matchesKey("\x1by", "alt+y"), true); assert.strictEqual(matchesKey("\x1by", "alt+y"), true);
assert.strictEqual(parseKey("\x1by"), "alt+y"); assert.strictEqual(parseKey("\x1by"), "alt+y");
assert.strictEqual(matchesKey("\x1bz", "alt+z"), true); assert.strictEqual(matchesKey("\x1bz", "alt+z"), true);
@@ -451,6 +455,10 @@ describe("matchesKey", () => {
assert.strictEqual(parseKey("\x1ba"), undefined); assert.strictEqual(parseKey("\x1ba"), undefined);
assert.strictEqual(matchesKey("\x1b1", "alt+1"), false); assert.strictEqual(matchesKey("\x1b1", "alt+1"), false);
assert.strictEqual(parseKey("\x1b1"), undefined); assert.strictEqual(parseKey("\x1b1"), undefined);
assert.strictEqual(matchesKey("\x1b,", "alt+,"), false);
assert.strictEqual(parseKey("\x1b,"), undefined);
assert.strictEqual(matchesKey("\x1b.", "alt+."), false);
assert.strictEqual(parseKey("\x1b."), undefined);
assert.strictEqual(matchesKey("\x1by", "alt+y"), false); assert.strictEqual(matchesKey("\x1by", "alt+y"), false);
assert.strictEqual(parseKey("\x1by"), undefined); assert.strictEqual(parseKey("\x1by"), undefined);
setKittyProtocolActive(false); setKittyProtocolActive(false);