From 1f2d8ecc13bf223833db90c9ddd78236b30a1f0d Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Wed, 27 Nov 2019 16:23:27 +0300
Subject: [PATCH] Return focused element

---
 src/components/autoFocuser.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/autoFocuser.js b/src/components/autoFocuser.js
index e3cec9281d..a133ee2ea8 100644
--- a/src/components/autoFocuser.js
+++ b/src/components/autoFocuser.js
@@ -65,27 +65,32 @@ define(["focusManager", "layoutManager"], function (focusManager, layoutManager)
         candidates = candidates.concat(arrayFrom(container.querySelectorAll(".btnResume")));
         candidates = candidates.concat(arrayFrom(container.querySelectorAll(".btnPlay")));
 
-        var notFound = candidates.every(function (element) {
+        var focusedElement;
+
+        candidates.every(function (element) {
             if (focusManager.isCurrentlyFocusable(element)) {
                 focusManager.focus(element);
+                focusedElement = element;
                 return false;
             }
 
             return true;
         });
 
-        if (notFound) {
+        if (!focusedElement) {
             // FIXME: Multiple itemsContainers
             var itemsContainer = container.querySelector(".itemsContainer");
 
             if (itemsContainer) {
-                notFound = !focusManager.autoFocus(itemsContainer);
+                focusedElement = focusManager.autoFocus(itemsContainer);
             }
         }
 
-        if (notFound) {
-            focusManager.autoFocus(container);
+        if (!focusedElement) {
+            focusedElement = focusManager.autoFocus(container);
         }
+
+        return focusedElement;
     }
 
     return {