Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix dialog reappearing after hitting Enter #841

Merged
merged 1 commit into from
Apr 26, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/components/views/dialogs/BaseDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ export default React.createClass({
}
},

_onKeyDown: function(e) {
// Must be when the key is released (and not pressed) otherwise componentWillUnmount
// will focus another element which will receive future key events
_onKeyUp: function(e) {
if (e.keyCode === KeyCode.ESCAPE) {
e.stopPropagation();
e.preventDefault();
Expand All @@ -79,7 +81,7 @@ export default React.createClass({
const TintableSvg = sdk.getComponent("elements.TintableSvg");

return (
<div onKeyDown={this._onKeyDown} className={this.props.className}>
<div onKeyUp={this._onKeyUp} className={this.props.className}>
<AccessibleButton onClick={this._onCancelClick}
className="mx_Dialog_cancelButton"
>
Expand Down