fix(VCardItem): use v-avatar for both icon/avatar props

vuetifyjs · Mar 7, 2023 · c003e6a · c003e6a
1 parent f4d801b
commit c003e6a
Showing 1 changed file with 4 additions and 27 deletions.
diff --git a/packages/vuetify/src/components/VCard/VCardItem.tsx b/packages/vuetify/src/components/VCard/VCardItem.tsx
@@ -3,7 +3,6 @@ import { VAvatar } from '@/components/VAvatar'
 import { VCardSubtitle } from './VCardSubtitle'
 import { VCardTitle } from './VCardTitle'
 import { VDefaultsProvider } from '@/components/VDefaultsProvider'
-import { VIcon } from '@/components/VIcon'
 
 // Composables
 import { IconValue } from '@/composables/icons'
@@ -52,19 +51,12 @@ export const VCardItem = genericComponent<VCardItemSlots>()({
             <div key="prepend" class="v-card-item__prepend">
               { !slots.prepend ? (
                 <>
-                  { props.prependAvatar && (
+                  { hasPrependMedia && (
                     <VAvatar
                       key="prepend-avatar"
                       density={ props.density }
-                      image={ props.prependAvatar }
-                    />
-                  ) }
-
-                  { props.prependIcon && (
-                    <VIcon
-                      key="prepend-icon"
-                      density={ props.density }
                       icon={ props.prependIcon }
+                      image={ props.prependAvatar }
                     />
                   ) }
                 </>
@@ -78,10 +70,6 @@ export const VCardItem = genericComponent<VCardItemSlots>()({
                       icon: props.prependIcon,
                       image: props.prependAvatar,
                     },
-                    VIcon: {
-                      density: props.density,
-                      icon: props.prependIcon,
-                    },
                   }}
                   v-slots:default={ slots.prepend }
                 />
@@ -109,18 +97,11 @@ export const VCardItem = genericComponent<VCardItemSlots>()({
             <div key="append" class="v-card-item__append">
               { !slots.append ? (
                 <>
-                  { props.appendIcon && (
-                    <VIcon
-                      key="append-icon"
-                      density={ props.density }
-                      icon={ props.appendIcon }
-                    />
-                  ) }
-
-                  { props.appendAvatar && (
+                  { hasAppendMedia && (
                     <VAvatar
                       key="append-avatar"
                       density={ props.density }
+                      icon={ props.appendIcon }
                       image={ props.appendAvatar }
                     />
                   ) }
@@ -135,10 +116,6 @@ export const VCardItem = genericComponent<VCardItemSlots>()({
                       icon: props.appendIcon,
                       image: props.appendAvatar,
                     },
-                    VIcon: {
-                      density: props.density,
-                      icon: props.appendIcon,
-                    },
                   }}
                   v-slots:default={ slots.append }
                 />