From 2ab61b6d7bc20e80fc03280f1997c36674abbb40 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sun, 2 Feb 2025 22:32:54 +0300
Subject: [PATCH] Add container for skip button to make it focusable

FocusManager.isCurrentlyFocusableInternal doesn't work with
fixed elements.
---
 src/components/playback/skipbutton.scss | 16 ++++++++++++----
 src/components/playback/skipsegment.ts  |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/playback/skipbutton.scss b/src/components/playback/skipbutton.scss
index e3a9e0dc0b..63eb13b9ce 100644
--- a/src/components/playback/skipbutton.scss
+++ b/src/components/playback/skipbutton.scss
@@ -1,10 +1,17 @@
+.skip-button-container {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 18%;
+    pointer-events: none;
+    z-index: 10000;
+}
+
 .skip-button {
     display: flex;
     align-items: center;
-    position: fixed;
-    bottom: 18%;
-    right: 16%;
-    z-index: 10000;
+    margin-left: auto;
+    margin-right: 16%;
     padding: 12px 20px;
     color: black;
     border: none;
@@ -15,6 +22,7 @@
     gap: 3px;
     box-shadow: 7px 6px 15px -14px rgba(0, 0, 0, 0.65);
     cursor: pointer;
+    pointer-events: auto;
 }
 
 @media (orientation: landscape) and (max-height: 500px) {
diff --git a/src/components/playback/skipsegment.ts b/src/components/playback/skipsegment.ts
index b73576c721..50b04628d7 100644
--- a/src/components/playback/skipsegment.ts
+++ b/src/components/playback/skipsegment.ts
@@ -49,7 +49,8 @@ class SkipSegment extends PlaybackSubscriber {
         if (!this.skipElement && this.currentSegment) {
             let buttonHtml = '';
 
-            buttonHtml += '<button is="emby-button" class="skip-button hide skip-button-hidden"></button>';
+            // FIXME: Move skip button to the video OSD
+            buttonHtml += '<div class="skip-button-container"><button is="emby-button" class="skip-button hide skip-button-hidden"></button></div>';
 
             document.body.insertAdjacentHTML('beforeend', buttonHtml);