From cc2009e9cbb07900af12c346f37a8f9022756828 Mon Sep 17 00:00:00 2001
From: Selemondev <selemondev@Selemondevs-MacBook-Pro.local>
Date: Sun, 10 Sep 2023 10:25:01 +0300
Subject: [PATCH] Update UAvatar component to include background color and text
 styles

---
 packages/nuxt-ui-vue/src/App.vue              |  4 +-
 .../src/Types/componentsTypes/components.ts   |  2 +
 .../components/elements/Avatar/UAvatar.vue    | 41 +++++++++++++++----
 .../nuxt-ui-vue/src/theme/nuxtLabsTheme.ts    |  2 +
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/packages/nuxt-ui-vue/src/App.vue b/packages/nuxt-ui-vue/src/App.vue
index e039c4f..e811412 100755
--- a/packages/nuxt-ui-vue/src/App.vue
+++ b/packages/nuxt-ui-vue/src/App.vue
@@ -2,5 +2,7 @@
 </script>
 
 <template>
-  <div />
+  <div class="grid place-items-center w-full min-h-screen">
+    <UAvatar src="https://github.com/selemondev.pg" icon="ph:moon" />
+  </div>
 </template>
diff --git a/packages/nuxt-ui-vue/src/Types/componentsTypes/components.ts b/packages/nuxt-ui-vue/src/Types/componentsTypes/components.ts
index 8334509..faf079d 100755
--- a/packages/nuxt-ui-vue/src/Types/componentsTypes/components.ts
+++ b/packages/nuxt-ui-vue/src/Types/componentsTypes/components.ts
@@ -93,6 +93,8 @@ export interface UAlert extends UComponentRoot {
 export interface UAvatar extends UComponentRoot {
   avatarWrapper?: string
   avatarChipClass?: string
+  avatarBackground?: string
+  avatarText?: string
   avatarSize?: string
   avatarIconSize?: string
   avatarRounded?: string
diff --git a/packages/nuxt-ui-vue/src/components/elements/Avatar/UAvatar.vue b/packages/nuxt-ui-vue/src/components/elements/Avatar/UAvatar.vue
index 60127ee..095b677 100755
--- a/packages/nuxt-ui-vue/src/components/elements/Avatar/UAvatar.vue
+++ b/packages/nuxt-ui-vue/src/components/elements/Avatar/UAvatar.vue
@@ -1,6 +1,7 @@
 <script setup lang='ts'>
 import type { PropType } from 'vue'
-import { computed, defineComponent } from 'vue'
+import { omit } from 'lodash-es'
+import { computed, defineComponent, ref, useAttrs, watch } from 'vue'
 import classNames from 'classnames'
 import { Icon } from '@iconify/vue'
 import type { VariantJSWithClassesListProps } from '../../../utils/getVariantProps'
@@ -21,7 +22,11 @@ const props = defineProps({
   },
   src: {
     type: String,
-    default: '',
+    default: null,
+  },
+  text: {
+    type: String,
+    default: null,
   },
   size: {
     type: String as PropType<AvatarSize>,
@@ -40,7 +45,7 @@ const props = defineProps({
 
   chipColor: {
     type: String,
-    default: '',
+    default: null,
   },
 
   chipSize: {
@@ -55,11 +60,29 @@ const props = defineProps({
 
   chipText: {
     type: String,
-    default: '',
+    default: null,
   },
 
 })
 
+const url = computed(() => {
+  if (typeof props.src === 'boolean')
+    return null
+
+  return props.src
+})
+
+const error = ref(false)
+
+watch(() => props.src, () => {
+  if (error.value)
+    error.value = false
+})
+
+function onError() {
+  error.value = true
+}
+
 const placeholder = computed(() => {
   return (props.alt || '').split(' ').map(word => word.charAt(0)).join('').substring(0, 2)
 })
@@ -78,6 +101,7 @@ const variant = computed(() => {
 const avatarWrapperClasses = computed<string>(() => {
   return classNames(
     variant.value.root,
+    (error.value || !url.value) && variant.value.avatarBackground,
     variant.value.avatarSize && variant.value[props.size],
   )
 })
@@ -121,6 +145,8 @@ const avatarIconSize = computed(() => {
 const avatarChipColorStyles = computed(() => ({
   'background-color': props.chipColor || '',
 }))
+const attrs = useAttrs()
+const attrsOmitted = omit(attrs, ['class'])
 </script>
 
 <script lang="ts">
@@ -132,9 +158,10 @@ export default defineComponent({
 
 <template>
   <span :class="[avatarWrapperClasses, avatarClasses]" :title="props.name">
-    <img v-if="props.src" :class="avatarClasses" :src="props.src" :alt="props.name">
-    <span v-else-if="!props.src" :class="variant.avatarPlaceholderClass">{{ placeholder }}</span>
-    <Icon v-if="!props.src && !placeholder" :icon="props.icon" :class="[avatarIconSize, variant.avatarIconColor]" />
+    <img v-if="url && !error" v-bind="attrsOmitted" :class="avatarClasses" :src="url" :alt="props.name" @error="onError">
+    <span v-else-if="text" :class="variant.avatarText">{{ props.text }}</span>
+    <span v-else-if="placeholder" :class="variant.avatarPlaceholderClass">{{ placeholder }}</span>
+    <Icon v-else-if="props.icon" :icon="props.icon" :class="[avatarIconSize, variant.avatarIconColor]" />
     <span v-if="props.chipColor" :style="avatarChipColorStyles" :class="[avatarChipClass, avatarChipSize]">
       {{ chipText }}
     </span>
diff --git a/packages/nuxt-ui-vue/src/theme/nuxtLabsTheme.ts b/packages/nuxt-ui-vue/src/theme/nuxtLabsTheme.ts
index f23f750..8256256 100755
--- a/packages/nuxt-ui-vue/src/theme/nuxtLabsTheme.ts
+++ b/packages/nuxt-ui-vue/src/theme/nuxtLabsTheme.ts
@@ -71,6 +71,8 @@ export default {
     base: {
       'root': 'relative cursor-pointer inline-flex items-center justify-center bg-gray-100 rounded-full',
       'avatarRounded': 'rounded-full',
+      'avatarBackground': 'bg-gray-100 dark:bg-gray-800',
+      'avatarText': 'font-medium leading-none text-gray-900 dark:text-white truncate',
       'avatarPlaceholderClass': 'font-medium cursor-pointer text-gray-600 upperCase',
       'avatarIconColor': 'text-black',
       '3xs': 'h-4 w-4 text-[8px]',