refactor: move the optional to check to AppLink

snapshot-labs · Nov 3, 2024 · f32d009 · f32d009
1 parent af1c22b
commit f32d009
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/apps/ui/src/components/AppLink.vue b/apps/ui/src/components/AppLink.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup>
 import { RouteLocationRaw, RouterLinkProps } from 'vue-router';
 
-const props = defineProps<RouterLinkProps>();
+const props = defineProps<
+  Omit<RouterLinkProps, 'to'> & { to?: RouteLocationRaw }
+>();
 
 const { isWhiteLabel } = useWhiteLabel();
 
@@ -32,7 +34,10 @@ function normalize(to: RouteLocationRaw) {
 </script>
 
 <template>
-  <router-link :to="normalize(props.to)">
+  <router-link v-if="props.to" :to="normalize(props.to)">
     <slot />
   </router-link>
+  <div v-else>
+    <slot />
+  </div>
 </template>
diff --git a/apps/ui/src/components/Ui/ProposalLabel.vue b/apps/ui/src/components/Ui/ProposalLabel.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { RouteLocationNamedRaw } from 'vue-router';
-import AppLink from '../AppLink.vue';
 
 const props = defineProps<{
   label: string;
@@ -50,8 +49,7 @@ function checkColorProximity(color: string): {
 </script>
 
 <template>
-  <component
-    :is="to ? AppLink : 'div'"
+  <AppLink
     :to="to"
     class="rounded-full w-fit max-w-[220px] shrink-0 flex"
     :class="{
@@ -66,5 +64,5 @@ function checkColorProximity(color: string): {
       class="truncate text-sm leading-[11px] whitespace-nowrap px-2 py-[6px]"
       v-text="label"
     />
-  </component>
+  </AppLink>
 </template>