A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: context menu and hovercard use window.scrolly but I use body as the scroll container
aminnausin3d06e0138e10
diff --git a/resources/js/App.vue b/resources/js/App.vueindex 0fbd3c83..f9ee336d 100755--- a/resources/js/App.vue+++ b/resources/js/App.vue@@ -38,5 +38,11 @@ watch(isPlaylist, setIsPlaylist, { immediate: false });<ToastController v-if="toastPosition" :position="toastPosition" /><RouterView /><GlobalModal />- <ContextMenu ref="contextMenu" :items="contextMenuItems" :style="contextMenuStyle" :itemStyle="contextMenuItemStyle ?? 'hover:bg-purple-600 hover:text-white'" />+ <ContextMenu+ ref="contextMenu"+ :items="contextMenuItems"+ :style="contextMenuStyle"+ :itemStyle="contextMenuItemStyle ?? 'hover:bg-purple-600 hover:text-white'"+ scrollContainer="body"+ /></template>diff --git a/resources/js/components/cards/HoverCard.vue b/resources/js/components/cards/HoverCard.vueindex 5b80453f..cd84bce3 100644--- a/resources/js/components/cards/HoverCard.vue+++ b/resources/js/components/cards/HoverCard.vue@@ -13,12 +13,14 @@ const props = withDefaults(margin?: number;iconHidden?: boolean;paddingLeft?: number;+ scrollContainer?: 'body' | 'window';}>(),{hoverCardDelay: 600,hoverCardLeaveDelay: 500,margin: 0,paddingLeft: 0,+ scrollContainer: 'body',},);@@ -59,7 +61,10 @@ const hoverCardLeave = () => {const updateTooltipPosition = (event: MouseEvent) => {const rect = (event.target as HTMLElement).getBoundingClientRect();- tooltipStyles.value = { left: `${rect.left + window.scrollX + props.paddingLeft}px`, top: `${rect.bottom + props.margin + window.scrollY}px` };+ const scrollY = props.scrollContainer === 'body' ? document.body.scrollTop : window.scrollY;+ const scrollX = props.scrollContainer === 'body' ? document.body.scrollLeft : window.scrollX;++ tooltipStyles.value = { left: `${rect.left + scrollX + props.paddingLeft}px`, top: `${rect.bottom + props.margin + scrollY}px` };};watch(diff --git a/resources/js/components/pinesUI/ContextMenu.vue b/resources/js/components/pinesUI/ContextMenu.vueindex 97f2277e..abdb140d 100644--- a/resources/js/components/pinesUI/ContextMenu.vue+++ b/resources/js/components/pinesUI/ContextMenu.vue@@ -46,13 +46,16 @@ const contextMenuToggle = async (event: any, override: boolean = true) => {function calculateContextMenuPosition(clickEvent: MouseEvent) {if (!contextMenu.value) return;+ const scrollY = props.scrollContainer === 'body' ? document.body.scrollTop : window.scrollY;+ const scrollX = props.scrollContainer === 'body' ? document.body.scrollLeft : window.scrollX;+if (window.innerHeight < clickEvent.clientY + contextMenu.value?.$el.offsetHeight) {- contextMenu.value.$el.style.top = window.innerHeight - contextMenu.value?.$el.offsetHeight + window.scrollY + 'px';+ contextMenu.value.$el.style.top = window.innerHeight - contextMenu.value?.$el.offsetHeight + scrollY + 'px';} else {- contextMenu.value.$el.style.top = clickEvent.clientY + window.scrollY + 'px';+ contextMenu.value.$el.style.top = clickEvent.clientY + scrollY + 'px';}if (window.innerWidth < clickEvent.clientX + contextMenu.value?.$el.offsetWidth) {- contextMenu.value.$el.style.left = clickEvent.clientX - contextMenu.value?.$el.offsetWidth + window.scrollX + 'px';+ contextMenu.value.$el.style.left = clickEvent.clientX - contextMenu.value?.$el.offsetWidth + scrollX + 'px';} else {contextMenu.value.$el.style.left = clickEvent.clientX + 'px';}diff --git a/resources/js/components/pinesUI/HoverCard.vue b/resources/js/components/pinesUI/HoverCard.vuedeleted file mode 100644index dd40a528..00000000--- a/resources/js/components/pinesUI/HoverCard.vue+++ /dev/null@@ -1,83 +0,0 @@-<script setup lang="ts">-import { reactive } from 'vue';--const data = reactive<{- hoverCardHovered: boolean;- hoverCardDelay: number;- hoverCardLeaveDelay: number;- hoverCardTimout: number | null;- hoverCardLeaveTimeout: number | null;- tooltipStyles: Record<string, string>;-}>({- hoverCardHovered: false,- hoverCardDelay: 600,- hoverCardLeaveDelay: 500,- hoverCardTimout: null,- hoverCardLeaveTimeout: null,- tooltipStyles: {},-});--const hoverCardEnter = (event: MouseEvent) => {- if (data.hoverCardLeaveTimeout) clearTimeout(data.hoverCardLeaveTimeout);-- if (data.hoverCardHovered) return;-- if (data.hoverCardTimout) clearTimeout(data.hoverCardTimout);-- data.hoverCardTimout = window.setTimeout(() => {- data.hoverCardHovered = true;- updateTooltipPosition(event);- }, data.hoverCardDelay);-};--const hoverCardLeave = () => {- if (data.hoverCardTimout) clearTimeout(data.hoverCardTimout);- if (!data.hoverCardHovered) return;- if (data.hoverCardLeaveTimeout) clearTimeout(data.hoverCardLeaveTimeout);- data.hoverCardLeaveTimeout = window.setTimeout(() => {- data.hoverCardHovered = false;- }, data.hoverCardLeaveDelay);-};--const updateTooltipPosition = (event: MouseEvent) => {- const rect = (event.target as HTMLElement).getBoundingClientRect();- data.tooltipStyles = { left: `${rect.left + window.scrollX}px`, top: `${rect.bottom + window.scrollY}px` };-};-</script>--<template>- <div class="relative" @mouseover="hoverCardEnter" @mouseleave="hoverCardLeave">- <slot name="trigger">- <a href="#_" class="hover:underline">@thedevdojo</a>- </slot>-- <Teleport to="body">- <Transition enter-from-class="opacity-0" enter-to-class="opacity-100" leave-from-class="opacity-100" leave-to-class="opacity-0">- <div- v-show="data.hoverCardHovered"- :style="data.tooltipStyles"- :class="`absolute w-[365px] max-w-[100vw] max-h-[50vh] overflow-y-auto scrollbar-minimal md:max-w-lg z-30 transition-all duration-300 ease-in-out -translate-x-1/2 translate-y-3 left-1/2 h-auto bg-white space-x-3 p-5 flex items-start rounded-md shadow-sm border border-neutral-200/70`"- v-cloak- >- <slot name="content">- <img src="https://cdn.devdojo.com/users/June2022/devdojo.jpg" alt="devdojo logo" class="rounded-full w-14 h-14" />- <div class="relative">- <p class="mb-1 font-bold">@thedevdojo</p>- <p class="mb-1 text-sm text-gray-600">The creative platform for developers. Community, tools, products, and more</p>- <p class="flex items-center space-x-1 text-xs text-gray-400">- <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">- <path- stroke-linecap="round"- stroke-linejoin="round"- d="M6.75 3v2.25M17.25 3v2.25M3 18.75V7.5a2.25 2.25 0 012.25-2.25h13.5A2.25 2.25 0 0121 7.5v11.25m-18 0A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75m-18 0v-7.5A2.25 2.25 0 015.25 9h13.5A2.25 2.25 0 0121 11.25v7.5m-9-6h.008v.008H12v-.008zM12 15h.008v.008H12V15zm0 2.25h.008v.008H12v-.008zM9.75 15h.008v.008H9.75V15zm0 2.25h.008v.008H9.75v-.008zM7.5 15h.008v.008H7.5V15zm0 2.25h.008v.008H7.5v-.008zm6.75-4.5h.008v.008h-.008v-.008zm0 2.25h.008v.008h-.008V15zm0 2.25h.008v.008h-.008v-.008zm2.25-4.5h.008v.008H16.5v-.008zm0 2.25h.008v.008H16.5V15z"- />- </svg>- <span>Joined June 2020</span>- </p>- </div>- </slot>- </div>- </Transition>- </Teleport>- </div>-</template>diff --git a/resources/js/types/types.ts b/resources/js/types/types.tsindex 1e53fc4c..af2adda8 100644--- a/resources/js/types/types.ts+++ b/resources/js/types/types.ts@@ -67,6 +67,7 @@ export interface ContextMenu {style?: string;itemStyle?: string;items?: ContextMenuItem[];+ scrollContainer?: 'window' | 'body';}export interface PopoverItem {diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.phpindex 5c014175..66e269c3 100755--- a/resources/views/layouts/app.blade.php+++ b/resources/views/layouts/app.blade.php@@ -71,7 +71,7 @@</style></head>-<body class="h-dynamic-screen overflow-y-auto bg-primary-900 dark:bg-primary-dark-900 sm:bg-primary-950 sm:dark:bg-primary-dark-950 dark:text-white text-gray-900 antialiased dark:[color-scheme:dark] scrollbar-minimal scrollbar-track:bg-neutral-300 scrollbar-track:dark:bg-neutral-800" id="root"> <!-- dark:bg-[#121216] dark:text-[#e2e0e2] text-gray-900 -->+<body class="relative h-dynamic-screen overflow-y-auto bg-primary-900 dark:bg-primary-dark-900 sm:bg-primary-950 sm:dark:bg-primary-dark-950 dark:text-white text-gray-900 antialiased dark:[color-scheme:dark] scrollbar-minimal scrollbar-track:bg-neutral-300 scrollbar-track:dark:bg-neutral-800" id="root"> <!-- dark:bg-[#121216] dark:text-[#e2e0e2] text-gray-900 --><divid="reverb-config"data-reverb-config='@json(["key" => config("reverb.apps.apps.0.key"), "host" => config("reverb.apps.apps.0.options.host"), "port" => config("reverb.apps.apps.0.options.port")])'>