Skip to content

Open source personal finance application

refactor: remove wrapper div from BottomSheetOrDropdown and fix Date trigger width

Ilya Komichevab2e22ee01f7
diff --git a/app/components/bottomSheet/BottomSheetOrDropdown.vue b/app/components/bottomSheet/BottomSheetOrDropdown.vue
index af344478..74637097 100644
--- a/app/components/bottomSheet/BottomSheetOrDropdown.vue
+++ b/app/components/bottomSheet/BottomSheetOrDropdown.vue
@@ -20,76 +20,74 @@ const open = ref(false)
</script>
<template>
- <div class="grow">
- <UPopover
- v-if="isLaptop"
- v-model:open="open"
- :content="{
- align: 'center',
- side: 'bottom',
- }"
- :ui="{
- content: 'z-50 overflow-hidden',
- }"
- class="popoverGroup grow overflow-hidden"
- >
- <slot name="trigger" />
+ <UPopover
+ v-if="isLaptop"
+ v-model:open="open"
+ :content="{
+ align: 'center',
+ side: 'bottom',
+ }"
+ :ui="{
+ content: 'z-50 overflow-hidden',
+ }"
+ class="popoverGroup grow overflow-hidden"
+ >
+ <slot name="trigger" />
- <template #content>
- <UiPopoverWrap
- :title="props.title"
- :isShowCloseBtn="props.isShowCloseBtn"
- @close="() => open = false"
- >
- <slot
- name="content"
- :close="() => open = false"
- />
- <slot
- name="custom"
- :close="() => open = false"
- />
- </UiPopoverWrap>
- </template>
- </UPopover>
+ <template #content>
+ <UiPopoverWrap
+ :title="props.title"
+ :isShowCloseBtn="props.isShowCloseBtn"
+ @close="() => open = false"
+ >
+ <slot
+ name="content"
+ :close="() => open = false"
+ />
+ <slot
+ name="custom"
+ :close="() => open = false"
+ />
+ </UiPopoverWrap>
+ </template>
+ </UPopover>
- <div
- v-else
- class="grow"
- @click="emit('openModal')"
- >
- <slot name="trigger" />
+ <div
+ v-else
+ class="grow"
+ @click="emit('openModal')"
+ >
+ <slot name="trigger" />
- <Teleport to="body">
- <BottomSheet
- v-if="props.isOpen"
- isShow
- :dragClassesCustom="`${props.dragClassesCustom ?? ''} bottomSheetDragClassesCustom`"
- :dragStyle="props.bottomSheetStyle"
- @closed="emit('closeModal')"
- >
- <template #default="{ close }">
- <div class="bottomSheetContent">
- <UiTitleModal v-if="props.title">
- {{ props.title }}
- </UiTitleModal>
+ <Teleport to="body">
+ <BottomSheet
+ v-if="props.isOpen"
+ isShow
+ :dragClassesCustom="`${props.dragClassesCustom ?? ''} bottomSheetDragClassesCustom`"
+ :dragStyle="props.bottomSheetStyle"
+ @closed="emit('closeModal')"
+ >
+ <template #default="{ close }">
+ <div class="bottomSheetContent">
+ <UiTitleModal v-if="props.title">
+ {{ props.title }}
+ </UiTitleModal>
- <div
- v-if="$slots.content"
- class="scrollerBlock bottomSheetContentInside"
- >
- <slot name="content" :close />
- </div>
-
- <slot
- v-if="$slots.custom"
- name="custom"
- :close
- />
+ <div
+ v-if="$slots.content"
+ class="scrollerBlock bottomSheetContentInside"
+ >
+ <slot name="content" :close />
</div>
- </template>
- </BottomSheet>
- </Teleport>
- </div>
+
+ <slot
+ v-if="$slots.custom"
+ name="custom"
+ :close
+ />
+ </div>
+ </template>
+ </BottomSheet>
+ </Teleport>
</div>
</template>
diff --git a/app/components/trnForm/Date.vue b/app/components/trnForm/Date.vue
index 0ad2a9c5..4be7a2e7 100644
--- a/app/components/trnForm/Date.vue
+++ b/app/components/trnForm/Date.vue
@@ -30,13 +30,12 @@ function changeDate(way: 'prev' | 'next' | 'today') {
<BottomSheetOrDropdown
:title="t('common.date')"
:isOpen="isShow"
- class="grow"
isShowCloseBtn
@openModal="isShow = true"
@closeModal="isShow = false"
>
<template #trigger>
- <UiActionButton class="text-2 grid grow !justify-start p-2">
+ <UiActionButton class="text-2 grid w-full !justify-start p-2 text-left">
<div class="text-1 text-sm">
{{ formattedDate.day }} {{ formattedDate.month }}
</div>