Skip to content

Open source personal finance application

fix: resolve NuxtLink in setup context, wrap Toggle in single root

Ilya Komichev467dabd10e02
diff --git a/app/components/ui/Element.vue b/app/components/ui/Element.vue
index ca714c09..76147111 100644
--- a/app/components/ui/Element.vue
+++ b/app/components/ui/Element.vue
@@ -10,6 +10,7 @@ const emit = defineEmits<{
click: [e: Event]
}>()
+const NuxtLink = resolveComponent('NuxtLink')
const slots = useSlots()
const elementClasses = computed(() => cn(
@@ -21,7 +22,7 @@ const elementClasses = computed(() => cn(
<template>
<component
- :is="props.to ? resolveComponent('NuxtLink') : 'div'"
+ :is="props.to ? NuxtLink : 'div'"
:to="props.to"
:class="{ uiElementLink: props.to }"
@click="(e: Event) => emit('click', e)"
diff --git a/app/components/ui/Toggle.vue b/app/components/ui/Toggle.vue
index b29135b8..7af325f0 100644
--- a/app/components/ui/Toggle.vue
+++ b/app/components/ui/Toggle.vue
@@ -10,19 +10,21 @@ const isShown = useStorage(`${props.storageKey}`, props.initStatus)
</script>
<template>
- <div v-if="$slots.header">
- <slot
- name="header"
- :isShown
- :toggle="() => isShown = !isShown"
- />
- </div>
+ <div>
+ <div v-if="$slots.header">
+ <slot
+ name="header"
+ :isShown
+ :toggle="() => isShown = !isShown"
+ />
+ </div>
- <div
- v-if="isShown && $slots.default"
- >
- <slot
- :toggle="() => isShown = !isShown"
- />
+ <div
+ v-if="isShown && $slots.default"
+ >
+ <slot
+ :toggle="() => isShown = !isShown"
+ />
+ </div>
</div>
</template>