Skip to content

A self-hosted media server and file management system

feat: replace context menu

aminnausine15226c9d3db
diff --git a/resources/js/components/cedar-ui/context-menu/ContextMenu.vue b/resources/js/components/cedar-ui/context-menu/ContextMenu.vue
index 2ab802fb..11c7f676 100644
--- a/resources/js/components/cedar-ui/context-menu/ContextMenu.vue
+++ b/resources/js/components/cedar-ui/context-menu/ContextMenu.vue
@@ -1,12 +1,12 @@
<script setup lang="ts">
-import type { ContextMenu } from '@/types/types';
+import type { ContextMenuOptions } from '@aminnausin/cedar-ui';
import { nextTick, onMounted, onUnmounted, ref, Teleport, useTemplateRef } from 'vue';
import { useMouseInElement } from '@vueuse/core';
import { ContextMenuItem } from '@/components/cedar-ui/context-menu';
import { OnClickOutside } from '@vueuse/components';
-const props = withDefaults(defineProps<ContextMenu>(), {
+const props = withDefaults(defineProps<ContextMenuOptions & { teleportDisabled?: boolean; teleportTarget?: string }>(), {
positionClasses: 'z-30 left-20 bottom-10',
style: '',
disabled: false,
@@ -122,7 +122,7 @@ defineExpose({ contextMenuToggle, contextMenuOpen });
}
"
ref="contextMenu"
- :class="`absolute z-50 w-48 max-w-[100vw] rounded-md border border-neutral-200/70 bg-white p-1 shadow-xs backdrop-blur-xs transition-all dark:border-neutral-700/10 dark:bg-neutral-800/90 ${style}`"
+ :class="['bg-overlay-2-t border-overlay-border/10 absolute z-50 w-48 max-w-[100vw] rounded-md border p-1 shadow-xs backdrop-blur-xs 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 f4ae909c..444b9942 100644
--- a/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue
+++ b/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue
@@ -1,73 +1,33 @@
<script setup lang="ts">
-import type { ContextMenuItem } from '@/types/types';
+import type { ContextMenuItem } from '@aminnausin/cedar-ui';
-import { RouterLink } from 'vue-router';
-const props = withDefaults(defineProps<ContextMenuItem>(), {});
+import { ButtonBase } from '../button';
+import { computed } from 'vue';
+import { cn } from '@aminnausin/cedar-ui';
+
+const props = withDefaults(defineProps<ContextMenuItem>(), {
+ selectedStyle: 'text-primary font-bold',
+});
+
+const wrapperProps = computed(() => {
+ if (!props.url) return {};
+ if (props.external) return { href: props.url, target: props.target ?? '_blank' };
+ return { to: props.url, target: props.target };
+});
</script>
<template>
- <a
- v-if="external && url"
- :href="url"
- target="_blank"
- :data-disabled="disabled"
- :class="`${selected ? (selectedStyle ?? 'font-bold text-violet-500') : ''} cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded-sm px-2 py-1.5 text-sm outline-hidden transition-colors data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 ${style ?? ''}`"
- >
- <slot name="icon">
- <component v-if="icon" :is="icon" class="w-4 h-4 mr-2" />
- <span
- v-else
- width="24"
- height="24"
- viewBox="0 0 24 24"
- fill="none"
- stroke="currentColor"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- class="w-4 h-4 mr-2"
- >
- </span>
- </slot>
- <span class="text-nowrap">{{ text }}</span
- ><span class="ml-auto text-xs tracking-widest opacity-60">{{ shortcut ?? '' }}</span>
- </a>
- <RouterLink
- v-else-if="url"
- :to="disabled ? '' : url"
- :data-disabled="disabled"
- :class="`${selected ? (selectedStyle ?? 'font-bold text-violet-500') : ''} cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded-sm px-2 py-1.5 text-sm outline-hidden transition-colors data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 ${style ?? ''}`"
- >
- <slot name="icon">
- <component v-if="icon" :is="icon" class="w-4 h-4 mr-2" />
- <span
- v-else
- width="24"
- height="24"
- viewBox="0 0 24 24"
- fill="none"
- stroke="currentColor"
- stroke-width="2"
- stroke-linecap="round"
- stroke-linejoin="round"
- class="w-4 h-4 mr-2"
- >
- </span>
- </slot>
- <span class="text-nowrap">{{ text }}</span>
- <span class="ml-auto text-xs tracking-widest opacity-60">{{ shortcut ?? '' }}</span>
- </RouterLink>
- <button
- v-else
+ <ButtonBase
+ :class="cn({ selectedStyle: selected }, 'hover:bg-overlay-accent relative h-7 w-full rounded-sm px-2 py-1.5 select-none', style)"
:disabled="disabled"
- :class="`${selected ? (selectedStyle ?? 'font-bold text-violet-500') : ''} cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded-sm px-2 py-1.5 text-sm outline-hidden transition-colors disabled:pointer-events-none disabled:opacity-50 ${style ?? ''}`"
:onclick="
() => {
if (action) action();
}
"
+ v-bind="wrapperProps"
>
<slot name="icon">
- <component v-if="icon" :is="icon" class="w-4 h-4 mr-2" />
+ <component v-if="icon" :is="icon" class="size-4" />
<span
v-else
width="24"
@@ -78,11 +38,11 @@ const props = withDefaults(defineProps<ContextMenuItem>(), {});
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
- class="w-4 h-4 mr-2"
+ class="size-4"
>
</span>
</slot>
<span class="text-nowrap">{{ text }}</span>
<span class="ml-auto text-xs tracking-widest opacity-60">{{ shortcut ?? '' }}</span>
- </button>
+ </ButtonBase>
</template>