arthur/ui
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/ui.git synced 2026-01-27 18:30:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore(Badge): handle color override like buttons

Browse Source
This commit is contained in:
Benjamin Canac
2023-06-01 16:06:07 +02:00
parent 241df7f05e
commit 23833e92cb
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/runtime/app.config.ts
View File

@@ -109,6 +109,7 @@ const badge = {
md: 'text-sm px-2 py-1', md: 'text-sm px-2 py-1',
lg: 'text-sm px-2.5 py-1.5' lg: 'text-sm px-2.5 py-1.5'
}, },
color: {},
variant: { variant: {
solid: 'bg-{color}-50 dark:bg-{color}-400 dark:bg-opacity-10 text-{color}-500 dark:text-{color}-400 ring-1 ring-inset ring-{color}-500 dark:ring-{color}-400 ring-opacity-10 dark:ring-opacity-20' solid: 'bg-{color}-50 dark:bg-{color}-400 dark:bg-opacity-10 text-{color}-500 dark:text-{color}-400 ring-1 ring-inset ring-{color}-500 dark:ring-{color}-400 ring-opacity-10 dark:ring-opacity-20'
}, },

12
src/runtime/components/elements/Badge.vue
View File

@@ -29,14 +29,18 @@ export default defineComponent({
type: String, type: String,
default: () => appConfig.ui.badge.default.color, default: () => appConfig.ui.badge.default.color,
validator (value: string) { validator (value: string) {
return appConfig.ui.colors.includes(value) console.log('Object.keys(appConfig.ui.badge.color)', Object.keys(appConfig.ui.badge.color))
return [...appConfig.ui.colors, ...Object.keys(appConfig.ui.badge.color)].includes(value)
} }
}, },
variant: { variant: {
type: String, type: String,
default: () => appConfig.ui.badge.default.variant, default: () => appConfig.ui.badge.default.variant,
validator (value: string) { validator (value: string) {
return Object.keys(appConfig.ui.badge.variant).includes(value) return [
...Object.keys(appConfig.ui.badge.variant),
...Object.values(appConfig.ui.badge.color).flatMap(value => Object.keys(value))
].includes(value)
} }
}, },
label: { label: {
@@ -55,12 +59,14 @@ export default defineComponent({
const ui = computed<Partial<typeof appConfig.ui.badge>>(() => defu({}, props.ui, appConfig.ui.badge)) const ui = computed<Partial<typeof appConfig.ui.badge>>(() => defu({}, props.ui, appConfig.ui.badge))
const badgeClass = computed(() => { const badgeClass = computed(() => {
const variant = ui.value.color?.[props.color as string]?.[props.variant as string] || ui.value.variant[props.variant]
return classNames( return classNames(
ui.value.base, ui.value.base,
ui.value.font, ui.value.font,
ui.value.rounded, ui.value.rounded,
ui.value.size[props.size], ui.value.size[props.size],
ui.value.variant[props.variant]?.replaceAll('{color}', props.color) variant?.replaceAll('{color}', props.color)
) )
}) })