Apply suggested changes

jellyfin · Jan 5, 2025 · 754d14f · 754d14f
1 parent 2a6c7eb
commit 754d14f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/components/focusManager.js b/src/components/focusManager.js
@@ -93,19 +93,24 @@ function isCurrentlyFocusableInternal(elem) {
 
 // Determines if a focusable element can be focused at a given point in time
 function isCurrentlyFocusable(elem) {
-    if (elem.disabled) {
-        return false;
-    }
-
-    if (elem.getAttribute('tabindex') === '-1') {
-        return false;
-    }
+    if (!elem.classList?.contains('focusable')) {
+        if (elem.disabled) {
+            return false;
+        }
 
-    if (elem.tagName === 'INPUT') {
-        const type = elem.type;
-        if (type === 'file') {
+        if (elem.getAttribute('tabindex') === '-1') {
             return false;
         }
+
+        if (elem.tagName === 'INPUT') {
+            const type = elem.type;
+            if (type === 'range') {
+                return false;
+            }
+            if (type === 'file') {
+                return false;
+            }
+        }
     }
 
     return isCurrentlyFocusableInternal(elem);

diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js
@@ -304,11 +304,13 @@ export default function (view) {
     }
 
     function slideDownToShow(elem) {
+        clearHideAnimationEventListeners(elem);
         elem.classList.remove('hide');
         elem.classList.remove('osdHeader-hidden');
     }
 
     function slideUpToHide(elem) {
+        clearHideAnimationEventListeners(elem);
         elem.classList.add('osdHeader-hidden');
         elem.addEventListener(transitionEndEventName, onHideAnimationComplete);
     }
@@ -365,7 +367,8 @@ export default function (view) {
             toggleSubtitleSync('hide');
 
             // Firefox does not blur by itself
-            if (document.activeElement && !focusManager.isCurrentlyFocusable(document.activeElement)) {
+            if (osdBottomElement.contains(document.activeElement)
+                || headerElement.contains(document.activeElement)) {
                 document.activeElement.blur();
             }
         }