@nuxt/ui 3.0.1 → 3.1.0

package/dist/runtime/components/Button.vue

@@ -1,122 +1,113 @@
-<script lang="ts">
-import type { VariantProps } from 'tailwind-variants'
-import type { AppConfig } from '@nuxt/schema'
-import _appConfig from '#build/app.config'
-import theme from '#build/ui/button'
-import type { LinkProps } from './Link.vue'
-import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import { tv } from '../utils/tv'
-import type { AvatarProps } from '../types'
-import type { PartialString } from '../types/utils'
-
-const appConfigButton = _appConfig as AppConfig & { ui: { button: Partial<typeof theme> } }
-
-const button = tv({ extend: tv(theme), ...(appConfigButton.ui?.button || {}) })
-
-type ButtonVariants = VariantProps<typeof button>
-
-export interface ButtonProps extends UseComponentIconsProps, Omit<LinkProps, 'raw' | 'custom'> {
-  label?: string
-  /**
-   * @defaultValue 'primary'
-   */
-  color?: ButtonVariants['color']
-  activeColor?: ButtonVariants['color']
-  /**
-   * @defaultValue 'solid'
-   */
-  variant?: ButtonVariants['variant']
-  activeVariant?: ButtonVariants['variant']
-  /**
-   * @defaultValue 'md'
-   */
-  size?: ButtonVariants['size']
-  /** Render the button with equal padding on all sides. */
-  square?: boolean
-  /** Render the button full width. */
-  block?: boolean
-  /** Set loading state automatically based on the `@click` promise state */
-  loadingAuto?: boolean
-  onClick?: ((event: MouseEvent) => void | Promise<void>) | Array<((event: MouseEvent) => void | Promise<void>)>
-  class?: any
-  ui?: PartialString<typeof button.slots>
-}
-
-export interface ButtonSlots {
-  leading(props?: {}): any
-  default(props?: {}): any
-  trailing(props?: {}): any
-}
+<script>
+import theme from "#build/ui/button";
 </script>
 
