@nuxt/ui 2.8.1 → 2.9.0

package/dist/runtime/components/forms/Checkbox.vue

@@ -1,8 +1,8 @@
 <template>
-  <div :class="wrapperClass">
+  <div :class="ui.wrapper">
     <div class="flex items-center h-5">
       <input
-        :id="name"
+        :id="inputId"
         v-model="toggle"
         :name="name"
         :required="required"
@@ -18,7 +18,7 @@
       >
     </div>
     <div v-if="label || $slots.label" class="ms-3 text-sm">
-      <label :for="name" :class="ui.label">
+      <label :for="inputId" :class="ui.label">
         <slot name="label">{{ label }}</slot>
         <span v-if="required" :class="ui.required">*</span>
       </label>
@@ -30,16 +30,23 @@
 </template>
 
 <script>
-import { computed, defineComponent } from "vue";
-import { omit } from "lodash-es";
+import { computed, toRef, defineComponent } from "vue";
 import { twMerge, twJoin } from "tailwind-merge";
-import { defuTwMerge } from "../../utils";
+import { useUI } from "../../composables/useUI";
 import { useFormGroup } from "../../composables/useFormGroup";
-import { useAppConfig } from "#imports";
+import { mergeConfig } from "../../utils";
+import { uid } from "../../utils/uid";
 import appConfig from "#build/app.config";
