Skip to content

A self-hosted media server and file management system

feat: update drawers

aminnausinb4195e40c820
diff --git a/package-lock.json b/package-lock.json
index ca95b66c..6f33643c 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,7 @@
"packages": {
"": {
"dependencies": {
- "@aminnausin/cedar-ui": "^0.0.10",
+ "@aminnausin/cedar-ui": "^0.0.12",
"@tanstack/vue-query": "^5.77.2",
"@vueuse/components": "^10.11.0",
"@vueuse/core": "^10.11.0",
@@ -95,9 +95,9 @@
}
},
"node_modules/@aminnausin/cedar-ui": {
- "version": "0.0.10",
- "resolved": "https://registry.npmjs.org/@aminnausin/cedar-ui/-/cedar-ui-0.0.10.tgz",
- "integrity": "sha512-l9b1eL865HKZalIVSnYuBfuMdWn0aphwU/uUk4DUJoWQJ1tIIM9LffJ76i0SDB5GqAReaE3+iIcJFPIoz9xnSw==",
+ "version": "0.0.12",
+ "resolved": "https://registry.npmjs.org/@aminnausin/cedar-ui/-/cedar-ui-0.0.12.tgz",
+ "integrity": "sha512-iHEI8RnyfwdIubEPlOJp/dzFme6uSUsjLtl2AZSRUKfF6oEtuAFitiD9gPVY01jLG+P5i/gYmaYfnS44NyUs5w==",
"license": "MIT",
"dependencies": {
"clsx": "^2.1.1",
diff --git a/package.json b/package.json
index 69ca70e8..0b6b4c69 100755
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
"vue-tsc": "^2.2.8"
},
"dependencies": {
- "@aminnausin/cedar-ui": "^0.0.10",
+ "@aminnausin/cedar-ui": "^0.0.12",
"@tanstack/vue-query": "^5.77.2",
"@vueuse/components": "^10.11.0",
"@vueuse/core": "^10.11.0",
diff --git a/resources/js/components/cedar-ui/drawer/BaseDrawer.vue b/resources/js/components/cedar-ui/drawer/BaseDrawer.vue
index 16d8a1ee..b4d20fff 100644
--- a/resources/js/components/cedar-ui/drawer/BaseDrawer.vue
+++ b/resources/js/components/cedar-ui/drawer/BaseDrawer.vue
@@ -10,35 +10,38 @@ import DrawerHandle from './DrawerHandle.vue';
const drawer = useDrawer();
-const props = withDefaults(defineProps<DrawerProps>(), { direction: 'bottom' });
+const props = withDefaults(defineProps<DrawerProps>(), { direction: 'bottom', showHeader: true, showFooter: true });
const swipeDirections = ref<SwipeDirection[]>([props.direction]);
-const closeDrawer = () => {
- drawer.close();
- emit('close');
-};
-
const { offset, isSwiping, onPointerDown, onPointerMove, onPointerUp, onPointerCancel, isTapGesture } = useSwipeHandler({
directions: swipeDirections,
swipeThreshold: { px: SWIPE_THRESHOLD },
velocityThreshold: VELOCITY_THRESHOLD,
- onSwipeOut: closeDrawer,
+ onSwipeOut: () => drawer.close('swipe'),
});
-const emit = defineEmits<(e: 'close') => void>();
+function handleOnPointerUp(e: PointerEvent) {
+ if (onPointerUp()) return;
+ if (isTapGesture() && isDrawerCloseTarget(e)) drawer.close('swipe');
+}
+
+function isDrawerCloseTarget(e: PointerEvent): boolean {
+ const target = e.target as HTMLElement | null;
+ return !!target?.closest('[data-drawer-close]');
+}
</script>
<template>
<RootDrawer
- @keydown.esc="closeDrawer"
+ @keydown.esc="drawer.close('escape')"
@pointerdown="onPointerDown"
@pointermove="onPointerMove"
- @pointerup="onPointerUp"
- @dragend="onPointerUp"
+ @pointerup="handleOnPointerUp"
@pointercancel="onPointerCancel"
- :class="cn(drawer.props.value?.rootClass, 'drawer transition-all duration-300 ease-out')"
+ @dragend="onPointerUp"
+ :class="cn(rootClass, 'drawer transition-all duration-300 ease-out')"
:data-isSwiping="isSwiping"
:style="{
- '--offset-y': `${Math.max(-10, offset.y)}px`,
+ '--offset-y': `${Math.max(-20, offset.y)}px`,
}"
id="drawer"
>
@@ -46,42 +49,31 @@ const emit = defineEmits<(e: 'close') => void>();
<div class="group flex w-full cursor-pointer pb-1 sm:p-0">
<slot name="handle">
<DrawerHandle
+ data-drawer-close
:aria-expanded="drawer.isOpen.value"
- @keydown.enter.prevent="drawer.close"
- @keydown.space.prevent="drawer.close"
- @pointerdown="onPointerDown"
- @pointermove="onPointerMove"
- @dragend="onPointerUp"
- @pointercancel="onPointerCancel"
- @pointerup="
- () => {
- onPointerUp();
- if (isTapGesture()) closeDrawer();
- }
- "
+ @keydown.enter.prevent="drawer.close('escape')"
+ @keydown.space.prevent="drawer.close('escape')"
/>
</slot>
</div>
- <div class="flex w-full flex-col gap-3" v-if="$slots.header || drawer.props.value.title || drawer.props.value.description">
+ <div class="flex w-full flex-col gap-1.5" v-if="props.showHeader">
<slot name="header">
- <div class="flex w-full flex-col gap-1.5" v-if="drawer.props.value.title || drawer.props.value.description">
- <h2 id="drawerTitle" class="text-foreground flex-1 text-xl font-semibold">
- <slot name="title">
- {{ drawer.props.value.title ?? title ?? 'Title' }}
- </slot>
- </h2>
- <p class="text-foreground-1 w-full text-sm" v-if="$slots.description || drawer.props.value.description || description" id="drawerDescription">
- <slot name="description">{{ drawer.props.value.description ?? description ?? 'Description' }}</slot>
- </p>
- </div>
+ <h2 id="drawerTitle" class="text-foreground flex-1 text-xl font-semibold">
+ <slot name="title">
+ {{ title ?? 'Title' }}
+ </slot>
+ </h2>
+ <p class="text-foreground-1 w-full text-sm" v-if="$slots.description || description" id="drawerDescription">
+ <slot name="description">{{ description ?? 'Description' }}</slot>
+ </p>
</slot>
</div>
<div v-if="$slots.default" class="scrollbar-hide flex max-h-[60vh] w-full flex-col gap-3 overflow-y-scroll">
<slot> </slot>
</div>
- <div v-if="$slots.footer || !$slots.default" class="flex w-full flex-col gap-3">
+ <div v-if="props.showFooter" class="flex w-full flex-col gap-3">
<slot name="footer">
- <ButtonText :class="'h-8 w-full text-sm capitalize ring-1'" :variant="'default'" @click="closeDrawer"> Close Drawer </ButtonText>
+ <ButtonText :class="'h-8 w-full text-sm capitalize ring-1'" :variant="'default'" @click="drawer.close('programmatic')"> Close Drawer </ButtonText>
</slot>
</div>
</div>
@@ -89,7 +81,9 @@ const emit = defineEmits<(e: 'close') => void>();
</template>
<style lang="css" scoped>
.drawer {
- transform: translateY(var(--offset-y, 0px)) translateX(var(--offset-x, 0px));
+ transform: translate3d(var(--offset-x, 0px), var(--offset-y, 0px), 0px);
+ touch-action: none;
+ will-change: transform;
}
@media (prefers-reduced-motion: reduce) {
diff --git a/resources/js/components/cedar-ui/drawer/DrawerController.vue b/resources/js/components/cedar-ui/drawer/DrawerController.vue
index 75d60aa0..cae32866 100644
--- a/resources/js/components/cedar-ui/drawer/DrawerController.vue
+++ b/resources/js/components/cedar-ui/drawer/DrawerController.vue
@@ -17,7 +17,7 @@ const drawerStore = useDrawer();
aria-modal="true"
:aria-labelledby="drawerStore.props.value?.title ? 'drawerTitle' : undefined"
:aria-describedby="drawerStore.props.value?.description ? 'drawerDescription' : undefined"
- class="fixed top-0 left-0 z-50 flex h-screen w-screen items-center justify-center bg-transparent text-gray-900 dark:text-neutral-200"
+ class="text-foreground-0 fixed top-0 left-0 z-50 flex h-screen w-screen items-center justify-center bg-transparent"
v-show="drawerStore.isOpen.value || drawerStore.isAnimating.value"
v-cloak
>
@@ -29,11 +29,7 @@ const drawerStore = useDrawer();
leave-from-class="opacity-100"
leave-to-class="opacity-0"
>
- <div
- v-if="drawerStore.isOpen.value"
- :class="['absolute inset-0 h-full w-full backdrop-blur-xs bg-black/50']"
- @click="drawerStore.close()"
- ></div>
+ <div v-if="drawerStore.isOpen.value" :class="['absolute inset-0 h-full w-full bg-black/50 backdrop-blur-xs']" @click="drawerStore.close('backdrop')"></div>
</Transition>
<Transition
@@ -49,7 +45,7 @@ const drawerStore = useDrawer();
class="scrollbar-hide fixed bottom-0 left-0 flex items-center"
:options="{ allowOutsideClick: true }"
>
- <component :is="drawerStore.component.value" />
+ <component :is="drawerStore.component.value" v-bind="drawerStore.props.value" />
</UseFocusTrap>
</Transition>
</div>
diff --git a/resources/js/components/cedar-ui/drawer/DrawerHandle.vue b/resources/js/components/cedar-ui/drawer/DrawerHandle.vue
index 8eed36a9..7ee49891 100644
--- a/resources/js/components/cedar-ui/drawer/DrawerHandle.vue
+++ b/resources/js/components/cedar-ui/drawer/DrawerHandle.vue
@@ -2,7 +2,7 @@
<button
type="button"
title="Close Drawer"
- class="bg-foreground-2 group-hover:bg-foreground-1 mx-auto h-1.5 w-1/5 cursor-pointer rounded-full transition-colors sm:w-1/12"
+ class="bg-foreground-2 group-hover:bg-foreground-1 mx-auto h-1.5 w-24 cursor-pointer rounded-full transition-colors focus:outline-0 sm:w-32 md:max-w-1/12"
aria-controls="drawer"
></button>
</template>
diff --git a/resources/js/components/cedar-ui/drawer/RootDrawer.vue b/resources/js/components/cedar-ui/drawer/RootDrawer.vue
index d6d0750e..78264e93 100644
--- a/resources/js/components/cedar-ui/drawer/RootDrawer.vue
+++ b/resources/js/components/cedar-ui/drawer/RootDrawer.vue
@@ -2,7 +2,17 @@
import { cn } from '@aminnausin/cedar-ui';
</script>
<template>
- <div :class="cn('bg-surface-1 w-screen rounded-t-lg backdrop-blur-lg')">
+ <div :class="cn('bg-surface-1 drawer-shell relative w-screen rounded-t-xl backdrop-blur-lg sm:rounded-t-lg')">
<slot></slot>
</div>
</template>
+<style scoped lang="css">
+.drawer-shell::after {
+ content: '';
+ position: absolute;
+ inset-inline: 0;
+ bottom: -200px;
+ height: 200px;
+ background: inherit;
+}
+</style>
diff --git a/resources/js/components/drawers/VideoSidebarDrawer.vue b/resources/js/components/drawers/VideoSidebarDrawer.vue
index 092e753d..adcc36ac 100644
--- a/resources/js/components/drawers/VideoSidebarDrawer.vue
+++ b/resources/js/components/drawers/VideoSidebarDrawer.vue
@@ -1,14 +1,11 @@
<script setup lang="ts">
-import { useAppStore } from '@/stores/AppStore';
import { BaseDrawer } from '@/components/cedar-ui/drawer';
import VideoSidebar from '@/components/panels/VideoSidebar.vue';
-
-const { cycleSideBar } = useAppStore();
</script>
<template>
- <BaseDrawer @close="cycleSideBar()">
+ <BaseDrawer>
<VideoSidebar />
</BaseDrawer>
</template>
diff --git a/resources/js/components/panels/NavBar.vue b/resources/js/components/panels/NavBar.vue
index 05cbe854..d717aafb 100755
--- a/resources/js/components/panels/NavBar.vue
+++ b/resources/js/components/panels/NavBar.vue
@@ -3,7 +3,7 @@ import { getScreenSize } from '@/service/util';
import { useAuthStore } from '@/stores/AuthStore';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
-import { drawer } from '@aminnausin/cedar-ui';
+import { drawer, type DrawerCloseReason } from '@aminnausin/cedar-ui';
import { ref } from 'vue';
import VideoSidebarDrawer from '@/components/drawers/VideoSidebarDrawer.vue';
@@ -34,7 +34,15 @@ const toggleVideoSidebar = (sidebar: 'folders' | 'history') => {
const screenSize = getScreenSize();
if (screenSize === 'default' || screenSize === 'sm') {
- drawer.open(VideoSidebarDrawer, {});
+ drawer.open(VideoSidebarDrawer, {
+ showHeader: false,
+ showFooter: false,
+ onClose: (reason: DrawerCloseReason) => {
+ console.log('Close', reason);
+
+ cycleSideBar(sidebar, 'list-card');
+ },
+ });
}
};
</script>