@byyuurin/ui 0.0.11 → 0.2.0

package/dist/runtime/components/RadioGroup.vue

@@ -1,75 +1,91 @@
 <script>
-
+import theme from "#build/ui/radio-group";
 </script>
 
 <script setup>
 import { reactivePick } from "@vueuse/core";
-import { Label, RadioGroupIndicator, RadioGroupItem, RadioGroupRoot, useForwardPropsEmits } from "reka-ui";
+import { Label, RadioGroupIndicator, RadioGroupItem as RekaRadioGroupItem, RadioGroupRoot, useForwardPropsEmits } from "reka-ui";
 import { computed, useId } from "vue";
-import { useFormItem } from "../composables/useFormItem";
-import { useTheme } from "../composables/useTheme";
+import { useAppConfig } from "#imports";
+import { useFormField } from "../composables/useFormField";
 import { get } from "../utils";
+import { cv, merge } from "../utils/style";
 const props = defineProps({
   as: { type: null, required: false },
-  legend: { type: String, required: false },
-  valueKey: { type: String, required: false, default: "value" },
-  labelKey: { type: String, required: false, default: "label" },
-  descriptionKey: { type: String, required: false, default: "description" },
-  options: { type: Array, required: false },
+  variant: { type: null, required: false },
   size: { type: null, required: false },
+  color: { type: null, required: false },
+  indicator: { type: null, required: false },
+  legend: { type: String, required: false },
+  valueKey: { type: null, required: false, default: "value" },
+  labelKey: { type: null, required: false, default: "label" },
+  descriptionKey: { type: null, required: false, default: "description" },
+  items: { type: null, required: false },
+  modelValue: { type: null, required: false },
+  defaultValue: { type: null, required: false },
   orientation: { type: null, required: false, default: "vertical" },
-  class: { type: null, required: false },
   ui: { type: null, required: false },
-  defaultValue: { type: null, required: false },
+  class: { type: [Object, String, Number, Boolean, null, Array], required: false, skipCheck: true },
   disabled: { type: Boolean, required: false },
   loop: { type: Boolean, required: false },
-  modelValue: { type: null, required: false },
   name: { type: String, required: false },
   required: { type: Boolean, required: false }
 });
-const emit = defineEmits(["update:modelValue", "change"]);
+const emit = defineEmits(["change", "update:modelValue"]);
 const slots = defineSlots();
-const rootProps = useForwardPropsEmits(reactivePick(props, "as", "modelValue", "defaultValue", "orientation", "loop", "required"), emit);
-const { id: _id, name, size, disabled, ariaAttrs, emitFormChange, emitFormInput } = useFormItem(props);
+const rootProps = useForwardPropsEmits(reactivePick(props, "as", "loop", "required"), emit);
+const { id: _id, name, color, size, disabled, ariaAttrs, emitFormChange, emitFormInput } = useFormField(props, { bind: false });
 const id = _id.value ?? useId();
