Merge pull request #3237 from matrix-org/bwindels/fixcpfocus

Don't focus composer on keydown with modifier
matrix-org · Jul 19, 2019 · 3ee26b6 · 3ee26b6
2 parents 4fa7302 + 77f5274
commit 3ee26b6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
@@ -326,11 +326,12 @@ const LoggedInView = React.createClass({
 
         let handled = false;
         const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
+        const hasModifier = ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey;
 
         switch (ev.keyCode) {
             case KeyCode.PAGE_UP:
             case KeyCode.PAGE_DOWN:
-                if (!ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) {
+                if (!hasModifier) {
                     this._onScrollKeyPressed(ev);
                     handled = true;
                 }
@@ -369,7 +370,7 @@ const LoggedInView = React.createClass({
         if (handled) {
             ev.stopPropagation();
             ev.preventDefault();
-        } else {
+        } else if (!hasModifier) {
             const targetTag = ev.target.tagName;
             const focusedOnInputControl = targetTag === "INPUT" ||
                 targetTag === "TEXTAREA" ||