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

Close copy tooltip in edge cases correctly #2999

Merged
merged 1 commit into from
May 20, 2019
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
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