-const { generateStyle } = useTheme();
-const style = computed(() => generateStyle("radioGroup", {
-  ...props,
-  size: size.value,
-  disabled: disabled.value
-}));
+const appConfig = useAppConfig();
+const ui = computed(() => {
+  const styler = cv(merge(theme, appConfig.ui.radioGroup));
+  return styler({
+    ...props,
+    color: color.value,
+    size: size.value,
+    disabled: disabled.value
+  });
+});
 function normalizeItem(item) {
-  if (item === null) {
+  const itemBase = {
+    disabled: disabled.value,
+    label: void 0,
+    description: void 0,
+    value: void 0,
+    ui: void 0,
+    class: void 0
+  };
+  if (typeof item === "object" && item === null) {
     return {
+      ...itemBase,
       id: `${id}:null`,
-      label: void 0,
-      value: void 0
+      value: null
     };
   }
-  if (typeof item === "string" || typeof item === "number") {
+  if (typeof item === "boolean" || typeof item === "string" || typeof item === "number" || typeof item === "bigint") {
     return {
+      ...itemBase,
       id: `${id}:${item}`,
       label: String(item),
-      value: item,
-      disabled: disabled.value
+      value: item
     };
   }
   const value = get(item, props.valueKey);
   const label = get(item, props.labelKey);
   const description = get(item, props.descriptionKey);
   return {
+    ...itemBase,
     ...item,
     id: `${id}:${value}`,
     label,
     value,
-    description,
-    disabled: disabled.value || item.disabled
+    description
   };
 }
 const normalizedItems = computed(() => {
-  if (!props.options)
+  if (!props.items)
     return [];
-  return props.options.map(normalizeItem);
+  return props.items.map(normalizeItem);
 });
 function onUpdate(value) {
   const event = new Event("change", { target: { value } });
@@ -81,42 +97,53 @@ function onUpdate(value) {
 
 <template>
   <RadioGroupRoot
-    v-slot="{ modelValue }"
-    v-bind="{ ...rootProps, id, name, disabled }"
-    :class="style.root({ class: [props.class, props.ui?.root] })"
+    v-bind="{ id, ...rootProps, name, disabled }"
+    :model-value="props.modelValue"
+    :default-value="props.defaultValue"
+    :orientation="props.orientation"
+    :class="ui.root({ class: [props.ui?.root, props.class] })"
     data-part="root"
     @update:model-value="onUpdate"
   >
-    <fieldset v-bind="ariaAttrs" :class="style.fieldset({ class: props.ui?.fieldset })" data-part="fieldset">
-      <legend v-if="props.legend || slots.legend" :class="style.legend({ class: props.ui?.legend })" data-part="legend">
+    <fieldset v-bind="ariaAttrs" :class="ui.fieldset({ class: props.ui?.fieldset })" data-part="fieldset">
+      <legend v-if="props.legend || !!slots.legend" :class="ui.legend({ class: props.ui?.legend })" data-part="legend">
         <slot name="legend">
           {{ props.legend }}
         </slot>
       </legend>
-      <div v-for="item in normalizedItems" :key="item.value" :class="style.item({ class: props.ui?.item, disabled: item.disabled })" data-part="item">
-        <div :class="style.container({ class: props.ui?.container })" data-part="container">
-          <RadioGroupItem
+      <component
+        :is="!props.variant || props.variant === 'list' ? 'div' : Label"
+        v-for="item in normalizedItems"
+        :key="item.value"
+        :class="ui.item({ class: [props.ui?.item, item.ui?.item, item.class], disabled: item.disabled })"
+        data-part="item"
+      >
+        <div :class="ui.container({ class: [props.ui?.container, item.ui?.container], disabled: item.disabled })" data-part="container">
+          <RekaRadioGroupItem
             :id="item.id"
             :value="item.value"
             :disabled="item.disabled"
-            :class="style.base({ class: props.ui?.base })"
+            :class="ui.base({ class: [props.ui?.base, item.ui?.base], disabled: item.disabled, indicator: props.indicator })"
             data-part="base"
+            :data-indicator="props.indicator"
           >
-            <RadioGroupIndicator :class="style.indicator({ class: props.ui?.indicator })" data-part="indicator" force-mount />
-          </RadioGroupItem>
+            <RadioGroupIndicator :class="ui.indicator({ class: [props.ui?.indicator, item.ui?.indicator], disabled: item.disabled })" data-part="indicator" force-mount />
+          </RekaRadioGroupItem>
         </div>
 
-        <div :class="style.wrapper({ class: props.ui?.wrapper })" data-part="wrapper">
-          <Label :for="item.id" :class="style.label({ class: props.ui?.label })" data-part="label">
-            <slot name="label" :item="item" :model-value="modelValue">{{ item.label }}</slot>
-          </Label>
-          <p v-if="item.description || slots.description" :class="style.description({ class: props.ui?.description })" data-part="description">
+        <div v-if="item.label || !!slots.label || (item.description || !!slots.description)" :class="ui.wrapper({ class: [props.ui?.wrapper, item.ui?.wrapper], disabled: item.disabled })" data-part="wrapper">
+          <component :is="!props.variant || props.variant === 'list' ? Label : 'p'" :for="item.id" :class="ui.label({ class: [props.ui?.label, item.ui?.label], disabled: item.disabled })" data-part="label">
+            <slot name="label" :item="item" :model-value="modelValue">
+              {{ item.label }}
+            </slot>
+          </component>
+          <p v-if="item.description || !!slots.description" :class="ui.description({ class: [props.ui?.description, item.ui?.description], disabled: item.disabled })" data-part="description">
             <slot name="description" :item="item" :model-value="modelValue">
               {{ item.description }}
             </slot>
           </p>
         </div>
-      </div>
+      </component>
     </fieldset>
   </RadioGroupRoot>
 </template>

package/dist/runtime/components/RadioGroup.vue.d.ts

@@ -1,74 +1,96 @@
 import type { VariantProps } from '@byyuurin/ui-kit';
-import type { PrimitiveProps, RadioGroupRootProps } from 'reka-ui';
-import type { radioGroup } from '../theme/index.js';
-import type { AcceptableValue, ComponentAttrs } from '../types/index.js';
-export interface RadioGroupEmits {
-    'update:modelValue': [payload: string];
-    'change': [payload: Event];
-}
+import type { RadioGroupRootEmits, RadioGroupRootProps } from 'reka-ui';
+import theme from '#build/ui/radio-group';
+import type { ComponentBaseProps, ComponentUIProps } from '../types';
+import type { AcceptableValue, GetItemKeys, GetModelValue, GetModelValueEmits, MaybeNull, NestedItem, StaticSlot } from '../types/utils';
 export type RadioGroupValue = AcceptableValue;
-export type RadioGroupItem = {
+interface RadioGroupItemBase {
     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>;
+    class?: ComponentBaseProps['class'];
+    ui?: Pick<ComponentUIProps<typeof theme>, 'item' | 'container' | 'base' | 'indicator' | 'wrapper' | 'label' | 'description'>;
 }
-type RadioGroupVariants = VariantProps<typeof radioGroup>;
-export interface RadioGroupProps<T extends RadioGroupItem = RadioGroupItem> extends ComponentAttrs<typeof radioGroup>, Pick<RadioGroupRootProps, 'defaultValue' | 'disabled' | 'loop' | 'modelValue' | 'name' | 'required'> {
+export type RadioGroupItem = RadioGroupValue | (RadioGroupItemBase & {
+    [key: string]: any;
+});
+type NormalizeItem<T extends RadioGroupItem> = Exclude<T & {
+    id: string;
+    ui?: Pick<ComponentUIProps<typeof theme>, 'item' | 'container' | 'base' | 'indicator' | 'wrapper' | 'label' | 'description'>;
+}, RadioGroupValue>;
+type ThemeVariants = VariantProps<typeof theme>;
+export interface RadioGroupProps<T extends RadioGroupItem[] = RadioGroupItem[], VK extends GetItemKeys<T> = 'value'> extends ComponentBaseProps, Pick<RadioGroupRootProps, 'disabled' | 'loop' | 'name' | 'required'> {
     /**
      * The element or component this component should render as.
      * @default "div"
      */
-    as?: PrimitiveProps['as'];
+    as?: RadioGroupRootProps['as'];
+    /** @default "list" */
+    variant?: ThemeVariants['variant'];
+    /** @default "md" */
+    size?: ThemeVariants['size'];
+    /** @default "primary" */
+    color?: ThemeVariants['color'];
+    /**
+     * Position of the indicator.
+     * @default "start"
+     */
+    indicator?: ThemeVariants['indicator'];
     legend?: string;
     /**
      * When `options` is an array of objects, select the field to use as the value.
      * @default "value"
      */
-    valueKey?: string;
+    valueKey?: VK;
     /**
      * When `options` is an array of objects, select the field to use as the label.
      * @default "label"
      */
-    labelKey?: string;
+    labelKey?: GetItemKeys<T>;
     /**
      * When `options` is an array of objects, select the field to use as the description.
      * @default "description"
      */
-    descriptionKey?: string;
-    options?: T[];
-    size?: RadioGroupVariants['size'];
+    descriptionKey?: GetItemKeys<T>;
+    items?: T;
+    /** The controlled value of the RadioGroup. Can be bind as `v-model`. */
+    modelValue?: MaybeNull<GetModelValue<T, VK, false>>;
+    /** The value of the RadioGroup when initially rendered. Use when you do not need to control the state of the RadioGroup. */
+    defaultValue?: MaybeNull<GetModelValue<T, VK, false>>;
     /**
      * The orientation the radio buttons are laid out.
      * @default "vertical"
      */
     orientation?: RadioGroupRootProps['orientation'];
+    ui?: ComponentUIProps<typeof theme>;
+}
+export type RadioGroupEmits<T extends RadioGroupItem[] = RadioGroupItem[], VK extends GetItemKeys<T> = 'value'> = Omit<RadioGroupRootEmits, 'update:modelValue'> & {
+    change: [event: Event];
+} & GetModelValueEmits<T, VK, false>;
+type SlotProps<T extends RadioGroupItem[]> = StaticSlot<{
+    item: NormalizeItem<NestedItem<T>>;
+    modelValue?: RadioGroupValue;
+}>;
+export interface RadioGroupSlots<T extends RadioGroupItem[] = RadioGroupItem[]> {
+    legend: StaticSlot;
+    label: SlotProps<T>;
+    description: SlotProps<T>;
 }
-declare const _default: <T extends RadioGroupItem>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-    props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
-        readonly onChange?: ((payload: Event) => any) | undefined;
-        readonly "onUpdate:modelValue"?: ((payload: string) => any) | undefined;
-    } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, "onChange" | "onUpdate:modelValue"> & RadioGroupProps<T> & Partial<{}>> & import("vue").PublicProps;
-    expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
+declare const __VLS_export: <T extends RadioGroupItem[], VK extends GetItemKeys<T> = "value">(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+    props: __VLS_PrettifyLocal<RadioGroupProps<T, VK> & {
+        onChange?: ((event: Event) => any) | undefined;
+        "onUpdate:modelValue"?: ((value: import("../types").GetItemValue<T, VK, NestedItem<T>>) => any) | undefined;
+    }> & import("vue").PublicProps;
+    expose: (exposed: {}) => void;
     attrs: any;
     slots: RadioGroupSlots<T>;
-    emit: ((evt: "change", payload: Event) => void) & ((evt: "update:modelValue", payload: string) => void);
+    emit: ((evt: "change", event: Event) => void) & ((evt: "update:modelValue", value: import("../types").GetItemValue<T, VK, NestedItem<T>>) => void);
 }>) => import("vue").VNode & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_PrettifyLocal<T> = {
-    [K in keyof T]: T[K];
+    [K in keyof T as K]: T[K];
 } & {};

package/dist/runtime/components/ScrollArea.vue

@@ -1,23 +1,27 @@
 <script>
-import { transitionProps } from "../theme/scroll-area";
+import theme from "#build/ui/scroll-area";
 </script>
 
 <script setup>
 import { reactivePick } from "@vueuse/core";
 import { ScrollAreaCorner, ScrollAreaRoot, ScrollAreaScrollbar, ScrollAreaThumb, ScrollAreaViewport } from "reka-ui";
 import { computed, ref } from "vue";
-import { useTheme } from "../composables/useTheme";
+import { useAppConfig } from "#imports";
+import { cv, merge } from "../utils/style";
 const props = defineProps({
-  class: { type: null, required: false },
   ui: { type: null, required: false },
+  class: { type: [Object, String, Number, Boolean, null, Array], required: false, skipCheck: true },
   type: { type: String, required: false },
   dir: { type: String, required: false },
-  scrollHideDelay: { type: Number, required: false }
+  scrollHideDelay: { type: Number, required: false, default: 150 }
 });
 const rootRef = ref();
 const rootProps = reactivePick(props, "type", "dir", "scrollHideDelay");
-const { generateStyle } = useTheme();
-const style = computed(() => generateStyle("scrollArea", props));
+const appConfig = useAppConfig();
+const ui = computed(() => {
+  const styler = cv(merge(theme, appConfig.ui.scrollArea));
+  return styler(props);
+});
 defineExpose({
   scrollTop,
   scrollTopLeft
@@ -34,35 +38,33 @@ function scrollTopLeft() {
   <ScrollAreaRoot
     ref="rootRef"
     v-bind="rootProps"
-    :class="style.root({ class: [props.class, props.ui?.root] })"
+    :class="ui.root({ class: [props.class, props.ui?.root] })"
     data-part="root"
   >
-    <ScrollAreaViewport :class="style.viewport({ class: props.ui?.viewport })" data-part="viewport">
+    <ScrollAreaViewport :class="ui.viewport({ class: props.ui?.viewport })" data-part="viewport">
       <slot></slot>
     </ScrollAreaViewport>
 
-    <TransitionGroup v-bind="transitionProps">
-      <ScrollAreaScrollbar
-        key="scrollbar-horizontal"
-        orientation="horizontal"
-        :class="style.scrollbar({ class: props.ui?.scrollbar })"
-        data-part="scrollbar"
-      >
-        <ScrollAreaThumb :class="style.thumb({ class: props.ui?.thumb })" data-part="thumb" />
-      </ScrollAreaScrollbar>
-      <ScrollAreaScrollbar
-        key="scrollbar-vertical"
-        orientation="vertical"
-        :class="style.scrollbar({ class: props.ui?.scrollbar })"
-        data-part="scrollbar"
-      >
-        <ScrollAreaThumb :class="style.thumb({ class: props.ui?.thumb })" data-part="thumb" />
-      </ScrollAreaScrollbar>
-      <ScrollAreaCorner
-        key="corner"
-        :class="style.corner({ class: props.ui?.corner })"
-        data-part="corner"
-      />
-    </TransitionGroup>
+    <ScrollAreaScrollbar
+      key="scrollbar-horizontal"
+      orientation="horizontal"
+      :class="ui.scrollbar({ class: props.ui?.scrollbar })"
+      data-part="scrollbar"
+    >
+      <ScrollAreaThumb :class="ui.thumb({ class: props.ui?.thumb })" data-part="thumb" />
+    </ScrollAreaScrollbar>
+    <ScrollAreaScrollbar
+      key="scrollbar-vertical"
+      orientation="vertical"
+      :class="ui.scrollbar({ class: props.ui?.scrollbar })"
+      data-part="scrollbar"
+    >
+      <ScrollAreaThumb :class="ui.thumb({ class: props.ui?.thumb })" data-part="thumb" />
+    </ScrollAreaScrollbar>
+    <ScrollAreaCorner
+      key="corner"
+      :class="ui.corner({ class: props.ui?.corner })"
+      data-part="corner"
+    />
   </ScrollAreaRoot>
 </template>

package/dist/runtime/components/ScrollArea.vue.d.ts

@@ -1,14 +1,18 @@
 import type { ScrollAreaRootProps } from 'reka-ui';
-import type { scrollArea } from '../theme/index.js';
-import type { ComponentAttrs } from '../types/index.js';
-export interface ScrollAreaProps extends ComponentAttrs<typeof scrollArea>, Pick<ScrollAreaRootProps, 'type' | 'dir' | 'scrollHideDelay'> {
+import theme from '#build/ui/scroll-area';
+import type { ComponentBaseProps, ComponentUIProps } from '../types';
+export interface ScrollAreaProps extends ComponentBaseProps, Pick<ScrollAreaRootProps, 'type' | 'dir' | 'scrollHideDelay'> {
+    ui?: ComponentUIProps<typeof theme>;
 }
-declare const _default: __VLS_WithSlots<import("vue").DefineComponent<ScrollAreaProps, {
+declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<ScrollAreaProps, {
     scrollTop: () => void;
     scrollTopLeft: () => void;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<ScrollAreaProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<ScrollAreaProps> & Readonly<{}>, {
+    scrollHideDelay: number;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
     default?: (props: {}) => any;
 }>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {