mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-23 11:15:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

don't focus composer on keydown with modifier

Browse source 
this breaks shortcuts like copy, ...
This commit is contained in:
Bruno Windels 2019-07-19 09:10:20 +02:00
parent 4fa7302f69
commit 77f5274cd8
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/components/structures/LoggedInView.js
View file

@ -326,11 +326,12 @@ const LoggedInView = React.createClass({
let handled = false; let handled = false;
const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev); const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
const hasModifier = ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey;
switch (ev.keyCode) { switch (ev.keyCode) {
case KeyCode.PAGE_UP: case KeyCode.PAGE_UP:
case KeyCode.PAGE_DOWN: case KeyCode.PAGE_DOWN:
if (!ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) { if (!hasModifier) {
this._onScrollKeyPressed(ev); this._onScrollKeyPressed(ev);
handled = true; handled = true;
} }
@ -369,7 +370,7 @@ const LoggedInView = React.createClass({
if (handled) { if (handled) {
ev.stopPropagation(); ev.stopPropagation();
ev.preventDefault(); ev.preventDefault();
} else { } else if (!hasModifier) {
const targetTag = ev.target.tagName; const targetTag = ev.target.tagName;
const focusedOnInputControl = targetTag === "INPUT" || const focusedOnInputControl = targetTag === "INPUT" ||
targetTag === "TEXTAREA" || targetTag === "TEXTAREA" ||