@byyuurin/ui 0.0.8 → 0.0.10

package/dist/runtime/components/Popover.vue

@@ -1,7 +1,7 @@
 <script lang="ts">
-import type { HoverCardRootProps, PopoverArrowProps, PopoverContentProps, PopoverRootEmits, PopoverRootProps } from 'reka-ui'
+import type { HoverCardRootProps, PopoverArrowProps, PopoverContentEmits, PopoverContentProps, PopoverRootEmits, PopoverRootProps } from 'reka-ui'
 import type { popover } from '../theme'
-import type { ComponentAttrs } from '../types'
+import type { ComponentAttrs, EmitsToProps } from '../types'
 
 export interface PopoverEmits extends PopoverRootEmits {}
 
@@ -17,7 +17,7 @@ export interface PopoverProps extends ComponentAttrs<typeof popover>, PopoverRoo
    */
   mode?: 'click' | 'hover'
   /** @default { side: 'bottom', sideOffset: 8, collisionPadding: 8 } */
-  content?: Omit<PopoverContentProps, 'as' | 'asChild' | 'forceMount'>
+  content?: Omit<PopoverContentProps, 'as' | 'asChild' | 'forceMount'> & Partial<EmitsToProps<PopoverContentEmits>>
   arrow?: boolean | Omit<PopoverArrowProps, 'as' | 'asChild'>
   /** @default true */
   portal?: boolean
@@ -69,11 +69,8 @@ const arrowProps = toRef(() => props.arrow as PopoverArrowProps)
 
 const Component = computed(() => props.mode === 'hover' ? HoverCard : Popover)
 
-const { theme, createStyler } = useTheme()
-const style = computed(() => {
-  const styler = createStyler(theme.value.popover)
-  return styler(props)
-})
+const { generateStyle } = useTheme()
+const style = computed(() => generateStyle('popover', props))
 </script>
 
 <template>

package/dist/runtime/components/Progress.vue

@@ -83,11 +83,8 @@ const percent = computed(() => {
 })
 
 const { dir } = useLocale()