-<script setup lang="ts">
-import { type Ref, computed, ref, inject } from 'vue'
-import { useForwardProps } from 'reka-ui'
-import { useComponentIcons } from '../composables/useComponentIcons'
-import { useButtonGroup } from '../composables/useButtonGroup'
-import { formLoadingInjectionKey } from '../composables/useFormField'
-import { omit } from '../utils'
-import { pickLinkProps } from '../utils/link'
-import UIcon from './Icon.vue'
-import UAvatar from './Avatar.vue'
-import ULink from './Link.vue'
-import ULinkBase from './LinkBase.vue'
-
-const props = withDefaults(defineProps<ButtonProps>(), {
-  active: undefined,
-  activeClass: '',
-  inactiveClass: ''
-})
-const slots = defineSlots<ButtonSlots>()
-
-const linkProps = useForwardProps(pickLinkProps(props))
-
-const { orientation, size: buttonSize } = useButtonGroup<ButtonProps>(props)
-
-const loadingAutoState = ref(false)
-const formLoading = inject<Ref<boolean> | undefined>(formLoadingInjectionKey, undefined)
-
-async function onClickWrapper(event: MouseEvent) {
-  loadingAutoState.value = true
-  const callbacks = Array.isArray(props.onClick) ? props.onClick : [props.onClick]
+<script setup>
+import { computed, ref, inject } from "vue";
+import { defu } from "defu";
+import { useForwardProps } from "reka-ui";
+import { useAppConfig } from "#imports";
+import { useComponentIcons } from "../composables/useComponentIcons";
+import { useButtonGroup } from "../composables/useButtonGroup";
+import { formLoadingInjectionKey } from "../composables/useFormField";
+import { omit } from "../utils";
+import { tv } from "../utils/tv";
+import { pickLinkProps } from "../utils/link";
+import UIcon from "./Icon.vue";
+import UAvatar from "./Avatar.vue";
+import ULink from "./Link.vue";
+import ULinkBase from "./LinkBase.vue";
+const props = defineProps({
+  label: { type: String, required: false },
+  color: { type: null, required: false },
+  activeColor: { type: null, required: false },
+  variant: { type: null, required: false },
+  activeVariant: { type: null, required: false },
+  size: { type: null, required: false },
+  square: { type: Boolean, required: false },
+  block: { type: Boolean, required: false },
+  loadingAuto: { type: Boolean, required: false },
+  onClick: { type: [Function, Array], required: false },
+  class: { type: null, required: false },
+  ui: { type: null, required: false },
+  icon: { type: String, required: false },
+  avatar: { type: Object, required: false },
+  leading: { type: Boolean, required: false },
+  leadingIcon: { type: String, required: false },
+  trailing: { type: Boolean, required: false },
+  trailingIcon: { type: String, required: false },
+  loading: { type: Boolean, required: false },
+  loadingIcon: { type: String, required: false },
+  as: { type: null, required: false },
+  type: { type: null, required: false },
+  disabled: { type: Boolean, required: false },
+  active: { type: Boolean, required: false, default: void 0 },
+  exact: { type: Boolean, required: false },
+  exactQuery: { type: [Boolean, String], required: false },
+  exactHash: { type: Boolean, required: false },
+  inactiveClass: { type: String, required: false, default: "" },
+  to: { type: null, required: false },
+  href: { type: null, required: false },
+  external: { type: Boolean, required: false },
+  target: { type: [String, Object, null], required: false },
+  rel: { type: [String, Object, null], required: false },
+  noRel: { type: Boolean, required: false },
+  prefetchedClass: { type: String, required: false },
+  prefetch: { type: Boolean, required: false },
+  prefetchOn: { type: [String, Object], required: false },
+  noPrefetch: { type: Boolean, required: false },
+  activeClass: { type: String, required: false, default: "" },
+  exactActiveClass: { type: String, required: false },
+  ariaCurrentValue: { type: String, required: false },
+  viewTransition: { type: Boolean, required: false },
+  replace: { type: Boolean, required: false }
+});
+const slots = defineSlots();
+const appConfig = useAppConfig();
+const { orientation, size: buttonSize } = useButtonGroup(props);
+const linkProps = useForwardProps(pickLinkProps(props));
+const loadingAutoState = ref(false);
+const formLoading = inject(formLoadingInjectionKey, void 0);
+async function onClickWrapper(event) {
+  loadingAutoState.value = true;
+  const callbacks = Array.isArray(props.onClick) ? props.onClick : [props.onClick];
   try {
-    await Promise.all(callbacks.map(fn => fn?.(event)))
+    await Promise.all(callbacks.map((fn) => fn?.(event)));
   } finally {
-    loadingAutoState.value = false
+    loadingAutoState.value = false;
   }
 }
-
 const isLoading = computed(() => {
-  return props.loading || (props.loadingAuto && (loadingAutoState.value || (formLoading?.value && props.type === 'submit')))
-})
-
+  return props.loading || props.loadingAuto && (loadingAutoState.value || formLoading?.value && props.type === "submit");
+});
 const { isLeading, isTrailing, leadingIconName, trailingIconName } = useComponentIcons(
   computed(() => ({ ...props, loading: isLoading.value }))
-)
-
+);
 const ui = computed(() => tv({
-  extend: button,
-  variants: {
-    active: {
-      true: {
-        base: props.activeClass
-      },
-      false: {
-        base: props.inactiveClass
+  extend: tv(theme),
+  ...defu({
+    variants: {
+      active: {
+        true: {
+          base: props.activeClass
+        },
+        false: {
+          base: props.inactiveClass
+        }
       }
     }
-  }
+  }, appConfig.ui?.button || {})
 })({
   color: props.color,
   variant: props.variant,
   size: buttonSize.value,
   loading: isLoading.value,
   block: props.block,
-  square: props.square || (!slots.default && !props.label),
+  square: props.square || !slots.default && !props.label,
   leading: isLeading.value,
   trailing: isTrailing.value,
   buttonGroup: orientation.value
-}))
+}));
 </script>
 
 <template>
