perf(rating): use useColor instead of useLayer

jd-solanki · jd-solanki · commit 105d6429cbdf · 2023-01-07T09:26:33.000+05:30
diff --git a/packages/anu-vue/src/components/rating/ARating.vue b/packages/anu-vue/src/components/rating/ARating.vue
@@ -1,14 +1,14 @@
 <script lang="ts" setup>
+import { defu } from 'defu'
 import type { ExtractPropTypes } from 'vue'
-import { useLayer, useProps as useLayerProps } from '@/composables/useLayer'
-import { disabled as disabledProp, readonly as readonlyProp } from '@/composables/useProps'
+import { useColor } from '@/composables'
+import { color as colorProp, disabled as disabledProp, readonly as readonlyProp } from '@/composables/useProps'
 
 const props = defineProps({
-  ...useLayerProps({
-    color: {
-      default: 'warning',
-    },
-  }),
+  /**
+   * Rating color
+   */
+  color: defu({ default: 'warning' }, colorProp),
 
   /**
    * Bind v-model value to rating
@@ -81,13 +81,7 @@ defineOptions({
   name: 'ARating',
 })
 
-const { getLayerClasses } = useLayer()
-
-const { styles, classes } = getLayerClasses(
-  toRef(props, 'color'),
-  ref(''),
-  ref(false),
-)
+const { styles } = useColor(toRef(props, 'color'), 'rating-color')
 
 const rating = ref(0)
 const isHovered = ref(false)
@@ -140,7 +134,6 @@ const onMouseLeave = () => {
       (props.animate && !props.readonly && !props.disabled) && 'a-rating-animated',
       props.readonly && 'a-rating-readonly pointer-events-none',
       props.disabled && 'a-rating-disabled pointer-events-none',
-      ...classes,
     ]"
   >
     <i
diff --git a/packages/anu-vue/src/composables/index.ts b/packages/anu-vue/src/composables/index.ts
@@ -1,3 +1,4 @@
+export * from './useColor'
 export * from './useConfigurable'
 export * from './useDOMScrollLock'
 export * from './useGroupModel'
diff --git a/packages/anu-vue/src/composables/useColor.ts b/packages/anu-vue/src/composables/useColor.ts
@@ -0,0 +1,24 @@
+import type { MaybeRef } from '@vueuse/core'
+import type { StyleValue } from 'vue'
+import type { ColorProp } from '@/composables/useProps'
+
+export const useColor = (color: MaybeRef<ColorProp>, cssVarName: MaybeRef<string>, as: 'text' | 'bg' = 'text') => {
+  const styles = computed(() => {
+    const _color = unref(color)
+    const cssVar = computed(() => `--a-${unref(cssVarName)}`)
+
+    const property = as === 'bg' ? 'background-color' : 'color'
+    const isThemeColor = ['primary', 'success', 'info', 'warning', 'danger'].includes(_color as string)
+
+    const _styles = {
+      [cssVar.value]: isThemeColor ? `hsl(var(--a-${_color}))` : _color,
+      [property]: `var(${cssVar.value})`,
+    } as StyleValue
+
+    return _styles
+  })
+
+  return {
+    styles,
+  }
+}
diff --git a/packages/anu-vue/src/composables/useLayer.ts b/packages/anu-vue/src/composables/useLayer.ts
@@ -15,6 +15,7 @@ export interface LayerProps {
 // Thanks: https://youtu.be/a_m7jxrTlaw
 // type LooseAutocomplete<T extends string> = T | Omit<string, T>
 
+// TODO: Use `useColor` composable to removed the color calculation
 export const useProps = (propOverrides?: Partial<ComponentObjectPropsOptions>) => {
   let props = {
     /**
diff --git a/packages/anu-vue/src/composables/useProps.ts b/packages/anu-vue/src/composables/useProps.ts
@@ -2,9 +2,12 @@ import { createDefu } from 'defu'
 import type { PropType } from 'vue'
 import type { ConfigurableValue } from '@/composables/useConfigurable'
 
+// ℹ️ We need to move this to some better places
+export type LooseAutocomplete<T extends string> = T | Omit<string, T>
+
 export const themeColors = ['primary', 'success', 'info', 'warning', 'danger'] as const
 export type ThemeColor = typeof themeColors[number]
-export type ColorProp = ThemeColor | undefined
+export type ColorProp = LooseAutocomplete<ThemeColor> | undefined
 
 export const color = {
   type: [String, undefined] as PropType<ColorProp>,

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+export * from './useColor'`
`1`	`2`	`export * from './useConfigurable'`
`2`	`3`	`export * from './useDOMScrollLock'`
`3`	`4`	`export * from './useGroupModel'`