-const { theme, createStyler } = useTheme()
-const style = computed(() => {
-  const styler = createStyler(theme.value.progress)
-  return styler(props)
-})
+const { generateStyle } = useTheme()
+const style = computed(() => generateStyle('progress', props))
 
 const indicatorStyle = computed(() => {
   if (percent.value === undefined)

package/dist/runtime/components/RadioGroup.vue

@@ -1,44 +1,35 @@
 <script lang="ts">
 import type { VariantProps } from '@byyuurin/ui-kit'
-import type { AcceptableValue, PrimitiveProps, RadioGroupRootProps } from 'reka-ui'
+import type { PrimitiveProps, RadioGroupRootProps } from 'reka-ui'
 import type { radioGroup } from '../theme'
-import type { ComponentAttrs } from '../types'
+import type { AcceptableValue, ComponentAttrs } from '../types'
 
 export interface RadioGroupEmits {
-  (event: 'update:modelValue', payload: string): void
-  (event: 'change', payload: Event): void
+  'update:modelValue': [payload: string]
+  'change': [payload: Event]
 }
 
-type SlotProps<T> = (props: { item: NormalizeItem<T>, modelValue?: AcceptableValue }) => any
+export type RadioGroupValue = AcceptableValue
 
-export interface RadioGroupSlots<T> {
-  legend?: (props?: {}) => any
+export type RadioGroupItem = {
+  label?: string
+  description?: string
+  disabled?: boolean
+  value?: RadioGroupValue
+  [key: string]: any
+} | RadioGroupValue
+
+type SlotProps<T extends RadioGroupItem> = (props: { item: T & { id: string }, modelValue?: RadioGroupValue }) => any
+
+export interface RadioGroupSlots<T extends RadioGroupItem = RadioGroupItem> {
+  legend?: any
   label?: SlotProps<T>
   description?: SlotProps<T>
 }
 
-type NormalizeItem<T> = { id: string } & (
-  T extends RadioOption
-    ? T
-    : {
-        id: string
-        label: string
-        value: any
-        description: string
-        disabled: false
-      }
-    )
-
 type RadioGroupVariants = VariantProps<typeof radioGroup>
 
-export interface RadioOption {
-  label?: string
-  description?: string
-  disabled?: boolean
-  value?: string
-}
-
-export interface RadioGroupProps<T> extends ComponentAttrs<typeof radioGroup>, Pick<RadioGroupRootProps, 'defaultValue' | 'disabled' | 'loop' | 'modelValue' | 'name' | 'required'> {
+export interface RadioGroupProps<T extends RadioGroupItem = RadioGroupItem> extends ComponentAttrs<typeof radioGroup>, Pick<RadioGroupRootProps, 'defaultValue' | 'disabled' | 'loop' | 'modelValue' | 'name' | 'required'> {
   /**
    * The element or component this component should render as.
    * @default "div"
@@ -70,10 +61,11 @@ export interface RadioGroupProps<T> extends ComponentAttrs<typeof radioGroup>, P
 }
 </script>
 
-<script lang="ts" setup generic="T extends RadioOption | AcceptableValue">
+<script lang="ts" setup generic="T extends RadioGroupItem">
 import { reactivePick } from '@vueuse/core'
 import { Label, RadioGroupIndicator, RadioGroupItem, RadioGroupRoot, useForwardPropsEmits } from 'reka-ui'
 import { computed, useId } from 'vue'
+import { useFormItem } from '../composables/useFormItem'
 import { useTheme } from '../composables/useTheme'
 import { get } from '../utils'
 
@@ -88,22 +80,33 @@ const emit = defineEmits<RadioGroupEmits>()
 const slots = defineSlots<RadioGroupSlots<T>>()
 
 const rootProps = useForwardPropsEmits(reactivePick(props, 'as', 'modelValue', 'defaultValue', 'orientation', 'loop', 'required'), emit)
-const id = useId()
 
-const { theme, createStyler } = useTheme()
-const style = computed(() => {
-  const styler = createStyler(theme.value.radioGroup)
-  return styler(props)
-})
+const { id: _id, name, size, disabled, ariaAttrs, emitFormChange, emitFormInput } = useFormItem<RadioGroupProps<T>>(props)
+const id = _id.value ?? useId()
+
+const { generateStyle } = useTheme()
+const style = computed(() => generateStyle('radioGroup', {
+  ...props,
+  size: size.value,
+  disabled: disabled.value,
+}))
+
+function normalizeItem(item: any) {
+  if (item === null) {
+    return {
+      id: `${id}:null`,
+      label: undefined,
+      value: undefined,
+    }
+  }
 
-function normalizeItem(item: any): NormalizeItem<T> {
-  if (['string', 'number', 'boolean'].includes(typeof item)) {
+  if (typeof item === 'string' || typeof item === 'number') {
     return {
       id: `${id}:${item}`,
+      label: String(item),
       value: item,
-      label: item,
-      description: '',
-    } as any
+      disabled: disabled.value,
+    }
   }
 
   const value = get(item, props.valueKey)
@@ -112,10 +115,11 @@ function normalizeItem(item: any): NormalizeItem<T> {
 
   return {
     ...item,
-    value,
+    id: `${id}:${value}`,
     label,
+    value,
     description,
-    id: `${id}:${value}`,
+    disabled: disabled.value || item.disabled,
   }
 }
 
@@ -130,26 +134,25 @@ function onUpdate(value: any) {
   // @ts-expect-error - 'target' does not exist in type 'EventInit'
   const event = new Event('change', { target: { value } })
   emit('change', event)
+  emitFormChange()
+  emitFormInput()
 }
 </script>
 
 <template>
   <RadioGroupRoot
-    :id="id"
     v-slot="{ modelValue }"
-    v-bind="rootProps"
-    :name="props.name"
-    :disabled="props.disabled"
+    v-bind="{ ...rootProps, id, name, disabled }"
     :class="style.root({ class: [props.class, props.ui?.root] })"
     @update:model-value="onUpdate"
   >
-    <fieldset :class="style.fieldset({ class: props.ui?.fieldset })">
+    <fieldset v-bind="ariaAttrs" :class="style.fieldset({ class: props.ui?.fieldset })">
       <legend v-if="props.legend || slots.legend" :class="style.legend({ class: props.ui?.legend })">
         <slot name="legend">
           {{ props.legend }}
         </slot>
       </legend>
-      <div v-for="item in normalizedItems" :key="item.value" :class="style.item({ class: props.ui?.item })">
+      <div v-for="item in normalizedItems" :key="item.value" :class="style.item({ class: props.ui?.item, disabled: item.disabled })">
         <div :class="style.container({ class: props.ui?.container })">
           <RadioGroupItem
             :id="item.id"
@@ -163,10 +166,10 @@ function onUpdate(value: any) {
 
         <div :class="style.wrapper({ class: props.ui?.wrapper })">
           <Label :for="item.id" :class="style.label({ class: props.ui?.label })">
-            <slot name="label" :item="item" :model-value="modelValue">{{ item.label }}</slot>
+            <slot name="label" :item="item" :model-value="(modelValue as RadioGroupValue)">{{ item.label }}</slot>
           </Label>
           <p v-if="item.description || slots.description" :class="style.description({ class: props.ui?.description })">
-            <slot name="description" :item="item" :model-value="modelValue">
+            <slot name="description" :item="item" :model-value="(modelValue as RadioGroupValue)">
               {{ item.description }}
             </slot>
           </p>

package/dist/runtime/components/ScrollArea.vue

@@ -17,12 +17,8 @@ const props = withDefaults(defineProps<ScrollAreaProps>(), {})
 const rootRef = ref<InstanceType<typeof ScrollAreaRoot>>()
 const rootProps = reactivePick(props, 'type', 'dir', 'scrollHideDelay')
 
-const { theme, createStyler } = useTheme()
-
-const style = computed(() => {
-  const styler = createStyler(theme.value.scrollArea)
-  return styler(props)
-})
+const { generateStyle } = useTheme()
+const style = computed(() => generateStyle('scrollArea', props))
 
 defineExpose({
   scrollTop,

package/dist/runtime/components/Select.vue

@@ -1,33 +1,11 @@
 <script lang="ts">
 import type { VariantProps } from '@byyuurin/ui-kit'
-import type { AcceptableValue, SelectArrowProps, SelectContentProps, SelectRootProps } from 'reka-ui'
+import type { SelectArrowProps, SelectContentEmits, SelectContentProps, SelectRootEmits, SelectRootProps } from 'reka-ui'
 import type { UseComponentIconsProps } from '../composables/useComponentIcons'
 import type { select } from '../theme'
-import type { ComponentAttrs, MaybeArray, MaybeArrayOfArray, MaybeArrayOfArrayItem, SelectModelValue, SelectOptionKey } from '../types'
+import type { AcceptableValue, ArrayOrNested, ComponentAttrs, EmitsToProps, GetItemKeys, GetItemValue, GetModelValue, GetModelValueEmits, MaybeArray, NestedItem } from '../types'
 
-export interface SelectEmits<T, V, M extends boolean> {
-  (event: 'update:open', value: boolean): void
-  (event: 'update:modelValue', payload: SelectModelValue<T, V, M, T extends { value: infer U } ? U : never>): void
-  (event: 'change', payload: Event): void
-  (event: 'blur', payload: FocusEvent): void
-  (event: 'focus', payload: FocusEvent): void
-}
-
-type SlotProps<T> = (props: { item: T, index: number }) => any
-
-export interface SelectSlots<T, M extends boolean> {
-  'leading'?: (props: { modelValue?: M extends true ? AcceptableValue[] : AcceptableValue, open: boolean, ui: ComponentAttrs<typeof select>['ui'] }) => any
-  'default'?: (props: { modelValue?: M extends true ? AcceptableValue[] : AcceptableValue, open: boolean }) => any
-  'trailing'?: (props: { modelValue?: M extends true ? AcceptableValue[] : AcceptableValue, open: boolean, ui: ComponentAttrs<typeof select>['ui'] }) => any
-  'item'?: SlotProps<T>
-  'item-leading'?: SlotProps<T>
-  'item-label'?: SlotProps<T>
-  'item-trailing'?: SlotProps<T>
-}
-
-type SelectVariants = VariantProps<typeof select>
-
-export interface SelectOption {
+interface SelectItemBase {
   label?: string
   icon?: string
   /**
@@ -35,18 +13,43 @@ export interface SelectOption {
    * @default "option"
    */
   type?: 'label' | 'separator' | 'option'
-  value?: string
+  value?: AcceptableValue
   disabled?: boolean
+  [key: string]: any
+}
+
+export type SelectItem = SelectItemBase | AcceptableValue | boolean
+
+export type SelectEmits<T extends ArrayOrNested<SelectItem>, VK extends GetItemKeys<T> | undefined, M extends boolean> = Omit<SelectRootEmits, 'update:modelValue'> & {
+  change: [payload: Event]
+  blur: [payload: FocusEvent]
+  focus: [payload: FocusEvent]
+} & GetModelValueEmits<T, VK, M>
+
+type SlotProps<T extends SelectItem> = (props: { item: T, index: number }) => any
+
+export interface SelectSlots<
+  T extends ArrayOrNested<SelectItem> = ArrayOrNested<SelectItem>,
+  VK extends GetItemKeys<T> | undefined = undefined,
+  M extends boolean = false,
+  I extends NestedItem<T> = NestedItem<T>,
+> {
+  'leading'?: (props: { modelValue?: GetModelValue<T, VK, M>, open: boolean, ui: ComponentAttrs<typeof select>['ui'] }) => any
+  'default'?: (props: { modelValue?: GetModelValue<T, VK, M>, open: boolean }) => any
+  'trailing'?: (props: { modelValue?: GetModelValue<T, VK, M>, open: boolean, ui: ComponentAttrs<typeof select>['ui'] }) => any
+  'item'?: SlotProps<I>
+  'item-leading'?: SlotProps<I>
+  'item-label'?: SlotProps<I>
+  'item-trailing'?: SlotProps<I>
 }
 
-export type SelectOptionValue = SelectOption | AcceptableValue | boolean
+type SelectVariants = VariantProps<typeof select>
 
 export interface SelectProps<
-  T extends MaybeArrayOfArrayItem<I>,
-  I extends MaybeArrayOfArray<SelectOptionValue> = MaybeArrayOfArray<SelectOptionValue>,
-  V extends SelectOptionKey<T> | undefined = undefined,
+  T extends ArrayOrNested<SelectItem> = ArrayOrNested<SelectItem>,
+  VK extends GetItemKeys<T> = 'value',
   M extends boolean = false,
-> extends Omit<SelectRootProps<T>, 'dir' | 'multiple' | 'modelValue' | 'defaultValue' | 'by'>, ComponentAttrs<typeof select>, UseComponentIconsProps {
+> extends ComponentAttrs<typeof select>, UseComponentIconsProps, Omit<SelectRootProps<T>, 'dir' | 'multiple' | 'modelValue' | 'defaultValue' | 'by'> {
   id?: string
   /** The placeholder text when the select is empty. */
   placeholder?: string
@@ -66,7 +69,7 @@ export interface SelectProps<
    * The content of the menu.
    * @default { side: 'bottom', sideOffset: 8, collisionPadding: 8, position: 'popper' }
    */
-  content?: Omit<SelectContentProps, 'as' | 'asChild' | 'forceMount'>
+  content?: Omit<SelectContentProps, 'as' | 'asChild' | 'forceMount'> & Partial<EmitsToProps<SelectContentEmits>>
   /**
    * Display an arrow alongside the menu.
    * @default false
@@ -81,17 +84,17 @@ export interface SelectProps<
    * When `options` is an array of objects, select the field to use as the value.
    * @default "value"
    */
-  valueKey?: V
+  valueKey?: VK
   /**
    * When `options` is an array of objects, select the field to use as the label.
    * @default "label"
    */
-  labelKey?: V
-  options?: I
+  labelKey?: VK
+  options?: T
   /** The value of the Select when initially rendered. Use when you do not need to control the state of the Select. */
-  defaultValue?: SelectModelValue<T, V, M, T extends { value: infer U } ? U : never>
+  defaultValue?: GetModelValue<T, VK, M>
   /** The controlled value of the Select. Can be bind as `v-model`. */
-  modelValue?: SelectModelValue<T, V, M, T extends { value: infer U } ? U : never>
+  modelValue?: GetModelValue<T, VK, M>
   /** Whether multiple options can be selected or not. */
   multiple?: M & boolean
   /** Highlight the ring color like a focus state. */
@@ -100,85 +103,89 @@ export interface SelectProps<
 }
 </script>
 
-<script lang="ts" setup generic="T extends MaybeArrayOfArrayItem<I>, I extends MaybeArrayOfArray<SelectOption | AcceptableValue | boolean> = MaybeArrayOfArray<SelectOption | AcceptableValue | boolean>, V extends SelectOptionKey<T> | undefined = undefined, M extends boolean = false">
+<script lang="ts" setup generic="T extends ArrayOrNested<SelectItem>, VK extends GetItemKeys<T> = 'value', M extends boolean = false">
 import { reactivePick } from '@vueuse/core'
 import { defu } from 'defu'
 import { SelectArrow, SelectContent, SelectGroup, SelectItem, SelectItemIndicator, SelectItemText, SelectLabel, SelectPortal, SelectRoot, SelectSeparator, SelectTrigger, SelectViewport, useForwardPropsEmits } from 'reka-ui'
 import { computed, toRef } from 'vue'
 import { useButtonGroup } from '../composables/useButtonGroup'
 import { useComponentIcons } from '../composables/useComponentIcons'
+import { useFormItem } from '../composables/useFormItem'
 import { useTheme } from '../composables/useTheme'
-import { compare, get } from '../utils'
+import { compare, get, isArrayOfArray } from '../utils'
+
+defineOptions({
+  inheritAttrs: false,
+})
 
-const props = withDefaults(defineProps<SelectProps<T, I, V, M>>(), {
-  variant: 'outline',
+const props = withDefaults(defineProps<SelectProps<T, VK, M>>(), {
   valueKey: 'value' as never,
   labelKey: 'label' as never,
   portal: true,
 })
 
-const emit = defineEmits<SelectEmits<T, V, M>>()
-const slots = defineSlots<SelectSlots<T, M>>()
+const emit = defineEmits<SelectEmits<T, VK, M>>()
+const slots = defineSlots<SelectSlots<T, VK, M>>()
 
 const rootProps = useForwardPropsEmits(reactivePick(props, 'open', 'defaultOpen', 'disabled', 'autocomplete', 'required', 'multiple'), emit)
 const contentProps = toRef(() => defu(props.content, { side: 'bottom', sideOffset: 8, collisionPadding: 8, position: 'popper' }) as SelectContentProps)
 const arrowProps = toRef(() => props.arrow as SelectArrowProps)
 
-const { theme, createStyler } = useTheme()
+const { id, name, size: formItemSize, highlight, disabled, ariaAttrs, emitFormChange, emitFormInput, emitFormBlur, emitFormFocus } = useFormItem<SelectProps<T, VK, M>>(props)
+const { size: buttonGroupSize, orientation } = useButtonGroup(props)
 
-const { size, orientation } = useButtonGroup(props)
+const { theme, generateStyle } = useTheme()
 const { isLeading, isTrailing, leadingIconName, trailingIconName } = useComponentIcons(toRef(() => defu(props, {
   trailingIcon: theme.value.app.icons.chevronDown,
 })))
 
-const groups = computed(() => props.options?.length ? (Array.isArray(props.options[0]) ? props.options : [props.options]) as SelectOption[][] : [])
-const items = computed(() => groups.value.flat() as T[])
+const style = computed(() => generateStyle('select', {
+  ...props,
+  groupOrientation: orientation.value,
+  size: buttonGroupSize.value || formItemSize.value,
+  highlight: highlight.value,
+  leading: isLeading.value,
+  trailing: isTrailing.value,
+}))
 
-const style = computed(() => {
-  const styler = createStyler(theme.value.select)
-  return styler({
-    ...props,
-    size: size.value,
-    groupOrientation: orientation.value,
-    leading: isLeading.value,
-    trailing: isTrailing.value,
-  })
-})
-
-function typedItem(item: SelectOption) {
-  return item as unknown as T
-}
+const groups = computed<SelectItem[][]>(
+  () => props.options?.length
+    ? isArrayOfArray(props.options) ? props.options : [props.options]
+    : [],
+)
 
-function typedValue<V extends MaybeArray<AcceptableValue>>(value?: V) {
-  return value as unknown as M extends true ? AcceptableValue[] : AcceptableValue
-}
-
-function typedModelValue(value: any) {
-  return value as MaybeArray<AcceptableValue> | undefined
-}
+const items = computed(() => groups.value.flat() as T[])
 
-function displayValue(value?: MaybeArray<AcceptableValue>): string | undefined {
+function displayValue(value?: MaybeArray<GetItemValue<T, VK>>): string {
   if (props.multiple && Array.isArray(value))
     return value.map((v) => displayValue(v)).filter(Boolean).join(', ')
 
   const item = items.value.find((item) => compare(typeof item === 'object' ? get(item as Record<string, any>, props.valueKey as string) : item, value))
-  return item && (typeof item === 'object' ? get(item, props.labelKey as string) : item)
+  return (item != null) && (typeof item === 'object' ? get(item, props.labelKey as string) : String(item))
+}
+
+function isSelectItem(item: SelectItem): item is SelectItemBase {
+  return typeof item === 'object' && item !== null
 }
 
 function onUpdate(value: any) {
   // @ts-expect-error - 'target' does not exist in type 'EventInit'
   const event = new Event('change', { target: { value } })
   emit('change', event)
+  emitFormChange()
+  emitFormInput()
 }
 
 function onUpdateOpen(value: boolean) {
   if (value) {
     const event = new FocusEvent('focus')
     emit('focus', event)
+    emitFormFocus()
   }
   else {
     const event = new FocusEvent('blur')
     emit('blur', event)
+    emitFormBlur()
   }
 }
 </script>
@@ -186,24 +193,24 @@ function onUpdateOpen(value: boolean) {
 <template>
   <SelectRoot
     v-slot="{ modelValue: innerValue, open }"
-    :name="props.name"
     v-bind="rootProps"
+    :name="name"
     :autocomplete="props.autocomplete"
-    :disabled="props.disabled"
-    :default-value="typedModelValue(props.defaultValue)"
-    :model-value="typedModelValue(props.modelValue)"
+    :disabled="disabled"
+    :default-value="(props.defaultValue as MaybeArray<AcceptableValue>)"
+    :model-value="(props.modelValue as MaybeArray<AcceptableValue>)"
     @update:model-value="onUpdate"
     @update:open="onUpdateOpen"
   >
-    <SelectTrigger :id="props.id" :class="style.base({ class: [props.class, props.ui?.base] })">
+    <SelectTrigger v-bind="{ ...$attrs, ...ariaAttrs, id }" :class="style.base({ class: [props.class, props.ui?.base] })">
       <span v-if="isLeading || slots.leading" :class="style.leading({ class: props.ui?.leading })">
-        <slot name="leading" :model-value="typedValue(innerValue)" :open="open" :ui="props.ui">
+        <slot name="leading" :model-value="(innerValue as GetModelValue<T, VK, M>)" :open="open" :ui="props.ui">
           <span v-if="isLeading && leadingIconName" :class="style.leadingIcon({ class: [leadingIconName, props.ui?.leadingIcon] })"></span>
         </slot>
       </span>
 
-      <slot :model-value="typedValue(innerValue)" :open="open">
-        <template v-for="displayedModelValue in [displayValue(innerValue)]" :key="displayedModelValue">
+      <slot :model-value="(innerValue as GetModelValue<T, VK, M>)" :open="open">
+        <template v-for="displayedModelValue in [displayValue((innerValue as GetModelValue<T, VK, M>))]" :key="displayedModelValue">
           <span v-if="displayedModelValue" :class="style.value({ class: props.ui?.value })">
             {{ displayedModelValue }}
           </span>
@@ -214,7 +221,7 @@ function onUpdateOpen(value: boolean) {
       </slot>
 
       <span v-if="isTrailing || !!slots.trailing" :class="style.trailing({ class: props.ui?.trailing })">
-        <slot name="trailing" :model-value="typedValue(innerValue)" :open="open" :ui="props.ui">
+        <slot name="trailing" :model-value="(innerValue as GetModelValue<T, VK, M>)" :open="open" :ui="props.ui">
           <span v-if="trailingIconName" :class="style.trailingIcon({ class: [trailingIconName, props.ui?.trailingIcon] })"></span>
         </slot>
       </span>
@@ -225,30 +232,30 @@ function onUpdateOpen(value: boolean) {
         <SelectViewport :class="style.viewport({ class: props.ui?.viewport })">
           <SelectGroup v-for="(group, groupIndex) in groups" :key="`group-${groupIndex}`" :class="style.group({ class: props.ui?.group })">
             <template v-for="(item, index) in group" :key="`group-${groupIndex}-${index}`">
-              <SelectLabel v-if="item.type === 'label'" :class="style.label({ class: props.ui?.label })">
+              <SelectLabel v-if="isSelectItem(item) && item.type === 'label'" :class="style.label({ class: props.ui?.label })">
                 {{ get(item, props.labelKey as string) }}
               </SelectLabel>
-              <SelectSeparator v-else-if="item.type === 'separator'" :class="style.separator({ class: props.ui?.separator })" />
+              <SelectSeparator v-else-if="isSelectItem(item) && item.type === 'separator'" :class="style.separator({ class: props.ui?.separator })" />
 
               <SelectItem
                 v-else
                 :class="style.item({ class: props.ui?.item })"
-                :disabled="item.disabled"
-                :value="typeof item === 'object' ? get(item, props.valueKey as string) : item"
+                :disabled="isSelectItem(item) && item.disabled"
+                :value="isSelectItem(item) ? get(item, props.valueKey as string) : item"
               >
-                <slot name="item" :item="typedItem(item)" :index="index">
-                  <slot name="item-leading" :item="typedItem(item)" :index="index">
-                    <span v-if="item.icon" :class="style.itemLeadingIcon({ class: [item.icon, props.ui?.itemLeadingIcon] })"></span>
+                <slot name="item" :item="(item as NestedItem<T>)" :index="index">
+                  <slot name="item-leading" :item="(item as NestedItem<T>)" :index="index">
+                    <span v-if="isSelectItem(item) && item.icon" :class="style.itemLeadingIcon({ class: [item.icon, props.ui?.itemLeadingIcon] })"></span>
                   </slot>
 
                   <SelectItemText :class="style.itemLabel({ class: props.ui?.itemLabel })">
-                    <slot name="item-label" :item="typedItem(item)" :index="index">
-                      {{ typeof item === 'object' ? get(item, props.labelKey as string) : item }}
+                    <slot name="item-label" :item="(item as NestedItem<T>)" :index="index">
+                      {{ isSelectItem(item) ? get(item, props.labelKey as string) : item }}
                     </slot>
                   </SelectItemText>
 
                   <span :class="style.itemTrailing({ class: props.ui?.itemTrailing })">
-                    <slot name="item-trailing" :item="typedItem(item)" :index="index"></slot>
+                    <slot name="item-trailing" :item="(item as NestedItem<T>)" :index="index"></slot>
 
                     <SelectItemIndicator as-child>
                       <span :class="style.itemTrailingIcon({ class: [props.selectedIcon || theme.app.icons.check, props.ui?.itemTrailingIcon] })"></span>

package/dist/runtime/components/Separator.vue

@@ -37,12 +37,8 @@ const slots = defineSlots<SeparatorSlots>()
 
 const rootProps = useForwardProps(reactivePick(props, 'as', 'decorative', 'orientation'))
 
-const { theme, createStyler } = useTheme()
-
-const style = computed(() => {
-  const styler = createStyler(theme.value.separator)
-  return styler(props)
-})
+const { generateStyle } = useTheme()
+const style = computed(() => generateStyle('separator', props))
 </script>
 
 <template>

package/dist/runtime/components/Skeleton.vue

@@ -19,11 +19,8 @@ import { useTheme } from '../composables/useTheme'
 
 const props = withDefaults(defineProps<SkeletonProps>(), {})
 
-const { theme, createStyler } = useTheme()
-const styler = computed(() => {
-  const styler = createStyler(theme.value.skeleton)
-  return styler(props)
-})
+const { generateStyle } = useTheme()
+const styler = computed(() => generateStyle('skeleton', props))
 </script>
 
 <template>

package/dist/runtime/components/Slider.vue

@@ -2,11 +2,11 @@
 import type { VariantProps } from '@byyuurin/ui-kit'
 import type { SliderRootProps } from 'reka-ui'
 import type { slider } from '../theme'
-import type { ComponentAttrs } from '../types'
+import type { ComponentAttrs, MaybeArray } from '../types'
 
 export interface SliderEmits {
-  (event: 'update:modelValue', payload: number | number[]): void
-  (event: 'change', payload: Event): void
+  'update:modelValue': [payload: MaybeArray<number>]
+  'change': [payload: Event]
 }
 
 type SliderVariants = VariantProps<typeof slider>
@@ -28,6 +28,7 @@ export interface SliderProps extends ComponentAttrs<typeof slider>, Pick<SliderR
 import { reactivePick } from '@vueuse/core'
 import { SliderRange, SliderRoot, SliderThumb, SliderTrack, useForwardPropsEmits } from 'reka-ui'
 import { computed } from 'vue'
+import { useFormItem } from '../composables/useFormItem'
 import { useTheme } from '../composables/useTheme'
 
 const props = withDefaults(defineProps<SliderProps>(), {
@@ -63,25 +64,26 @@ const sliderValue = computed({
 
 const thumbsCount = computed(() => sliderValue.value?.length ?? 1)
 
-const { theme, createStyler } = useTheme()
-const style = computed(() => {
-  const styler = createStyler(theme.value.slider)
-  return styler(props)
-})
+const { id, size, name, disabled, ariaAttrs, emitFormChange, emitFormInput } = useFormItem<SliderProps>(props)
+const { generateStyle } = useTheme()
+const style = computed(() => generateStyle('slider', {
+  ...props,
+  size: size.value,
+}))
 
 function onChange(value: any) {
   // @ts-expect-error - 'target' does not exist in type 'EventInit'
   const event = new Event('change', { target: { value } })
   emit('change', event)
+  emitFormChange()
+  emitFormInput()
 }
 </script>
 
 <template>
   <SliderRoot
-    v-bind="rootProps"
+    v-bind="{ ...rootProps, ...ariaAttrs, id, name, disabled }"
     v-model="sliderValue"
-    :name="props.name"
-    :disabled="props.disabled"
     :class="style.root({ class: [props.class, props.ui?.root] })"
     :default-value="defaultSliderValue"
     :data-steps="thumbsCount"