diff --git a/src/components/Progress/Progress.vue b/src/components/Progress/Progress.vue index 64b2952..5f9be68 100644 --- a/src/components/Progress/Progress.vue +++ b/src/components/Progress/Progress.vue @@ -1,6 +1,16 @@ diff --git a/src/components/Progress/composables/useProgressClasses.ts b/src/components/Progress/composables/useProgressClasses.ts index ccc8293..2e93f10 100644 --- a/src/components/Progress/composables/useProgressClasses.ts +++ b/src/components/Progress/composables/useProgressClasses.ts @@ -6,7 +6,7 @@ import type { ProgressVariant, ProgressSize } from '../types' // export type ProgressClassMap = { default: Record } -const progressColorClasses: Record = { +const barColorClasses: Record = { // const progressColorClasses: ProgressClassMap = { // default: { default: 'bg-blue-600 dark:bg-blue-600', @@ -22,11 +22,24 @@ const progressColorClasses: Record = { // }, } +const outsideTextColorClasses: Record = { + default: 'text-blue-700 dark:text-blue-500', + blue: 'text-blue-700 dark:text-blue-500', + alternative: 'dark:bg-gray-800', + dark: 'dark:text-white', + light: 'text-white dark:text-gray-800', + green: 'text-green-700 dark:text-green-500', + red: 'text-red-700 dark:text-red-500', + yellow: 'text-yellow-700 dark:text-yellow-500', + purple: 'text-purple-700 dark:text-purple-500', + pink: 'text-pink-700 dark:text-pink-600', +} + const progressSizeClasses: Record = { - sm: 'text-sm h-1.5', - md: 'text-sm h-2.5', - lg: 'text-base h-4', - xl: 'text-base h-6', + sm: 'h-1.5 text-xs leading-none', + md: 'h-2.5 text-xs leading-none', + lg: 'h-4 text-sm leading-none', + xl: 'h-6 text-base leading-tight', } export type UseProgressClassesProps = { @@ -34,11 +47,11 @@ export type UseProgressClassesProps = { size: Ref } -export function useProgressClasses(props: UseProgressClassesProps): { wrapperClasses: Ref, outerClass: Ref} { +export function useProgressClasses(props: UseProgressClassesProps): { innerClasses: Ref, outerClasses: Ref, outsideLabelClasses: Ref} { const bindClasses = computed(() => { let colorClass = '' - colorClass = progressColorClasses[props.color.value] + colorClass = barColorClasses[props.color.value] let sizeClass = '' sizeClass = progressSizeClasses[props.size.value] @@ -49,7 +62,7 @@ export function useProgressClasses(props: UseProgressClassesProps): { wrapperCla ) }) - const outerClass = computed(() => { + const outerClasses = computed(() => { let outerSizeClass = '' outerSizeClass = progressSizeClasses[props.size.value] return classNames( @@ -57,9 +70,18 @@ export function useProgressClasses(props: UseProgressClassesProps): { wrapperCla ) }) + const outsideLabelClasses = computed(() => { + let outsideLabelClass = '' + outsideLabelClass = outsideTextColorClasses[props.color.value] + return classNames( + outsideLabelClass + ) + }) + return { - wrapperClasses: bindClasses, - outerClass + innerClasses: bindClasses, + outerClasses, + outsideLabelClasses } } \ No newline at end of file