Skip to content

A self-hosted media server and file management system

fix: context menu layers

aminnausin730f7ddb0f8c
diff --git a/resources/js/components/cedar-ui/context-menu/ContextMenu.vue b/resources/js/components/cedar-ui/context-menu/ContextMenu.vue
index dc9da97d..498fbf5b 100644
--- a/resources/js/components/cedar-ui/context-menu/ContextMenu.vue
+++ b/resources/js/components/cedar-ui/context-menu/ContextMenu.vue
@@ -5,6 +5,7 @@ import { nextTick, onMounted, onUnmounted, ref, Teleport, useTemplateRef } from
import { useMouseInElement } from '@vueuse/core';
import { ContextMenuItem } from '@/components/cedar-ui/context-menu';
import { OnClickOutside } from '@vueuse/components';
+import { cn } from '@aminnausin/cedar-ui';
const props = withDefaults(defineProps<ContextMenuOptions & { teleportDisabled?: boolean; teleportTarget?: string }>(), {
positionClasses: 'z-30 left-20 bottom-10',
@@ -93,7 +94,6 @@ const closeContextMenu = (e: any) => {
contextMenuOpen.value = false;
}
};
-
onMounted(() => {
window.addEventListener('resize', closeContextMenu);
});
@@ -122,10 +122,15 @@ defineExpose({ contextMenuToggle, contextMenuOpen });
}
"
ref="contextMenu"
- :class="[
- 'bg-overlay-2-t border-overlay-border/10 pointer-events-auto absolute z-50 w-48 max-w-[100vw] rounded-md border p-1 shadow-xs backdrop-blur-xs transition-all',
- style,
- ]"
+ :class="
+ cn(
+ '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',
+ 'transition-all',
+ style,
+ )
+ "
:style="menuStyles"
v-cloak
>
diff --git a/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue b/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue
index c9caf546..147b7210 100644
--- a/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue
+++ b/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue
@@ -17,7 +17,7 @@ const wrapperProps = computed(() => {
</script>
<template>
<ButtonBase
- :class="cn({ selectedStyle: selected }, 'hover:bg-overlay-accent relative h-7 w-full rounded-sm px-2 py-1.5 text-xs select-none', style)"
+ :class="cn({ selectedStyle: selected }, 'hover:bg-overlay-accent h-7 w-full justify-start rounded-sm px-2 py-1.5 text-xs select-none', style)"
:disabled="disabled"
:onclick="
() => {
@@ -28,9 +28,9 @@ const wrapperProps = computed(() => {
>
<slot name="icon">
<component v-if="icon" :is="icon" class="size-4 shrink-0" />
- <span v-else class="size-4"> </span>
+ <span v-else class="size-4 shrink-0"> </span>
</slot>
<span class="mr-auto truncate text-nowrap">{{ text }}</span>
- <span class="text-xs tracking-widest opacity-60" v-if="shortcut">{{ shortcut ?? '' }}</span>
+ <span class="text-xs tracking-widest opacity-60" v-if="shortcut">{{ shortcut }}</span>
</ButtonBase>
</template>