Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exclude all numpad keys from keyboard mapping #6881

Merged
merged 1 commit into from Jan 15, 2020
Merged

Exclude all numpad keys from keyboard mapping #6881

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 7 additions & 8 deletions packages/core/src/browser/keyboard/keyboard-layout-service.ts
View file
Open in desktop
Expand Up @@ -146,7 +146,7 @@ export class KeyboardLayoutService {
if (mapping.hasOwnProperty(code)) {
const keyMapping = mapping[code];
const mappedKey = Key.getKey(code);
if (this.isValidKey(mappedKey)) {
if (mappedKey && this.shouldIncludeKey(code)) {
if (isWindows) {
this.addWindowsKeyMapping(key2KeyCode, mappedKey, (keyMapping as IWindowsKeyMapping).vkey, keyMapping.value);
} else {
Expand All @@ -172,13 +172,12 @@ export class KeyboardLayoutService {
return { key2KeyCode, code2Character };
}

protected isValidKey(key?: Key): key is Key {
return key !== undefined
&& key !== Key.ADD
&& key !== Key.SUBTRACT
&& key !== Key.MULTIPLY
&& key !== Key.DIVIDE
&& key !== Key.DECIMAL;
protected shouldIncludeKey(code: string): boolean {
// Exclude all numpad keys because they produce values that are already found elsewhere on the keyboard.
// This can cause problems, e.g. if `Numpad3` maps to `PageDown` then commands bound to `PageDown` would
// be resolved to `Digit3` (`Numpad3` is associated with `Key.DIGIT3`), effectively blocking the user
// from typing `3` in an editor.
return !code.startsWith('Numpad');
}

private addKeyMapping(key2KeyCode: KeyCode[], mappedKey: Key, value: string, shift: boolean, alt: boolean): void {
Expand Down