@nuxt/ui 2.8.1 → 2.9.0

package/dist/runtime/components/elements/Button.vue

@@ -17,14 +17,15 @@
 </template>
 
 <script>
-import { computed, defineComponent } from "vue";
-import { omit } from "lodash-es";
+import { computed, defineComponent, toRef } from "vue";
 import { twMerge, twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import ULink from "../elements/Link.vue";
-import { defuTwMerge } from "../../utils";
-import { useAppConfig } from "#imports";
+import { useUI } from "../../composables/useUI";
+import { mergeConfig } from "../../utils";
 import appConfig from "#build/app.config";
+import { button } from "#ui/ui.config";
+const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.button, button);
 export default defineComponent({
   components: {
     UIcon,
@@ -58,25 +59,25 @@ export default defineComponent({
     },
     size: {
       type: String,
-      default: () => appConfig.ui.button.default.size,
+      default: () => config.default.size,
       validator(value) {
-        return Object.keys(appConfig.ui.button.size).includes(value);
+        return Object.keys(config.size).includes(value);
       }
     },
     color: {
       type: String,
-      default: () => appConfig.ui.button.default.color,
+      default: () => config.default.color,
       validator(value) {
-        return [...appConfig.ui.colors, ...Object.keys(appConfig.ui.button.color)].includes(value);
+        return [...appConfig.ui.colors, ...Object.keys(config.color)].includes(value);
       }
     },
     variant: {
       type: String,
-      default: () => appConfig.ui.button.default.variant,
+      default: () => config.default.variant,
       validator(value) {
         return [
-          ...Object.keys(appConfig.ui.button.variant),
-          ...Object.values(appConfig.ui.button.color).flatMap((value2) => Object.keys(value2))
+          ...Object.keys(config.variant),
+          ...Object.values(config.color).flatMap((value2) => Object.keys(value2))
         ].includes(value);
       }
     },
@@ -86,7 +87,7 @@ export default defineComponent({
     },
     loadingIcon: {
       type: String,
-      default: () => appConfig.ui.button.default.loadingIcon
+      default: () => config.default.loadingIcon
     },
     leadingIcon: {
       type: String,
@@ -112,14 +113,17 @@ export default defineComponent({
       type: Boolean,
       default: false
     },
+    class: {
+      type: [String, Object, Array],
+      default: void 0
+    },
     ui: {
       type: Object,
-      default: () => ({})
+      default: void 0
     }
   },
-  setup(props, { attrs, slots }) {
-    const appConfig2 = useAppConfig();
-    const ui = computed(() => defuTwMerge({}, props.ui, appConfig2.ui.button));
+  setup(props, { slots }) {
+    const { ui, attrs } = useUI("button", toRef(props, "ui"), config);
     const isLeading = computed(() => {
       return props.icon && props.leading || props.icon && !props.trailing || props.loading && !props.trailing || props.leadingIcon;
     });
@@ -138,7 +142,7 @@ export default defineComponent({
         props.padded && ui.value[isSquare.value ? "square" : "padding"][props.size],
         variant?.replaceAll("{color}", props.color),
         props.block ? "w-full flex justify-center items-center" : "inline-flex items-center"
-      ), attrs.class);
+      ), props.class);
     });
     const leadingIconName = computed(() => {
       if (props.loading) {
@@ -167,7 +171,7 @@ export default defineComponent({
       );
     });
     return {
-      attrs: omit(attrs, ["class"]),
+      attrs,
       isLeading,
       isTrailing,
       isSquare,

package/dist/runtime/components/elements/Button.vue.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="lodash" />
 import type { PropType } from 'vue';
+import type { ButtonVariant } from '../../types';
 declare const _default: import("vue").DefineComponent<{
     type: {
         type: StringConstructor;
@@ -26,17 +26,17 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     size: {
-        type: StringConstructor;
+        type: PropType<"sm" | "md" | "xs" | "2xs" | "lg" | "xl">;
         default: () => any;
         validator(value: string): boolean;
     };
     color: {
-        type: StringConstructor;
+        type: PropType<any>;
         default: () => any;
         validator(value: string): boolean;
     };
     variant: {
-        type: StringConstructor;
+        type: PropType<ButtonVariant>;
         default: () => any;
         validator(value: string): boolean;
     };
@@ -72,14 +72,18 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    ui: {
+    class: {
         type: PropType<any>;
-        default: () => {};
+        default: undefined;
+    };
+    ui: {
+        type: PropType<Partial<any>>;
+        default: undefined;
     };
 }, {
-    attrs: import("lodash").Omit<{
+    attrs: import("vue").ComputedRef<Pick<{
         [x: string]: unknown;
-    }, "class">;
+    }, string>>;
     isLeading: import("vue").ComputedRef<string | true>;
     isTrailing: import("vue").ComputedRef<string | true>;
     isSquare: import("vue").ComputedRef<boolean>;
@@ -114,17 +118,17 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     size: {
-        type: StringConstructor;
+        type: PropType<"sm" | "md" | "xs" | "2xs" | "lg" | "xl">;
         default: () => any;
         validator(value: string): boolean;
     };
     color: {
-        type: StringConstructor;
+        type: PropType<any>;
         default: () => any;
         validator(value: string): boolean;
     };
     variant: {
-        type: StringConstructor;
+        type: PropType<ButtonVariant>;
         default: () => any;
         validator(value: string): boolean;
     };
@@ -160,20 +164,25 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    ui: {
+    class: {
         type: PropType<any>;
-        default: () => {};
+        default: undefined;
+    };
+    ui: {
+        type: PropType<Partial<any>>;
+        default: undefined;
     };
 }>>, {
     icon: string;
-    color: string;
-    ui: any;
+    color: any;
+    ui: Partial<any>;
+    class: any;
     label: string;
     type: string;
     loading: boolean;
     disabled: boolean;
-    variant: string;
-    size: string;
+    variant: ButtonVariant;
+    size: "sm" | "md" | "xs" | "2xs" | "lg" | "xl";
     block: boolean;
     padded: boolean;
     loadingIcon: string;

package/dist/runtime/components/elements/ButtonGroup.d.ts

@@ -1,7 +1,7 @@
 import type { PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<{
     size: {
-        type: StringConstructor;
+        type: PropType<"sm" | "md" | "xs" | "2xs" | "lg" | "xl">;
         default: null;
         validator(value: string): boolean;
     };
@@ -10,15 +10,19 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
         validator(value: string): boolean;
     };
-    ui: {
+    class: {
         type: PropType<any>;
-        default: () => {};
+        default: undefined;
+    };
+    ui: {
+        type: PropType<Partial<any>>;
+        default: undefined;
     };
 }, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
 }>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     size: {
-        type: StringConstructor;
+        type: PropType<"sm" | "md" | "xs" | "2xs" | "lg" | "xl">;
         default: null;
         validator(value: string): boolean;
     };
@@ -27,13 +31,18 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
         validator(value: string): boolean;
     };
-    ui: {
+    class: {
         type: PropType<any>;
-        default: () => {};
+        default: undefined;
+    };
+    ui: {
+        type: PropType<Partial<any>>;
+        default: undefined;
     };
 }>>, {
-    ui: any;
-    size: string;
+    ui: Partial<any>;
+    class: any;
+    size: "sm" | "md" | "xs" | "2xs" | "lg" | "xl";
     orientation: "horizontal" | "vertical";
 }, {}>;
 export default _default;

package/dist/runtime/components/elements/ButtonGroup.mjs

@@ -1,9 +1,11 @@
-import { h, cloneVNode, computed, defineComponent } from "vue";
-import { omit } from "lodash-es";
+import { h, cloneVNode, computed, toRef, defineComponent } from "vue";
 import { twMerge, twJoin } from "tailwind-merge";
-import { defuTwMerge, getSlotsChildren } from "../../utils/index.mjs";
-import { useAppConfig } from "#imports";
+import { useUI } from "../../composables/useUI.mjs";
+import { mergeConfig, getSlotsChildren } from "../../utils/index.mjs";
 import appConfig from "#build/app.config";
+import { button, buttonGroup } from "#ui/ui.config";
+const buttonConfig = mergeConfig(appConfig.ui.strategy, appConfig.ui.button, button);
+const buttonGroupConfig = mergeConfig(appConfig.ui.strategy, appConfig.ui.buttonGroup, buttonGroup);
 export default defineComponent({
   inheritAttrs: false,
   props: {
@@ -11,7 +13,7 @@ export default defineComponent({
       type: String,
       default: null,
       validator(value) {
-        return Object.keys(appConfig.ui.button.size).includes(value);
+        return Object.keys(buttonConfig.size).includes(value);
       }
     },
     orientation: {
@@ -21,14 +23,17 @@ export default defineComponent({
         return ["horizontal", "vertical"].includes(value);
       }
     },
+    class: {
+      type: [String, Object, Array],
+      default: void 0
+    },
     ui: {
       type: Object,
-      default: () => ({})
+      default: void 0
     }
   },
-  setup(props, { attrs, slots }) {
-    const appConfig2 = useAppConfig();
-    const ui = computed(() => defuTwMerge({}, props.ui, appConfig2.ui.buttonGroup));
+  setup(props, { slots }) {
+    const { ui, attrs } = useUI("buttonGroup", toRef(props, "ui"), buttonGroupConfig);
     const children = computed(() => getSlotsChildren(slots));
     const rounded = computed(() => {
       const roundedMap = {
@@ -46,11 +51,6 @@ export default defineComponent({
     });
     const clones = computed(() => children.value.map((node, index) => {
       const vProps = {};
-      if (props.orientation === "vertical") {
-        ui.value.wrapper = "flex flex-col -space-y-px";
-      } else {
-        ui.value.wrapper = "inline-flex -space-x-px";
-      }
       if (props.size) {
         vProps.size = props.size;
       }
@@ -65,6 +65,13 @@ export default defineComponent({
       }
       return cloneVNode(node, vProps);
     }));
-    return () => h("div", { class: twMerge(twJoin(ui.value.wrapper, ui.value.rounded, ui.value.shadow), attrs.class), ...omit(attrs, ["class"]) }, clones.value);
+    const wrapperClass = computed(() => {
+      return twMerge(twJoin(
+        ui.value.wrapper[props.orientation],
+        ui.value.rounded,
+        ui.value.shadow
+      ), props.class);
+    });
+    return () => h("div", { class: wrapperClass.value, ...attrs.value }, clones.value);
   }
 });

package/dist/runtime/components/elements/Dropdown.vue

@@ -1,5 +1,5 @@
 <template>
-  <HMenu v-slot="{ open }" as="div" :class="wrapperClass" v-bind="attrs" @mouseleave="onMouseLeave">
+  <HMenu v-slot="{ open }" as="div" :class="ui.wrapper" v-bind="attrs" @mouseleave="onMouseLeave">
     <HMenuButton
       ref="trigger"
       as="div"
@@ -45,18 +45,19 @@
 </template>
 
 <script>
-import { defineComponent, ref, computed, onMounted } from "vue";
+import { defineComponent, ref, computed, toRef, onMounted } from "vue";
 import { Menu as HMenu, MenuButton as HMenuButton, MenuItems as HMenuItems, MenuItem as HMenuItem } from "@headlessui/vue";
 import { defu } from "defu";
-import { omit } from "lodash-es";
-import { twMerge } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import UAvatar from "../elements/Avatar.vue";
 import UKbd from "../elements/Kbd.vue";
 import ULink from "../elements/Link.vue";
+import { useUI } from "../../composables/useUI";
 import { usePopper } from "../../composables/usePopper";
-import { defuTwMerge } from "../../utils";
-import { useAppConfig } from "#imports";
+import { mergeConfig, omit } from "../../utils";
+import appConfig from "#build/app.config";
+import { dropdown } from "#ui/ui.config";
+const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.dropdown, dropdown);
 export default defineComponent({
   components: {
     HMenu,
@@ -95,14 +96,17 @@ export default defineComponent({
       type: Number,
       default: 0
     },
+    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.dropdown));
+  setup(props) {
+    const { ui, attrs } = useUI("dropdown", toRef(props, "ui"), config, toRef(props, "class"));
     const popper = computed(() => defu(props.mode === "hover" ? { offsetDistance: 0 } : {}, props.popper, ui.value.popper));
     const [trigger, container] = usePopper(popper.value);
     const menuApi = ref(null);
@@ -122,7 +126,6 @@ export default defineComponent({
       const offsetDistance = props.popper?.offsetDistance || ui.value.popper?.offsetDistance || 8;
       return props.mode === "hover" ? { paddingTop: `${offsetDistance}px`, paddingBottom: `${offsetDistance}px` } : {};
     });
-    const wrapperClass = computed(() => twMerge(ui.value.wrapper, attrs.class));
     function onMouseOver() {
       if (props.mode !== "hover" || !menuApi.value) {
         return;
@@ -156,13 +159,12 @@ export default defineComponent({
       }, props.closeDelay);
     }
     return {
-      attrs: omit(attrs, ["class"]),
       // eslint-disable-next-line vue/no-dupe-keys
       ui,
+      attrs,
       trigger,
       container,
       containerStyle,
-      wrapperClass,
       onMouseOver,
       onMouseLeave,
       omit

package/dist/runtime/components/elements/Dropdown.vue.d.ts

@@ -1,7 +1,6 @@
-/// <reference types="lodash" />
 import type { PropType } from 'vue';
-import type { DropdownItem } from '../../types/dropdown';
-import type { PopperOptions } from '../../types/popper';
+import { omit } from '../../utils';
+import type { DropdownItem, PopperOptions } from '../../types';
 declare const _default: import("vue").DefineComponent<{
     items: {
         type: PropType<DropdownItem[][]>;
@@ -28,15 +27,19 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    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>>;
     trigger: import("vue").Ref<import("@vueuse/core").MaybeElement>;
     container: import("vue").Ref<import("@vueuse/core").MaybeElement>;
     containerStyle: import("vue").ComputedRef<{
@@ -46,14 +49,9 @@ declare const _default: import("vue").DefineComponent<{
         paddingTop?: undefined;
         paddingBottom?: undefined;
     }>;
-    wrapperClass: import("vue").ComputedRef<string>;
     onMouseOver: () => void;
     onMouseLeave: () => void;
-    omit: {
-        <T extends object, K extends import("lodash").PropertyName[]>(object: T | null | undefined, ...paths: K): Pick<T, Exclude<keyof T, K[number]>>;
-        <T_1 extends object, K_1 extends keyof T_1>(object: T_1 | null | undefined, ...paths: import("lodash").Many<K_1>[]): import("lodash").Omit<T_1, K_1>;
-        <T_2 extends object>(object: T_2 | null | undefined, ...paths: import("lodash").Many<import("lodash").PropertyName>[]): Partial<T_2>;
-    };
+    omit: typeof omit;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     items: {
         type: PropType<DropdownItem[][]>;
@@ -80,13 +78,18 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    ui: {
+    class: {
         type: PropType<any>;
-        default: () => {};
+        default: undefined;
+    };
+    ui: {
+        type: PropType<Partial<any>>;
+        default: undefined;
     };
 }>>, {
-    ui: any;
+    ui: Partial<any>;
     popper: PopperOptions;
+    class: any;
     disabled: boolean;
     items: DropdownItem[][];
     mode: "click" | "hover";

package/dist/runtime/components/elements/Kbd.vue

@@ -5,12 +5,13 @@
 </template>
 
 <script>
-import { defineComponent, computed } from "vue";
-import { omit } from "lodash-es";
+import { toRef, defineComponent, computed } from "vue";
 import { twMerge, twJoin } from "tailwind-merge";
-import { defuTwMerge } from "../../utils";
-import { useAppConfig } from "#imports";
+import { useUI } from "../../composables/useUI";
+import { mergeConfig } from "../../utils";
 import appConfig from "#build/app.config";
+import { kbd } from "#ui/ui.config";
+const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.kbd, kbd);
 export default defineComponent({
   inheritAttrs: false,
   props: {
@@ -20,19 +21,22 @@ export default defineComponent({
     },
     size: {
       type: String,
-      default: () => appConfig.ui.kbd.default.size,
+      default: () => config.default.size,
       validator(value) {
-        return Object.keys(appConfig.ui.kbd.size).includes(value);
+        return Object.keys(config.size).includes(value);
       }
     },
+    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.kbd));
+  setup(props) {
+    const { ui, attrs } = useUI("kbd", toRef(props, "ui"), config);
     const kbdClass = computed(() => {
       return twMerge(twJoin(
         ui.value.base,
@@ -42,12 +46,12 @@ export default defineComponent({
         ui.value.font,
         ui.value.background,
         ui.value.ring
-      ), attrs.class);
+      ), props.class);
     });
     return {
-      attrs: omit(attrs, ["class"]),
       // eslint-disable-next-line vue/no-dupe-keys
       ui,
+      attrs,
       kbdClass
     };
   }

package/dist/runtime/components/elements/Kbd.vue.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="lodash" />
 import type { PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<{
     value: {
@@ -6,19 +5,23 @@ declare const _default: import("vue").DefineComponent<{
         default: null;
     };
     size: {
-        type: StringConstructor;
+        type: PropType<string | number | symbol>;
         default: () => any;
         validator(value: string): boolean;
     };
-    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>>;
     kbdClass: import("vue").ComputedRef<string>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     value: {
@@ -26,17 +29,22 @@ declare const _default: import("vue").DefineComponent<{
         default: null;
     };
     size: {
-        type: StringConstructor;
+        type: PropType<string | number | symbol>;
         default: () => any;
         validator(value: string): boolean;
     };
-    ui: {
+    class: {
         type: PropType<any>;
-        default: () => {};
+        default: undefined;
+    };
+    ui: {
+        type: PropType<Partial<any>>;
+        default: undefined;
     };
 }>>, {
-    ui: any;
+    ui: Partial<any>;
+    class: any;
     value: string;
-    size: string;
+    size: string | number | symbol;
 }, {}>;
 export default _default;

package/dist/runtime/components/elements/Link.vue

@@ -1,7 +1,13 @@
 <template>
-  <button v-if="!to" :type="type" :disabled="disabled" v-bind="$attrs" :class="inactiveClass">
+  <component
+    :is="as"
+    v-if="!to"
+    :disabled="disabled"
+    v-bind="$attrs"
+    :class="inactiveClass"
+  >
     <slot />
-  </button>
+  </component>
   <NuxtLink
     v-else
     v-slot="{ route, href, target, rel, navigate, isActive, isExactActive, isExternal }"
@@ -24,21 +30,25 @@
 </template>
 
 <script>
-import { isEqual } from "lodash-es";
+import { isEqual } from "ohash";
 import { defineComponent } from "vue";
 import { NuxtLink } from "#components";
 export default defineComponent({
   inheritAttrs: false,
   props: {
     ...NuxtLink.props,
-    type: {
+    as: {
       type: String,
-      default: null
+      default: "button"
     },
     disabled: {
       type: Boolean,
       default: null
     },
+    active: {
+      type: Boolean,
+      default: false
+    },
     exact: {
       type: Boolean,
       default: false
@@ -58,6 +68,9 @@ export default defineComponent({
   },
   setup(props) {
     function resolveLinkClass(route, $route, { isActive, isExactActive }) {
+      if (props.active) {
+        return props.activeClass;
+      }
       if (props.exactQuery && !isEqual(route.query, $route.query)) {
         return props.inactiveClass;
       }