Skip to content

Commit ca3473e

Browse files
committed
feat: add support for custom spinner colors in FwbSpinner component
1 parent 570e238 commit ca3473e

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

docs/components/spinner.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import { FwbSpinner } from 'flowbite-vue'
5959
<fwb-spinner color="red" />
6060
<fwb-spinner color="white" />
6161
<fwb-spinner color="yellow" />
62+
<fwb-spinner color="#3fb984" /> <!-- Custom color -->
6263
</template>
6364
6465
<script setup>

docs/components/spinner/examples/FwbSpinnerExampleColor.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<fwb-spinner color="red" />
99
<fwb-spinner color="white" />
1010
<fwb-spinner color="yellow" />
11+
<fwb-spinner color="#3fb984" />
1112
</div>
1213
</template>
1314

src/components/FwbSpinner/FwbSpinner.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<template>
22
<svg
33
:class="spinnerClasses"
4+
:style="customColor ? { '--custom-fill': customColor } : {}"
45
fill="none"
56
role="status"
67
viewBox="0 0 100 101"
@@ -12,7 +13,7 @@
1213
/>
1314
<path
1415
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"
15-
fill="currentFill"
16+
:fill="customColor || 'currentFill'"
1617
/>
1718
</svg>
1819
</template>
@@ -34,5 +35,5 @@ const props = withDefaults(defineProps<ISpinnerProps>(), {
3435
size: '4',
3536
})
3637
37-
const { spinnerClasses } = useSpinnerClasses(toRefs(props))
38+
const { spinnerClasses, customColor } = useSpinnerClasses(toRefs(props))
3839
</script>

src/components/FwbSpinner/composables/useSpinnerClasses.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,12 @@ export type UseSpinnerClassesProps = {
3838
size: Ref<SpinnerSize>
3939
}
4040

41-
export function useSpinnerClasses (props: UseSpinnerClassesProps): { spinnerClasses: Ref<string> } {
41+
export function useSpinnerClasses (props: UseSpinnerClassesProps): { spinnerClasses: Ref<string>, customColor: Ref<string | null> } {
4242
const sizeClasses = computed(() => sizes[props.size.value])
43-
const colorClasses = computed(() => colors[props.color.value])
43+
44+
const colorClasses = computed(() => colors[props.color.value as SpinnerColor] ?? '')
45+
const customColor = computed(() => colorClasses.value ? null : (props.color.value as string))
46+
4447
const bgColorClasses = computed(() => 'text-gray-200 dark:text-gray-600')
4548
const animateClasses = computed(() => 'animate-spin')
4649
const spinnerClasses = computed(() => classNames(
@@ -50,5 +53,5 @@ export function useSpinnerClasses (props: UseSpinnerClassesProps): { spinnerClas
5053
sizeClasses.value,
5154
))
5255

53-
return { spinnerClasses }
56+
return { spinnerClasses, customColor }
5457
}

src/components/FwbSpinner/types.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
export type SpinnerColor = 'blue' | 'gray' | 'green' | 'red' | 'yellow' | 'pink' | 'purple' | 'white'
1+
type CustomColor = (`#${string}` & {})
2+
export type SpinnerColor = 'blue' | 'gray' | 'green' | 'red' | 'yellow' | 'pink' | 'purple' | 'white' | CustomColor
23

34
export type SpinnerSize = '0' | '0.5' | '1' | '1.5' | '2' | '2.5' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | '10' | '11' | '12'

0 commit comments

Comments
 (0)