@indielayer/ui 1.0.9 → 1.1.0

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)
@@ -9,7 +9,7 @@ const hexToRGB = (hex: string) => hex.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i
   ?.map((x) => parseInt(x, 16))
 
 export const setOpacity = (color: string, opacity: number) => {
-  const [r, g, b] = (isHex(color) ? hexToRGB(color) : parseRGB(color)) ?? [0,0,0]
+  const [r, g, b] = (isHex(color) ? hexToRGB(color) : parseRGB(color)) ?? [0, 0, 0]
 
   return 'rgba' + '(' + r + ',' + g + ',' + b + ',' + opacity + ')'
 }
@@ -22,7 +22,7 @@ export const colorShade = (color: string, percentage: number) => {
   const shade = lighten ? 0 : percentage * 255 ** 2
   const calcPrimary = (p: string | number) => Math.round((base * Math.floor(Number(p)) ** 2 + shade) ** 0.5)
 
-  const [r, g, b, a] = (isHex(color) ? hexToRGB(color) : parseRGB(color)) ?? [0,0,0]
+  const [r, g, b, a] = (isHex(color) ? hexToRGB(color) : parseRGB(color)) ?? [0, 0, 0]
   const red = calcPrimary(r)
   const green = calcPrimary(g)
   const blue = calcPrimary(b)
@@ -33,346 +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',
-  },
-  gray: {
-    50: '#f9fafb',
-    100: '#f3f4f6',
-    200: '#e5e7eb',
-    300: '#d1d5db',
-    400: '#9ca3af',
-    500: '#6b7280',
-    600: '#4b5563',
-    700: '#374151',
-    800: '#1f2937',
-    900: '#111827',
-  },
-  zinc: {
-    50: '#fafafa',
-    100: '#f4f4f5',
-    200: '#e4e4e7',
-    300: '#d4d4d8',
-    400: '#a1a1aa',
-    500: '#71717a',
-    600: '#52525b',
-    700: '#3f3f46',
-    800: '#27272a',
-    900: '#18181b',
-  },
-  neutral: {
-    50: '#fafafa',
-    100: '#f5f5f5',
-    200: '#e5e5e5',
-    300: '#d4d4d4',
-    400: '#a3a3a3',
-    500: '#737373',
-    600: '#525252',
-    700: '#404040',
-    800: '#262626',
-    900: '#171717',
-  },
-  stone: {
-    50: '#fafaf9',
-    100: '#f5f5f4',
-    200: '#e7e5e4',
-    300: '#d6d3d1',
-    400: '#a8a29e',
-    500: '#78716c',
-    600: '#57534e',
-    700: '#44403c',
-    800: '#292524',
-    900: '#1c1917',
-  },
-  red: {
-    50: '#fef2f2',
-    100: '#fee2e2',
-    200: '#fecaca',
-    300: '#fca5a5',
-    400: '#f87171',
-    500: '#ef4444',
-    600: '#dc2626',
-    700: '#b91c1c',
-    800: '#991b1b',
-    900: '#7f1d1d',
-  },
-  orange: {
-    50: '#fff7ed',
-    100: '#ffedd5',
-    200: '#fed7aa',
-    300: '#fdba74',
-    400: '#fb923c',
-    500: '#f97316',
-    600: '#ea580c',
-    700: '#c2410c',
-    800: '#9a3412',
-    900: '#7c2d12',
-  },
-  amber: {
-    50: '#fffbeb',
-    100: '#fef3c7',
-    200: '#fde68a',
-    300: '#fcd34d',
-    400: '#fbbf24',
-    500: '#f59e0b',
-    600: '#d97706',
-    700: '#b45309',
-    800: '#92400e',
-    900: '#78350f',
-  },
-  yellow: {
-    50: '#fefce8',
-    100: '#fef9c3',
-    200: '#fef08a',
-    300: '#fde047',
-    400: '#facc15',
-    500: '#eab308',
-    600: '#ca8a04',
-    700: '#a16207',
-    800: '#854d0e',
-    900: '#713f12',
-  },
-  lime: {
-    50: '#f7fee7',
-    100: '#ecfccb',
-    200: '#d9f99d',
-    300: '#bef264',
-    400: '#a3e635',
-    500: '#84cc16',
-    600: '#65a30d',
-    700: '#4d7c0f',
-    800: '#3f6212',
-    900: '#365314',
-  },
-  green: {
-    50: '#f0fdf4',
-    100: '#dcfce7',
-    200: '#bbf7d0',
-    300: '#86efac',
-    400: '#4ade80',
-    500: '#22c55e',
-    600: '#16a34a',
-    700: '#15803d',
-    800: '#166534',
-    900: '#14532d',
-  },
-  emerald: {
-    50: '#ecfdf5',
-    100: '#d1fae5',
-    200: '#a7f3d0',
-    300: '#6ee7b7',
-    400: '#34d399',
-    500: '#10b981',
-    600: '#059669',
-    700: '#047857',
-    800: '#065f46',
-    900: '#064e3b',
-  },
-  teal: {
-    50: '#f0fdfa',
-    100: '#ccfbf1',
-    200: '#99f6e4',
-    300: '#5eead4',
-    400: '#2dd4bf',
-    500: '#14b8a6',
-    600: '#0d9488',
-    700: '#0f766e',
-    800: '#115e59',
-    900: '#134e4a',
-  },
-  cyan: {
-    50: '#ecfeff',
-    100: '#cffafe',
-    200: '#a5f3fc',
-    300: '#67e8f9',
-    400: '#22d3ee',
-    500: '#06b6d4',
-    600: '#0891b2',
-    700: '#0e7490',
-    800: '#155e75',
-    900: '#164e63',
-  },
-  sky: {
-    50: '#f0f9ff',
-    100: '#e0f2fe',
-    200: '#bae6fd',
-    300: '#7dd3fc',
-    400: '#38bdf8',
-    500: '#0ea5e9',
-    600: '#0284c7',
-    700: '#0369a1',
-    800: '#075985',
-    900: '#0c4a6e',
-  },
-  blue: {
-    50: '#eff6ff',
-    100: '#dbeafe',
-    200: '#bfdbfe',
-    300: '#93c5fd',
-    400: '#60a5fa',
-    500: '#3b82f6',
-    600: '#2563eb',
-    700: '#1d4ed8',
-    800: '#1e40af',
-    900: '#1e3a8a',
-  },
-  indigo: {
-    50: '#eef2ff',
-    100: '#e0e7ff',
-    200: '#c7d2fe',
-    300: '#a5b4fc',
-    400: '#818cf8',
-    500: '#6366f1',
-    600: '#4f46e5',
-    700: '#4338ca',
-    800: '#3730a3',
-    900: '#312e81',
-  },
-  violet: {
-    50: '#f5f3ff',
-    100: '#ede9fe',
-    200: '#ddd6fe',
-    300: '#c4b5fd',
-    400: '#a78bfa',
-    500: '#8b5cf6',
-    600: '#7c3aed',
-    700: '#6d28d9',
-    800: '#5b21b6',
-    900: '#4c1d95',
-  },
-  purple: {
-    50: '#faf5ff',
-    100: '#f3e8ff',
-    200: '#e9d5ff',
-    300: '#d8b4fe',
-    400: '#c084fc',
-    500: '#a855f7',
-    600: '#9333ea',
-    700: '#7e22ce',
-    800: '#6b21a8',
-    900: '#581c87',
-  },
-  fuchsia: {
-    50: '#fdf4ff',
-    100: '#fae8ff',
-    200: '#f5d0fe',
-    300: '#f0abfc',
-    400: '#e879f9',
-    500: '#d946ef',
-    600: '#c026d3',
-    700: '#a21caf',
-    800: '#86198f',
-    900: '#701a75',
-  },
-  pink: {
-    50: '#fdf2f8',
-    100: '#fce7f3',
-    200: '#fbcfe8',
-    300: '#f9a8d4',
-    400: '#f472b6',
-    500: '#ec4899',
-    600: '#db2777',
-    700: '#be185d',
-    800: '#9d174d',
-    900: '#831843',
-  },
-  rose: {
-    50: '#fff1f2',
-    100: '#ffe4e6',
-    200: '#fecdd3',
-    300: '#fda4af',
-    400: '#fb7185',
-    500: '#f43f5e',
-    600: '#e11d48',
-    700: '#be123c',
-    800: '#9f1239',
-    900: '#881337',
-  },
-})
+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,32 +1,33 @@
-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'
+export type Tone = '50' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900' | '950'
 
 export interface ColorPalette {
-  50: string
-  100: string
-  200: string
-  300: string
-  400: string
-  500: string
-  600: string
-  700: string
-  800: string
-  900: string
+  50: string;
+  100: string;
+  200: string;
+  300: string;
+  400: string;
+  500: string;
+  600: string;
+  700: string;
+  800: string;
+  900: string;
+  950: string;
 }
 
 export type ColorLibrary = Record<string, ColorPalette>
 
 export interface ColorsProps {
-  color?: string
+  color?: string;
 }
 
 export interface ColorComposition {
-  getPalette: (color: string)=> ColorPalette
-  getColorOpacity: (color: string, opacity: number)=> string
+  getPalette: (color?: string) => ColorPalette;
+  getColorOpacity: (color: string, opacity: number) => string;
 }
 
 const colorCache: ColorLibrary = {}