@@ -125,22 +116,22 @@ const ui = computed(() => tv({
     :type="type"
     :disabled="disabled || isLoading"
     :class="ui.base({ class: [props.class, props.ui?.base] })"
-    v-bind="omit(linkProps, ['type', 'disabled'])"
+    v-bind="omit(linkProps, ['type', 'disabled', 'onClick'])"
     custom
   >
     <ULinkBase
       v-bind="slotProps"
       :class="ui.base({
-        class: [props.class, props.ui?.base],
-        active,
-        ...(active && activeVariant ? { variant: activeVariant } : {}),
-        ...(active && activeColor ? { color: activeColor } : {})
-      })"
+  class: [props.class, props.ui?.base],
+  active,
+  ...active && activeVariant ? { variant: activeVariant } : {},
+  ...active && activeColor ? { color: activeColor } : {}
+})"
       @click="onClickWrapper"
     >
       <slot name="leading">
         <UIcon v-if="isLeading && leadingIconName" :name="leadingIconName" :class="ui.leadingIcon({ class: props.ui?.leadingIcon, active })" />
-        <UAvatar v-else-if="!!avatar" :size="((props.ui?.leadingAvatarSize || ui.leadingAvatarSize()) as AvatarProps['size'])" v-bind="avatar" :class="ui.leadingAvatar({ class: props.ui?.leadingAvatar, active })" />
+        <UAvatar v-else-if="!!avatar" :size="props.ui?.leadingAvatarSize || ui.leadingAvatarSize()" v-bind="avatar" :class="ui.leadingAvatar({ class: props.ui?.leadingAvatar, active })" />
       </slot>
 
       <slot>

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

@@ -0,0 +1,73 @@
+import type { AppConfig } from '@nuxt/schema';
+import theme from '#build/ui/button';
+import type { LinkProps } from './Link.vue';
+import type { UseComponentIconsProps } from '../composables/useComponentIcons';
+import type { ComponentConfig } from '../types/utils';
+type Button = ComponentConfig<typeof theme, AppConfig, 'button'>;
+export interface ButtonProps extends UseComponentIconsProps, Omit<LinkProps, 'raw' | 'custom'> {
+    label?: string;
+    /**
+     * @defaultValue 'primary'
+     */
+    color?: Button['variants']['color'];
+    activeColor?: Button['variants']['color'];
+    /**
+     * @defaultValue 'solid'
+     */
+    variant?: Button['variants']['variant'];
+    activeVariant?: Button['variants']['variant'];
+    /**
+     * @defaultValue 'md'
+     */
+    size?: Button['variants']['size'];
+    /** Render the button with equal padding on all sides. */
+    square?: boolean;
+    /** Render the button full width. */
+    block?: boolean;
+    /** Set loading state automatically based on the `@click` promise state */
+    loadingAuto?: boolean;
+    onClick?: ((event: MouseEvent) => void | Promise<void>) | Array<((event: MouseEvent) => void | Promise<void>)>;
+    class?: any;
+    ui?: Button['slots'];
+}
+export interface ButtonSlots {
+    leading(props?: {}): any;
+    default(props?: {}): any;
+    trailing(props?: {}): any;
+}
+declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<ButtonProps>, {
+    active: undefined;
+    activeClass: string;
+    inactiveClass: string;
+}>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<ButtonProps>, {
+    active: undefined;
+    activeClass: string;
+    inactiveClass: string;
+}>>> & Readonly<{}>, {
+    activeClass: string;
+    active: boolean;
+    inactiveClass: string;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>, Readonly<ButtonSlots> & ButtonSlots>;
+export default _default;
+type __VLS_WithDefaults<P, D> = {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_PrettifyLocal<P[K] & {
+        default: D[K];
+    }> : P[K];
+};
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToOption<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: import('vue').PropType<T[K]>;
+        required: true;
+    };
+};
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/dist/runtime/components/ButtonGroup.vue

