4ad1ae6ed4
Shortcuts were defined in four places that drifted apart: per-action IPC channel pairs, a hand-written VK table in the service, a second one in the renderer, and three copies of the keycap styling. Adding an action meant editing all of them, so two shortcuts stayed hardcoded in bootstrap and one had no settings entry at all. packages/core/src/keybinding.ts is now the single source for the binding type, the selectable key catalog, the action catalog, normalization, validation, conflict detection, display labels, search and deserialization. Main, preload and renderer all read from it; nothing redefines keys or rules locally. - Each action holds a list of bindings instead of one. AppConfig's four *Shortcut fields collapse into a single keyBindings map, migrated on launch. - Mouse buttons can be bound. Left click is refused, right/middle need a modifier, side buttons are free. uiohook cannot swallow events, so the original click still fires and the UI says so. - Keys can be picked from a grouped dropdown with a search box, not only by recording a keypress. - HOTKEY's 14 channels become KEYBINDING's 9, taking the action as a parameter, so actions no longer multiply channels. The history and command popups moved out of bootstrap into ordinary actions. - displayLabel is gone; labels derive from the binding and follow the app language and platform. Fixes found on the way: - Double-press hands-free was unreachable: lookup returned only the first matching action, and dictation shares its default binding. - Reserved-combination checks compared joined key names, so a different modifier order let Ctrl+C through. - Disabling shortcuts released every global registration in the process, including the popup ones, and never restored them. - Enabling shortcuts after starting disabled left nothing registered. - The dashboard stored the caption event payload instead of the state in it.
17 lines
799 B
TypeScript
17 lines
799 B
TypeScript
// apps/desktop/src/renderer/utils/format-hotkey.ts
|
|
// 렌더러가 실행 중인 플랫폼을 알아내는 얇은 어댑터.
|
|
//
|
|
// 키 이름 · 수정자 표기 · 결합 규칙의 정본은 @d3ro/core/keybinding 이다
|
|
// (formatBindingSegments / joinBindingSegments). 매핑 테이블을 여기에 두지 않는다.
|
|
|
|
import type { BindingPlatform } from '@d3ro/core/keybinding'
|
|
|
|
export type Platform = BindingPlatform
|
|
|
|
export function getPlatform(): Platform {
|
|
const p = (window as { electronAPI?: { platform?: string } }).electronAPI?.platform
|
|
if (p === 'darwin' || p === 'win32' || p === 'linux') return p
|
|
// 폴백: SSR/테스트 환경에서는 navigator.platform로 추정.
|
|
if (typeof navigator !== 'undefined' && /Mac/i.test(navigator.platform)) return 'darwin'
|
|
return 'win32'
|
|
}
|