Merge pull request jellyfin#1641 from dmitrylyzo/fix-event-source-2

Fix event source for inputManager in case of multiple open dialogs
iwalton3 · Jul 25, 2020 · f5e93a1 · f5e93a1
2 parents 0afe858 + f292053
commit f5e93a1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/scripts/inputManager.js b/src/scripts/inputManager.js
@@ -66,9 +66,12 @@ import appHost from 'apphost';
         if (!sourceElement) {
             sourceElement = document.activeElement || window;
 
-            const dlg = document.querySelector('.dialogContainer .dialog.opened');
+            const dialogs = document.querySelectorAll('.dialogContainer .dialog.opened');
 
-            if (dlg && (!sourceElement || !dlg.contains(sourceElement))) {
+            // Suppose the top open dialog is active
+            const dlg = dialogs.length ? dialogs[dialogs.length - 1] : null;
+
+            if (dlg && !dlg.contains(sourceElement)) {
                 sourceElement = dlg;
             }
         }