refactor: Replaced classNames with tailwind merge in badge component
This commit is contained in:
@@ -1,33 +1,28 @@
|
|||||||
<template>
|
<template>
|
||||||
<component :is="wrapperType" :class="badgeClasses" :href="href">
|
<component :is="wrapperType" :class="badgeClasses" :href="href">
|
||||||
<slot name="icon"/>
|
<slot name="icon" />
|
||||||
<slot name="default" />
|
<slot name="default" />
|
||||||
</component>
|
</component>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { computed, toRefs, useSlots } from 'vue'
|
import { computed, useSlots } from 'vue'
|
||||||
import type { PropType } from 'vue'
|
|
||||||
import type { BadgeType, BadgeSize } from './types'
|
import type { BadgeType, BadgeSize } from './types'
|
||||||
import { useBadgeClasses } from '@/components/Badge/composables/useBadgeClasses'
|
import { useBadgeClasses } from '@/components/Badge/composables/useBadgeClasses'
|
||||||
|
|
||||||
const props = defineProps({
|
interface IBadgeProps {
|
||||||
type: {
|
type?: BadgeType
|
||||||
type: String as PropType<BadgeType>,
|
size?: BadgeSize
|
||||||
default: 'default',
|
href?: string | null
|
||||||
},
|
}
|
||||||
size: {
|
const props = withDefaults(defineProps<IBadgeProps>(), {
|
||||||
type: String as PropType<BadgeSize>,
|
type: 'default',
|
||||||
default: 'xs',
|
size: 'xs',
|
||||||
},
|
href: null,
|
||||||
href: {
|
|
||||||
type: String,
|
|
||||||
default: null,
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const slots = useSlots()
|
const slots = useSlots()
|
||||||
const isContentEmpty = computed(() => !slots.default)
|
const isContentEmpty = computed(() => !slots.default)
|
||||||
const wrapperType = computed(() => props.href ? 'a' : 'span')
|
const wrapperType = computed(() => (props.href ? 'a' : 'span'))
|
||||||
|
|
||||||
const { badgeClasses } = useBadgeClasses(toRefs(props), { isContentEmpty })
|
const { badgeClasses } = useBadgeClasses(props, { isContentEmpty })
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import type { BadgeType, BadgeSize } from '../types'
|
import type { BadgeType, BadgeSize } from '../types'
|
||||||
import { computed } from 'vue'
|
import { computed, type Ref, useAttrs } from 'vue'
|
||||||
import type { Ref } from 'vue'
|
import { twMerge } from 'tailwind-merge'
|
||||||
import classNames from 'classnames'
|
|
||||||
|
|
||||||
const defaultBadgeClasses = 'mr-2 px-2.5 py-0.5 rounded flex items-center justify-center'
|
const defaultBadgeClasses = 'mr-2 px-2.5 py-0.5 rounded flex items-center justify-center'
|
||||||
const badgeLinkClasses = 'bg-blue-100 hover:bg-blue-200 text-blue-800 dark:text-blue-800 dark:hover:bg-blue-300'
|
const badgeLinkClasses = 'bg-blue-100 hover:bg-blue-200 text-blue-800 dark:text-blue-800 dark:hover:bg-blue-300'
|
||||||
@@ -35,24 +34,29 @@ const badgeSizeClasses: Record<BadgeSize, string> = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export type UseBadgeClassesProps = {
|
export type UseBadgeClassesProps = {
|
||||||
type: Ref<BadgeType>
|
type: BadgeType
|
||||||
size: Ref<BadgeSize>
|
size: BadgeSize
|
||||||
href: Ref<string>
|
href: string | null
|
||||||
}
|
}
|
||||||
export type UseBadgeClassesOptions = {
|
export type UseBadgeClassesOptions = {
|
||||||
isContentEmpty: Ref<boolean>
|
isContentEmpty: Ref<boolean>
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useBadgeClasses(props: UseBadgeClassesProps, options: UseBadgeClassesOptions): {
|
export function useBadgeClasses(
|
||||||
|
props: UseBadgeClassesProps,
|
||||||
|
options: UseBadgeClassesOptions,
|
||||||
|
): {
|
||||||
badgeClasses: Ref<string>
|
badgeClasses: Ref<string>
|
||||||
} {
|
} {
|
||||||
|
const attrs = useAttrs()
|
||||||
const badgeClasses = computed<string>(() => {
|
const badgeClasses = computed<string>(() => {
|
||||||
return classNames(
|
return twMerge(
|
||||||
badgeSizeClasses[props.size.value],
|
badgeSizeClasses[props.size],
|
||||||
props.href.value ? '' : badgeTypeClasses[props.type.value],
|
props.href ? '' : badgeTypeClasses[props.type],
|
||||||
props.href.value ? '' : badgeTextClasses[props.type.value],
|
props.href ? '' : badgeTextClasses[props.type],
|
||||||
props.href.value ? badgeLinkClasses : '',
|
props.href ? badgeLinkClasses : '',
|
||||||
options.isContentEmpty.value ? onlyIconClasses : defaultBadgeClasses,
|
options.isContentEmpty.value ? onlyIconClasses : defaultBadgeClasses,
|
||||||
|
attrs.class as string,
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user