Add support for custom colors to FwbProgress and FwbSpinner

docs/components/progress.md

@@ -86,14 +86,15 @@ You can also apply color.
 ```vue
 <template>
   <div class="grid gap-2">
-    <fwb-progress :progress="12.5" label="Default"  />
-    <fwb-progress :progress="25" color="dark" label="Dark"  />
-    <fwb-progress :progress="37.5" color="blue" label="Blue"  />
-    <fwb-progress :progress="50" color="red" label="Red"  />
-    <fwb-progress :progress="62.5" color="green" label="Green"  />
-    <fwb-progress :progress="75" color="yellow" label="Yellow"  />
-    <fwb-progress :progress="87.5" color="indigo" label="Indigo"  />
-    <fwb-progress :progress="100" color="purple" label="Purple"  />
+    <fwb-progress :progress="11" label="Default"  />
+    <fwb-progress :progress="22" color="dark" label="Dark"  />
+    <fwb-progress :progress="33" color="blue" label="Blue"  />
+    <fwb-progress :progress="44" color="red" label="Red"  />
+    <fwb-progress :progress="55" color="green" label="Green"  />
+    <fwb-progress :progress="66" color="yellow" label="Yellow"  />
+    <fwb-progress :progress="77" color="indigo" label="Indigo"  />
+    <fwb-progress :progress="88" color="purple" label="Purple"  />
+    <fwb-progress :progress="99" color="#3fb984" label="Custom color"  />
   </div>
 </template>
 

docs/components/progress/examples/FwbProgressExampleColor.vue

@@ -2,42 +2,47 @@
   <div class="vp-raw grid gap-2">
     <fwb-progress
       label="Default"
-      :progress="12.5"
+      :progress="11"
     />
     <fwb-progress
       color="dark"
       label="Dark"
-      :progress="25"
+      :progress="22"
     />
     <fwb-progress
       color="blue"
       label="Blue"
-      :progress="37.5"
+      :progress="33"
     />
     <fwb-progress
       color="red"
       label="Red"
-      :progress="50"
+      :progress="44"
     />
     <fwb-progress
       color="green"
       label="Green"
-      :progress="62.5"
+      :progress="55"
     />
     <fwb-progress
       color="yellow"
       label="Yellow"
-      :progress="75"
+      :progress="66"
     />
     <fwb-progress
       color="indigo"
       label="Indigo"
-      :progress="87.5"
+      :progress="77"
     />
     <fwb-progress
       color="purple"
       label="Purple"
-      :progress="100"
+      :progress="88"
+    />
+    <fwb-progress
+      color="#3fb984"
+      label="Custom color"
+      :progress="99"
     />
   </div>
 </template>

docs/components/spinner.md

@@ -59,6 +59,7 @@ import { FwbSpinner } from 'flowbite-vue'
   <fwb-spinner color="red" />
   <fwb-spinner color="white" />
   <fwb-spinner color="yellow" />
+  <fwb-spinner color="#3fb984" /> <!-- Custom color -->
 </template>
 
 <script setup>

docs/components/spinner/examples/FwbSpinnerExampleColor.vue

@@ -8,6 +8,7 @@
     <fwb-spinner color="red" />
     <fwb-spinner color="white" />
     <fwb-spinner color="yellow" />
+    <fwb-spinner color="#3fb984" />
   </div>
 </template>
 

src/components/FwbProgress/FwbProgress.vue

@@ -4,11 +4,13 @@
       <div class="mb-1 flex justify-between">
         <span
           :class="outsideLabelClasses"
+          :style="customColor ? { color: customColor } : {}"
           class="text-base font-medium"
         >{{ label }}</span>
         <span
           v-if="labelProgress && labelPosition === 'outside'"
           :class="outsideLabelClasses"
+          :style="customColor ? { color: customColor } : {}"
           class="text-sm font-medium"
         >{{ progress }}%</span>
       </div>
@@ -19,7 +21,9 @@
     >
       <div
         :class="innerClasses"
-        :style="{ width: progress + '%' }"
+        :style="customColor
+          ? { width: progress + '%', backgroundColor: customColor }
+          : { width: progress + '%' }"
         class="rounded-full p-0.5 text-center font-medium text-blue-100"
       >
         <template v-if="labelProgress && labelPosition === 'inside'">
@@ -59,5 +63,6 @@ const {
   innerClasses,
   outerClasses,
   outsideLabelClasses,
+  customColor,
 } = useProgressClasses(toRefs(props))
 </script>

src/components/FwbProgress/composables/useProgressClasses.ts

@@ -1,7 +1,7 @@
 import classNames from 'classnames'
 import { computed, type Ref } from 'vue'
 
-import type { ProgressLabelPosition, ProgressSize, ProgressVariant } from '../types'
+import type { CustomColor, ProgressLabelPosition, ProgressSize, ProgressVariant } from '../types'
 
 const barColorClasses: Record<ProgressVariant, string> = {
   default: 'bg-blue-600 dark:bg-blue-600',
@@ -38,10 +38,18 @@
   labelPosition: Ref<ProgressLabelPosition>
 }
 
-export function useProgressClasses (props: UseProgressClassesProps): { innerClasses: Ref<string>, outerClasses: Ref<string>, outsideLabelClasses: Ref<string> } {
+export function useProgressClasses (props: UseProgressClassesProps): {
+  innerClasses: Ref<string>,
+  outerClasses: Ref<string>,
+  outsideLabelClasses: Ref<string>,
+  customColor: Ref<CustomColor | null>
+} {
+  const customColor = computed(() => {
+    return props.color.value as CustomColor
+  })
   const bindClasses = computed(() => {
     return classNames(
-      barColorClasses[props.color.value],
+      customColor.value ? '' : barColorClasses[props.color.value],
       progressSizeClasses[props.size.value],
     )
   })
@@ -51,7 +59,7 @@
     )
   })
   const outsideLabelClasses = computed(() => {
-    return classNames(
+    return customColor.value ? '' : classNames(
       outsideTextColorClasses[props.color.value],
     )
   })
@@ -60,5 +68,6 @@
     innerClasses: bindClasses,
     outerClasses,
     outsideLabelClasses,
+    customColor,
   }
 }

src/components/FwbProgress/types.ts

@@ -1,3 +1,4 @@
 export type ProgressLabelPosition = 'inside' | 'outside' | 'none'
 export type ProgressSize = 'sm' | 'md' | 'lg' | 'xl'
-export type ProgressVariant = 'default' | 'dark' | 'green' | 'red' | 'yellow' | 'purple' | 'blue' | 'indigo'
+export type CustomColor = (`#${string}` & {})
+export type ProgressVariant = 'default' | 'dark' | 'green' | 'red' | 'yellow' | 'purple' | 'blue' | 'indigo' | CustomColor

