A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: stuck video player tooltips
aminnausinf98c5ebc2f3b
diff --git a/resources/js/components/video/VideoTimeline.vue b/resources/js/components/video/VideoTimeline.vueindex 22d9577e..0c29bc72 100644--- a/resources/js/components/video/VideoTimeline.vue+++ b/resources/js/components/video/VideoTimeline.vue@@ -1,6 +1,6 @@<script setup lang="ts">import { computed, onMounted, onUnmounted, ref, useTemplateRef } from 'vue';-import { getScreenSize, toFormattedDuration } from '@/service/util';+import { getClientX, getScreenSize, toFormattedDuration } from '@/service/util';import { throttle } from 'lodash';import VideoTooltipSlider from '@/components/video/VideoTooltipSlider.vue';@@ -47,19 +47,30 @@ const handleKeydown = (event: KeyboardEvent) => {emit('keyBind', event, !allowedKeys.includes(event.key));};-const handleProgressTooltip = throttle((event: MouseEvent) => {- getProgressTooltip(event);+function showTooltip(event: MouseEvent | TouchEvent) {+ if (!progressTooltip.value) return;+ progressTooltip.value.tooltipToggle(true);+ if ('touches' in event) handleProgressTooltip(event);+}++function hideTooltip() {+ if (!progressTooltip.value) return;+ progressTooltip.value.tooltipToggle(false);+}++const handleProgressTooltip = throttle((event: MouseEvent | TouchEvent) => {+ getProgressTooltip(getClientX(event));requestAnimationFrame(() => {if (!progressTooltip.value) return;progressTooltip.value.calculateTooltipPosition(event);});}, 7);-const getProgressTooltip = (event: MouseEvent) => {+const getProgressTooltip = (clientX: number) => {if (!props.timeDuration || !progressBar.value) return;const rect = progressBar.value.getBoundingClientRect();- const offsetX = event.clientX - rect.left;+ const offsetX = clientX - rect.left;const extendedLeft = thumbWidth / 2;const extendedRight = rect.width - thumbWidth / 2;@@ -118,7 +129,9 @@ defineExpose({ progressTooltip });:tooltip-delay="0"/><div class="group peer pointer-events-auto relative flex h-2 min-h-2 select-none items-center" ref="progress-container" role="group" aria-label="Video progress slider">- <div class="absolute -top-4 h-4 w-full"></div>+ <!-- Padding -->+ <div class="absolute -top-4 h-4 w-full" />+ <!-- Timeline --><div:class="['pointer-events-none w-full overflow-clip rounded-full bg-white/30 transition-[height,border-radius] duration-100 ease-in-out',@@ -167,20 +180,14 @@ defineExpose({ progressTooltip });<input@mousemove="handleProgressTooltip"+ @touchmove="handleProgressTooltip"@pointerdown="emit('seekPreview')"@pointerup="emit('seek')"- @mouseenter="- () => {- if (!progressTooltip) return;- progressTooltip?.tooltipToggle();- }- "- @mouseleave="- () => {- if (!progressTooltip) return;- progressTooltip?.tooltipToggle(false);- }- "+ @mouseenter="showTooltip"+ @mouseleave="hideTooltip"+ @touchstart="showTooltip"+ @touchend="hideTooltip"+ @touchcancel="hideTooltip"@keydown="handleKeydown"ref="progress-bar"placeholder="0"@@ -238,7 +245,11 @@ defineExpose({ progressTooltip });height: 100%;transform-origin: left center;- background: #111827;+ background: #f03;+ /* background-color: #111827; */+ /* background: linear-gradient(to right, #f03 80%, #ff2791 100%); */+ /* background-size: var(--container-width); */+ /* background-position-x: 0px; */}.group:hover .progress {diff --git a/resources/js/components/video/VideoTooltipSlider.vue b/resources/js/components/video/VideoTooltipSlider.vueindex 8ec7815e..1d56f55c 100644--- a/resources/js/components/video/VideoTooltipSlider.vue+++ b/resources/js/components/video/VideoTooltipSlider.vue@@ -1,5 +1,6 @@<script setup lang="ts">import { reactive, ref, useTemplateRef } from 'vue';+import { getClientX } from '@/service/util';const props = withDefaults(defineProps<{@@ -56,14 +57,14 @@ const tooltipLeave = () => {}, props.tooltipLeaveDelay);};-function calculateTooltipPosition(event: MouseEvent) {+function calculateTooltipPosition(event: MouseEvent | TouchEvent) {if (!tooltip.value) return;const target = props.targetElement ?? (event.target as HTMLElement);const rect = target.getBoundingClientRect();const width = tooltip.value.offsetWidth;- let left = Math.max(event.clientX - rect.left - width / 2 + props.offset, props.offset);+ let left = Math.max(getClientX(event) - rect.left - width / 2 + props.offset, props.offset);if (left + width - props.offset > rect.width) {left = rect.width - width + props.offset;diff --git a/resources/js/service/util.ts b/resources/js/service/util.tsindex ccbc63f5..bc28a436 100644--- a/resources/js/service/util.ts+++ b/resources/js/service/util.ts@@ -206,3 +206,7 @@ export function isAxiosError(error: unknown): error is AxiosError {export function toPlural(value: number): string {return value != 1 ? 's' : '';}++export function getClientX(event: TouchEvent | MouseEvent): number {+ return 'touches' in event ? event.touches[0]?.clientX : event.clientX;+}