Skip to content

A self-hosted media server and file management system

fix: eslint and tooltip animations on video player and progress bar

aminnausin9f2d70715456
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index 1c5d926c..ade5fcb7 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -17,12 +17,13 @@ import { useRouter } from 'vue-router';
import { toast } from '@/service/toaster/toastService';
import VideoPopoverSlider from '@/components/video/VideoPopoverSlider.vue';
+import VideoTooltipSlider from '@/components/video/VideoTooltipSlider.vue';
import VideoPopoverItem from '@/components/video/VideoPopoverItem.vue';
import VideoPartyPanel from '@/components/video/VideoPartyPanel.vue';
import ButtonCorner from '@/components/inputs/ButtonCorner.vue';
import VideoHeatmap from '@/components/video/VideoHeatmap.vue';
import VideoPopover from '@/components/video/VideoPopover.vue';
-import VideoTooltip from '@/components/video/VideoTooltip.vue';
+
import VideoButton from '@/components/video/VideoButton.vue';
import VideoSlider from '@/components/video/VideoSlider.vue';
import VideoLyrics from '@/components/video/VideoLyrics.vue';
@@ -127,8 +128,8 @@ const videoButtonOffset = computed(() => {
return 8 + (isFullScreen.value ? 8 : 0);
});
const timeStrings = computed(() => {
- let timeElapsedVerbose = toFormattedDuration((timeElapsed.value / 100) * timeDuration.value, false, 'verbose') ?? 'Unknown';
- let timeDurationVerbose = toFormattedDuration(timeDuration.value, false, 'verbose') ?? 'Unknown';
+ const timeElapsedVerbose = toFormattedDuration((timeElapsed.value / 100) * timeDuration.value, false, 'verbose') ?? 'Unknown';
+ const timeDurationVerbose = toFormattedDuration(timeDuration.value, false, 'verbose') ?? 'Unknown';
return {
timeElapsed: toFormattedDuration((timeElapsed.value / 100) * timeDuration.value, true, 'digital') ?? '00:00',
timeDuration: toFormattedDuration(timeDuration.value, true, 'digital') ?? '00:00',
@@ -176,7 +177,7 @@ const player = useTemplateRef('player');
// const url = ref('');
const contextMenuItems = computed(() => {
- let items: ContextMenuItem[] = [
+ const items: ContextMenuItem[] = [
{
text: 'Loop',
icon: isLooping.value ? ProiconsCheckmark : undefined,
@@ -204,7 +205,7 @@ const contextMenuItems = computed(() => {
});
const videoPopoverItems = computed(() => {
- let items: PopoverItem[] = [
+ const items: PopoverItem[] = [
{
text: 'Ambient Mode',
title: 'Toggle Ambient Mode',
@@ -304,7 +305,7 @@ const audioPoster = computed(() => {
const initVideoPlayer = async () => {
if (stateVideo.value.id === currentId.value) return;
- let root = document.getElementById('root');
+ const root = document.getElementById('root');
isLooping.value = false;
isPictureInPicture.value = false;
@@ -345,7 +346,7 @@ const handleInitMediaSession = () => {
const studioName = stateFolder.value?.series?.studio;
const folderName = stateFolder.value.series?.title ?? stateFolder.value.name;
- const artist = (studioName ? `${studioName} · ${folderName}` : null) || (isAudio ? folderName : null);
+ const artist = (studioName ? `${studioName} · ${folderName}` : null) || (isAudio.value ? folderName : null);
const newMediaSession = new MediaMetadata({
title: stateVideo.value.metadata?.title || stateVideo.value.name,
@@ -368,7 +369,7 @@ const handleInitMediaSession = () => {
const handleProgress = (override = false) => {
if (!player.value || !stateVideo.value.metadata?.id) return;
- let progress = player.value.currentTime / player.value.duration;
+ const progress = player.value.currentTime / player.value.duration;
if (isNaN(progress) || !progress) return;
@@ -743,7 +744,7 @@ function getEndTime() {
function getPlayerInfo() {
if (!player.value) return;
- let playbackQuality = player.value.getVideoPlaybackQuality();
+ const playbackQuality = player.value.getVideoPlaybackQuality();
bufferHealth.value = toFormattedDuration(player.value.buffered.length, false) ?? '0s';
frameHealth.value = `${playbackQuality.droppedVideoFrames} / ${playbackQuality.totalVideoFrames}`;
}
@@ -1067,10 +1068,10 @@ defineExpose({
>
<!-- Heatmap and Timeline -->
<section class="flex-1 w-full rounded-full flex flex-col-reverse px-2 h-8 relative">
- <VideoTooltip
+ <VideoTooltipSlider
ref="progress-tooltip"
tooltip-position="top"
- class="-top-6 left-0"
+ class="-top-4 left-0"
:tooltip-text="timeSeeking"
:target-element="progressBar ?? undefined"
:offset="videoButtonOffset"
diff --git a/resources/js/components/video/VideoTooltip.vue b/resources/js/components/video/VideoTooltipSlider.vue
similarity index 86%
rename from resources/js/components/video/VideoTooltip.vue
rename to resources/js/components/video/VideoTooltipSlider.vue
index f740992f..6e031dfa 100644
--- a/resources/js/components/video/VideoTooltip.vue
+++ b/resources/js/components/video/VideoTooltipSlider.vue
@@ -96,16 +96,14 @@ defineExpose({ calculateTooltipPosition, tooltipToggle, tooltipVisible });
</script>
<template>
- <Transition
- enter-active-class="ease-out duration-150"
- enter-from-class="scale-[0.8] opacity-60"
- enter-to-class="scale-100 opacity-100"
- leave-active-class="ease-in-out duration-100"
- leave-from-class="scale-100 opacity-100"
- leave-to-class="scale-[0.1] opacity-50"
+ <div
+ ref="tooltip"
+ style="z-index: 9"
+ v-cloak
+ :class="['absolute flex items-center justify-center transition-opacity ease-out duration-300', tooltipVisible ? 'opacity-100' : 'ease-in-out opacity-0', style]"
>
- <div ref="tooltip" style="z-index: 9" :class="`absolute ${tooltipVisible ? '' : 'invisible'} ${style ? ' ' + style : ''}`" v-cloak>
- <slot name="content">
+ <slot name="content">
+ <div :class="`w-full h-full transition-transform pointer-events-none ${tooltipVisible ? 'scale-100' : 'duration-150 ease-in-out scale-0'}`">
<p
class="flex-shrink-0 text-xs whitespace-nowrap min-h-4 py-1 px-2 bg-opacity-90 bg-neutral-800 backdrop-blur-sm rounded-md shadow-sm flex items-center justify-center font-mono"
>
@@ -118,7 +116,7 @@ defineExpose({ calculateTooltipPosition, tooltipToggle, tooltipVisible });
>
<div class="origin-top-left -rotate-45 w-1.5 h-1.5 transform bg-neutral-800 bg-opacity-90"></div>
</div>
- </slot>
- </div>
- </Transition>
+ </div>
+ </slot>
+ </div>
</template>