Skip to content

Commit

Permalink
Merge pull request #2999 from matrix-org/t3chguy/copied_tooltip
Browse files Browse the repository at this point in the history
Close copy tooltip in edge cases correctly
  • Loading branch information
turt2live committed May 20, 2019
2 parents db73e64 + e2476ac commit 7979934
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/components/views/dialogs/ShareDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ export default class ShareDialog extends React.Component {
top: y,
message: successful ? _t('Copied!') : _t('Failed to copy'),
}, false);
e.target.onmouseleave = close;
// Drop a reference to this close handler for componentWillUnmount
this.closeCopiedTooltip = e.target.onmouseleave = close;
}

onLinkSpecificEventCheckboxClick() {
Expand All @@ -131,6 +132,12 @@ export default class ShareDialog extends React.Component {
}
}

componentWillUnmount() {
// if the Copied tooltip is open then get rid of it, there are ways to close the modal which wouldn't close
// the tooltip otherwise, such as pressing Escape or clicking X really quickly
if (this.closeCopiedTooltip) this.closeCopiedTooltip();
}

render() {
let title;
let matrixToUrl;
Expand Down

0 comments on commit 7979934

Please sign in to comment.