PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fixes 2 issues with Dialog closing

Browse source 
+ Upload Confirmation dialog would just change focus on ESC and not close
+ Keywords Dialog in UserSettings would also close UserSettings because event bubbled up
This commit is contained in:
Michael Telatynski 2017-05-07 20:43:42 +01:00 committed by GitHub
parent ceb71a4ef6
commit 78e7272344
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/dialogs/BaseDialog.js
View file

@ -57,6 +57,12 @@ export default React.createClass({
} }
}, },
// Don't let key down events get any further, so they only trigger this and nothing more
_onKeyDown: function(e) {
e.stopPropagation();
e.preventDefault();
},
// Must be when the key is released (and not pressed) otherwise componentWillUnmount // Must be when the key is released (and not pressed) otherwise componentWillUnmount
// will focus another element which will receive future key events // will focus another element which will receive future key events
_onKeyUp: function(e) { _onKeyUp: function(e) {
@ -81,7 +87,7 @@ export default React.createClass({
const TintableSvg = sdk.getComponent("elements.TintableSvg"); const TintableSvg = sdk.getComponent("elements.TintableSvg");
return ( return (
<div onKeyUp={this._onKeyUp} className={this.props.className}> <div onKeyDown={this._onKeyDown} onKeyUp={this._onKeyUp} className={this.props.className}>
<AccessibleButton onClick={this._onCancelClick} <AccessibleButton onClick={this._onCancelClick}
className="mx_Dialog_cancelButton" className="mx_Dialog_cancelButton"
> >