fix(FEC-6914): open menu while other menu open (#44)

kaltura · Sep 11, 2017 · 56e9d86 · 56e9d86
1 parent 163696d
commit 56e9d86
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/src/components/language/language.js b/src/components/language/language.js
@@ -77,19 +77,21 @@ class LanguageControl extends BaseComponent {
   /**
    * event listener for clicking outside handler.
    *
-   * @param {Event} e - click event
+   * @param {*} e - click event
    * @returns {void}
    * @memberof LanguageControl
    */
-  handleClickOutside(e: Event): void {
+  handleClickOutside(e: any): void {
     if (
       this._controlLanguageElement &&
       !this.props.isMobile &&
       !this._controlLanguageElement.contains(event.target) &&
       this.state.smartContainerOpen &&
       !this.state.cvaaOverlay
     ) {
-      e.stopPropagation();
+      if (e.target.classList.contains('overlay-play')) {
+        e.stopPropagation();
+      }
       this.setState({smartContainerOpen: false});
     }
   }

diff --git a/src/components/menu/menu.js b/src/components/menu/menu.js
@@ -51,13 +51,16 @@ class Menu extends Component {
    * handler to click outside of the component event listener.
    * if not mobile device and clicked outside the component, call the onClose callback
    *
-   * @param {Event} e click event
+   * @param {*} e click event
    * @returns {void}
    * @memberof Menu
    */
-  handleClickOutside(e: Event) {
+  handleClickOutside(e: any) {
     if (!this.props.isMobile && this._menuElement && !this._menuElement.contains(event.target)) {
-      e.stopPropagation();
+
+      if (e.target.classList.contains('overlay-play') || e.target.parentElement.getElementsByClassName('dropdown-menu')[0] === this._menuElement) {
+        e.stopPropagation();
+      }
       this.props.onClose();
     }
   }

diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
@@ -76,13 +76,15 @@ class SettingsControl extends BaseComponent {
   /**
    * event listener for clicking outside handler.
    *
-   * @param {Event} e - click event
+   * @param {*} e - click event
    * @returns {void}
    * @memberof SettingsControl
    */
-  handleClickOutside(e: Event) {
+  handleClickOutside(e: any) {
     if (!this.props.isMobile && !!this._controlSettingsElement && !this._controlSettingsElement.contains(event.target) && this.state.smartContainerOpen) {
-      e.stopPropagation();
+      if (e.target.classList.contains('overlay-play')) {
+        e.stopPropagation();
+      }
       this.setState({smartContainerOpen: false});
     }
   }