A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: submenu for context menu
aminnausina842c689e0c7
diff --git a/resources/js/components/cedar-ui/context-menu/ContextMenu.vue b/resources/js/components/cedar-ui/context-menu/ContextMenu.vueindex 9d3a9703..ded3fde4 100644--- a/resources/js/components/cedar-ui/context-menu/ContextMenu.vue+++ b/resources/js/components/cedar-ui/context-menu/ContextMenu.vue@@ -21,69 +21,84 @@ const menuStyles = ref<Record<string, string>>({});const { isOutside } = useMouseInElement(contextMenu);-const contextMenuToggle = async (event: any, override: boolean = true) => {+let lastEvent: MouseEvent | null = null;++const contextMenuToggle = async (event: MouseEvent, override: boolean = true) => {if (!override || props.disabled) {- document.removeEventListener('contextmenu', closeContextMenu);contextMenuOpen.value = false;return;}- if (!contextMenuOpen.value) {- document.addEventListener('contextmenu', closeContextMenu);- contextMenuOpen.value = true;- }-+ // Native context menu only runs if disabledevent.preventDefault();event.stopPropagation();- contextMenu.value?.$el.classList.add('opacity-0');+ // always close first if open, then reopen fresh — matches native explorer behaviour+ if (contextMenuOpen.value) {+ contextMenuOpen.value = false;+ await nextTick();+ }++ if (lastEvent?.clientX === event.clientX && lastEvent?.clientY === event.clientY && lastEvent?.target === event.target) {+ lastEvent = null;+ return;+ }++ contextMenuOpen.value = true;+ lastEvent = event;++ await nextTick();- await nextTick(() => {- calculateContextMenuPosition(event);- calculateSubMenuPosition(event);- contextMenu.value?.$el.classList.remove('opacity-0');- });+ calculateContextMenuPosition(event);+ calculateSubMenuPosition(event);};-function calculateContextMenuPosition(clickEvent: MouseEvent) {- if (!contextMenu.value) return;+function calculateContextMenuPosition(event: MouseEvent) {+ const el = contextMenu.value?.$el as HTMLElement | undefined;+ if (!el) 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 + scrollY + 'px';- } else {- 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 + scrollX + 'px';- } else {- contextMenu.value.$el.style.left = clickEvent.clientX + 'px';- }+ const overflowsBottom = event.clientY + el.offsetHeight > window.innerHeight;+ const overflowsRight = event.clientX + el.offsetWidth > window.innerWidth;++ el.style.top = Math.max(overflowsBottom ? window.innerHeight - el.offsetHeight : event.clientY, 0) + scrollY + 'px';+ el.style.left = Math.max((overflowsRight ? event.clientX - el.offsetWidth : event.clientX) + scrollX, 0) + 'px';}-async function calculateSubMenuPosition(clickEvent: MouseEvent) {+async function calculateSubMenuPosition(event: MouseEvent) {await nextTick();- const submenus: NodeListOf<HTMLElement> = document.querySelectorAll('[data-submenu]');- const contextMenuWidth = contextMenu.value?.$el.offsetWidth;++ const el = contextMenu.value?.$el as HTMLElement | undefined;+ if (!el) return;++ const submenus = document.querySelectorAll<HTMLElement>('[data-submenu]');+ const menuRight = event.clientX + el.offsetWidth;for (const submenu of submenus) {- if (window.innerWidth < clickEvent.clientX + contextMenuWidth + submenu.offsetWidth) {- submenu.classList.add('left-0', '-translate-x-full');- submenu.classList.remove('right-0', 'translate-x-full');- } else {- submenu.classList.remove('left-0', '-translate-x-full');- submenu.classList.add('right-0', 'translate-x-full');- }+ const overflowsRight = menuRight + submenu.offsetWidth > window.innerWidth;+ const overflowsLeft = el.offsetLeft - submenu.offsetWidth < 0;- const previousElementSiblingRect = submenu.previousElementSibling?.getBoundingClientRect();- if (previousElementSiblingRect && window.innerHeight < previousElementSiblingRect.top + submenu.offsetHeight) {- const heightDifference = window.innerHeight - previousElementSiblingRect.top - submenu.offsetHeight;- submenu.style.top = heightDifference + 'px';- } else {- submenu.style.top = '';+ const floating = !(overflowsLeft && overflowsRight);+ submenu.dataset.floating = String(floating);++ submenu.classList.toggle('left-0', overflowsRight);+ submenu.classList.toggle('-translate-x-full', overflowsRight && !overflowsLeft);+ submenu.classList.toggle('right-0', !overflowsRight);+ submenu.classList.toggle('translate-x-full', !overflowsRight);+ submenu.classList.toggle('floating-menu', floating);++ const triggerRect = submenu.previousElementSibling?.getBoundingClientRect();+ const overflowsBottom = triggerRect && triggerRect.top + submenu.offsetHeight > window.innerHeight;++ if (overflowsLeft && overflowsRight) {+ submenu.style.top = '0px';+ submenu.style.left = '0px';+ return;}++ submenu.style.top = overflowsBottom ? `${window.innerHeight - triggerRect!.top - submenu.offsetHeight}px` : '';}}@@ -94,6 +109,7 @@ const closeContextMenu = (e: any) => {contextMenuOpen.value = false;}};+onMounted(() => {window.addEventListener('resize', closeContextMenu);});@@ -107,17 +123,17 @@ defineExpose({ contextMenuToggle, contextMenuOpen });<template><Transitionenter-active-class="ease-out duration-150"- enter-from-class="scale-[0.8] opacity-60"+ enter-from-class="scale-80 opacity-0"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"+ leave-to-class="scale-60 opacity-0"><Teleport :to="teleportTarget" :disabled="teleportDisabled"><OnClickOutside- v-show="contextMenuOpen"+ v-if="contextMenuOpen"@trigger="- (e: any) => {+ (e: MouseEvent) => {contextMenuToggle(e, false);}"@@ -127,7 +143,7 @@ defineExpose({ contextMenuToggle, contextMenuOpen });'absolute z-50 w-48 max-w-[100vw]','rounded-md border p-1 shadow-xs backdrop-blur-xs','bg-overlay-2-t border-overlay-border/10 pointer-events-auto',- 'text-xs transition-all',+ 'origin-top-left text-xs transition-[opacity,scale]',style,)"diff --git a/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue b/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vueindex 90a35a36..dc08db49 100644--- a/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue+++ b/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue@@ -5,7 +5,9 @@ import { ButtonBase } from '@/components/cedar-ui/button';import { computed } from 'vue';import { cn } from '@aminnausin/cedar-ui';-const props = withDefaults(defineProps<ContextMenuItem & { divider?: boolean }>(), {+import ProiconsChevronRight from '~icons/proicons/chevron-right';++const props = withDefaults(defineProps<ContextMenuItem & { divider?: boolean; children?: ContextMenuItem[]; submenuStyle?: string }>(), {selectedStyle: 'text-primary font-bold',});@@ -14,26 +16,54 @@ const wrapperProps = computed(() => {if (props.external) return { href: props.url, target: props.target ?? '_blank' };return { to: props.url, target: props.target };});++const hasChildren = computed(() => (props.children?.length ?? 0) > 0);</script><template><div v-if="divider" class="bg-hr dark:bg-hr/30 -mx-1 my-1 h-px" />- <ButtonBase- v-else- v-bind="wrapperProps"- :class="cn({ [selectedStyle]: selected }, 'hover:bg-overlay-accent h-7 w-full justify-start rounded-sm px-2 py-1.5 select-none', style)"- :disabled="disabled"- :onclick="- () => {- if (action) action();- }- "- >- <slot name="icon">- <component v-if="icon" :is="icon" class="size-4 shrink-0" />- <span v-else class="size-4 shrink-0"> </span>- </slot>- <span class="mr-auto truncate text-nowrap">{{ text }}</span>- <span class="tracking-widest opacity-60" v-if="shortcut">{{ shortcut }}</span>- </ButtonBase>+ <div v-else class="relative" :class="{ 'group/submenu': hasChildren }">+ <ButtonBase+ v-bind="wrapperProps"+ :class="cn({ [selectedStyle]: selected }, 'hocus:bg-overlay-accent h-7 w-full justify-start rounded-sm px-2 py-1.5 select-none', style)"+ :disabled="disabled"+ @click.stop="if (!hasChildren) action?.();"+ >+ <slot name="icon">+ <component v-if="icon" :is="icon" class="size-4 shrink-0" />+ <span v-else class="size-4 shrink-0" />+ </slot>+ <span class="mr-auto truncate text-nowrap">{{ text }}</span>+ <ProiconsChevronRight v-if="hasChildren" class="size-3 opacity-60" />+ <span v-else-if="shortcut" class="tracking-widest opacity-60">{{ shortcut }}</span>+ </ButtonBase>++ <div+ v-if="hasChildren"+ data-submenu+ data-floating="true"+ :class="+ cn(+ 'floating-menu peer max-h-0 px-2',+ 'opacity-0',+ 'group-hover/submenu:max-h-none group-hover/submenu:opacity-100',+ 'group-focus-within/submenu:pointer-events-auto group-focus-within/submenu:opacity-100',+ submenuStyle,+ )+ "+ >+ <div class="submenu-divider bg-hr dark:bg-hr/30 -mx-3 my-1 h-px" />+ <ContextMenuItem v-for="(child, index) in children" :key="index" v-bind="child" />+ </div>+ </div></template>+<style lang="css" scoped>+@reference '@css/app.css';+.floating-menu {+ @apply bg-overlay-2-t border-overlay-border/10 absolute top-0 max-h-none w-48 rounded-md border p-1 px-1! shadow-xs backdrop-blur-xs transition-opacity duration-100 ease-in group-hover/submenu:ease-out;+}++[data-submenu][data-floating='true'] > .submenu-divider {+ display: none;+}+</style>diff --git a/resources/js/types/types.ts b/resources/js/types/types.tsindex a8c24ae3..a6378cbb 100644--- a/resources/js/types/types.ts+++ b/resources/js/types/types.ts@@ -63,6 +63,8 @@ export interface ContextMenuItem {hidden?: boolean;icon?: Component;divider?: boolean;+ children?: ContextMenuItem[];+ submenuStye?: string;}export interface ContextMenu {