@@ -28,6 +28,110 @@ const MODIFIER_TOKENS = new Set([
2828 "cmdorctrl" ,
2929] ) ;
3030
31+ /** Electron 支持的具名按键 token(不区分大小写) */
32+ const NAMED_KEY_TOKENS = new Set ( [
33+ "space" ,
34+ "spacebar" ,
35+ "tab" ,
36+ "capslock" ,
37+ "numlock" ,
38+ "scrolllock" ,
39+ "backspace" ,
40+ "delete" ,
41+ "del" ,
42+ "insert" ,
43+ "return" ,
44+ "enter" ,
45+ "up" ,
46+ "down" ,
47+ "left" ,
48+ "right" ,
49+ "home" ,
50+ "end" ,
51+ "pageup" ,
52+ "pagedown" ,
53+ "escape" ,
54+ "esc" ,
55+ "volumeup" ,
56+ "volumedown" ,
57+ "volumemute" ,
58+ "medianexttrack" ,
59+ "mediaprevioustrack" ,
60+ "mediastop" ,
61+ "mediaplaypause" ,
62+ "printscreen" ,
63+ "plus" ,
64+ ] ) ;
65+
66+ /** Electron 支持的符号按键 token */
67+ const PUNCTUATION_TOKENS = new Set ( [
68+ ")" ,
69+ "!" ,
70+ "@" ,
71+ "#" ,
72+ "$" ,
73+ "%" ,
74+ "^" ,
75+ "&" ,
76+ "*" ,
77+ "(" ,
78+ ":" ,
79+ ";" ,
80+ "+" ,
81+ "=" ,
82+ "<" ,
83+ "," ,
84+ "_" ,
85+ "-" ,
86+ ">" ,
87+ "." ,
88+ "?" ,
89+ "/" ,
90+ "~" ,
91+ "`" ,
92+ "{" ,
93+ "]" ,
94+ "[" ,
95+ "|" ,
96+ "\\" ,
97+ "}" ,
98+ '"' ,
99+ "'" ,
100+ ] ) ;
101+
102+ /** 小键盘 Accelerator token → event.code */
103+ const NUMPAD_TO_CODE : Record < string , string > = {
104+ num0 : "Numpad0" ,
105+ num1 : "Numpad1" ,
106+ num2 : "Numpad2" ,
107+ num3 : "Numpad3" ,
108+ num4 : "Numpad4" ,
109+ num5 : "Numpad5" ,
110+ num6 : "Numpad6" ,
111+ num7 : "Numpad7" ,
112+ num8 : "Numpad8" ,
113+ num9 : "Numpad9" ,
114+ numdec : "NumpadDecimal" ,
115+ numadd : "NumpadAdd" ,
116+ numsub : "NumpadSubtract" ,
117+ nummult : "NumpadMultiply" ,
118+ numdiv : "NumpadDivide" ,
119+ } ;
120+
121+ /** event.code → 小键盘 Accelerator token */
122+ const CODE_TO_NUMPAD : Record < string , string > = Object . fromEntries (
123+ Object . entries ( NUMPAD_TO_CODE ) . map ( ( [ token , code ] ) => [ code , token ] ) ,
124+ ) ;
125+
126+ /** 小键盘符号键的展示文案 */
127+ const NUMPAD_LABELS : Record < string , string > = {
128+ numdec : "Num." ,
129+ numadd : "Num+" ,
130+ numsub : "Num-" ,
131+ nummult : "Num*" ,
132+ numdiv : "Num/" ,
133+ } ;
134+
31135/**
32136 * 把 Accelerator 中的 key token(最后一段非 modifier)规范成 KeyboardEvent.code 形式
33137 * Electron Accelerator 用的是 key 字符(如 "A"、"Right"),需要映射到 code
@@ -39,6 +143,9 @@ const keyToCode = (token: string): string => {
39143 if ( / ^ [ A - Z a - z ] $ / . test ( t ) ) return `Key${ t . toUpperCase ( ) } ` ;
40144 // 数字
41145 if ( / ^ [ 0 - 9 ] $ / . test ( t ) ) return `Digit${ t } ` ;
146+ // 小键盘
147+ const numpad = NUMPAD_TO_CODE [ t . toLowerCase ( ) ] ;
148+ if ( numpad ) return numpad ;
42149 // 方向键
43150 const arrow : Record < string , string > = {
44151 left : "ArrowLeft" ,
@@ -155,13 +262,20 @@ export const normalizeAccelerator = (accel: string): string => {
155262 . split ( "+" )
156263 . map ( ( t ) => t . trim ( ) )
157264 . filter ( Boolean ) ;
158- const mods = { cmdOrCtrl : false , cmd : false , ctrl : false , alt : false , shift : false } ;
265+ const mods = {
266+ cmdOrCtrl : false ,
267+ cmd : false ,
268+ super : false ,
269+ ctrl : false ,
270+ alt : false ,
271+ shift : false ,
272+ } ;
159273 let key = "" ;
160274 for ( const t of tokens ) {
161275 const lower = t . toLowerCase ( ) ;
162276 if ( lower === "commandorcontrol" || lower === "cmdorctrl" ) mods . cmdOrCtrl = true ;
163- else if ( lower === "cmd" || lower === "command" || lower === "meta" || lower === "super" )
164- mods . cmd = true ;
277+ else if ( lower === "cmd" || lower === "command" ) mods . cmd = true ;
278+ else if ( lower === "meta" || lower === "super" ) mods . super = true ;
165279 else if ( lower === "ctrl" || lower === "control" ) mods . ctrl = true ;
166280 else if ( lower === "alt" || lower === "option" ) mods . alt = true ;
167281 else if ( lower === "shift" ) mods . shift = true ;
@@ -173,20 +287,51 @@ export const normalizeAccelerator = (accel: string): string => {
173287 const parts : string [ ] = [ ] ;
174288 if ( mods . cmdOrCtrl ) parts . push ( "CommandOrControl" ) ;
175289 if ( mods . cmd ) parts . push ( "Cmd" ) ;
290+ if ( mods . super ) parts . push ( "Super" ) ;
176291 if ( mods . ctrl ) parts . push ( "Ctrl" ) ;
177292 if ( mods . alt ) parts . push ( "Alt" ) ;
178293 if ( mods . shift ) parts . push ( "Shift" ) ;
179294 parts . push ( key ) ;
180295 return parts . join ( "+" ) ;
181296} ;
182297
298+ /**
299+ * 判断 accelerator 是否在 Electron 支持的按键集合内
300+ * @param accel - 加速键字符串
301+ * @returns 是否受支持
302+ */
303+ export const isSupportedAccelerator = ( accel : string ) : boolean => {
304+ if ( ! accel ) return false ;
305+ const tokens = accel
306+ . split ( "+" )
307+ . map ( ( t ) => t . trim ( ) )
308+ . filter ( Boolean ) ;
309+ if ( tokens . length === 0 ) return false ;
310+
311+ let key = "" ;
312+ for ( const token of tokens ) {
313+ if ( MODIFIER_TOKENS . has ( token . toLowerCase ( ) ) ) continue ;
314+ key = token ;
315+ }
316+ if ( ! key ) return false ;
317+
318+ const lower = key . toLowerCase ( ) ;
319+ if ( / ^ [ a - z 0 - 9 ] $ / . test ( lower ) ) return true ;
320+ if ( / ^ f ( [ 1 - 9 ] | 1 [ 0 - 9 ] | 2 [ 0 - 4 ] ) $ / . test ( lower ) ) return true ;
321+ if ( / ^ n u m [ 0 - 9 ] $ / . test ( lower ) ) return true ;
322+ if ( [ "numdec" , "numadd" , "numsub" , "nummult" , "numdiv" ] . includes ( lower ) ) return true ;
323+ if ( NAMED_KEY_TOKENS . has ( lower ) ) return true ;
324+ return PUNCTUATION_TOKENS . has ( key ) ;
325+ } ;
326+
183327/** 直接对已解析结构与事件比较,避免热路径重复解析字符串 */
184328export const matchParsed = ( event : KeyboardEvent , parsed : ParsedAccelerator ) : boolean => {
185329 if ( event . ctrlKey !== parsed . ctrl ) return false ;
186330 if ( event . metaKey !== parsed . meta ) return false ;
187331 if ( event . altKey !== parsed . alt ) return false ;
188332 if ( event . shiftKey !== parsed . shift ) return false ;
189- return event . code === parsed . code ;
333+ // 小键盘回车与主回车共用 Return,避免全局与应用内行为不一致
334+ return event . code === parsed . code || ( parsed . code === "Enter" && event . code === "NumpadEnter" ) ;
190335} ;
191336
192337/**
@@ -220,6 +365,10 @@ export const formatAccelerator = (accel: string | null, isMac: boolean): string
220365 out . push ( isMac ? "↵" : "Enter" ) ;
221366 } else if ( lower === "space" || lower === "spacebar" ) {
222367 out . push ( "Space" ) ;
368+ } else if ( / ^ n u m [ 0 - 9 ] $ / . test ( lower ) ) {
369+ out . push ( `Num${ lower . slice ( 3 ) } ` ) ;
370+ } else if ( lower in NUMPAD_LABELS ) {
371+ out . push ( NUMPAD_LABELS [ lower ] ) ;
223372 } else if ( / ^ [ a - z ] $ / . test ( lower ) ) {
224373 out . push ( lower . toUpperCase ( ) ) ;
225374 } else {
@@ -256,6 +405,9 @@ export const eventToAccelerator = (event: KeyboardEvent, isMac: boolean): string
256405 if ( code . startsWith ( "Digit" ) ) return code . slice ( 5 ) ;
257406 if ( code . startsWith ( "Arrow" ) ) return code . slice ( 5 ) ; // ArrowLeft → Left
258407 if ( code . startsWith ( "F" ) && / ^ F [ 0 - 9 ] + $ / . test ( code ) ) return code ; // F1
408+ const numpad = CODE_TO_NUMPAD [ code ] ;
409+ if ( numpad ) return numpad ;
410+ if ( code === "NumpadEnter" ) return "Return" ;
259411 const map : Record < string , string > = {
260412 Space : "Space" ,
261413 Enter : "Return" ,
@@ -289,7 +441,7 @@ export const eventToAccelerator = (event: KeyboardEvent, isMac: boolean): string
289441 const cmdOrCtrl = isMac ? event . metaKey : event . ctrlKey ;
290442 const otherCmdLike = isMac ? event . ctrlKey : event . metaKey ;
291443 if ( cmdOrCtrl ) parts . push ( "CommandOrControl" ) ;
292- if ( otherCmdLike ) parts . push ( isMac ? "Ctrl" : "Cmd " ) ;
444+ if ( otherCmdLike ) parts . push ( isMac ? "Ctrl" : "Super " ) ;
293445 if ( event . altKey ) parts . push ( "Alt" ) ;
294446 if ( event . shiftKey ) parts . push ( "Shift" ) ;
295447 parts . push ( codeToToken ( event . code ) ) ;
0 commit comments