Skip to content

A self-hosted media server and file management system

fix: code organisation

aminnausin4b7d8787bc8c
diff --git a/resources/js/components/cedar-ui/popover/BasePopover.vue b/resources/js/components/cedar-ui/popover/BasePopover.vue
index 6904265c..bb607f7e 100644
--- a/resources/js/components/cedar-ui/popover/BasePopover.vue
+++ b/resources/js/components/cedar-ui/popover/BasePopover.vue
@@ -46,15 +46,15 @@ const popover = useTemplateRef('popover');
const popoverArrow = useTemplateRef('popoverArrowRef');
const popoverButton = useTemplateRef<ComponentPublicInstance>('popoverButton');
+const init = ref(false);
+const maxWidth = ref(0);
+const maxHeight = ref(0);
+
const mergedButtonAttributes = computed(() => ({
title: 'Open Menu',
...props.buttonAttributes,
}));
-const init = ref(false);
-const maxWidth = ref(0);
-const maxHeight = ref(0);
-
const adjustPopoverPosition = () => {
if (!popover.value?.$el || !popoverButton.value?.$el) return;
@@ -89,19 +89,12 @@ const adjustPopoverPosition = () => {
popoverStyles.value = { left: `${left}px`, top: `${clampedTop}px` };
};
-onClickOutside(popover, (event) => {
- if (popoverButton.value?.$el?.contains(event.target as Node)) return;
- popoverOpen.value = false;
-});
-
const handleClose = () => {
maxWidth.value = 0;
maxHeight.value = 0;
popoverOpen.value = false;
};
-defineExpose({ handleClose });
-
watch(
() => popoverOpen.value,
(value) => {
@@ -119,6 +112,13 @@ onMounted(() => {
onUnmounted(() => {
window.removeEventListener('resize', handleClose);
});
+
+onClickOutside(popover, (event) => {
+ if (popoverButton.value?.$el?.contains(event.target as Node)) return;
+ popoverOpen.value = false;
+});
+
+defineExpose({ handleClose });
</script>
<template>
<div class="relative flex">