fix(contextmenu): Fix #1722 TopSites context menu not clickable

mozilla · Nov 8, 2016 · 17d58da · 17d58da
1 parent 2728d9d
commit 17d58da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/content-src/components/ContextMenu/ContextMenu.js b/content-src/components/ContextMenu/ContextMenu.js
@@ -4,17 +4,18 @@ const ContextMenu = React.createClass({
   componentWillMount() {
     this.hideContext = () => {
       this.props.onUpdate(false);
+      window.removeEventListener("click", this.hideContext);
     };
   },
+  componentWillUnmount() {
+    window.removeEventListener("click", this.hideContext);
+  },
   componentDidUpdate(prevProps) {
     if (this.props.visible && !prevProps.visible) {
       setTimeout(() => {
         window.addEventListener("click", this.hideContext, false);
       }, 0);
     }
-    if (!this.props.visible && prevProps.visible) {
-      window.removeEventListener("click", this.hideContext);
-    }
   },
   render() {
     return (<span hidden={!this.props.visible} className="context-menu">

diff --git a/content-src/components/LinkMenuButton/LinkMenuButton.js b/content-src/components/LinkMenuButton/LinkMenuButton.js
@@ -4,6 +4,7 @@ const LinkMenuButton = React.createClass({
   render() {
     return (<button className="link-menu-button" onClick={e => {
       e.preventDefault();
+      e.stopPropagation();
       this.props.onClick(e);
     }}>
       <span className="sr-only">Open context menu</span>