mirror of
https://github.com/stablyai/orca.git
synced 2026-11-19 04:23:57 +00:00
* fix(native-chat): make the chat view toggle a remappable keybinding The terminal and Chat UI toggle was hardcoded to Mod+Shift+J, so users could not rebind or disable it, Settings did not list it, and it overrode user bindings on that chord. Declare it as terminal.toggleNativeChat in the keybinding registry, match it through the user's keybindings, and render its menu labels from the registry. * fix(keybindings): align native chat toggle admission and execution * fix(keybindings): preserve runtime input and defer closed menu hints * test(keybindings): use typed alias read instrumentation * Fix keybinding dependency direction and physical modifier inputs * Preserve typed input facts in floating shortcut arbitration * Clarify native chat shortcut precedence on Windows and Linux * Simplify native chat shortcut resolution and nominal labels --------- Co-authored-by: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
118 lines
3.5 KiB
TypeScript
118 lines
3.5 KiB
TypeScript
import type {
|
|
KeybindingActionId,
|
|
KeybindingInput,
|
|
KeybindingOverrides,
|
|
KeybindingMatchOptions
|
|
} from './types'
|
|
import { DEFINITIONS_BY_ID, DIGIT_INDEX_KEY_PATTERN } from './definitions'
|
|
import { canonicalizeParsedKeybinding, parseKeybinding } from './parser'
|
|
import {
|
|
modifierStateMatches,
|
|
keyMatches,
|
|
digitKeyMatches,
|
|
resolveModifierToken
|
|
} from './matching-key'
|
|
import {
|
|
getDefaultBindings,
|
|
getEffectiveKeybindingsForAction,
|
|
keybindingIsActiveInContext
|
|
} from './effective'
|
|
|
|
export function keybindingMatchesInput(
|
|
binding: string,
|
|
input: KeybindingInput,
|
|
platform: NodeJS.Platform
|
|
): boolean {
|
|
const parsed = parseKeybinding(binding)
|
|
if (!parsed) {
|
|
return false
|
|
}
|
|
// A double-tap binding matches only a synthetic double-tap input (and vice-versa), resolved per platform.
|
|
if (parsed.doubleTapModifier) {
|
|
return (
|
|
input.doubleTapModifier !== undefined &&
|
|
resolveModifierToken(parsed.doubleTapModifier, platform) ===
|
|
resolveModifierToken(input.doubleTapModifier, platform)
|
|
)
|
|
}
|
|
if (input.doubleTapModifier !== undefined) {
|
|
return false
|
|
}
|
|
return (
|
|
modifierStateMatches(parsed, input, platform) && keyMatches(parsed.key, input, parsed, platform)
|
|
)
|
|
}
|
|
|
|
export function keybindingMatchesAction(
|
|
actionId: KeybindingActionId,
|
|
input: KeybindingInput,
|
|
platform: NodeJS.Platform,
|
|
overrides?: KeybindingOverrides,
|
|
options: KeybindingMatchOptions = {}
|
|
): boolean {
|
|
const definition = DEFINITIONS_BY_ID.get(actionId)
|
|
if (!definition) {
|
|
return false
|
|
}
|
|
if (!keybindingIsActiveInContext(definition, options)) {
|
|
return false
|
|
}
|
|
return getEffectiveKeybindingsForAction(actionId, platform, overrides).some((binding) =>
|
|
keybindingMatchesInput(binding, input, platform)
|
|
)
|
|
}
|
|
|
|
// Why: decided from the definition and the pressed chord, so re-saving a default never takes it from the field.
|
|
export function keybindingRunsInTextField(
|
|
actionId: KeybindingActionId,
|
|
input: KeybindingInput,
|
|
platform: NodeJS.Platform
|
|
): boolean {
|
|
const definition = DEFINITIONS_BY_ID.get(actionId)
|
|
return (
|
|
definition?.allowInTextField === 'non-default-chords' &&
|
|
!getDefaultBindings(definition, platform).some((binding) =>
|
|
keybindingMatchesInput(binding, input, platform)
|
|
)
|
|
)
|
|
}
|
|
|
|
export function digitFromInput(input: KeybindingInput, platform: NodeJS.Platform): string | null {
|
|
for (let value = 1; value <= 9; value++) {
|
|
const digit = String(value)
|
|
if (digitKeyMatches(input, digit, platform)) {
|
|
return digit
|
|
}
|
|
}
|
|
return null
|
|
}
|
|
|
|
// Why: a digit-index row's representative chord fires for any 1-9 — reuse its modifiers with the pressed digit via the normal matcher.
|
|
export function matchKeybindingDigitIndex(
|
|
actionId: KeybindingActionId,
|
|
input: KeybindingInput,
|
|
platform: NodeJS.Platform,
|
|
overrides?: KeybindingOverrides,
|
|
options: KeybindingMatchOptions = {}
|
|
): number | null {
|
|
const definition = DEFINITIONS_BY_ID.get(actionId)
|
|
if (!definition || !keybindingIsActiveInContext(definition, options)) {
|
|
return null
|
|
}
|
|
const digit = digitFromInput(input, platform)
|
|
if (!digit) {
|
|
return null
|
|
}
|
|
for (const binding of getEffectiveKeybindingsForAction(actionId, platform, overrides)) {
|
|
const parsed = parseKeybinding(binding)
|
|
if (!parsed || parsed.doubleTapModifier || !DIGIT_INDEX_KEY_PATTERN.test(parsed.key)) {
|
|
continue
|
|
}
|
|
const candidate = canonicalizeParsedKeybinding({ ...parsed, key: digit })
|
|
if (keybindingMatchesInput(candidate, input, platform)) {
|
|
return Number(digit) - 1
|
|
}
|
|
}
|
|
return null
|
|
}
|