Fix player button hiding (#8065)

Author: absidue

src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js

@@ -25,6 +25,7 @@ import {
   showToast,
   writeFileWithPicker,
   throttle,
+  removeFromArrayIfExists,
 } from '../../helpers/utils'
 
 /** @typedef {import('../../helpers/sponsorblock').SponsorBlockCategory} SponsorBlockCategory */
@@ -851,39 +852,28 @@ export default defineComponent({
       }
 
       if (!enableScreenshot.value || props.format === 'audio') {
-        const index = elementList.indexOf('ft_screenshot')
-        elementList.splice(index, 1)
+        removeFromArrayIfExists(elementList, 'ft_screenshot')
       }
 
       if (!props.theatrePossible) {
-        const index = elementList.indexOf('ft_theatre_mode')
-        // doesn't exist in overflow menu, as theatre mode only works on wide screens
-        if (index !== -1) {
-          elementList.splice(index, 1)
-        }
+        removeFromArrayIfExists(uiConfig.controlPanelElements, 'ft_theatre_mode')
       }
 
       if (!props.autoplayPossible) {
-        const index = elementList.indexOf('ft_autoplay_toggle')
-        elementList.splice(index, 1)
+        removeFromArrayIfExists(elementList, 'ft_autoplay_toggle')
       }
 
       if (props.format === 'audio') {
-        const index = elementList.indexOf('picture_in_picture')
-        elementList.splice(index, 1)
+        removeFromArrayIfExists(elementList, 'picture_in_picture')
       }
 
       if (isLive.value) {
-        const index = elementList.indexOf('loop')
-        elementList.splice(index, 1)
+        removeFromArrayIfExists(uiConfig.overflowMenuButtons, 'loop')
       }
 
       if (!useVrMode.value) {
-        const indexRecenterVr = uiConfig.overflowMenuButtons.indexOf('recenter_vr')
-        uiConfig.overflowMenuButtons.splice(indexRecenterVr, 1)
-
-        const indexToggleStereoscopic = uiConfig.overflowMenuButtons.indexOf('toggle_stereoscopic')
-        uiConfig.overflowMenuButtons.splice(indexToggleStereoscopic, 1)
+        removeFromArrayIfExists(uiConfig.overflowMenuButtons, 'recenter_vr')
+        removeFromArrayIfExists(uiConfig.overflowMenuButtons, 'toggle_stereoscopic')
       }
 
       return uiConfig

src/renderer/helpers/utils.js

@@ -831,6 +831,19 @@ export function randomArrayItem(array) {
   return array[Math.floor(Math.random() * array.length)]
 }
 
+/**
+ * @template T
+ * @param {T[]} array
+ * @param {T} entry
+ */
+export function removeFromArrayIfExists(array, entry) {
+  const index = array.indexOf(entry)
+
+  if (index !== -1) {
+    array.splice(index, 1)
+  }
+}
+
 /**
  * @param {string} text
  */

src/renderer/views/Channel/Channel.vue

@@ -290,7 +290,8 @@ import {
   extractNumberFromString,
   showToast,
   getChannelPlaylistId,
-  getIconForSortPreference
+  getIconForSortPreference,
+  removeFromArrayIfExists
 } from '../../helpers/utils'
 import { isNullOrEmpty } from '../../helpers/strings'
 import {
@@ -472,19 +473,6 @@ const hideChannelCommunity = computed(() => store.getters.getHideChannelCommunit
 /** @type {import('vue').ComputedRef<boolean>} */
 const hideWatchedSubs = computed(() => store.getters.getHideWatchedSubs)
 
-/**
- * @template T
- * @param {T[]} array
- * @param {T} entry
- */
-function removeFromArrayIfExists(array, entry) {
-  const index = array.indexOf(entry)
-
-  if (index !== -1) {
-    array.splice(index, 1)
-  }
-}
-
 const tabInfoValues = computed(() => {
   const values = [...channelTabs.value]