@byyuurin/ui 0.0.10 → 0.1.0

package/dist/runtime/components/Slider.vue

@@ -1,82 +1,67 @@
-<script lang="ts">
-import type { VariantProps } from '@byyuurin/ui-kit'
-import type { SliderRootProps } from 'reka-ui'
-import type { slider } from '../theme'
-import type { ComponentAttrs, MaybeArray } from '../types'
-
-export interface SliderEmits {
-  'update:modelValue': [payload: MaybeArray<number>]
-  'change': [payload: Event]
-}
-
-type SliderVariants = VariantProps<typeof slider>
-
-export interface SliderProps extends ComponentAttrs<typeof slider>, Pick<SliderRootProps, 'as' | 'name' | 'disabled' | 'inverted' | 'min' | 'max' | 'step' | 'minStepsBetweenThumbs'> {
-  modelValue?: number | number[]
-  size?: SliderVariants['size']
-  /**
-   * The orientation of the slider.
-   * @default "horizontal"
-   */
-  orientation?: SliderVariants['orientation']
-  /** The value of the slider when initially rendered. Use when you do not need to control the state of the slider. */
-  defaultValue?: number | number[]
-}
+<script>
+import theme from "#build/ui/slider";
 </script>
 
-<script setup lang="ts">
-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>(), {
-  orientation: 'horizontal',
-  step: 1,
-  max: 100,
-})
-
-const emit = defineEmits<SliderEmits>()
-
-const rootProps = useForwardPropsEmits(reactivePick(props, 'as', 'orientation', 'min', 'max', 'step', 'minStepsBetweenThumbs', 'inverted'), emit)
-
-const modelValue = defineModel<number | number[]>()
-
+<script setup>
+import { reactivePick, useVModel } from "@vueuse/core";
+import { SliderRange, SliderRoot, SliderThumb, SliderTrack, useForwardPropsEmits } from "reka-ui";
+import { computed } from "vue";
+import { useAppConfig } from "#imports";
+import { useFormField } from "../composables/useFormField";
+import { cv, merge } from "../utils/style";
+import Tooltip from "./Tooltip.vue";
+const props = defineProps({
+  as: { type: null, required: false },
+  size: { type: null, required: false },
+  color: { type: null, required: false },
+  orientation: { type: null, required: false, default: "horizontal" },
+  tooltip: { type: [Boolean, Object], required: false },
+  modelValue: { type: null, required: false },
+  defaultValue: { type: null, required: false },
+  ui: { type: null, required: false },
+  class: { type: [Object, String, Number, Boolean, null, Array], required: false, skipCheck: true },
+  name: { type: String, required: false },
+  disabled: { type: Boolean, required: false },
+  inverted: { type: Boolean, required: false },
+  min: { type: Number, required: false, default: 0 },
+  max: { type: Number, required: false, default: 100 },
+  step: { type: Number, required: false, default: 1 },
+  minStepsBetweenThumbs: { type: Number, required: false }
+});
+const emit = defineEmits(["update:modelValue", "change"]);
+const modelValue = useVModel(props, "modelValue", emit);
+const rootProps = useForwardPropsEmits(reactivePick(props, "as", "min", "max", "step", "minStepsBetweenThumbs", "inverted"), emit);
 const defaultSliderValue = computed(() => {
-  if (typeof props.defaultValue === 'number')
-    return [props.defaultValue]
-
-  return props.defaultValue
-})
-
+  if (typeof props.defaultValue === "number")
+    return [props.defaultValue];
+  return props.defaultValue;
+});
 const sliderValue = computed({
   get() {
-    if (typeof modelValue.value === 'number')
-      return [modelValue.value]
-
-    return modelValue.value ?? defaultSliderValue.value
+    if (typeof modelValue.value === "number")
+      return [modelValue.value];
+    return modelValue.value ?? defaultSliderValue.value;
   },
   set(value) {
-    modelValue.value = value?.length === 1 ? value[0] : value
-  },
-})
-
-const thumbsCount = computed(() => sliderValue.value?.length ?? 1)
-
-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()
+    modelValue.value = value?.length === 1 ? value[0] : value;
+  }
+});
+const thumbs = computed(() => sliderValue.value?.length ?? 1);
+const { id, name, size, color, disabled, ariaAttrs, emitFormChange, emitFormInput } = useFormField(props);
+const appConfig = useAppConfig();
+const ui = computed(() => {
+  const styler = cv(merge(theme, appConfig.ui.slider));
+  return styler({
+    ...props,
+    size: size.value,
+    color: color.value,
+    disabled: disabled.value
+  });
+});
+function onChange(value) {
+  const event = new Event("change", { target: { value } });
+  emit("change", event);
+  emitFormChange();
 }
 </script>
 
