A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: Full Screen Context Menu Fixes #177 and Toast Messages don't work in fullscreen Fixes #178
aminnausin2d3e829507a0
diff --git a/resources/js/App.vue b/resources/js/App.vueindex ad99c35a..6fc8b537 100755--- a/resources/js/App.vue+++ b/resources/js/App.vue@@ -2,6 +2,7 @@import type { ToastPostion } from '@/types/pinesTypes';import { onMounted, onUnmounted, ref, watch } from 'vue';+import { useFullscreen } from '@/composables/useFullscreen';import { getScreenSize } from '@/service/util';import { useAuthStore } from '@/stores/AuthStore';import { storeToRefs } from 'pinia';@@ -16,6 +17,7 @@ const toastPosition = ref<ToastPostion>();const { toggleDarkMode, initDarkMode, initAmbientMode, initPlaybackHeatmap, initIsPlaylist, setAmbientMode, setPlaybackHeatmap, setIsPlaylist } = useAppStore();const { lightMode, ambientMode, playbackHeatmap, contextMenuItems, contextMenuStyle, contextMenuItemStyle, isPlaylist } = storeToRefs(useAppStore());+const { isFullscreen } = useFullscreen();async function loadUser() {const authStore = useAuthStore();@@ -45,10 +47,11 @@ watch(isPlaylist, setIsPlaylist, { immediate: false });</script><template>- <ToastController v-if="toastPosition" :position="toastPosition" /><RouterView /><GlobalModal />+ <ToastController v-if="toastPosition && !isFullscreen" :position="toastPosition" /><ContextMenu+ v-if="!isFullscreen"ref="contextMenu":items="contextMenuItems":style="contextMenuStyle"diff --git a/resources/js/components/video/VideoAmbientPlayer.vue b/resources/js/components/video/VideoAmbientPlayer.vueindex 0eb26109..868bfbdc 100755--- a/resources/js/components/video/VideoAmbientPlayer.vue+++ b/resources/js/components/video/VideoAmbientPlayer.vue@@ -244,7 +244,6 @@ watch(</Transition><VideoPlayerref="video-player"- class="w-full"@seeked="() => {if (player?.paused) preloadDraw();diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex af4343a2..2a8eea44 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -21,6 +21,7 @@ import { toast } from '@/service/toaster/toastService';import VideoPopoverSlider from '@/components/video/VideoPopoverSlider.vue';import VideoPopoverItem from '@/components/video/VideoPopoverItem.vue';+import ToastController from '@/components/pinesUI/ToastController.vue';import VideoPartyPanel from '@/components/video/VideoPartyPanel.vue';import VideoTimeline from '@/components/video/VideoTimeline.vue';import ButtonCorner from '@/components/inputs/ButtonCorner.vue';@@ -29,6 +30,7 @@ import VideoPopover from '@/components/video/VideoPopover.vue';import VideoButton from '@/components/video/VideoButton.vue';import VideoSlider from '@/components/video/VideoSlider.vue';import VideoLyrics from '@/components/video/VideoLyrics.vue';+import ContextMenu from '@/components/pinesUI/ContextMenu.vue';import ProiconsPictureInPictureEnter from '~icons/proicons/picture-in-picture-enter';import ProiconsFullScreenMaximize from '~icons/proicons/full-screen-maximize';@@ -72,9 +74,12 @@ let unSub: () => boolean; // Unsub from seek busconst emit = defineEmits(['loadedData', 'seeked', 'play', 'pause', 'ended', 'loadedMetadata']);// Global State-const { playbackHeatmap, ambientMode, lightMode, isAutoPlay, isPlaylist } = storeToRefs(useAppStore());+const { contextMenuItems, contextMenuStyle, contextMenuItemStyle, playbackHeatmap, ambientMode, lightMode, isAutoPlay, isPlaylist } = storeToRefs(useAppStore());const { createRecord, updateViewCount } = useContentStore();const { setContextMenu } = useAppStore();++const contextM = useTemplateRef('contextMenu');+const { userData } = storeToRefs(useAuthStore());const { stateVideo, stateFolder, nextVideoURL, previousVideoURL } = storeToRefs(useContentStore()) as unknown as {stateVideo: Ref<VideoResource>;@@ -188,7 +193,7 @@ const timeline = useTemplateRef('video-timeline');const progressTooltip = timeline.value?.progressTooltip;// const url = ref('');-const contextMenuItems = computed(() => {+const playerContextMenuItems = computed(() => {const items: ContextMenuItem[] = [{text: 'Loop',@@ -644,10 +649,9 @@ const handleLyrics = () => {const handleFullScreen = async () => {if (!container.value) return;-try {if (!isFullScreen.value || document.fullscreenElement === null) {- await container.value?.requestFullscreen();+ await container.value.requestFullscreen();isFullScreen.value = true;document.documentElement.classList.add('fullscreen');} else {@@ -988,14 +992,16 @@ defineExpose({<div:class="[`relative overflow-clip rounded`, { 'rounded-xl': !isFullScreen }]"ref="video-container"+ id="video-container"@mousemove="playerMouseActivity"@touchmove="playerMouseActivity"@contextmenu="(e: any) => {- if (isFullScreen) return;+ // if (isFullScreen) return;// This does not work in fullscreen because the video container requests fullscreen but the context menu is higher in the document tree.// TODO: change the video page to be widescreen like on youtube when fullscreen- setContextMenu(e, { items: contextMenuItems, style: 'w-32', itemStyle: 'text-xs' });+ setContextMenu(e, { items: playerContextMenuItems, style: 'w-32', itemStyle: 'text-xs' });+ contextM?.contextMenuToggle(e, true);}">@@ -1458,6 +1464,17 @@ defineExpose({class="absolute left-0 top-0 flex h-full w-full cursor-pointer items-center justify-center blur":style="`background: transparent url('${audioPoster}') 50% 50% / cover no-repeat;`"></div>+ <div class="absolute left-0 top-0 h-full w-full" v-show="isFullScreen">+ <ToastController :teleport-disabled="true" :position="'bottom-left'" />+ <ContextMenu+ ref="contextMenu"+ :items="contextMenuItems"+ :style="contextMenuStyle"+ :itemStyle="contextMenuItemStyle ?? 'hover:bg-purple-600 hover:text-white'"+ scrollContainer="window"+ teleport-disabled+ />+ </div></div></template>diff --git a/resources/js/composables/useFullscreen.ts b/resources/js/composables/useFullscreen.tsnew file mode 100644index 00000000..ee24f231--- /dev/null+++ b/resources/js/composables/useFullscreen.ts@@ -0,0 +1,11 @@+import { onMounted, onUnmounted, ref } from 'vue';++export function useFullscreen() {+ const isFullscreen = ref(!!document.fullscreenElement);++ const update = () => (isFullscreen.value = !!document.fullscreenElement);+ onMounted(() => document.addEventListener('fullscreenchange', update));+ onUnmounted(() => document.removeEventListener('fullscreenchange', update));++ return { isFullscreen };+}