@@ -1,57 +1,31 @@
-<script lang="ts">
-import type { VariantProps } from 'tailwind-variants'
-import type { AppConfig } from '@nuxt/schema'
-import _appConfig from '#build/app.config'
-import theme from '#build/ui/button-group'
-import { tv } from '../utils/tv'
-
-const appConfigButtonGroup = _appConfig as AppConfig & { ui: { buttonGroup: Partial<typeof theme> } }
-
-const buttonGroup = tv({ extend: tv(theme), ...(appConfigButtonGroup.ui?.buttonGroup) })
-
-type ButtonGroupVariants = VariantProps<typeof buttonGroup>
-
-export interface ButtonGroupProps {
-  /**
-   * The element or component this component should render as.
-   * @defaultValue 'div'
-   */
-  as?: any
-  /**
-   * @defaultValue 'md'
-   */
-  size?: ButtonGroupVariants['size']
-  /**
-   * The orientation the buttons are laid out.
-   * @defaultValue 'horizontal'
-   */
-  orientation?: ButtonGroupVariants['orientation']
-  class?: any
-}
-
-export interface ButtonGroupSlots {
-  default(props?: {}): any
-}
+<script>
+import theme from "#build/ui/button-group";
 </script>
 
-<script setup lang="ts">
-import { provide, computed } from 'vue'
-import { Primitive } from 'reka-ui'
-import { buttonGroupInjectionKey } from '../composables/useButtonGroup'
-
-const props = withDefaults(defineProps<ButtonGroupProps>(), {
-  orientation: 'horizontal'
-})
-defineSlots<ButtonGroupSlots>()
-
+<script setup>
+import { provide, computed } from "vue";
+import { Primitive } from "reka-ui";
+import { useAppConfig } from "#imports";
+import { buttonGroupInjectionKey } from "../composables/useButtonGroup";
+import { tv } from "../utils/tv";
+const props = defineProps({
+  as: { type: null, required: false },
+  size: { type: null, required: false },
+  orientation: { type: null, required: false, default: "horizontal" },
+  class: { type: null, required: false },
+  ui: { type: null, required: false }
+});
+defineSlots();
+const appConfig = useAppConfig();
+const ui = computed(() => tv({ extend: tv(theme), ...appConfig.ui?.buttonGroup || {} }));
 provide(buttonGroupInjectionKey, computed(() => ({
   orientation: props.orientation,
   size: props.size
-})))
+})));
 </script>
 
 <template>
-  <Primitive :as="as" :class="buttonGroup({ orientation, class: props.class })">
+  <Primitive :as="as" :class="ui({ orientation, class: props.class })">
     <slot />
   </Primitive>
 </template>

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

@@ -0,0 +1,55 @@
+import type { AppConfig } from '@nuxt/schema';
+import theme from '#build/ui/button-group';
+import type { ComponentConfig } from '../types/utils';
+type ButtonGroup = ComponentConfig<typeof theme, AppConfig, 'buttonGroup'>;
+export interface ButtonGroupProps {
+    /**
+     * The element or component this component should render as.
+     * @defaultValue 'div'
+     */
+    as?: any;
+    /**
+     * @defaultValue 'md'
+     */
+    size?: ButtonGroup['variants']['size'];
+    /**
+     * The orientation the buttons are laid out.
+     * @defaultValue 'horizontal'
+     */
+    orientation?: ButtonGroup['variants']['orientation'];
+    class?: any;
+    ui?: ButtonGroup['slots'];
+}
+export interface ButtonGroupSlots {
+    default(props?: {}): any;
+}
+declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<ButtonGroupProps>, {
+    orientation: string;
+}>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<ButtonGroupProps>, {
+    orientation: string;
+}>>> & Readonly<{}>, {
+    orientation: ButtonGroup["variants"]["orientation"];
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>, Readonly<ButtonGroupSlots> & ButtonGroupSlots>;
+export default _default;
+type __VLS_WithDefaults<P, D> = {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_PrettifyLocal<P[K] & {
+        default: D[K];
+    }> : P[K];
+};
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToOption<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: import('vue').PropType<T[K]>;
+        required: true;
+    };
+};
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};