+import { checkbox } from "#ui/ui.config";
+const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.checkbox, checkbox);
 export default defineComponent({
   inheritAttrs: false,
   props: {
+    id: {
+      type: String,
+      // A default value is needed here to bind the label
+      default: () => uid()
+    },
     value: {
       type: [String, Number, Boolean, Object],
       default: null
@@ -78,7 +85,7 @@ export default defineComponent({
     },
     color: {
       type: String,
-      default: () => appConfig.ui.checkbox.default.color,
+      default: () => config.default.color,
       validator(value) {
         return appConfig.ui.colors.includes(value);
       }
@@ -87,17 +94,19 @@ export default defineComponent({
       type: String,
       default: ""
     },
+    class: {
+      type: [String, Object, Array],
+      default: void 0
+    },
     ui: {
       type: Object,
-      default: () => ({})
+      default: void 0
     }
   },
   emits: ["update:modelValue", "change"],
-  setup(props, { emit, attrs }) {
-    const appConfig2 = useAppConfig();
-    const ui = computed(() => defuTwMerge({}, props.ui, appConfig2.ui.checkbox));
-    const { emitFormChange, formGroup } = useFormGroup();
-    const color = computed(() => formGroup?.error?.value ? "red" : props.color);
+  setup(props, { emit }) {
+    const { ui, attrs } = useUI("checkbox", toRef(props, "ui"), config, toRef(props, "class"));
+    const { emitFormChange, color, name, inputId } = useFormGroup(props);
     const toggle = computed({
       get() {
         return props.modelValue;
@@ -110,7 +119,6 @@ export default defineComponent({
       emit("change", event);
       emitFormChange();
     };
-    const wrapperClass = computed(() => twMerge(ui.value.wrapper, attrs.class));
     const inputClass = computed(() => {
       return twMerge(twJoin(
         ui.value.base,
@@ -122,11 +130,13 @@ export default defineComponent({
       ), props.inputClass);
     });
     return {
-      attrs: omit(attrs, ["class"]),
       // eslint-disable-next-line vue/no-dupe-keys
       ui,
+      attrs,
       toggle,
-      wrapperClass,
+      inputId,
+      // eslint-disable-next-line vue/no-dupe-keys
+      name,
       // eslint-disable-next-line vue/no-dupe-keys
       inputClass,
       onChange

package/dist/runtime/components/forms/Checkbox.vue.d.ts

@@ -1,8 +1,11 @@
-/// <reference types="lodash" />
 import type { PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<{
+    id: {
+        type: StringConstructor;
+        default: () => string;
+    };
     value: {
-        type: (ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[];
+        type: (ObjectConstructor | BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: null;
     };
     modelValue: {
@@ -38,7 +41,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     color: {
-        type: StringConstructor;
+        type: PropType<any>;
         default: () => any;
         validator(value: string): any;
     };
@@ -46,22 +49,31 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    ui: {
+    class: {
         type: PropType<any>;
-        default: () => {};
+        default: undefined;
+    };
+    ui: {
+        type: PropType<Partial<any>>;
+        default: undefined;
     };
 }, {
-    attrs: import("lodash").Omit<{
-        [x: string]: unknown;
-    }, "class">;
     ui: import("vue").ComputedRef<any>;
+    attrs: import("vue").ComputedRef<Pick<{
+        [x: string]: unknown;
+    }, string>>;
     toggle: import("vue").WritableComputedRef<boolean | unknown[]>;
-    wrapperClass: import("vue").ComputedRef<string>;
+    inputId: import("vue").ComputedRef<any>;
+    name: import("vue").ComputedRef<any>;
     inputClass: import("vue").ComputedRef<string>;
     onChange: (event: Event) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "update:modelValue")[], "change" | "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    id: {
+        type: StringConstructor;
+        default: () => string;
+    };
     value: {
-        type: (ObjectConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[];
+        type: (ObjectConstructor | BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: null;
     };
     modelValue: {
@@ -97,7 +109,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     color: {
-        type: StringConstructor;
+        type: PropType<any>;
         default: () => any;
         validator(value: string): any;
     };
@@ -105,17 +117,23 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    ui: {
+    class: {
         type: PropType<any>;
-        default: () => {};
+        default: undefined;
+    };
+    ui: {
+        type: PropType<Partial<any>>;
+        default: undefined;
     };
 }>> & {
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     onChange?: ((...args: any[]) => any) | undefined;
 }, {
-    color: string;
-    ui: any;
+    id: string;
+    color: any;
+    ui: Partial<any>;
     name: string;
+    class: any;
     value: string | number | boolean | Record<string, any>;
     label: string;
     modelValue: boolean | unknown[];

package/dist/runtime/components/forms/Form.vue

@@ -7,6 +7,7 @@
 <script>
 import { provide, ref, defineComponent } from "vue";
 import { useEventBus } from "@vueuse/core";
+import { uid } from "../../utils/uid";
 export default defineComponent({
   props: {
     schema: {
@@ -28,8 +29,7 @@ export default defineComponent({
   },
   emits: ["submit"],
   setup(props, { expose, emit }) {
-    const seed = Math.random().toString(36).substring(7);
-    const bus = useEventBus(`form-${seed}`);
+    const bus = useEventBus(`form-${uid()}`);
     bus.on(async (event) => {
       if (event.type !== "submit" && props.validateOn?.includes(event.type)) {
         await validate(event.path, { silent: true });

package/dist/runtime/components/forms/FormGroup.vue

@@ -1,30 +1,50 @@
 <template>
-  <div :class="wrapperClass" v-bind="attrs">
-    <label>
-      <div v-if="label" :class="[ui.label.wrapper, size]">
-        <p :class="[ui.label.base, required ? ui.label.required : '']">{{ label }}</p>
-        <span v-if="hint" :class="[ui.hint]">{{ hint }}</span>
-      </div>
+  <div :class="ui.wrapper" v-bind="attrs">
+    <div v-if="label || $slots.label" :class="[ui.label.wrapper, size]">
+      <label :for="inputId" :class="[ui.label.base, required ? ui.label.required : '']">
+        <slot v-if="$slots.label" name="label" v-bind="{ error, label, name, hint, description, help }" />
+        <template v-else>{{ label }}</template>
+      </label>
+      <span v-if="hint || $slots.hint" :class="[ui.hint]">
+        <slot v-if="$slots.hint" name="hint" v-bind="{ error, label, name, hint, description, help }" />
+        <template v-else>{{ hint }}</template>
+      </span>
+    </div>
 
-      <p v-if="description" :class="[ui.description, size]">{{ description }}</p>
+    <p v-if="description || $slots.description" :class="[ui.description, size]">
+      <slot v-if="$slots.description" name="description" v-bind="{ error, label, name, hint, description, help }" />
+      <template v-else>
+        {{ description }}
+      </template>
+    </p>
 
-      <div :class="[label ? ui.container : '']">
-        <slot v-bind="{ error }" />
+    <div :class="[label ? ui.container : '']">
+      <slot v-bind="{ error }" />
 
-        <p v-if="error && typeof error !== 'boolean'" :class="[ui.error, size]">{{ error }}</p>
-        <p v-else-if="help" :class="[ui.help, size]">{{ help }}</p>
-      </div>
-    </label>
+      <p v-if="(typeof error === 'string' && error) || $slots.error" :class="[ui.error, size]">
+        <slot v-if="$slots.error" name="error" v-bind="{ error, label, name, hint, description, help }" />
+        <template v-else>
+          {{ error }}
+        </template>
+      </p>
+      <p v-else-if="help || $slots.help" :class="[ui.help, size]">
+        <slot v-if="$slots.help" name="help" v-bind="{ error, label, name, hint, description, help }" />
+        <template v-else>
+          {{ help }}
+        </template>
+      </p>
+    </div>
   </div>
 </template>
 
 <script>
-import { computed, defineComponent, provide, inject } from "vue";
-import { omit } from "lodash-es";
-import { twMerge } from "tailwind-merge";
-import { defuTwMerge } from "../../utils";
-import { useAppConfig } from "#imports";
+import { computed, defineComponent, provide, inject, ref, toRef } from "vue";
+import { useUI } from "../../composables/useUI";
+import { mergeConfig } from "../../utils";
 import appConfig from "#build/app.config";
+import { formGroup } from "#ui/ui.config";
+import { uid } from "../../utils/uid";
+const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.formGroup, formGroup);
 export default defineComponent({
   inheritAttrs: false,
   props: {
@@ -36,7 +56,7 @@ export default defineComponent({
       type: String,
       default: null,
       validator(value) {
-        return Object.keys(appConfig.ui.formGroup.size).includes(value);
+        return Object.keys(config.size).includes(value);
       }
     },
     label: {
@@ -63,30 +83,34 @@ export default defineComponent({
       type: String,
       default: null
     },
+    class: {
+      type: [String, Object, Array],
+      default: void 0
+    },
     ui: {
       type: Object,
-      default: () => ({})
+      default: void 0
     }
   },
-  setup(props, { attrs }) {
-    const appConfig2 = useAppConfig();
-    const ui = computed(() => defuTwMerge({}, props.ui, appConfig2.ui.formGroup));
-    const wrapperClass = computed(() => twMerge(ui.value.wrapper, attrs.class));
+  setup(props) {
+    const { ui, attrs } = useUI("formGroup", toRef(props, "ui"), config, toRef(props, "class"));
     const formErrors = inject("form-errors", null);
     const error = computed(() => {
       return props.error && typeof props.error === "string" || typeof props.error === "boolean" ? props.error : formErrors?.value?.find((error2) => error2.path === props.name)?.message;
     });
-    const size = computed(() => ui.value.size[props.size ?? appConfig2.ui.input.default.size]);
+    const size = computed(() => ui.value.size[props.size ?? config.default.size]);
+    const inputId = ref(uid());
     provide("form-group", {
       error,
+      inputId,
       name: computed(() => props.name),
       size: computed(() => props.size)
     });
     return {
-      attrs: omit(attrs, ["class"]),
       // eslint-disable-next-line vue/no-dupe-keys
       ui,
-      wrapperClass,
+      attrs,
+      inputId,
       // eslint-disable-next-line vue/no-dupe-keys
       size,
       // eslint-disable-next-line vue/no-dupe-keys

package/dist/runtime/components/forms/FormGroup.vue.d.ts

@@ -1,12 +1,11 @@
-/// <reference types="lodash" />
-import type { PropType } from 'vue';
+import type { Ref, PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<{
     name: {
         type: StringConstructor;
         default: null;
     };
     size: {
-        type: StringConstructor;
+        type: PropType<string | number | symbol>;
         default: null;
         validator(value: string): boolean;
     };
@@ -34,25 +33,29 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: null;
     };
-    ui: {
+    class: {
         type: PropType<any>;
-        default: () => {};
+        default: undefined;
+    };
+    ui: {
+        type: PropType<Partial<any>>;
+        default: undefined;
     };
 }, {
-    attrs: import("lodash").Omit<{
-        [x: string]: unknown;
-    }, "class">;
     ui: import("vue").ComputedRef<any>;
-    wrapperClass: import("vue").ComputedRef<string>;
+    attrs: import("vue").ComputedRef<Pick<{
+        [x: string]: unknown;
+    }, string>>;
+    inputId: Ref<string>;
     size: import("vue").ComputedRef<any>;
-    error: import("vue").ComputedRef<any>;
+    error: import("vue").ComputedRef<string | boolean | undefined>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     name: {
         type: StringConstructor;
         default: null;
     };
     size: {
-        type: StringConstructor;
+        type: PropType<string | number | symbol>;
         default: null;
         validator(value: string): boolean;
     };
@@ -80,18 +83,23 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: null;
     };
-    ui: {
+    class: {
         type: PropType<any>;
-        default: () => {};
+        default: undefined;
+    };
+    ui: {
+        type: PropType<Partial<any>>;
+        default: undefined;
     };
 }>>, {
     error: string | boolean;
     description: string;
-    ui: any;
+    ui: Partial<any>;
     name: string;
+    class: any;
     label: string;
     required: boolean;
-    size: string;
+    size: string | number | symbol;
     help: string;
     hint: string;
 }, {}>;

package/dist/runtime/components/forms/Input.vue

@@ -1,6 +1,7 @@
 <template>
-  <div :class="wrapperClass">
+  <div :class="ui.wrapper">
     <input
+      :id="inputId"
       ref="input"
       :name="name"
       :value="modelValue"
@@ -31,14 +32,15 @@
 </template>
 
 <script>
-import { ref, computed, onMounted, defineComponent } from "vue";
-import { omit } from "lodash-es";
+import { ref, computed, toRef, onMounted, defineComponent } from "vue";
 import { twMerge, twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
-import { defuTwMerge } from "../../utils";
+import { useUI } from "../../composables/useUI";
 import { useFormGroup } from "../../composables/useFormGroup";
-import { useAppConfig } from "#imports";
+import { mergeConfig } from "../../utils";
 import appConfig from "#build/app.config";
+import { input } from "#ui/ui.config";
+const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.input, input);
 export default defineComponent({
   components: {
     UIcon
@@ -53,6 +55,10 @@ export default defineComponent({
       type: String,
       default: "text"
     },
+    id: {
+      type: String,
+      default: null
+    },
     name: {
       type: String,
       default: null
@@ -79,7 +85,7 @@ export default defineComponent({
     },
     loadingIcon: {
       type: String,
-      default: () => appConfig.ui.input.default.loadingIcon
+      default: () => config.default.loadingIcon
     },
     leadingIcon: {
       type: String,
@@ -107,25 +113,25 @@ export default defineComponent({
     },
     size: {
       type: String,
-      default: () => appConfig.ui.input.default.size,
+      default: null,
       validator(value) {
-        return Object.keys(appConfig.ui.input.size).includes(value);
+        return Object.keys(config.size).includes(value);
       }
     },
     color: {
       type: String,
-      default: () => appConfig.ui.input.default.color,
+      default: () => config.default.color,
       validator(value) {
-        return [...appConfig.ui.colors, ...Object.keys(appConfig.ui.input.color)].includes(value);
+        return [...appConfig.ui.colors, ...Object.keys(config.color)].includes(value);
       }
     },
     variant: {
       type: String,
-      default: () => appConfig.ui.input.default.variant,
+      default: () => config.default.variant,
       validator(value) {
         return [
-          ...Object.keys(appConfig.ui.input.variant),
-          ...Object.values(appConfig.ui.input.color).flatMap((value2) => Object.keys(value2))
+          ...Object.keys(config.variant),
+          ...Object.values(config.color).flatMap((value2) => Object.keys(value2))
         ].includes(value);
       }
     },
@@ -133,22 +139,23 @@ export default defineComponent({
       type: String,
       default: null
     },
+    class: {
+      type: [String, Object, Array],
+      default: void 0
+    },
     ui: {
       type: Object,
-      default: () => ({})
+      default: void 0
     }
   },
   emits: ["update:modelValue", "blur"],
-  setup(props, { emit, attrs, slots }) {
-    const appConfig2 = useAppConfig();
-    const ui = computed(() => defuTwMerge({}, props.ui, appConfig2.ui.input));
-    const { emitFormBlur, emitFormInput, formGroup } = useFormGroup();
-    const color = computed(() => formGroup?.error?.value ? "red" : props.color);
-    const size = computed(() => formGroup?.size?.value ?? props.size);
-    const input = ref(null);
+  setup(props, { emit, slots }) {
+    const { ui, attrs } = useUI("input", toRef(props, "ui"), config, toRef(props, "class"));
+    const { emitFormBlur, emitFormInput, size, color, inputId, name } = useFormGroup(props, config);
+    const input2 = ref(null);
     const autoFocus = () => {
       if (props.autofocus) {
-        input.value?.focus();
+        input2.value?.focus();
       }
     };
     const onInput = (event) => {
@@ -164,7 +171,6 @@ export default defineComponent({
         autoFocus();
       }, 100);
     });
-    const wrapperClass = computed(() => twMerge(ui.value.wrapper, attrs.class));
     const inputClass = computed(() => {
       const variant = ui.value.color?.[color.value]?.[props.variant] || ui.value.variant[props.variant];
       return twMerge(twJoin(
@@ -206,7 +212,7 @@ export default defineComponent({
     const leadingIconClass = computed(() => {
       return twJoin(
         ui.value.icon.base,
-        appConfig2.ui.colors.includes(color.value) && ui.value.icon.color.replaceAll("{color}", color.value),
+        appConfig.ui.colors.includes(color.value) && ui.value.icon.color.replaceAll("{color}", color.value),
         ui.value.icon.size[size.value],
         props.loading && "animate-spin"
       );
@@ -221,19 +227,21 @@ export default defineComponent({
     const trailingIconClass = computed(() => {
       return twJoin(
         ui.value.icon.base,
-        appConfig2.ui.colors.includes(color.value) && ui.value.icon.color.replaceAll("{color}", color.value),
+        appConfig.ui.colors.includes(color.value) && ui.value.icon.color.replaceAll("{color}", color.value),
         ui.value.icon.size[size.value],
         props.loading && !isLeading.value && "animate-spin"
       );
     });
     return {
-      attrs: omit(attrs, ["class"]),
       // eslint-disable-next-line vue/no-dupe-keys
       ui,
-      input,
+      attrs,
+      // eslint-disable-next-line vue/no-dupe-keys
+      name,
+      inputId,
+      input: input2,
       isLeading,
       isTrailing,
-      wrapperClass,
       // eslint-disable-next-line vue/no-dupe-keys
       inputClass,
       leadingIconName,