A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: scroll to current lyric when enabling lyrics viewer while playing
aminnausin6494265b2210
diff --git a/resources/js/components/video/VideoLyrics.vue b/resources/js/components/video/VideoLyrics.vueindex 1b630e03..e6d8a237 100644--- a/resources/js/components/video/VideoLyrics.vue+++ b/resources/js/components/video/VideoLyrics.vue@@ -85,7 +85,15 @@ function findCurrentLyric(lyrics: LyricItem[], currentTime: number, asPercentagereturn resultIndex;}-const handleUpdate = () => {+const scrollToCurrent = () => {+ handleUpdate(true);+};++const handleUpdateEvent = () => {+ handleUpdate();+};++const handleUpdate = async (scrollOverride: boolean = false) => {/*** Find index ...* Find Lyric ...@@ -114,7 +122,7 @@ const handleUpdate = () => {const target = document.getElementById(`lyric-${current.time}`);if (!target) return;- if (props.isPaused || (isContainerVisible.value && isActiveLyricVisible.value)) {+ if (props.isPaused || scrollOverride || (isContainerVisible.value && isActiveLyricVisible.value)) {target.scrollIntoView({ behavior: 'smooth', block: 'center' });}@@ -203,28 +211,29 @@ onMounted(() => {onUnmounted(() => {if (props.player) {- props.player.removeEventListener('timeupdate', handleUpdate);+ props.player.removeEventListener('timeupdate', handleUpdateEvent);}lyricObserver.value?.disconnect();if (unsubscribe) unsubscribe();});+watch(() => stateVideo.value, resetComponent);watch(() => props.isPaused, handleUpdate);watch(() => props.player,(newPlayer, oldPlayer) => {if (oldPlayer) {- oldPlayer.removeEventListener('timeupdate', handleUpdate);+ oldPlayer.removeEventListener('timeupdate', handleUpdateEvent);}if (newPlayer) {- newPlayer.addEventListener('timeupdate', handleUpdate);+ newPlayer.addEventListener('timeupdate', handleUpdateEvent);}},{ immediate: true },);-watch(() => stateVideo.value, resetComponent);+defineExpose({ scrollToCurrent });</script><template><section class="fade-mask scrollbar-hide flex h-full w-full flex-col overflow-y-scroll text-center text-sm sm:text-xl" ref="lyrics-container" v-show="lyrics.length > 0">diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex 450049a8..55f3e033 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -103,8 +103,6 @@ const { contextMenuItems, contextMenuStyle, contextMenuItemStyle, playbackHeatmaconst { createRecord, updateViewCount } = useContentStore();const { setContextMenu } = useAppStore();-const playerContextMenu = useTemplateRef('contextMenu');-const { userData } = storeToRefs(useAuthStore());const { stateVideo, stateFolder, nextVideoURL, previousVideoURL } = storeToRefs(useContentStore()) as unknown as {stateVideo: Ref<VideoResource>;@@ -214,10 +212,15 @@ const keyBinds = computed(() => {// Elementsconst player = useTemplateRef('player');-const popover = useTemplateRef('popover');-const container = useTemplateRef('video-container');-const timeline = useTemplateRef('video-timeline');-const progressTooltip = timeline.value?.progressTooltip;+const popover = useTemplateRef('player-popover');+const container = useTemplateRef('player-container');+const timeline = useTemplateRef('player-timeline');++const playerContextMenu = useTemplateRef('contextMenu');+const playerLyrics = useTemplateRef('playerLyrics');++const progressTooltip = computed(() => timeline.value?.progressTooltip);+// const url = ref('');const playerContextMenuItems = computed(() => {@@ -781,7 +784,7 @@ function handleControlsTimeout() {isShowingControls.value = false;popover.value?.handleClose();- progressTooltip?.tooltipToggle(false);+ progressTooltip.value?.tooltipToggle(false);}const debouncedEndTime = debounce(getEndTime, 100);@@ -1038,7 +1041,7 @@ defineExpose({<template><div:class="[`relative overflow-clip rounded-sm`, { 'rounded-xl': !isFullScreen }]"- ref="video-container"+ ref="player-container"id="video-container"@mousemove="playerMouseActivity"@touchmove="playerMouseActivity"@@ -1138,7 +1141,7 @@ defineExpose({><!-- Heatmap and Timeline --><VideoTimeline- ref="video-timeline"+ ref="player-timeline":buffer-percentage="bufferPercentage":time-duration="timeDuration":time-elapsed-verbose="timeStrings.timeElapsedVerbose"@@ -1275,7 +1278,7 @@ defineExpose({</VideoButton><VideoPopoverpopoverClass="max-w-40! rounded-lg h-32 md:h-fit right-0!"- ref="popover"+ ref="player-popover":margin="80":player="player ?? undefined":button-attributes="{@@ -1350,9 +1353,11 @@ defineExpose({leave-active-class="transition ease-in duration-300"leave-from-class="translate-y-0 opacity-100"leave-to-class="translate-y-full opacity-0"+ @after-enter="playerLyrics?.scrollToCurrent()"><div :class="`absolute top-0 flex h-full w-full opacity-0 transition-all`" style="z-index: 5" v-show="isShowingLyrics"><VideoLyrics+ ref="playerLyrics"v-if="isAudio || stateFolder.is_majority_audio"@seek="handleManualSeek":player="player"@@ -1360,6 +1365,7 @@ defineExpose({:time-duration="timeDuration":is-paused="isPaused":is-fullscreen="isFullScreen"+ :is-enabled="isShowingLyrics"/></div></Transition>