@@ -84,15 +69,26 @@ function onChange(value: any) {
   <SliderRoot
     v-bind="{ ...rootProps, ...ariaAttrs, id, name, disabled }"
     v-model="sliderValue"
-    :class="style.root({ class: [props.class, props.ui?.root] })"
     :default-value="defaultSliderValue"
-    :data-steps="thumbsCount"
+    :class="ui.root({ class: [props.ui?.root, props.class] })"
+    :data-steps="thumbs"
+    data-part="root"
+    @update:model-value="emitFormInput()"
     @value-commit="onChange"
   >
-    <SliderTrack :class="style.track({ class: props.ui?.track })">
-      <SliderRange :class="style.range({ class: props.ui?.range })" />
+    <SliderTrack :class="ui.track({ class: props.ui?.track })" data-part="track">
+      <SliderRange :class="ui.range({ class: props.ui?.range })" data-part="range" />
     </SliderTrack>
 
-    <SliderThumb v-for="count in thumbsCount" :key="count" :class="style.thumb({ class: props.ui?.thumb })" />
+    <Tooltip
+      v-for="thumb in thumbs"
+      :key="thumb"
+      v-bind="typeof props.tooltip === 'object' ? props.tooltip : {}"
+      :text="String(thumbs > 1 ? sliderValue?.[thumb - 1] : sliderValue)"
+      :disabled="!props.tooltip"
+      disable-closing-trigger
+    >
+      <SliderThumb :class="ui.thumb({ class: props.ui?.thumb })" data-part="thumb" />
+    </Tooltip>
   </SliderRoot>
 </template>

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

@@ -0,0 +1,52 @@
+import type { VariantProps } from '@byyuurin/ui-kit';
+import type { SliderRootProps } from 'reka-ui';
+import theme from '#build/ui/slider';
+import type { ComponentBaseProps, ComponentUIProps, TooltipProps } from '../types';
+import type { MaybeArray } from '../types/utils';
+type ThemeVariants = VariantProps<typeof theme>;
+export interface SliderProps<T extends MaybeArray<number> = MaybeArray<number>> extends ComponentBaseProps, Pick<SliderRootProps, 'name' | 'disabled' | 'inverted' | 'min' | 'max' | 'step' | 'minStepsBetweenThumbs'> {
+    /**
+     * The element or component this component should render as.
+     * @default "div"
+     */
+    as?: SliderRootProps['as'];
+    /** @default "md" */
+    size?: ThemeVariants['size'];
+    /** @default "primary" */
+    color?: ThemeVariants['color'];
+    /**
+     * The orientation of the slider.
+     * @default "horizontal"
+     */
+    orientation?: ThemeVariants['orientation'];
+    /**
+     * Display a tooltip around the slider thumbs with the current value.
+     * @default false
+     */
+    tooltip?: boolean | TooltipProps;
+    modelValue?: T;
+    /** The value of the slider when initially rendered. Use when you do not need to control the state of the slider. */
+    defaultValue?: T;
+    ui?: ComponentUIProps<typeof theme>;
+}
+export interface SliderEmits<T extends MaybeArray<number>> {
+    'update:modelValue': [value: T];
+    'change': [event: Event];
+}
+declare const __VLS_export: <T extends MaybeArray<number>>(__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<SliderProps<T> & {
+        onChange?: ((event: Event) => any) | undefined;
+        "onUpdate:modelValue"?: ((value: T) => any) | undefined;
+    }> & import("vue").PublicProps;
+    expose: (exposed: {}) => void;
+    attrs: any;
+    slots: {};
+    emit: ((evt: "change", event: Event) => void) & ((evt: "update:modelValue", value: 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 as K]: T[K];
+} & {};

package/dist/runtime/components/Switch.vue

@@ -1,98 +1,87 @@
-<script lang="ts">
-import type { VariantProps } from '@byyuurin/ui-kit'
-import type { SwitchRootProps } from 'reka-ui'
-import type { switch as _switch } from '../theme'
-import type { ComponentAttrs } from '../types'
-
-export interface SwitchEmits {
-  change: [payload: Event]
-}
-
-export interface SwitchSlots {
-  label?: (props: { label?: string }) => any
-  description?: (props: { description?: string }) => any
-}
-
-type SwitchVariants = VariantProps<typeof _switch>
-
-export interface SwitchProps extends ComponentAttrs<typeof _switch>, Pick<SwitchRootProps, 'as' | 'disabled' | 'id' | 'name' | 'required' | 'value' | 'defaultValue'> {
-  size?: SwitchVariants['size']
-  /** When `true`, the loading icon will be displayed. */
-  loading?: boolean
-  /**
-   * The icon when the `loading` prop is `true`.
-   * @default app.icons.loading
-   */
-  loadingIcon?: string
-  /** Display an icon when the switch is checked. */
-  checkedIcon?: string
-  /** Display an icon when the switch is unchecked. */
-  uncheckedIcon?: string
-  label?: string
-  description?: string
-}
+<script>
+import theme from "#build/ui/switch";
 </script>
 
-<script lang="ts" setup>
-import { reactivePick } from '@vueuse/core'
-import { Label, Primitive, SwitchRoot, SwitchThumb, useForwardProps } from 'reka-ui'
-import { computed, useId } from 'vue'
-import { useFormItem } from '../composables/useFormItem'
-import { useTheme } from '../composables/useTheme'
-
-const props = withDefaults(defineProps<SwitchProps>(), {})
-const emit = defineEmits<SwitchEmits>()
-const slots = defineSlots<SwitchSlots>()
-const modelValue = defineModel<boolean>({ default: undefined })
-
-const rootProps = useForwardProps(reactivePick(props, 'required', 'value', 'defaultValue'))
-
-const { id: _id, size, name, disabled, ariaAttrs, emitFormChange, emitFormInput } = useFormItem<SwitchProps>(props)
-const id = _id.value ?? useId()
-
-const { theme, generateStyle } = useTheme()
-const style = computed(() => generateStyle('switch', {
-  ...props,
-  size: size.value,
-  disabled: disabled.value,
-  checked: false,
-  unchecked: false,
-}))
-
-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 setup>
+import { reactivePick, useVModel } from "@vueuse/core";
+import { Label, Primitive, SwitchRoot, SwitchThumb, useForwardProps } from "reka-ui";
+import { computed, useId } from "vue";
+import { useAppConfig } from "#imports";
+import { useFormField } from "../composables/useFormField";
+import { cv, merge } from "../utils/style";
+import Icon from "./Icon.vue";
+defineOptions({ inheritAttrs: false });
+const props = defineProps({
+  as: { type: null, required: false },
+  color: { type: null, required: false },
+  size: { type: null, required: false },
+  loading: { type: Boolean, required: false },
+  loadingIcon: { type: [String, Object], required: false },
+  checkedIcon: { type: [String, Object], required: false },
+  uncheckedIcon: { type: [String, Object], required: false },
+  modelValue: { type: Boolean, required: false },
+  label: { type: String, required: false },
+  description: { type: String, required: false },
+  ui: { type: null, required: false },
+  class: { type: [Object, String, Number, Boolean, null, Array], required: false, skipCheck: true },
+  disabled: { type: Boolean, required: false },
+  id: { type: String, required: false },
+  name: { type: String, required: false },
+  required: { type: Boolean, required: false },
+  value: { type: String, required: false },
+  defaultValue: { type: Boolean, required: false }
+});
+const emit = defineEmits(["change", "update:modelValue"]);
+const slots = defineSlots();
+const modelValue = useVModel(props, "modelValue", emit);
+const rootProps = useForwardProps(reactivePick(props, "required", "value", "defaultValue"));
+const { id: _id, name, size, color, disabled, ariaAttrs, emitFormChange, emitFormInput } = useFormField(props);
+const id = _id.value ?? useId();
+const appConfig = useAppConfig();
+const ui = computed(() => {
+  const styler = cv(merge(theme, appConfig.ui.switch));
+  return styler({
+    ...props,
+    size: size.value,
+    color: color.value,
+    disabled: disabled.value || props.loading,
+    checked: false,
+    unchecked: false
+  });
+});
+function onUpdate(value) {
+  const event = new Event("change", { target: { value } });
+  emit("change", event);
+  emitFormChange();
+  emitFormInput();
 }
 </script>
 
 <template>
-  <Primitive :as="props.as" :class="style.root({ class: [props.class, props.ui?.root] })">
-    <div :class="style.container({ class: props.ui?.container })">
+  <Primitive :as="props.as" :class="ui.root({ class: [props.ui?.root, props.class] })" data-part="root">
+    <div :class="ui.container({ class: props.ui?.container })" data-part="container">
       <SwitchRoot
-        v-bind="{ ...rootProps, ...ariaAttrs, id, name }"
+        v-bind="{ id, ...rootProps, ...ariaAttrs, name }"
         v-model="modelValue"
-        :class="style.base({ class: props.ui?.base })"
         :disabled="disabled || props.loading"
+        :class="ui.base({ class: props.ui?.base })"
+        data-part="base"
         @update:model-value="onUpdate"
       >
-        <SwitchThumb :class="style.thumb({ class: props.ui?.thumb })">
-          <span v-if="props.loading" :class="style.icon({ class: [theme.app.icons.loading, props.ui?.icon], checked: true, unchecked: true })"></span>
+        <SwitchThumb :class="ui.thumb({ class: props.ui?.thumb })" data-part="thumb">
+          <Icon v-if="props.loading" :name="props.loadingIcon || appConfig.ui.icons.loading" :class="ui.icon({ class: props.ui?.icon, checked: true, unchecked: true })" data-part="icon" />
           <template v-else>
-            <span v-if="props.checkedIcon" :class="style.icon({ class: [props.checkedIcon, props.ui?.icon], checked: true })"></span>
-            <span v-if="props.uncheckedIcon" :class="style.icon({ class: [props.uncheckedIcon, props.ui?.icon], unchecked: true })"></span>
+            <Icon v-if="props.checkedIcon" :name="props.checkedIcon" :class="ui.icon({ class: props.ui?.icon, checked: true })" data-part="icon" />
+            <Icon v-if="props.uncheckedIcon" :name="props.uncheckedIcon" :class="ui.icon({ class: props.ui?.icon, unchecked: true })" data-part="icon" />
           </template>
         </SwitchThumb>
       </SwitchRoot>
     </div>
-    <div v-if="props.label || slots.label || props.description || slots.description" :class="style.wrapper({ class: props.ui?.wrapper })">
-      <Label v-if="props.label || slots.label" :for="id" :class="style.label({ class: props.ui?.label })">
+    <div v-if="props.label || !!slots.label || (props.description || !!slots.description)" :class="ui.wrapper({ class: props.ui?.wrapper })" data-part="wrapper">
+      <Label v-if="props.label || !!slots.label" :for="id" :class="ui.label({ class: props.ui?.label })" data-part="label">
         <slot name="label" :label="props.label">{{ props.label }}</slot>
       </Label>
-      <p v-if="props.description || slots.description" :class="style.description({ class: props.ui?.description })">
+      <p v-if="props.description || !!slots.description" :class="ui.description({ class: props.ui?.description })" data-part="description">
         <slot name="description" :description="props.description">
           {{ props.description }}
         </slot>

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

@@ -0,0 +1,58 @@
+import type { VariantProps } from '@byyuurin/ui-kit';
+import type { SwitchRootProps } from 'reka-ui';
+import theme from '#build/ui/switch';
+import type { ComponentBaseProps, ComponentUIProps, IconProps } from '../types';
+import type { StaticSlot } from '../types/utils';
+type ThemeVariants = VariantProps<typeof theme>;
+export interface SwitchProps extends ComponentBaseProps, Pick<SwitchRootProps, 'disabled' | 'id' | 'name' | 'required' | 'value' | 'defaultValue'> {
+    /**
+     * The element or component this component should render as.
+     *  @default "div"
+     */
+    as?: SwitchRootProps['as'];
+    /** @default "primary" */
+    color?: ThemeVariants['color'];
+    /** @default "md" */
+    size?: ThemeVariants['size'];
+    /** When `true`, the loading icon will be displayed. */
+    loading?: boolean;
+    /**
+     * The icon when the `loading` prop is `true`.
+     * @default app.icons.loading
+     */
+    loadingIcon?: IconProps['name'];
+    /** Display an icon when the switch is checked. */
+    checkedIcon?: IconProps['name'];
+    /** Display an icon when the switch is unchecked. */
+    uncheckedIcon?: IconProps['name'];
+    modelValue?: boolean;
+    label?: string;
+    description?: string;
+    ui?: ComponentUIProps<typeof theme>;
+}
+export interface SwitchEmits {
+    'change': [event: Event];
+    'update:modelValue': [value: boolean];
+}
+export interface SwitchSlots {
+    label: StaticSlot<{
+        label?: string;
+    }>;
+    description: StaticSlot<{
+        description?: string;
+    }>;
+}
+declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<SwitchProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    change: (event: Event) => any;
+    "update:modelValue": (value: boolean) => any;
+}, string, import("vue").PublicProps, Readonly<SwitchProps> & Readonly<{
+    onChange?: ((event: Event) => any) | undefined;
+    "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
+}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, SwitchSlots>;
+declare const _default: typeof __VLS_export;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};