From b0c7687f2b931dfb5457592ddd7b5fad64fecc28 Mon Sep 17 00:00:00 2001
From: nklhrstv <me@nikolahristov.com>
Date: Tue, 17 Mar 2020 18:43:19 +0200
Subject: [PATCH] detach Popup listeners on route blur

---
 src/common/Popup/Popup.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/Popup/Popup.js b/src/common/Popup/Popup.js
index cf22cda08..93f35cecf 100644
--- a/src/common/Popup/Popup.js
+++ b/src/common/Popup/Popup.js
@@ -2,9 +2,11 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const FocusLock = require('react-focus-lock').default;
+const { useRouteFocused } = require('stremio-router');
 const styles = require('./styles');
 
 const Popup = ({ open, direction, renderLabel, renderMenu, dataset, onCloseRequest, ...props }) => {
+    const routeFocused = useRouteFocused();
     const labelRef = React.useRef(null);
     const menuRef = React.useRef(null);
     const [autoDirection, setAutoDirection] = React.useState(null);
@@ -36,7 +38,7 @@ const Popup = ({ open, direction, renderLabel, renderMenu, dataset, onCloseReque
                 }
             }
         };
-        if (open) {
+        if (routeFocused && open) {
             window.addEventListener('resize', onCloseEvent);
             window.addEventListener('keydown', onCloseEvent);
             window.addEventListener('mousedown', onCloseEvent);
@@ -46,7 +48,7 @@ const Popup = ({ open, direction, renderLabel, renderMenu, dataset, onCloseReque
             window.removeEventListener('keydown', onCloseEvent);
             window.removeEventListener('mousedown', onCloseEvent);
         };
-    }, [open, onCloseRequest, dataset]);
+    }, [routeFocused, open, onCloseRequest, dataset]);
     React.useLayoutEffect(() => {
         if (open) {
             const autoDirection = [];