From 45a1e4981e2fe02a6dd25f4a53fbcba7cf7988a2 Mon Sep 17 00:00:00 2001
From: novenary <streetwalkermc@gmail.com>
Date: Thu, 2 Feb 2023 17:02:04 +0200
Subject: [PATCH] Move skip button out of the control bar

---
 src/components/VideoPlayer.vue | 112 ++++++++++++++-------------------
 src/locales/en.json            |   1 +
 2 files changed, 48 insertions(+), 65 deletions(-)

diff --git a/src/components/VideoPlayer.vue b/src/components/VideoPlayer.vue
index 6d1299aa..6bceb412 100644
--- a/src/components/VideoPlayer.vue
+++ b/src/components/VideoPlayer.vue
@@ -6,6 +6,17 @@
         :class="{ 'player-container': !isEmbed }"
     >
         <video ref="videoEl" class="w-full" data-shaka-player :autoplay="shouldAutoPlay" :loop="selectedAutoLoop" />
+        <button
+            v-if="inSegment"
+            class="skip-segment-button"
+            type="button"
+            :aria-label="$t('actions.skip_segment')"
+            aria-pressed="false"
+            @click="onClickSkipSegment"
+        >
+            <span v-t="'actions.skip_segment'" />
+            <i class="material-icons-round">skip_next</i>
+        </button>
     </div>
 </template>
 
@@ -51,6 +62,7 @@ export default {
             lastUpdate: new Date().getTime(),
             initialSeekComplete: false,
             destroying: false,
+            inSegment: false,
         };
     },
     computed: {
@@ -365,12 +377,7 @@ export default {
                     this.updateProgressDatabase(time);
                     if (this.sponsors && this.sponsors.segments) {
                         const segment = this.findCurrentSegment(time);
-                        const segmentUpdate = new CustomEvent("segmentupdate", {
-                            detail: {
-                                inSegment: !!segment,
-                            },
-                        });
-                        videoEl.dispatchEvent(segmentUpdate);
+                        this.inSegment = !!segment;
                         if (segment?.autoskip && (!segment.skipped || this.selectedAutoLoop)) {
                             this.skipSegment(videoEl, segment);
                         }
@@ -403,6 +410,10 @@ export default {
         findCurrentSegment(time) {
             return this.sponsors?.segments?.find(s => time >= s.segment[0] && time < s.segment[1]);
         },
+        onClickSkipSegment() {
+            const videoEl = this.$refs.videoEl;
+            this.skipSegment(videoEl);
+        },
         skipSegment(videoEl, segment) {
             const time = videoEl.currentTime;
             if (!segment) segment = this.findCurrentSegment(time);
@@ -455,54 +466,6 @@ export default {
 
                 shaka.ui.OverflowMenu.registerElement("open_new_tab", new OpenButton.Factory());
 
-                const videoPlayerComponent = this;
-
-                const SkipSegmentButton = class extends shaka.ui.Element {
-                    constructor(parent, controls) {
-                        super(parent, controls);
-
-                        // FIXME: this layout is by no means final,
-                        // I just needed something to test with.
-                        this.button_ = document.createElement("button");
-                        this.button_.classList.add("shaka-small-play-button");
-                        this.button_.classList.add("shaka-tooltip");
-                        this.button_.classList.add("shaka-hidden");
-                        this.button_.ariaPressed = "false";
-
-                        this.icon_ = document.createElement("i");
-                        this.icon_.classList.add("material-icons-round");
-                        this.icon_.textContent = "skip_next";
-                        this.button_.appendChild(this.icon_);
-
-                        const label = document.createElement("label");
-                        this.newTabNameSpan_ = document.createElement("span");
-                        this.newTabNameSpan_.classList.add("shaka-current-time");
-                        this.newTabNameSpan_.innerText = "Skip segment";
-                        label.appendChild(this.newTabNameSpan_);
-
-                        this.button_.appendChild(label);
-                        this.parent.appendChild(this.button_);
-
-                        this.eventManager.listen(this.button_, "click", () => {
-                            videoPlayerComponent.skipSegment(videoEl);
-                        });
-
-                        videoEl.addEventListener("segmentupdate", e => {
-                            const inSegment = e.detail.inSegment;
-                            if (inSegment) this.button_.classList.remove("shaka-hidden");
-                            else this.button_.classList.add("shaka-hidden");
-                        });
-                    }
-                };
-
-                SkipSegmentButton.Factory = class {
-                    create(rootElement, controls) {
-                        return new SkipSegmentButton(rootElement, controls);
-                    }
-                };
-
-                shaka.ui.Controls.registerElement("skip_segment", new SkipSegmentButton.Factory());
-
                 this.$ui = new shaka.ui.Overlay(localPlayer, this.$refs.container, videoEl);
 
                 const overflowMenuButtons = [
@@ -519,17 +482,6 @@ export default {
                 }
 
                 const config = {
-                    controlPanelElements: [
-                        "play_pause",
-                        "time_and_duration",
-                        "spacer",
-                        "skip_segment",
-                        "spacer",
-                        "mute",
-                        "volume",
-                        "fullscreen",
-                        "overflow_menu",
-                    ],
                     overflowMenuButtons: overflowMenuButtons,
                     seekBarColors: {
                         base: "rgba(255, 255, 255, 0.3)",
@@ -796,4 +748,34 @@ export default {
     background-color: rgba(0, 0, 0, 0.6) !important;
     padding: 0.09em 0;
 }
+
+.skip-segment-button {
+    /* position button above player overlay */
+    z-index: 1000;
+
+    position: absolute;
+    transform: translate(0, -50%);
+    top: 50%;
+    right: 0;
+
+    background-color: rgb(0 0 0 / 0.5);
+    border: 2px rgba(255, 255, 255, 0.75) solid;
+    border-right: 0;
+    border-radius: 0.75em;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    padding: 0.5em;
+
+    /* center text vertically */
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    line-height: 1.5em;
+}
+
+.skip-segment-button .material-icons-round {
+    font-size: 1.6em !important;
+    line-height: inherit !important;
+}
 </style>
diff --git a/src/locales/en.json b/src/locales/en.json
index 62351e3e..99edcf41 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -43,6 +43,7 @@
         "skip_filler_tangent": "Skip Filler Tangent",
         "show_markers": "Show Markers on Player",
         "min_segment_length": "Minimum Segment Length (in seconds)",
+        "skip_segment": "Skip Segment",
         "theme": "Theme",
         "auto": "Auto",
         "dark": "Dark",