Merge pull request #3187 from chenjigeng/fix/select-all

Tyriar · web-flow · commit f64724f54f1a · 2021-01-11T09:41:14.000-08:00
fix shift+cmd+a will Select all
diff --git a/src/common/input/Keyboard.ts b/src/common/input/Keyboard.ts
@@ -356,7 +356,7 @@ export function evaluateKeyboardEvent(
           const keyCode = ev.ctrlKey ? ev.keyCode - 64 : ev.keyCode + 32;
           result.key = C0.ESC + String.fromCharCode(keyCode);
         }
-      } else if (isMac && !ev.altKey && !ev.ctrlKey && ev.metaKey) {
+      } else if (isMac && !ev.altKey && !ev.ctrlKey && !ev.shiftKey && ev.metaKey) {
         if (ev.keyCode === 65) { // cmd + a
           result.type = KeyboardResultType.SELECT_ALL;
         }

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ export function evaluateKeyboardEvent(`
`356`	`356`	`const keyCode = ev.ctrlKey ? ev.keyCode - 64 : ev.keyCode + 32;`
`357`	`357`	`result.key = C0.ESC + String.fromCharCode(keyCode);`
`358`	`358`	`}`
`359`		`- } else if (isMac && !ev.altKey && !ev.ctrlKey && ev.metaKey) {`
	`359`	`+ } else if (isMac && !ev.altKey && !ev.ctrlKey && !ev.shiftKey && ev.metaKey) {`
`360`	`360`	`if (ev.keyCode === 65) { // cmd + a`
`361`	`361`	`result.type = KeyboardResultType.SELECT_ALL;`
`362`	`362`	`}`