@indielayer/ui 1.0.10 → 1.1.0

package/src/components/tag/Tag.theme.ts

@@ -1,8 +1,16 @@
-import type { ThemeParams } from '../../composables/theme'
+import type { ThemeClasses, ThemeComponent } from '../../composables/theme'
+import type { TagProps } from './Tag.vue'
 
-export default {
+type InternalClasses = 'wrapper' | 'loadingWrapper'
+
+interface InternalTheme extends ThemeComponent<TagProps, InternalClasses> {}
+export interface TagTheme extends Omit<InternalTheme, 'classes'> {
+  classes?: Partial<ThemeClasses<TagProps, InternalClasses>>;
+}
+
+const theme: InternalTheme = {
   classes: {
-    wrapper: ({ props, data }: ThemeParams) => {
+    wrapper: ({ props, data }) => {
       let c = 'inline-flex items-center leading-none max-w-full'
 
       if (props.size === 'xs') c += ' px-2 py-1 text-xs'
@@ -17,7 +25,7 @@ export default {
     loadingWrapper: 'absolute inset-0 flex items-center justify-center z-40 bg-gray-300 dark:bg-gray-600 rounded opacity-50',
   },
 
-  styles: ({ colors, props, css }: ThemeParams) => {
+  styles: ({ colors, props, css }) => {
     const color = colors.getPalette(props.color)
 
     return css.variables({
@@ -30,3 +38,5 @@ export default {
     })
   },
 }
+
+export default theme

package/src/components/tag/Tag.vue

@@ -1,9 +1,28 @@
 <script lang="ts">
-export default { name: 'XTag' }
+const tagProps = {
+  ...useCommon.props(),
+  ...useColors.props('gray'),
+  tag: {
+    type: String,
+    default: 'span',
+  },
+  rounded: Boolean,
+  removable: Boolean,
+  outlined: Boolean,
+}
+
+export type TagProps = ExtractPublicPropTypes<typeof tagProps>
+
+export default {
+  name: 'XTag',
+  validators: {
+    ...useCommon.validators(),
+  },
+}
 </script>
 
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, type ExtractPublicPropTypes } from 'vue'
 import { useColors } from '../../composables/colors'
 import { useCommon } from '../../composables/common'
 import { useTheme } from '../../composables/theme'
@@ -13,17 +32,7 @@ import XIcon from '../icon/Icon.vue'
 
 import theme from './Tag.theme'
 
-const props = defineProps({
-  ...useCommon.props(),
-  ...useColors.props('gray'),
-  tag: {
-    type: String,
-    default: 'span',
-  },
-  rounded: Boolean,
-  removable: Boolean,
-  outlined: Boolean,
-})
+const props = defineProps(tagProps)
 
 defineEmits(['remove'])
 

package/src/components/tag/index.ts

@@ -0,0 +1,2 @@
+export { default as XTag } from './Tag.vue'
+export type { TagProps } from './Tag.vue'

package/src/components/textarea/Textarea.theme.ts

@@ -1,23 +1,22 @@
-import type { ThemeParams } from '../../composables/theme'
+import type { Ref } from 'vue'
+import type { ThemeClasses, ThemeComponent } from '../../composables/theme'
+import type { TextareaProps } from './Textarea.vue'
 
-export default {
-  classes: {
-    wrapper: 'inline-block align-bottom text-left',
-    // wrapper: ({ props, data }: ThemeParams) => {
-    //   let c = 'inline-flex items-center leading-none whitespace-nowrap'
-
-    //   if (props.size === 'xs') c += ' px-2 py-1 text-xs'
-    //   else if (props.size === 'sm') c += ' px-2 py-1 text-sm'
-    //   else if (props.size === 'lg') c += ' px-4 py-3 text-lg'
-    //   else if (props.size === 'xl') c += ' px-6 py-6 text-xl'
-    //   else c += ' px-3 py-2'
+type InternalClasses = 'wrapper' | 'label' | 'input'
+type InternalExtraData = {
+  errorInternal: Ref<boolean>;
+}
 
-    //   return c
-    // },
+interface InternalTheme extends ThemeComponent<TextareaProps, InternalClasses, InternalExtraData> {}
+export interface TextareaTheme extends Omit<InternalTheme, 'classes'> {
+  classes?: Partial<ThemeClasses<TextareaProps, InternalClasses, InternalExtraData>>;
+}
 
-    // loadingWrapper: 'absolute inset-0 flex items-center justify-center z-40 bg-gray-300 dark:bg-gray-600 rounded opacity-50',
+const theme: InternalTheme = {
+  classes: {
+    wrapper: 'inline-block align-bottom text-left',
 
-    label: ({ props }: ThemeParams) => {
+    label: ({ props }) => {
       const classes = 'font-medium text-gray-800 dark:text-gray-200 mb-1'
 
       if (props.size === 'xs') return classes + ' text-xs'
@@ -28,7 +27,7 @@ export default {
       return classes //+ ' text-sm'
     },
 
-    input: ({ props, data }: ThemeParams) => {
+    input: ({ props, data }) => {
       const classes = ['resize-none appearance-none block w-full placeholder-gray-400 dark:placeholder-gray-500 outline-transparent outline outline-2 outline-offset-[-1px] transition duration-150 ease-in-out border-gray-300 dark:border-gray-700 border shadow-sm rounded-md']
 
       if (!data.errorInternal && !props.disabled) classes.push('hover:border-gray-400 dark:hover:border-gray-500')
@@ -46,17 +45,6 @@ export default {
       return classes
     },
   },
-
-  styles: ({ colors, props, css }: ThemeParams) => {
-    const color = colors.getPalette(props.color)
-
-    return css.variables({
-      bg: color[100],
-      text: color[800],
-      border: color[800],
-      dark: {
-        text: props.outlined ? color[200] : color[800],
-      },
-    })
-  },
 }
+
+export default theme

package/src/components/textarea/Textarea.vue

@@ -1,22 +1,5 @@
 <script lang="ts">
-export default { name: 'XTextarea' }
-</script>
-
-<script setup lang="ts">
-import { ref, watch } from 'vue'
-import { useResizeObserver, useEventListener } from '@vueuse/core'
-import { useCSS } from '../../composables/css'
-import { useTheme } from '../../composables/theme'
-import { useCommon } from '../../composables/common'
-import { useColors } from '../../composables/colors'
-import { useInputtable } from '../../composables/inputtable'
-import { useInteractive } from '../../composables/interactive'
-
-import XInputError from '../helpers/InputError'
-
-import theme from './Textarea.theme'
-
-const props = defineProps({
+const textareaProps = {
   ...useCommon.props(),
   ...useInteractive.props(),
   ...useInputtable.props(),
@@ -38,7 +21,33 @@ const props = defineProps({
   },
   preventEnter: Boolean,
   block: Boolean,
-})
+}
+
+export type TextareaProps = ExtractPublicPropTypes<typeof textareaProps>
+
+export default {
+  name: 'XTextarea',
+  validators: {
+    ...useCommon.validators(),
+  },
+}
+</script>
+
+<script setup lang="ts">
+import { ref, watch, type ExtractPublicPropTypes } from 'vue'
+import { useResizeObserver, useEventListener } from '@vueuse/core'
+import { useCSS } from '../../composables/css'
+import { useTheme } from '../../composables/theme'
+import { useCommon } from '../../composables/common'
+import { useColors } from '../../composables/colors'
+import { useInputtable } from '../../composables/inputtable'
+import { useInteractive } from '../../composables/interactive'
+
+import XInputError from '../helpers/InputError'
+
+import theme from './Textarea.theme'
+
+const props = defineProps(textareaProps)
 
 const emit = defineEmits(useInputtable.emits())
 

package/src/components/textarea/index.ts

@@ -0,0 +1,2 @@
+export { default as XTextarea } from './Textarea.vue'
+export type { TextareaProps } from './Textarea.vue'

package/src/components/toggle/Toggle.theme.ts

@@ -1,10 +1,18 @@
-import type { ThemeParams } from '../../composables/theme'
+import type { ThemeClasses, ThemeComponent } from '../../composables/theme'
+import type { ToggleProps } from './Toggle.vue'
 
-export default {
+type InternalClasses = 'wrapper' | 'label' | 'buttonWrapper' | 'button'
+
+interface InternalTheme extends ThemeComponent<ToggleProps, InternalClasses> {}
+export interface ToggleTheme extends Omit<InternalTheme, 'classes'> {
+  classes?: Partial<ThemeClasses<ToggleProps, InternalClasses>>;
+}
+
+const theme: InternalTheme = {
   classes: {
     wrapper: '',
 
-    label: ({ props }: ThemeParams) => {
+    label: ({ props }) => {
       const c = 'font-medium text-gray-800 dark:text-gray-200'
 
       if (props.size === 'xs') return c + ' text-xs'
@@ -15,7 +23,7 @@ export default {
       return c + ' text-sm'
     },
 
-    buttonWrapper: ({ props }: ThemeParams) => {
+    buttonWrapper: ({ props }) => {
       let c = 'relative shrink-0'
 
       if (props.size === 'sm' || props.size === 'xs') c += ' w-6'
@@ -26,7 +34,7 @@ export default {
       return c
     },
 
-    button: ({ props }: ThemeParams) => {
+    button: ({ props }) => {
       let c = 'rounded-full shadow transform transition duration-150 shrink-0'
 
       if (props.size === 'sm' || props.size === 'xs') c += ' h-3 w-3'
@@ -38,7 +46,7 @@ export default {
     },
   },
 
-  styles: ({ colors, props, css }: ThemeParams) => {
+  styles: ({ colors, props, css }) => {
     const color = colors.getPalette(props.color)
 
     return css.variables({
@@ -49,3 +57,5 @@ export default {
     })
   },
 }
+
+export default theme

package/src/components/toggle/Toggle.vue

@@ -1,9 +1,27 @@
 <script lang="ts">
-export default { name: 'XToggle' }
+const toggleProps = {
+  ...useCommon.props(),
+  ...useColors.props('primary'),
+  ...useInteractive.props(),
+  ...useInputtable.props(),
+  id: String,
+  label: String,
+  helper: String,
+  glow: Boolean,
+}
+
+export type ToggleProps = ExtractPublicPropTypes<typeof toggleProps>
+
+export default {
+  name: 'XToggle',
+  validators: {
+    ...useCommon.validators(),
+  },
+}
 </script>
 
 <script setup lang="ts">
-import { computed, ref } from 'vue'
+import { computed, ref, type ExtractPublicPropTypes } from 'vue'
 import { useTheme } from '../../composables/theme'
 import { useCommon } from '../../composables/common'
 import { useColors } from '../../composables/colors'
@@ -15,16 +33,7 @@ import XInputError from '../helpers/InputError'
 
 import theme from './Toggle.theme'
 
-const props = defineProps({
-  ...useCommon.props(),
-  ...useColors.props('primary'),
-  ...useInteractive.props(),
-  ...useInputtable.props(),
-  id: String,
-  label: String,
-  helper: String,
-  glow: Boolean,
-})
+const props = defineProps(toggleProps)
 
 const emit = defineEmits(useInputtable.emits(false))
 

package/src/components/toggle/index.ts

@@ -0,0 +1,2 @@
+export { default as XToggle } from './Toggle.vue'
+export type { ToggleProps } from './Toggle.vue'

package/src/components/tooltip/Tooltip.vue

@@ -1,8 +1,13 @@
 <script lang="ts">
+const tooltipProps = {}
+
+export type TooltipProps = ExtractPublicPropTypes<typeof tooltipProps>
+
 export default { name: 'XTooltip' }
 </script>
 
 <script setup lang="ts">
+import type { ExtractPublicPropTypes } from 'vue'
 import XPopover from '../../components/popover/Popover.vue'
 import XPopoverContainer from '../../components/popover/PopoverContainer.vue'
 </script>

package/src/components/tooltip/index.ts

@@ -0,0 +1,2 @@
+export { default as XTooltip } from './Tooltip.vue'
+export type { TooltipProps } from './Tooltip.vue'

package/src/composables/colors-utils.ts

@@ -1,4 +1,4 @@
-import type { Tone, ColorLibrary, ColorPalette } from './colors'
+import type { Tone, ColorLibrary } from './colors'
 
 const isHex = (hex: string) => /^#(?:[A-Fa-f0-9]{3}){1,2}$/.test(hex)
 const isRGB = (rgb: string) => /^rgb[(](?:\s*0*(?:\d\d?(?:\.\d+)?(?:\s*%)?|\.\d+\s*%|100(?:\.0*)?\s*%|(?:1\d\d|2[0-4]\d|25[0-5])(?:\.\d+)?)\s*(?:,(?![)])|(?=[)]))){3}[)]$/.test(rgb)
@@ -33,81 +33,4 @@ export const colorShade = (color: string, percentage: number) => {
 export const shades: Tone[] = ['50', '100', '200', '300', '400', '500', '600', '700', '800', '900']
 export const indielayerColors = ['primary', 'secondary', 'success', 'warning', 'error']
 
-// calculate custom colors
-// export function calculateColors(): ColorLibrary {
-//   const cc = computedColors
-//   const customColors: ColorLibrary = {}
-//   const e = document.createElement('div')
-
-//   document.body.appendChild(e)
-
-//   indielayerColors.forEach((color) => {
-//     const c: ColorPalette = { ...tailwindColors.gray }
-
-//     shades.forEach((shade) => {
-//       e.className = `bg-${color}-${shade}`
-//       c[shade] = window.getComputedStyle(e ,null).getPropertyValue('background-color')
-//     })
-
-//     customColors[color] = c
-//   })
-
-//   e.remove()
-
-//   return customColors
-// }
-
-// const computedColors = Object.freeze([
-//   'bg-primary-50',
-//   'bg-primary-100',
-//   'bg-primary-200',
-//   'bg-primary-300',
-//   'bg-primary-400',
-//   'bg-primary-500',
-//   'bg-primary-600',
-//   'bg-primary-700',
-//   'bg-primary-800',
-//   'bg-primary-900',
-//   'bg-secondary-50',
-//   'bg-secondary-100',
-//   'bg-secondary-200',
-//   'bg-secondary-300',
-//   'bg-secondary-400',
-//   'bg-secondary-500',
-//   'bg-secondary-600',
-//   'bg-secondary-700',
-//   'bg-secondary-800',
-//   'bg-secondary-900',
-//   'bg-error-50',
-//   'bg-error-100',
-//   'bg-error-200',
-//   'bg-error-300',
-//   'bg-error-400',
-//   'bg-error-500',
-//   'bg-error-600',
-//   'bg-error-700',
-//   'bg-error-800',
-//   'bg-error-900',
-//   'bg-warning-50',
-//   'bg-warning-100',
-//   'bg-warning-200',
-//   'bg-warning-300',
-//   'bg-warning-400',
-//   'bg-warning-500',
-//   'bg-warning-600',
-//   'bg-warning-700',
-//   'bg-warning-800',
-//   'bg-warning-900',
-//   'bg-success-50',
-//   'bg-success-100',
-//   'bg-success-200',
-//   'bg-success-300',
-//   'bg-success-400',
-//   'bg-success-500',
-//   'bg-success-600',
-//   'bg-success-700',
-//   'bg-success-800',
-//   'bg-success-900',
-// ])
-
 export const tailwindColors: ColorLibrary = Object.freeze({ 'slate': { '50': '#f8fafc', '100': '#f1f5f9', '200': '#e2e8f0', '300': '#cbd5e1', '400': '#94a3b8', '500': '#64748b', '600': '#475569', '700': '#334155', '800': '#1e293b', '900': '#0f172a', '950': '#020617' }, 'gray': { '50': '#f9fafb', '100': '#f3f4f6', '200': '#e5e7eb', '300': '#d1d5db', '400': '#9ca3af', '500': '#6b7280', '600': '#4b5563', '700': '#374151', '800': '#1f2937', '900': '#111827', '950': '#030712' }, 'zinc': { '50': '#fafafa', '100': '#f4f4f5', '200': '#e4e4e7', '300': '#d4d4d8', '400': '#a1a1aa', '500': '#71717a', '600': '#52525b', '700': '#3f3f46', '800': '#27272a', '900': '#18181b', '950': '#09090b' }, 'neutral': { '50': '#fafafa', '100': '#f5f5f5', '200': '#e5e5e5', '300': '#d4d4d4', '400': '#a3a3a3', '500': '#737373', '600': '#525252', '700': '#404040', '800': '#262626', '900': '#171717', '950': '#0a0a0a' }, 'stone': { '50': '#fafaf9', '100': '#f5f5f4', '200': '#e7e5e4', '300': '#d6d3d1', '400': '#a8a29e', '500': '#78716c', '600': '#57534e', '700': '#44403c', '800': '#292524', '900': '#1c1917', '950': '#0c0a09' }, 'red': { '50': '#fef2f2', '100': '#fee2e2', '200': '#fecaca', '300': '#fca5a5', '400': '#f87171', '500': '#ef4444', '600': '#dc2626', '700': '#b91c1c', '800': '#991b1b', '900': '#7f1d1d', '950': '#450a0a' }, 'orange': { '50': '#fff7ed', '100': '#ffedd5', '200': '#fed7aa', '300': '#fdba74', '400': '#fb923c', '500': '#f97316', '600': '#ea580c', '700': '#c2410c', '800': '#9a3412', '900': '#7c2d12', '950': '#431407' }, 'amber': { '50': '#fffbeb', '100': '#fef3c7', '200': '#fde68a', '300': '#fcd34d', '400': '#fbbf24', '500': '#f59e0b', '600': '#d97706', '700': '#b45309', '800': '#92400e', '900': '#78350f', '950': '#451a03' }, 'yellow': { '50': '#fefce8', '100': '#fef9c3', '200': '#fef08a', '300': '#fde047', '400': '#facc15', '500': '#eab308', '600': '#ca8a04', '700': '#a16207', '800': '#854d0e', '900': '#713f12', '950': '#422006' }, 'lime': { '50': '#f7fee7', '100': '#ecfccb', '200': '#d9f99d', '300': '#bef264', '400': '#a3e635', '500': '#84cc16', '600': '#65a30d', '700': '#4d7c0f', '800': '#3f6212', '900': '#365314', '950': '#1a2e05' }, 'green': { '50': '#f0fdf4', '100': '#dcfce7', '200': '#bbf7d0', '300': '#86efac', '400': '#4ade80', '500': '#22c55e', '600': '#16a34a', '700': '#15803d', '800': '#166534', '900': '#14532d', '950': '#052e16' }, 'emerald': { '50': '#ecfdf5', '100': '#d1fae5', '200': '#a7f3d0', '300': '#6ee7b7', '400': '#34d399', '500': '#10b981', '600': '#059669', '700': '#047857', '800': '#065f46', '900': '#064e3b', '950': '#022c22' }, 'teal': { '50': '#f0fdfa', '100': '#ccfbf1', '200': '#99f6e4', '300': '#5eead4', '400': '#2dd4bf', '500': '#14b8a6', '600': '#0d9488', '700': '#0f766e', '800': '#115e59', '900': '#134e4a', '950': '#042f2e' }, 'cyan': { '50': '#ecfeff', '100': '#cffafe', '200': '#a5f3fc', '300': '#67e8f9', '400': '#22d3ee', '500': '#06b6d4', '600': '#0891b2', '700': '#0e7490', '800': '#155e75', '900': '#164e63', '950': '#083344' }, 'sky': { '50': '#f0f9ff', '100': '#e0f2fe', '200': '#bae6fd', '300': '#7dd3fc', '400': '#38bdf8', '500': '#0ea5e9', '600': '#0284c7', '700': '#0369a1', '800': '#075985', '900': '#0c4a6e', '950': '#082f49' }, 'blue': { '50': '#eff6ff', '100': '#dbeafe', '200': '#bfdbfe', '300': '#93c5fd', '400': '#60a5fa', '500': '#3b82f6', '600': '#2563eb', '700': '#1d4ed8', '800': '#1e40af', '900': '#1e3a8a', '950': '#172554' }, 'indigo': { '50': '#eef2ff', '100': '#e0e7ff', '200': '#c7d2fe', '300': '#a5b4fc', '400': '#818cf8', '500': '#6366f1', '600': '#4f46e5', '700': '#4338ca', '800': '#3730a3', '900': '#312e81', '950': '#1e1b4b' }, 'violet': { '50': '#f5f3ff', '100': '#ede9fe', '200': '#ddd6fe', '300': '#c4b5fd', '400': '#a78bfa', '500': '#8b5cf6', '600': '#7c3aed', '700': '#6d28d9', '800': '#5b21b6', '900': '#4c1d95', '950': '#2e1065' }, 'purple': { '50': '#faf5ff', '100': '#f3e8ff', '200': '#e9d5ff', '300': '#d8b4fe', '400': '#c084fc', '500': '#a855f7', '600': '#9333ea', '700': '#7e22ce', '800': '#6b21a8', '900': '#581c87', '950': '#3b0764' }, 'fuchsia': { '50': '#fdf4ff', '100': '#fae8ff', '200': '#f5d0fe', '300': '#f0abfc', '400': '#e879f9', '500': '#d946ef', '600': '#c026d3', '700': '#a21caf', '800': '#86198f', '900': '#701a75', '950': '#4a044e' }, 'pink': { '50': '#fdf2f8', '100': '#fce7f3', '200': '#fbcfe8', '300': '#f9a8d4', '400': '#f472b6', '500': '#ec4899', '600': '#db2777', '700': '#be185d', '800': '#9d174d', '900': '#831843', '950': '#500724' }, 'rose': { '50': '#fff1f2', '100': '#ffe4e6', '200': '#fecdd3', '300': '#fda4af', '400': '#fb7185', '500': '#f43f5e', '600': '#e11d48', '700': '#be123c', '800': '#9f1239', '900': '#881337', '950': '#4c0519' }, 'lightBlue': { '50': '#f0f9ff', '100': '#e0f2fe', '200': '#bae6fd', '300': '#7dd3fc', '400': '#38bdf8', '500': '#0ea5e9', '600': '#0284c7', '700': '#0369a1', '800': '#075985', '900': '#0c4a6e', '950': '#082f49' }, 'warmGray': { '50': '#fafaf9', '100': '#f5f5f4', '200': '#e7e5e4', '300': '#d6d3d1', '400': '#a8a29e', '500': '#78716c', '600': '#57534e', '700': '#44403c', '800': '#292524', '900': '#1c1917', '950': '#0c0a09' }, 'trueGray': { '50': '#fafafa', '100': '#f5f5f5', '200': '#e5e5e5', '300': '#d4d4d4', '400': '#a3a3a3', '500': '#737373', '600': '#525252', '700': '#404040', '800': '#262626', '900': '#171717', '950': '#0a0a0a' }, 'coolGray': { '50': '#f9fafb', '100': '#f3f4f6', '200': '#e5e7eb', '300': '#d1d5db', '400': '#9ca3af', '500': '#6b7280', '600': '#4b5563', '700': '#374151', '800': '#1f2937', '900': '#111827', '950': '#030712' }, 'blueGray': { '50': '#f8fafc', '100': '#f1f5f9', '200': '#e2e8f0', '300': '#cbd5e1', '400': '#94a3b8', '500': '#64748b', '600': '#475569', '700': '#334155', '800': '#1e293b', '900': '#0f172a', '950': '#020617' } })

package/src/composables/colors.ts

@@ -1,7 +1,7 @@
-import * as R from 'ramda'
 import { computed, inject, unref } from 'vue'
 import { injectThemeKey } from './keys'
 import { isValidColor, tailwindColors, colorShade, setOpacity } from './colors-utils'
+import { mergeRightDeep } from '../common/utils'
 
 export type Tone = '50' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900' | '950'
 
@@ -26,7 +26,7 @@ export interface ColorsProps {
 }
 
 export interface ColorComposition {
-  getPalette: (color: string) => ColorPalette;
+  getPalette: (color?: string) => ColorPalette;
   getColorOpacity: (color: string, opacity: number) => string;
 }
 
@@ -42,13 +42,13 @@ const defaultColors = {
 
 export const useColors = (): ColorComposition => {
   const globalTheme = inject(injectThemeKey,  {})
-  const customColors = computed(() => R.mergeRight(defaultColors, unref(globalTheme).colors))
+  const customColors = computed(() => mergeRightDeep(defaultColors, unref(globalTheme).colors || {}))
 
   const getTailwindColor = (color: string) => tailwindColors[color]
 
   const getColorOpacity = (color: string, opacity: number) => setOpacity(color, opacity)
 
-  const getPalette = (color: string): ColorPalette => {
+  const getPalette = (color?: string): ColorPalette => {
     if (!color) return getTailwindColor('gray')
 
     const twColor = getTailwindColor(color)
@@ -88,6 +88,8 @@ export const useColors = (): ColorComposition => {
   }
 }
 
+export type UseColorsProps = ReturnType<typeof useColors.props>
+
 useColors.props = (defaultColor?: string) => ({
   color: {
     type: String,

package/src/composables/common.ts

@@ -1,6 +1,6 @@
 import type { PropType } from 'vue'
 
-export type Size = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | undefined
+export type Size = 'xs' | 'sm' | 'md' | 'lg' | 'xl'
 
 export const useCommon = () => {}
 

package/src/composables/inputtable.ts

@@ -1,4 +1,4 @@
-import type { Ref, PropType } from 'vue'
+import type { PropType } from 'vue'
 import { ref, computed, inject, watch, onMounted, onUnmounted } from 'vue'
 import { injectFormKey } from './keys'
 
@@ -19,8 +19,8 @@ export const useInputtable = (props: any, { focus, emit, withListeners = true }:
   watch(() => props.name, (val) => { if (val) nameInternal.value = val })
 
   const form = inject(injectFormKey, {
-    registerInput: (inputName: string, methods: XFormInputMethods) => {},
-    unregisterInput: (inputName: string) => {},
+    registerInput: () => {},
+    unregisterInput: () => {},
     isInsideForm: false,
   })
 
@@ -34,7 +34,7 @@ export const useInputtable = (props: any, { focus, emit, withListeners = true }:
     errorInternal.value = val
   }
 
-  const validate = (val: any): boolean => {
+  const validate = (val?: any): boolean => {
     val = val || props.modelValue
 
     isFirstValidation.value = false

package/src/composables/keys.ts

@@ -1,9 +1,12 @@
 import type { InjectionKey } from 'vue'
+import type { FormInjection } from '../components/form/Form.vue'
+import type { TabGroupInjection } from '../components/tab/TabGroup.vue'
+import type { ButtonGroupInjection } from '../components/button/ButtonGroup.vue'
 
-export const injectTabKey = Symbol() as InjectionKey<any>
-export const injectFormKey = Symbol() as InjectionKey<any>
+export const injectTabKey = Symbol() as InjectionKey<TabGroupInjection>
+export const injectFormKey = Symbol() as InjectionKey<FormInjection>
 export const injectThemeKey = Symbol() as InjectionKey<any>
 export const injectIconsKey = Symbol() as InjectionKey<any>
 export const injectColorsKey = Symbol() as InjectionKey<any>
-export const injectButtonGroupKey = Symbol() as InjectionKey<any>
+export const injectButtonGroupKey = Symbol() as InjectionKey<ButtonGroupInjection>
 export const injectNotificationKey = Symbol() as InjectionKey<any>

package/src/composables/theme.ts

@@ -1,26 +1,30 @@
-import { computed, inject, unref, useSlots, type StyleValue } from 'vue'
+import { computed, inject, unref, useSlots, type StyleValue, type Slots, type UnwrapNestedRefs, type UnwrapRef, type MaybeRef } from 'vue'
 import { injectThemeKey } from './keys'
 import { useColors, type ColorComposition } from './colors'
 import { useCSS, type CSSComposition } from './css'
-import * as R from 'ramda'
-import { smartUnref } from '../common/utils'
+import { isFunction, isObject, mergeRightDeep, smartUnref } from '../common/utils'
 
-import type { Slots } from 'vue'
-
-export type ThemeParams = {
-  props: any;
+export type ThemeVueClass = string | Record<string, boolean> | (string | Record<string, boolean>)[]
+export type ThemeClasses<P, K extends string = string, D = undefined> = Record<K, string | ((params: ThemeParams<P, D>) => ThemeVueClass)>
+export type ThemeStyles<P, D> = StyleValue | ((params: ThemeParams<P, D>) => StyleValue);
+export interface ThemeComponent<P = object, K extends string = string, D = object> {
+  classes?: ThemeClasses<P, K, D>;
+  styles?: ThemeStyles<P, D>;
+}
+export type ThemeParams<P = Record<string, any>, D = Record<string, any>> = {
+  props: UnwrapRef<P>;
   slots: Slots;
   colors: ColorComposition;
   css: CSSComposition;
   rtl?: boolean;
-  data?: any;
+  data: UnwrapNestedRefs<D>;
 }
 
-export const useTheme = (namespace: string, defaultTheme: any = {}, props: any, data?: any) => {
+export const useTheme = <P extends object = object, K extends string = string, D extends object = object>(namespace: string, defaultTheme: ThemeComponent<P, K, D> = {}, props: MaybeRef<P> = {} as P, data: D = {} as D) => {
   const userTheme = inject(injectThemeKey, false)
 
   const rawClasses = computed(() => {
-    if (unref(userTheme)?.[namespace]) return R.mergeRight(defaultTheme.classes, unref(userTheme)[namespace].classes || {})
+    if (unref(userTheme)?.[namespace]) return mergeRightDeep(defaultTheme.classes, unref(userTheme)[namespace].classes || {})
 
     return defaultTheme.classes
   })
@@ -34,8 +38,7 @@ export const useTheme = (namespace: string, defaultTheme: any = {}, props: any,
   const slots = useSlots()
   const colors = useColors()
   const css = useCSS(namespace)
-
-  const classes = computed(() => getClasses(rawClasses.value, {
+  const classes = computed<Record<K, ThemeVueClass>>(() => getClasses(rawClasses.value, {
     props: unref(props),
     slots,
     data: smartUnref(data),
@@ -71,18 +74,18 @@ export const useTheme = (namespace: string, defaultTheme: any = {}, props: any,
   }
 }
 
-function getClasses(xs: any, params: ThemeParams): any {
-  return R.map((x) => R.is(Function, x)
-    ? x(params)
-    : R.is(Object, x) || R.is(Array, x)
-      ? getClasses(x, params)
-      : x, xs)
+function getClasses(classes: any, params: ThemeParams): any {
+  const parsedClasses: Record<string, string> = {}
+
+  Object.keys(classes).forEach((key) => {
+    const x = classes[key]
+
+    parsedClasses[key] = isFunction(x) ? x(params) : (isObject(x) ? getClasses(x, params) : x)
+  })
+
+  return parsedClasses
 }
 
 function getStyles(styles: any, params: ThemeParams) {
-  return R.is(Function, styles)
-    ? styles(params) || {}
-    : R.is(Object, styles)
-      ? styles
-      : {}
+  return isFunction(styles) ? (styles(params) || {}) : (isObject(styles) ? styles : {})
 }

package/src/create.ts

@@ -24,10 +24,9 @@ const create = (createOptions: IndielayerUIOptions = {}) => {
 
     if (options.components)
       options.components.forEach((component: any) => {
-        // TODO: remove me
         const name = component.name.startsWith('X') ? component.name.slice(1) : component.name
 
-        app.component(`${options.prefix}${name}`, component)
+        if (!app.component(`${options.prefix}${name}`)) app.component(`${options.prefix}${name}`, component)
       })
 
     app.provide(injectColorsKey, options.colors)

package/src/version.ts

@@ -1 +1 @@
-export default '1.0.10'
+export default '1.1.0'

package/volar.d.ts

@@ -1,4 +1,4 @@
-declare module '@vue/runtime-core' {
+declare module 'vue' {
   export interface GlobalComponents {
     XAlert: typeof import('@indielayer/ui')['XAlert']
     XAvatar: typeof import('@indielayer/ui')['XAvatar']