src/components/FwbSpinner/FwbSpinner.vue

@@ -1,6 +1,7 @@
 <template>
   <svg
     :class="spinnerClasses"
+    :style="customColor ? { '--custom-fill': customColor } : {}"
     fill="none"
     role="status"
     viewBox="0 0 100 101"
@@ -12,7 +13,7 @@
     />
     <path
       d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-      fill="currentFill"
+      :fill="customColor || 'currentFill'"
     />
   </svg>
 </template>
@@ -34,5 +35,5 @@ const props = withDefaults(defineProps<ISpinnerProps>(), {
   size: '4',
 })
 
-const { spinnerClasses } = useSpinnerClasses(toRefs(props))
+const { spinnerClasses, customColor } = useSpinnerClasses(toRefs(props))
 </script>

src/components/FwbSpinner/composables/useSpinnerClasses.ts

@@ -38,9 +38,12 @@ export type UseSpinnerClassesProps = {
   size: Ref<SpinnerSize>
 }
 
-export function useSpinnerClasses (props: UseSpinnerClassesProps): { spinnerClasses: Ref<string> } {
+export function useSpinnerClasses (props: UseSpinnerClassesProps): { spinnerClasses: Ref<string>, customColor: Ref<string | null> } {
   const sizeClasses = computed(() => sizes[props.size.value])
-  const colorClasses = computed(() => colors[props.color.value])
+
+  const colorClasses = computed(() => colors[props.color.value as SpinnerColor] ?? '')
+  const customColor = computed(() => colorClasses.value ? null : (props.color.value as string))
+
   const bgColorClasses = computed(() => 'text-gray-200 dark:text-gray-600')
   const animateClasses = computed(() => 'animate-spin')
   const spinnerClasses = computed(() => classNames(
@@ -50,5 +53,5 @@ export function useSpinnerClasses (props: UseSpinnerClassesProps): { spinnerClas
     sizeClasses.value,
   ))
 
-  return { spinnerClasses }
+  return { spinnerClasses, customColor }
 }

src/components/FwbSpinner/types.ts

@@ -1,3 +1,4 @@
-export type SpinnerColor = 'blue' | 'gray' | 'green' | 'red' | 'yellow' | 'pink' | 'purple' | 'white'
+type CustomColor = (`#${string}` & {})
+export type SpinnerColor = 'blue' | 'gray' | 'green' | 'red' | 'yellow' | 'pink' | 'purple' | 'white' | CustomColor
 
 export type SpinnerSize = '0' | '0.5' | '1' | '1.5' | '2' | '2.5' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | '10' | '11' | '12'