Skip to content

Commit 3656403

Browse files
fix(keyboard): Add mac editing commands for NumpadEnter (#1026)
This should fix NumpadEnter on webkit for mac.
1 parent 21acb36 commit 3656403

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/usKeyboardLayout.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ export const macEditingCommands: {[key: string]: string|string[]} = {
292292
'Backspace': 'deleteBackward:',
293293
'Tab': 'insertTab:',
294294
'Enter': 'insertNewline:',
295+
'NumpadEnter': 'insertNewline:',
295296
'Escape': 'cancelOperation:',
296297
'ArrowUp': 'moveUp:',
297298
'ArrowDown': 'moveDown:',
@@ -305,6 +306,7 @@ export const macEditingCommands: {[key: string]: string|string[]} = {
305306
'PageDown': 'scrollPageDown:',
306307
'Shift+Backspace': 'deleteBackward:',
307308
'Shift+Enter': 'insertNewline:',
309+
'Shift+NumpadEnter': 'insertNewline:',
308310
'Shift+Tab': 'insertBacktab:',
309311
'Shift+Escape': 'cancelOperation:',
310312
'Shift+ArrowUp': 'moveUpAndModifySelection:',
@@ -320,6 +322,7 @@ export const macEditingCommands: {[key: string]: string|string[]} = {
320322
'Shift+Numpad5': 'delete:',
321323
'Control+Tab': 'selectNextKeyView:',
322324
'Control+Enter': 'insertLineBreak:',
325+
'Control+NumpadEnter': 'insertLineBreak:',
323326
'Control+Quote': 'insertSingleQuoteIgnoringSubstitution:',
324327
'Control+KeyA': 'moveToBeginningOfParagraph:',
325328
'Control+KeyB': 'moveBackward:',
@@ -341,6 +344,7 @@ export const macEditingCommands: {[key: string]: string|string[]} = {
341344
'Control+ArrowLeft': 'moveToLeftEndOfLine:',
342345
'Control+ArrowRight': 'moveToRightEndOfLine:',
343346
'Shift+Control+Enter': 'insertLineBreak:',
347+
'Shift+Control+NumpadEnter': 'insertLineBreak:',
344348
'Shift+Control+Tab': 'selectPreviousKeyView:',
345349
'Shift+Control+Quote': 'insertDoubleQuoteIgnoringSubstitution:',
346350
'Shift+Control+KeyA': 'moveToBeginningOfParagraphAndModifySelection:',
@@ -358,6 +362,7 @@ export const macEditingCommands: {[key: string]: string|string[]} = {
358362
'Alt+Backspace': 'deleteWordBackward:',
359363
'Alt+Tab': 'insertTabIgnoringFieldEditor:',
360364
'Alt+Enter': 'insertNewlineIgnoringFieldEditor:',
365+
'Alt+NumpadEnter': 'insertNewlineIgnoringFieldEditor:',
361366
'Alt+Escape': 'complete:',
362367
'Alt+ArrowUp': ['moveBackward:', 'moveToBeginningOfParagraph:'],
363368
'Alt+ArrowDown': ['moveForward:', 'moveToEndOfParagraph:'],
@@ -369,6 +374,7 @@ export const macEditingCommands: {[key: string]: string|string[]} = {
369374
'Shift+Alt+Backspace': 'deleteWordBackward:',
370375
'Shift+Alt+Tab': 'insertTabIgnoringFieldEditor:',
371376
'Shift+Alt+Enter': 'insertNewlineIgnoringFieldEditor:',
377+
'Shift+Alt+NumpadEnter': 'insertNewlineIgnoringFieldEditor:',
372378
'Shift+Alt+Escape': 'complete:',
373379
'Shift+Alt+ArrowUp': 'moveParagraphBackwardAndModifySelection:',
374380
'Shift+Alt+ArrowDown': 'moveParagraphForwardAndModifySelection:',

test/keyboard.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,8 @@ module.exports.describe = function({testRunner, expect, FFOX, CHROMIUM, WEBKIT,
221221
const lastEvent = await page.evaluate('lastEvent');
222222
expect(lastEvent.key).toBe(expectedKey, `${JSON.stringify(key)} had the wrong key: ${lastEvent.key}`);
223223
expect(lastEvent.code).toBe(expectedCode, `${JSON.stringify(key)} had the wrong code: ${lastEvent.code}`);
224-
expect(await page.$eval('textarea', t => t.value)).toBe('\n', `${JSON.stringify(key)} failed to create a newline`);
224+
const value = await page.$eval('textarea', t => t.value);
225+
expect(value).toBe('\n', `${JSON.stringify(key)} failed to create a newline: ${JSON.stringify(value)}`);
225226
await page.$eval('textarea', t => t.value = '');
226227
}
227228
});

0 commit comments

Comments
 (0)