From 305f050003458f7f84e5be8414cd0a62c899d2ef Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sat, 14 Mar 2020 22:26:08 +0300
Subject: [PATCH] Move blur of foreign element to generic dialog module

---
 src/components/dialogHelper/dialogHelper.js | 3 +++
 src/components/slideshow/slideshow.js       | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js
index 6ee96df31..b9bc71bc1 100644
--- a/src/components/dialogHelper/dialogHelper.js
+++ b/src/components/dialogHelper/dialogHelper.js
@@ -244,6 +244,9 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
             focusManager.pushScope(dlg);
             if (dlg.getAttribute('data-autofocus') === 'true') {
                 focusManager.autoFocus(dlg);
+            } else if (document.activeElement && !dlg.contains(document.activeElement)) {
+                // Blur foreign element to prevent triggering of an action from the previous scope
+                document.activeElement.blur();
             }
         };
 
diff --git a/src/components/slideshow/slideshow.js b/src/components/slideshow/slideshow.js
index 67cae4b6b..40d87e951 100644
--- a/src/components/slideshow/slideshow.js
+++ b/src/components/slideshow/slideshow.js
@@ -188,11 +188,6 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
                 stopInterval();
             });
 
-            // Blur foreign element to prevent starting of "nested" slideshow
-            if (document.activeElement && !dlg.contains(document.activeElement)) {
-                document.activeElement.blur();
-            }
-
             inputManager.on(window, onInputCommand);
             document.addEventListener((window.PointerEvent ? 'pointermove' : 'mousemove'), onPointerMove);