@@ -41,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)
@@ -73,6 +74,7 @@ export const useColors = (): ColorComposition => {
       700: colorShade(color, -0.25),
       800: colorShade(color, -0.58),
       900: colorShade(color, -0.7),
+      950: colorShade(color, -0.8),
     }
 
     colorCache[color] = palette
@@ -86,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/css.ts

@@ -5,13 +5,13 @@ const isTheme = (theme: string) => themes.includes(theme)
 const isModifier = (modifier: string) => modifiers.includes(modifier)
 
 export interface CSSComposition {
-  get: (name: string, value: string, theme?: string, modifier?: string)=> string
-  variable: (name: string, theme?: string, modifier?: string)=> string
-  variables: (object: Record<string, string | object>, theme?: string, modifier?: string)=> Record<string, string>
+  get: (name: string, value: string, theme?: string, modifier?: string) => string;
+  variable: (name: string, theme?: string, modifier?: string) => string;
+  variables: (object: Record<string, string | object>, theme?: string, modifier?: string) => Record<string, string>;
 }
 
 export const useCSS = (namespace?: string): CSSComposition => {
-  const get = (name: string, value: string, theme?: string, modifier?: string) => `${variable(name,theme,modifier)}: ${value}`
+  const get = (name: string, value: string, theme?: string, modifier?: string) => `${variable(name, theme, modifier)}: ${value}`
 
   const variable = (name: string, theme?: string, modifier?: string) =>
     `--x${namespace ? `-${namespace}` : ''}${theme ? `-${theme}` : ''}-${name}${modifier ? `-${modifier}` : ''}`

package/src/composables/inputtable.ts

@@ -1,14 +1,14 @@
-import type { Ref, PropType } from 'vue'
+import type { PropType } from 'vue'
 import { ref, computed, inject, watch, onMounted, onUnmounted } from 'vue'
 import { injectFormKey } from './keys'
 
 export interface XFormInputMethods {
-  focus: ()=> void,
-  validate: (val: any)=> boolean,
-  setError: (val: string)=> void
+  focus: () => void;
+  validate: (val: any) => boolean;
+  setError: (val: string) => void;
 }
 
-export const useInputtable = (props: any, { focus, emit, withListeners = true }: { focus: ()=> void, emit: any, withListeners?: boolean }) => {
+export const useInputtable = (props: any, { focus, emit, withListeners = true }: { focus: () => void; emit: any; withListeners?: boolean; }) => {
   const isFirstValidation = ref(true)
   const errorInternal = ref(props.error)
 
@@ -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/interactive.ts

@@ -1,8 +1,8 @@
 import type { Ref } from 'vue'
 
 export interface InteractiveProps {
-  disabled?: boolean
-  loading?: boolean
+  disabled?: boolean;
+  loading?: boolean;
 }
 
 export const useInteractive = (

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
-  slots: Slots
-  colors: ColorComposition
-  css: CSSComposition
-  rtl?: boolean
-  data?: 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: 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 : {})
 }