A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: vast improvement to progress bar time and visual accuracy
aminnausin39fbc2a54b24
diff --git a/resources/js/components/video/VideoTimeline.vue b/resources/js/components/video/VideoTimeline.vueindex 66df51cd..0effcf6c 100644--- a/resources/js/components/video/VideoTimeline.vue+++ b/resources/js/components/video/VideoTimeline.vue@@ -5,6 +5,9 @@ import { throttle } from 'lodash';import VideoTooltipSlider from '@/components/video/VideoTooltipSlider.vue';+const sliderStep = 0.01;+const thumbWidth = 8;+const emit = defineEmits<{seek: [];seekPreview: [];@@ -21,22 +24,19 @@ const props = defineProps<{const progressTooltip = useTemplateRef('progress-tooltip');const progressContainer = useTemplateRef('progress-container');const progressBar = useTemplateRef('progress-bar');-const progressThumb = useTemplateRef('progress-thumb');-const timeSeeking = ref('');const containerWidth = ref(0);const timeElapsed = defineModel<number>({ required: true });+const timeSeeking = ref('');const thumbX = computed(() => {if (!progressContainer.value) return 0;const clamped = Math.min(Math.max(timeElapsed.value, 0), 100);- return (clamped / 100) * (containerWidth.value - 8);+ return (clamped / 100) * (containerWidth.value - thumbWidth);});-const thumbWidth = ref(8);-const handleProgressTooltip = throttle((event: MouseEvent) => {getProgressTooltip(event);requestAnimationFrame(() => {@@ -51,32 +51,16 @@ const getProgressTooltip = (event: MouseEvent) => {const rect = progressBar.value.getBoundingClientRect();const offsetX = event.clientX - rect.left;- thumbWidth.value = 8;-- const extendedLeft = thumbWidth.value / 2;- const extendedRight = rect.width - thumbWidth.value / 2;+ const extendedLeft = thumbWidth / 2;+ const extendedRight = rect.width - thumbWidth / 2;const clampedX = Math.min(Math.max(offsetX, extendedLeft), extendedRight);const percent = (clampedX - extendedLeft) / (extendedRight - extendedLeft);- const time = Math.min(Math.max(0, percent * props.timeDuration), props.timeDuration);-- const sliderStep = 0.001;-- // Convert rawPercent to slider value with steps- // const rawValue = sliderMin + percent * (sliderMax - sliderMin);-- const durationStepped = Math.round((percent * props.timeDuration) / sliderStep) * sliderStep;+ const steppedDuration = Math.round((percent * props.timeDuration) / sliderStep) * sliderStep;+ const clampedDuration = Math.min(Math.max(0, steppedDuration), props.timeDuration);- // Round to nearest step- // console.log(rawValue, steppedValue, percent, percent * props.timeDuration, Math.round(percent / sliderStep) * sliderStep * props.timeDuration);-- const steppedValue = Math.round(percent / sliderStep) * sliderStep;- const clampedValue = Math.min(Math.max(0, steppedValue), 1);- const clampedDuration = Math.min(Math.max(0, durationStepped), props.timeDuration);-- // timeSeeking.value = toFormattedDuration(clampedValue * props.timeDuration, true, 'digital') ?? '00:00';timeSeeking.value = toFormattedDuration(clampedDuration, true, 'digital') ?? '00:00';};@@ -97,9 +81,14 @@ onMounted(() => {});onUnmounted(() => {- if (resizeObserver && progressContainer.value) {+ if (!resizeObserver) return;++ if (progressContainer.value) {resizeObserver.unobserve(progressContainer.value);}++ resizeObserver?.disconnect();+ resizeObserver = null;});defineExpose({ progressTooltip });@@ -119,13 +108,20 @@ defineExpose({ progressTooltip });/><div class="relative group h-2 flex items-center pointer-events-auto min-h-2" ref="progress-container" role="group" aria-label="Video progress slider"><div class="h-1 group-hover:h-2 transition-[height,border-radius] duration-200 ease-in-out w-full rounded-full overflow-clip pointer-events-none bg-white/30">- <div class="h-full w-full buffer" :style="{ '--buffer': bufferPercentage }">+ <div+ class="h-full w-full buffer"+ :style="{+ '--buffer': bufferPercentage,+ }"+ ><div- class="h-full bg-[#111827]"+ :class="`h-full bg-[#111827] progress`":style="{+ '--container-width': containerWidth,+ '--time-elapsed': timeElapsed,+ '--thumb-width': thumbWidth,transformOrigin: 'left center',- transform: `scaleX(${timeElapsed}%)`,- // width: `${timeElapsed}%`,+ transform: `scaleX(calc(var(--scale-x) / 100))`,}"></div></div>@@ -134,7 +130,7 @@ defineExpose({ progressTooltip });<divclass="absolute top-0.5 group-hover:top-0 transition-[top] duration-200 ease-in-out pointer-events-none z-10":style="{- '--thumb-offset': `${(Math.min(Math.max(timeElapsed, 0), 100) / 100) * 4}px`,+ '--thumb-offset': `${(Math.min(Math.max(timeElapsed, 0), 100) / 100) * (thumbWidth / 2)}px`,transform: `translateX(${thumbX}px)`,}">@@ -165,14 +161,13 @@ defineExpose({ progressTooltip });min="0"max="100"value="0"- step="0.01"+ :step="sliderStep":aria-valuemin="0":aria-valuemax="timeDuration":aria-valuenow="`${timeElapsed as number}`":aria-valuetext="timeElapsedVerbose":class="[`peer absolute left-0 top-0 w-full !h-2 flex items-center slider pointer-events-auto focus:outline-none`]":style="{- // '--buffer': bufferPercentage,'--thumb-color': 'ffffff00','--track-color': 'ffffff00','--progress-color': 'ffffff00',@@ -180,20 +175,16 @@ defineExpose({ progressTooltip });/></div><slot> </slot>- {{ thumbWidth }}- {{ progressBar?.value }}- {{ thumbX }}</section></template><style lang="css" scoped>.thumb {- /* --thumb-offset: 0px; */transform: translateX(var(--thumb-offset));}.group:hover .thumb {- --thumb-offset: -0px;+ --thumb-offset: 0px;}.video-timeline {@@ -201,6 +192,18 @@ defineExpose({ progressTooltip });left: -4px;}+.progress {+ --thumb-width: 8;+ --thumb-offset: calc(var(--thumb-width) / 2);+ --container-width: 0;+ --time-elapsed: 0;+ --scale-x: calc((var(--thumb-offset) / 2 / var(--container-width)) * 100 + var(--time-elapsed) * (1 - var(--thumb-offset) / var(--container-width)));+}++.group:hover .progress {+ --thumb-offset: var(--thumb-width);+}+.buffer {--buffer-color: rgba(255, 255, 255, 0.3);--buffer: 0;