Skip to content

Commit

Permalink
feat(Avatar): handle chipText (#306)
Browse files Browse the repository at this point in the history
Co-authored-by: Benjamin Canac <canacb1@gmail.com>
  • Loading branch information
jaybharadia and benjamincanac authored Jun 22, 2023
1 parent 4863636 commit 759af05
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 12 deletions.
1 change: 1 addition & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ module.exports = {
root: true,
extends: ['@nuxt/eslint-config'],
rules: {
'semi': ['error', 'never'],
'comma-dangle': ['error', 'never'],
'space-before-function-paren': ['error', 'always'],
'vue/multi-word-component-names': 0,
Expand Down
4 changes: 3 additions & 1 deletion docs/content/2.elements/1.avatar.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ baseProps:

### Chip

Use the `chip-color` and `chip-position` props to display a chip on the Avatar.
Use the `chip-color`, `chip-text` and `chip-position` props to display a chip on the Avatar.

::component-card
---
props:
chipColor: 'primary'
chipText: ''
chipPosition: 'top-right'
size : 'sm'
extraColors:
- gray
baseProps:
Expand Down
20 changes: 10 additions & 10 deletions src/runtime/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const avatar = {
'3xl': 'h-20 w-20 text-2xl'
},
chip: {
base: 'absolute block rounded-full ring-1 ring-white dark:ring-gray-900',
base: 'absolute rounded-full ring-1 ring-white dark:ring-gray-900 flex items-center justify-center text-white dark:text-gray-900 font-medium',
background: 'bg-{color}-500 dark:bg-{color}-400',
position: {
'top-right': 'top-0 right-0',
Expand All @@ -84,15 +84,15 @@ const avatar = {
'bottom-left': 'bottom-0 left-0'
},
size: {
'3xs': 'h-1 w-1',
'2xs': 'h-1 w-1',
xs: 'h-1.5 w-1.5',
sm: 'h-2 w-2',
md: 'h-2.5 w-2.5',
lg: 'h-3 w-3',
xl: 'h-3.5 w-3.5',
'2xl': 'h-3.5 w-3.5',
'3xl': 'h-4 w-4'
'3xs': 'h-[4px] min-w-[4px] text-[4px] p-px',
'2xs': 'h-[5px] min-w-[5px] text-[5px] p-px',
xs: 'h-1.5 min-w-[0.375rem] text-[6px] p-px',
sm: 'h-2 min-w-[0.5rem] text-[7px] p-0.5',
md: 'h-2.5 min-w-[0.625rem] text-[8px] p-0.5',
lg: 'h-3 min-w-[0.75rem] text-[10px] p-0.5',
xl: 'h-3.5 min-w-[0.875rem] text-[11px] p-1',
'2xl': 'h-4 min-w-[1rem] text-[12px] p-1',
'3xl': 'h-5 min-w-[1.25rem] text-[14px] p-1'
}
},
default: {
Expand Down
8 changes: 7 additions & 1 deletion src/runtime/components/elements/Avatar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<img v-if="url && !error" :class="avatarClass" :src="url" :alt="alt" :onerror="() => onError()">
<span v-else-if="text || placeholder" :class="ui.placeholder">{{ text || placeholder }}</span>

<span v-if="chipColor" :class="chipClass" />
<span v-if="chipColor" :class="chipClass">
{{ chipText }}
</span>
<slot />
</span>
</template>
Expand Down Expand Up @@ -55,6 +57,10 @@ export default defineComponent({
return Object.keys(appConfig.ui.avatar.chip.position).includes(value)
}
},
chipText: {
type: [String, Number],
default: null
},
ui: {
type: Object as PropType<Partial<typeof appConfig.ui.avatar>>,
default: () => appConfig.ui.avatar
Expand Down

1 comment on commit 759af05

@vercel
Copy link

@vercel vercel bot commented on 759af05 Jun 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

ui – ./

ui.nuxtlabs.com
ui-nuxtlabs.vercel.app
ui-git-dev-nuxtlabs.vercel.app

Please sign in to comment.