Skip to content

Open source personal finance application

feat: enhance Item and Element components with improved context menu handling and UI updates

Ilya Komichev9b9de2356dcf
diff --git a/app/components/categories/Item.vue b/app/components/categories/Item.vue
index 1426b56c..73923856 100644
--- a/app/components/categories/Item.vue
+++ b/app/components/categories/Item.vue
@@ -31,7 +31,7 @@ const parentCategory = computed(() => categoriesStore.items[props.category?.pare
</script>
<template>
- <component :is="props.contextMenuItems ? resolveComponent('UContextMenu') : 'div'" v-bind="props.contextMenuItems ? { items: props.contextMenuItems } : {}">
+ <UContextMenu v-if="props.contextMenuItems" :items="props.contextMenuItems">
<UiElement
v-if="props.category"
:isActive="props.activeItemId === props.categoryId"
@@ -60,5 +60,34 @@ const parentCategory = computed(() => categoriesStore.items[props.category?.pare
/>
</div>
</UiElement>
- </component>
+ </UContextMenu>
+
+ <UiElement
+ v-else-if="props.category"
+ :isActive="props.activeItemId === props.categoryId"
+ :class="props.class"
+ :lineWidth="props.lineWidth"
+ :insideClasses="`min-h-[46px] ${props.insideClasses}`"
+ @click="(e: Event) => emit('click', e)"
+ >
+ <template #leftIcon>
+ <UiIconBase
+ :color="props.category.color"
+ :name="props.category.icon"
+ invert
+ @click="emit('filter', props.categoryId ?? '')"
+ />
+ </template>
+
+ <div class="grid grow gap-0.5">
+ <CategoriesName
+ :alt="props.alt"
+ :category="props.category"
+ :parentCategory="parentCategory"
+ :hasChildren="childCategoriesIds.length > 0"
+ :showChildrenCount="childCategoriesIds.length"
+ :isShowParent="props.isShowParent"
+ />
+ </div>
+ </UiElement>
</template>
diff --git a/app/components/ui/Element.vue b/app/components/ui/Element.vue
index 76cbe144..bc58ec6b 100644
--- a/app/components/ui/Element.vue
+++ b/app/components/ui/Element.vue
@@ -49,7 +49,7 @@ const elementClasses = computed(() => cn(
<style>
@reference '~/assets/css/main.css';
-.v-popper--shown .uiElement {
+[data-state='open'] > .uiElement {
@apply !bg-item-4;
}
</style>
diff --git a/app/components/wallets/Item.vue b/app/components/wallets/Item.vue
index a2bb6a5b..3dffa00c 100644
--- a/app/components/wallets/Item.vue
+++ b/app/components/wallets/Item.vue
@@ -62,7 +62,7 @@ if (!props.isSort) {
</script>
<template>
- <component :is="props.contextMenuItems ? resolveComponent('UContextMenu') : 'div'" v-bind="props.contextMenuItems ? { items: props.contextMenuItems } : {}">
+ <UContextMenu v-if="props.contextMenuItems" :items="props.contextMenuItems">
<UiElement
v-if="wallet"
ref="longPressRef"
@@ -190,5 +190,133 @@ if (!props.isSort) {
</div>
</template>
</UiElement>
- </component>
+ </UContextMenu>
+
+ <UiElement
+ v-else-if="wallet"
+ ref="longPressRef"
+ :isActive="activeItemId === props.walletId"
+ :insideClasses="`${props.insideClasses ?? ''} min-h-[46px]`"
+ :lineWidth="props.lineWidth"
+ :class="classes"
+ @click="emit('click', props.walletId)"
+ >
+ <!-- Icon -->
+ <template v-if="props.isShowIcon" #leftIcon>
+ <WalletsIcon
+ :name="wallet.name"
+ :color="wallet.color"
+ />
+ </template>
+
+ <!-- Main -->
+ <template v-if="!props.alt">
+ <div class="grid grow gap-1">
+ <div class="text-muted text-sm leading-none font-medium tracking-wide text-nowrap">
+ {{ wallet.name }}
+ </div>
+
+ <!-- Rate -->
+ <div
+ v-if="props.isShowRate && wallet.currency !== currenciesStore.base && wallet.rate"
+ class="opacity-90"
+ >
+ <Amount
+ :amount="wallet.rate"
+ :precision="2"
+ :currencyCode="currenciesStore.base"
+ :isShowBaseRate="false"
+ align="left"
+ variant="2xs"
+ class="text-xs opacity-70"
+ />
+ </div>
+
+ <div
+ v-if="props.isShowCreditLimit && wallet.type === 'credit' && wallet.creditLimit"
+ class="flex items-center gap-0.5 opacity-70"
+ >
+ <Amount
+ :amount="wallet.creditLimit - Math.abs(wallet.amount)"
+ :currencyCode="wallet.currency"
+ :isShowBaseRate="false"
+ :isShowSymbol="false"
+ align="left"
+ variant="2xs"
+ />
+
+ <div
+ v-if="wallet.amount !== 0"
+ class="text-2xs leading-none opacity-70"
+ >
+ /
+ </div>
+
+ <Amount
+ v-if="wallet.amount !== 0"
+ :amount="wallet.creditLimit"
+ :currencyCode="wallet.currency"
+ :isShowBaseRate="false"
+ :isShowSymbol="false"
+ align="left"
+ variant="2xs"
+ />
+ </div>
+ </div>
+
+ <div class="pr-1">
+ <Amount
+ v-if="wallet.creditLimit"
+ :amount="creditAmount"
+ :currencyCode="wallet.currency"
+ :isShowBaseRate="props.isShowBaseRate"
+ variant="sm"
+ />
+ <Amount
+ v-else
+ :amount="wallet.amount"
+ :currencyCode="wallet.currency"
+ :isShowBaseRate="props.isShowBaseRate"
+ variant="sm"
+ />
+ </div>
+ </template>
+
+ <!-- Alternative -->
+ <template v-if="props.alt">
+ <div class="grid grow gap-0.5">
+ <div class="text-2 text-xs leading-none whitespace-nowrap">
+ {{ wallet.name }}
+ </div>
+
+ <div v-if="!isSort">
+ <Amount
+ v-if="wallet.creditLimit"
+ :amount="creditAmount"
+ :currencyCode="wallet.currency"
+ :isShowBaseRate="false"
+ :isShowMinus="false"
+ align="left"
+ variant="2xs"
+ />
+ <Amount
+ v-else
+ :amount="wallet.amount"
+ :currencyCode="wallet.currency"
+ :isShowBaseRate="props.isShowBaseRate"
+ :isShowMinus="false"
+ align="left"
+ variant="2xs"
+ />
+ </div>
+ </div>
+
+ <div
+ v-if="isSort"
+ class="sortHandle flex-center absolute right-0 h-full rounded-md px-3 group-hover:bg-(--item-6)"
+ >
+ <Icon name="lucide:grip-vertical" size="20" />
+ </div>
+ </template>
+ </UiElement>
</template>