From 2c2eda1f006c1ddcde13e890ae8f5830d7ac9bf1 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 10 May 2018 17:51:49 +0100
Subject: [PATCH] Export ContextualMenu component, with added `hasBackground`
 property

, which is only enabled when `createMenu` is used.
---
 src/components/structures/ContextualMenu.js | 43 +++++++++++----------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index 99d1f892b9..17f1a23e14 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -40,7 +40,7 @@ function getOrCreateContainer() {
     return container;
 }
 
-class ContextualMenu extends React.Component {
+export default class ContextualMenu extends React.Component {
     propTypes: {
         top: PropTypes.number,
         bottom: PropTypes.number,
@@ -57,6 +57,10 @@ class ContextualMenu extends React.Component {
         menuPaddingRight: PropTypes.number,
         menuPaddingBottom: PropTypes.number,
         menuPaddingLeft: PropTypes.number,
+
+        // If true, insert an invisible screen-sized element behind the
+        // menu that when clicked will close it.
+        hasBackground: PropTypes.bool,
     }
 
     render() {
@@ -154,31 +158,30 @@ class ContextualMenu extends React.Component {
                 { chevron }
                 <ElementClass {...props} onFinished={props.closeMenu} onResize={props.windowResize} />
             </div>
-            <div className="mx_ContextualMenu_background" onClick={props.closeMenu}></div>
+            { props.hasBackground && <div className="mx_ContextualMenu_background" onClick={props.closeMenu}></div> }
             <style>{ chevronCSS }</style>
         </div>;
     }
 }
 
-module.exports = {
-    createMenu: function(ElementClass, props) {
-        const closeMenu = function(...args) {
-            ReactDOM.unmountComponentAtNode(getOrCreateContainer());
+export function createMenu(ElementClass, props) {
+    const closeMenu = function(...args) {
+        ReactDOM.unmountComponentAtNode(getOrCreateContainer());
 
-            if (props && props.onFinished) {
-                props.onFinished.apply(null, args);
-            }
-        };
+        if (props && props.onFinished) {
+            props.onFinished.apply(null, args);
+        }
+    };
 
-        const menu = <ContextualMenu
-            {...props}
-            elementClass={ElementClass}
-            closeMenu={closeMenu}
-            windowResize={closeMenu}
-        />;
+    const menu = <ContextualMenu
+        {...props}
+        hasBackground={true}
+        elementClass={ElementClass}
+        closeMenu={closeMenu}
+        windowResize={closeMenu}
+    />;
 
-        ReactDOM.render(menu, getOrCreateContainer());
+    ReactDOM.render(menu, getOrCreateContainer());
 
-        return {close: closeMenu};
-    },
-};
+    return {close: closeMenu};
+}