refactor(ShareLink): remove v-sheet to avoid linebreak

openfoodfacts · Aug 17, 2024 · 3cfb7b6 · 3cfb7b6
1 parent fabdf44
commit 3cfb7b6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 35 deletions.
diff --git a/src/components/OpenFoodFactsLink.vue b/src/components/OpenFoodFactsLink.vue
@@ -2,12 +2,12 @@
   <a v-if="display === 'link'" :href="getUrl" target="_blank" :disabled="disabled">
     {{ getSourceName }}
   </a>
-  <v-btn v-else-if="display === 'button'" size="small" :prepend-icon="getSourceIcon" append-icon="mdi-open-in-new" :href="getUrl" target="_blank" :disabled="disabled">
-    {{ getSourceName }}
-  </v-btn>
   <v-list-item v-else-if="display === 'list-item'" :slim="true" :prepend-icon="getSourceIcon" append-icon="mdi-open-in-new" :href="getUrl" target="_blank" :disabled="disabled">
     {{ getSourceName }}
   </v-list-item>
+  <v-btn v-else-if="display === 'button'" size="small" :prepend-icon="getSourceIcon" append-icon="mdi-open-in-new" :href="getUrl" target="_blank" :disabled="disabled">
+    {{ getSourceName }}
+  </v-btn>
 </template>
 
 <script>
@@ -34,7 +34,7 @@ export default {
     display: {
       type: String,
       default: 'link',
-      examples: ['link', 'button', 'list-item']
+      examples: ['link', 'list-item', 'button']
     },
     disabled: {
       type: Boolean,

diff --git a/src/components/PriceAddLink.vue b/src/components/PriceAddLink.vue
@@ -2,6 +2,9 @@
   <a v-if="display === 'link'" :to="getAddUrl" :disabled="disabled">
     {{ $t('Common.AddPrice') }}
   </a>
+  <v-list-item v-else-if="display === 'list-item'" :slim="true" base-color="primary" prepend-icon="mdi-tag-plus-outline" :to="getAddUrl" :disabled="disabled">
+    {{ $t('Common.AddPrice') }}
+  </v-list-item>
   <v-btn
     v-else-if="display === 'button'"
     size="small"
@@ -12,9 +15,6 @@
   >
     {{ $t('Common.AddPrice') }}
   </v-btn>
-  <v-list-item v-else-if="display === 'list-item'" :slim="true" base-color="primary" prepend-icon="mdi-tag-plus-outline" :to="getAddUrl" :disabled="disabled">
-    {{ $t('Common.AddPrice') }}
-  </v-list-item>
 </template>
 
 <script>
@@ -36,7 +36,7 @@ export default {
     display: {
       type: String,
       default: 'link',
-      examples: ['link', 'button', 'list-item']
+      examples: ['link', 'list-item', 'button']
     },
     disabled: {
       type: Boolean,

diff --git a/src/components/ShareLink.vue b/src/components/ShareLink.vue
@@ -2,35 +2,33 @@
   <a v-if="display === 'link'" :disabled="disabled" @click="shareViaWebShare">
     {{ $t('Common.Share') }}
   </a>
-  <v-sheet v-else-if="display === 'button'">
-    <v-btn
-      v-if="!$vuetify.display.smAndUp"
-      class="ml-2"
-      size="small"
-      density="comfortable"
-      color="teal"
-      icon="mdi-share-variant"
-      :title="$t('Common.Share')"
-      :disabled="disabled"
-      @click="shareViaWebShare"
-    />
-    <v-btn
-      v-else
-      class="ml-2"
-      size="small"
-      rounded="xl"
-      color="teal"
-      prepend-icon="mdi-share-variant"
-      :title="$t('Common.Share')"
-      :disabled="disabled"
-      @click="shareViaWebShare"
-    >
-      {{ $t('Common.Share') }}
-    </v-btn>
-  </v-sheet>
   <v-list-item v-else-if="display === 'list-item'" :slim="true" base-color="teal" prepend-icon="mdi-share-variant" :disabled="disabled" @click="shareViaWebShare">
     {{ $t('Common.Share') }}
   </v-list-item>
+  <v-btn
+    v-else-if="display === 'button' && !$vuetify.display.smAndUp"
+    class="ml-2"
+    size="small"
+    density="comfortable"
+    color="teal"
+    icon="mdi-share-variant"
+    :title="$t('Common.Share')"
+    :disabled="disabled"
+    @click="shareViaWebShare"
+  />
+  <v-btn
+    v-else-if="display === 'button' && $vuetify.display.smAndUp"
+    class="ml-2"
+    size="small"
+    rounded="xl"
+    color="teal"
+    prepend-icon="mdi-share-variant"
+    :title="$t('Common.Share')"
+    :disabled="disabled"
+    @click="shareViaWebShare"
+  >
+    {{ $t('Common.Share') }}
+  </v-btn>
 
   <v-snackbar
     v-model="shareLinkCopySuccessMessage"
@@ -53,7 +51,7 @@ export default {
     display: {
       type: String,
       default: 'link',
-      examples: ['link', 'button', 'list-item']
+      examples: ['link', 'list-item', 'button']
     },
     disabled: {
       type: Boolean,