Skip to content

Commit d4ce049

Browse files
committed
refactor: move keyNames related code into runtime
1 parent 99e27df commit d4ce049

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

Diff for: src/compiler/codegen/events.js

+1-14
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@ const keyCodes: { [key: string]: number | Array<number> } = {
1616
'delete': [8, 46]
1717
}
1818

19-
const keyNames: { [key: string]: string | Array<string> } = {
20-
esc: 'Escape',
21-
tab: 'Tab',
22-
enter: 'Enter',
23-
space: ' ',
24-
up: 'ArrowUp',
25-
left: 'ArrowLeft',
26-
right: 'ArrowRight',
27-
down: 'ArrowDown',
28-
'delete': ['Backspace', 'Delete']
29-
}
30-
3119
// #4868: modifiers that prevent the execution of the listener
3220
// need to explicitly return null so that we can determine whether to remove
3321
// the listener for .once
@@ -157,7 +145,6 @@ function genFilterCode (key: string): string {
157145
`_k($event.keyCode,` +
158146
`${JSON.stringify(key)},` +
159147
`${JSON.stringify(code)},` +
160-
`$event.key,` +
161-
`${JSON.stringify(keyNames[key])})`
148+
`$event.key)`
162149
)
163150
}

Diff for: src/core/instance/render-helpers/check-keycodes.js

+14-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
import config from 'core/config'
44
import { hyphenate } from 'shared/util'
55

6+
const keyNames: { [key: string]: string | Array<string> } = {
7+
esc: 'Escape',
8+
tab: 'Tab',
9+
enter: 'Enter',
10+
space: ' ',
11+
up: 'ArrowUp',
12+
left: 'ArrowLeft',
13+
right: 'ArrowRight',
14+
down: 'ArrowDown',
15+
'delete': ['Backspace', 'Delete']
16+
}
17+
618
function isKeyNotMatch<T> (expect: T | Array<T>, actual: T): boolean {
719
if (Array.isArray(expect)) {
820
return expect.indexOf(actual) === -1
@@ -20,10 +32,10 @@ export function checkKeyCodes (
2032
eventKeyCode: number,
2133
key: string,
2234
builtInAlias?: number | Array<number>,
23-
eventKeyName?: string,
24-
builtInName?: string | Array<string>
35+
eventKeyName?: string
2536
): ?boolean {
2637
const keyCodes = config.keyCodes[key] || builtInAlias
38+
const builtInName: string | Array<string> = keyNames[key]
2739
if (builtInName && keyCodes === builtInAlias && eventKeyName) {
2840
return isKeyNotMatch(builtInName, eventKeyName)
2941
} else if (keyCodes) {

0 commit comments

Comments
 (0)