@nuxt/ui 4.0.1 → 4.2.0

package/cli/templates.mjs

@@ -62,7 +62,7 @@ const ui = computed(() => tv({ extend: tv(theme), ...(appConfig.ui?.${camelName}
 </script>
 
 <template>
-  <Primitive :as="as" :class="ui.root({ class: [props.ui?.root, props.class] })">
+  <Primitive :as="as" data-slot="root" :class="ui.root({ class: [props.ui?.root, props.class] })">
     <slot />
   </Primitive>
 </template>
@@ -105,7 +105,7 @@ const ui = computed(() => tv({ extend: tv(theme), ...(appConfig.ui?.${camelName}
 </script>
 
 <template>
-  <${upperName}Root v-bind="rootProps" :class="ui.root({ class: [props.ui?.root, props.class] })" />
+  <${upperName}Root v-bind="rootProps" data-slot="root" :class="ui.root({ class: [props.ui?.root, props.class] })" />
 </template>
 `
   }
@@ -141,22 +141,34 @@ const test = ({ name, prose, content }) => {
       ? undefined
       : `
 import { describe, it, expect } from 'vitest'
+import { axe } from 'vitest-axe'
+import { mountSuspended } from '@nuxt/test-utils/runtime'
 import ${upperName} from '../../${content ? '../' : ''}src/runtime/components/${content ? 'content/' : ''}${upperName}.vue'
 import type { ${upperName}Props, ${upperName}Slots } from '../../${content ? '../' : ''}src/runtime/components/${content ? 'content/' : ''}${upperName}.vue'
 import ComponentRender from '../${content ? '../' : ''}component-render'
 
 describe('${upperName}', () => {
+  const props = {}
+
   it.each([
     // Props
     ['with as', { props: { as: 'section' } }],
     ['with class', { props: { class: '' } }],
     ['with ui', { props: { ui: {} } }],
     // Slots
-    ['with default slot', { slots: { default: () => 'Default slot' } }]
+    ['with default slot', { props, slots: { default: () => 'Default slot' } }]
   ])('renders %s correctly', async (nameOrHtml: string, options: { props?: ${upperName}Props, slots?: Partial<${upperName}Slots> }) => {
     const html = await ComponentRender(nameOrHtml, options, ${upperName})
     expect(html).toMatchSnapshot()
   })
+
+  it('passes accessibility tests', async () => {
+    const wrapper = await mountSuspended(${upperName}, {
+      props
+    })
+
+    expect(await axe(wrapper.element)).toHaveNoViolations()
+  })
 })
 `
   }
@@ -167,7 +179,7 @@ const docs = ({ name, primitive }) => {
   const upperName = splitByCase(name).map(p => upperFirst(p)).join('')
 
   return {
-    filename: `docs/content/3.components/${kebabName}.md`,
+    filename: `docs/content/docs/2.components/${kebabName}.md`,
     contents: `---
 title: ${upperName}
 description: ''

package/dist/module.d.mts

@@ -40,6 +40,10 @@ interface ModuleOptions {
          * @see https://ui.nuxt.com/docs/getting-started/installation/nuxt#themetransitions
          */
         transitions?: boolean;
+        /**
+         * The default variants to use for components
+         * @see https://ui.nuxt.com/docs/getting-started/installation/nuxt#themedefaultvariants
+         */
         defaultVariants?: {
             /**
              * The default color variant to use for components
@@ -52,6 +56,12 @@ interface ModuleOptions {
              */
             size?: Size;
         };
+        /**
+         * Prefix for Tailwind CSS utility classes
+         * @see https://ui.nuxt.com/docs/getting-started/installation/nuxt#themeprefix
+         * @example 'tw'
+         */
+        prefix?: string;
     };
     /**
      * Force the import of prose components even if `@nuxtjs/mdc` or `@nuxt/content` are not installed
@@ -63,6 +73,21 @@ interface ModuleOptions {
      * @defaultValue false
      */
     content?: boolean;
+    /**
+     * Experimental features
+     */
+    experimental?: {
+        /**
+         * Enable automatic component detection for tree-shaking
+         * Only generates theme files for components actually used in your app
+         * - `true`: Enable automatic detection
+         * - `string[]`: Enable detection and include additional components (useful for dynamic components)
+         * @defaultValue false
+         * @example true
+         * @example ['Modal', 'Dropdown']
+         */
+        componentDetection?: boolean | string[];
+    };
 }
 declare module '#app' {
     interface RuntimeNuxtHooks {

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/ui",
-  "version": "4.0.1",
+  "version": "4.2.0",
   "docs": "https://ui.nuxt.com/docs/getting-started/installation/nuxt",
   "configKey": "ui",
   "compatibility": {
@@ -8,6 +8,6 @@
   },
   "builder": {
     "@nuxt/module-builder": "1.0.2",
-    "unbuild": "3.6.0"
+    "unbuild": "3.6.1"
   }
 }

package/dist/module.mjs

@@ -1,14 +1,17 @@
 import { defu } from 'defu';
 import { defineNuxtModule, createResolver, addPlugin, hasNuxtModule, addComponentsDir, addImportsDir, installModule } from '@nuxt/kit';
-import { d as defaultOptions, r as resolveColors, a as getDefaultUiConfig, b as addTemplates } from './shared/ui.D-FDXAUi.mjs';
+import { d as defaultOptions, r as resolveColors, a as getDefaultConfig, b as addTemplates } from './shared/ui.B77q-Dvh.mjs';
 import '../dist/runtime/utils/index.js';
 import 'node:url';
 import 'scule';
 import 'knitwork';
 import 'tailwindcss/colors';
+import 'node:fs/promises';
+import 'pathe';
+import 'tinyglobby';
 
 const name = "@nuxt/ui";
-const version = "4.0.1";
+const version = "4.2.0";
 
 const module = defineNuxtModule({
   meta: {
@@ -27,9 +30,9 @@ const module = defineNuxtModule({
     options.theme.colors = resolveColors(options.theme.colors);
     nuxt.options.ui = options;
     nuxt.options.alias["#ui"] = resolve("./runtime");
-    nuxt.options.appConfig.ui = defu(nuxt.options.appConfig.ui || {}, getDefaultUiConfig(options.theme.colors));
+    nuxt.options.appConfig.ui = defu(nuxt.options.appConfig.ui || {}, getDefaultConfig(options.theme));
     nuxt.options.app.rootAttrs = nuxt.options.app.rootAttrs || {};
-    nuxt.options.app.rootAttrs.class = [nuxt.options.app.rootAttrs.class, "isolate"].filter(Boolean).join(" ");
+    nuxt.options.app.rootAttrs.class = [nuxt.options.app.rootAttrs.class, `${options.theme?.prefix ? options.theme.prefix + ":" : ""}isolate`].filter(Boolean).join(" ");
     nuxt.hook("vite:extend", async ({ config }) => {
       const plugin = await import('@tailwindcss/vite').then((r) => r.default);
       config.plugins ||= [];

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

@@ -51,16 +51,22 @@ type SlotProps<T extends AccordionItem> = (props: {
     item: T;
     index: number;
     open: boolean;
+    ui: Accordion['ui'];
 }) => any;
 export type AccordionSlots<T extends AccordionItem = AccordionItem> = {
     leading: SlotProps<T>;
-    default: SlotProps<T>;
+    default(props: {
+        item: T;
+        index: number;
+        open: boolean;
+    }): any;
     trailing: SlotProps<T>;
     content: SlotProps<T>;
     body: SlotProps<T>;
 } & DynamicSlots<T, 'body', {
     index: number;
     open: boolean;
+    ui: Accordion['ui'];
 }>;
 declare const __VLS_export: <T extends AccordionItem>(__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<AccordionProps<T> & {

package/dist/runtime/components/Accordion.vue

@@ -34,35 +34,36 @@ const ui = computed(() => tv({ extend: tv(theme), ...appConfig.ui?.accordion ||
 </script>
 
 <template>
-  <AccordionRoot v-bind="rootProps" :type="type" :class="ui.root({ class: [props.ui?.root, props.class] })">
+  <AccordionRoot v-bind="rootProps" :type="type" data-slot="root" :class="ui.root({ class: [props.ui?.root, props.class] })">
     <AccordionItem
       v-for="(item, index) in props.items"
       v-slot="{ open }"
       :key="index"
       :value="item.value || String(index)"
       :disabled="item.disabled"
+      data-slot="item"
       :class="ui.item({ class: [props.ui?.item, item.ui?.item, item.class] })"
     >
-      <AccordionHeader as="div" :class="ui.header({ class: [props.ui?.header, item.ui?.header] })">
-        <AccordionTrigger :class="ui.trigger({ class: [props.ui?.trigger, item.ui?.trigger], disabled: item.disabled })">
-          <slot name="leading" :item="item" :index="index" :open="open">
-            <UIcon v-if="item.icon" :name="item.icon" :class="ui.leadingIcon({ class: [props.ui?.leadingIcon, item?.ui?.leadingIcon] })" />
+      <AccordionHeader as="div" data-slot="header" :class="ui.header({ class: [props.ui?.header, item.ui?.header] })">
+        <AccordionTrigger data-slot="trigger" :class="ui.trigger({ class: [props.ui?.trigger, item.ui?.trigger], disabled: item.disabled })">
+          <slot name="leading" :item="item" :index="index" :open="open" :ui="ui">
+            <UIcon v-if="item.icon" :name="item.icon" data-slot="leadingIcon" :class="ui.leadingIcon({ class: [props.ui?.leadingIcon, item?.ui?.leadingIcon] })" />
           </slot>
 
-          <span v-if="get(item, props.labelKey) || !!slots.default" :class="ui.label({ class: [props.ui?.label, item.ui?.label] })">
+          <span v-if="get(item, props.labelKey) || !!slots.default" data-slot="label" :class="ui.label({ class: [props.ui?.label, item.ui?.label] })">
             <slot :item="item" :index="index" :open="open">{{ get(item, props.labelKey) }}</slot>
           </span>
 
-          <slot name="trailing" :item="item" :index="index" :open="open">
-            <UIcon :name="item.trailingIcon || trailingIcon || appConfig.ui.icons.chevronDown" :class="ui.trailingIcon({ class: [props.ui?.trailingIcon, item.ui?.trailingIcon] })" />
+          <slot name="trailing" :item="item" :index="index" :open="open" :ui="ui">
+            <UIcon :name="item.trailingIcon || trailingIcon || appConfig.ui.icons.chevronDown" data-slot="trailingIcon" :class="ui.trailingIcon({ class: [props.ui?.trailingIcon, item.ui?.trailingIcon] })" />
           </slot>
         </AccordionTrigger>
       </AccordionHeader>
 
-      <AccordionContent v-if="item.content || !!slots.content || item.slot && !!slots[item.slot] || !!slots.body || item.slot && !!slots[`${item.slot}-body`]" :class="ui.content({ class: [props.ui?.content, item.ui?.content] })">
-        <slot :name="item.slot || 'content'" :item="item" :index="index" :open="open">
-          <div :class="ui.body({ class: [props.ui?.body, item.ui?.body] })">
-            <slot :name="item.slot ? `${item.slot}-body` : 'body'" :item="item" :index="index" :open="open">
+      <AccordionContent v-if="item.content || !!slots.content || item.slot && !!slots[item.slot] || !!slots.body || item.slot && !!slots[`${item.slot}-body`]" data-slot="content" :class="ui.content({ class: [props.ui?.content, item.ui?.content] })">
+        <slot :name="item.slot || 'content'" :item="item" :index="index" :open="open" :ui="ui">
+          <div data-slot="body" :class="ui.body({ class: [props.ui?.body, item.ui?.body] })">
+            <slot :name="item.slot ? `${item.slot}-body` : 'body'" :item="item" :index="index" :open="open" :ui="ui">
               {{ item.content }}
             </slot>
           </div>

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

@@ -51,16 +51,22 @@ type SlotProps<T extends AccordionItem> = (props: {
     item: T;
     index: number;
     open: boolean;
+    ui: Accordion['ui'];
 }) => any;
 export type AccordionSlots<T extends AccordionItem = AccordionItem> = {
     leading: SlotProps<T>;
-    default: SlotProps<T>;
+    default(props: {
+        item: T;
+        index: number;
+        open: boolean;
+    }): any;
     trailing: SlotProps<T>;
     content: SlotProps<T>;
     body: SlotProps<T>;
 } & DynamicSlots<T, 'body', {
     index: number;
     open: boolean;
+    ui: Accordion['ui'];
 }>;
 declare const __VLS_export: <T extends AccordionItem>(__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<AccordionProps<T> & {

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

@@ -56,14 +56,14 @@ export interface AlertEmits {
     'update:open': [value: boolean];
 }
 export interface AlertSlots {
-    leading(props?: {}): any;
+    leading(props: {
+        ui: Alert['ui'];
+    }): any;
     title(props?: {}): any;
     description(props?: {}): any;
     actions(props?: {}): any;
     close(props: {
-        ui: {
-            [K in keyof Required<Alert['slots']>]: (props?: Record<string, any>) => string;
-        };
+        ui: Alert['ui'];
     }): any;
 }
 declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<AlertProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {

package/dist/runtime/components/Alert.vue

@@ -39,32 +39,32 @@ const ui = computed(() => tv({ extend: tv(theme), ...appConfig.ui?.alert || {} }
 </script>
 
 <template>
-  <Primitive :as="as" :data-orientation="orientation" :class="ui.root({ class: [props.ui?.root, props.class] })">
-    <slot name="leading">
-      <UAvatar v-if="avatar" :size="props.ui?.avatarSize || ui.avatarSize()" v-bind="avatar" :class="ui.avatar({ class: props.ui?.avatar })" />
-      <UIcon v-else-if="icon" :name="icon" :class="ui.icon({ class: props.ui?.icon })" />
+  <Primitive :as="as" :data-orientation="orientation" data-slot="root" :class="ui.root({ class: [props.ui?.root, props.class] })">
+    <slot name="leading" :ui="ui">
+      <UAvatar v-if="avatar" :size="props.ui?.avatarSize || ui.avatarSize()" v-bind="avatar" data-slot="avatar" :class="ui.avatar({ class: props.ui?.avatar })" />
+      <UIcon v-else-if="icon" :name="icon" data-slot="icon" :class="ui.icon({ class: props.ui?.icon })" />
     </slot>
 
-    <div :class="ui.wrapper({ class: props.ui?.wrapper })">
-      <div v-if="title || !!slots.title" :class="ui.title({ class: props.ui?.title })">
+    <div data-slot="wrapper" :class="ui.wrapper({ class: props.ui?.wrapper })">
+      <div v-if="title || !!slots.title" data-slot="title" :class="ui.title({ class: props.ui?.title })">
         <slot name="title">
           {{ title }}
         </slot>
       </div>
-      <div v-if="description || !!slots.description" :class="ui.description({ class: props.ui?.description })">
+      <div v-if="description || !!slots.description" data-slot="description" :class="ui.description({ class: props.ui?.description })">
         <slot name="description">
           {{ description }}
         </slot>
       </div>
 
-      <div v-if="orientation === 'vertical' && (actions?.length || !!slots.actions)" :class="ui.actions({ class: props.ui?.actions })">
+      <div v-if="orientation === 'vertical' && (actions?.length || !!slots.actions)" data-slot="actions" :class="ui.actions({ class: props.ui?.actions })">
         <slot name="actions">
           <UButton v-for="(action, index) in actions" :key="index" size="xs" v-bind="action" />
         </slot>
       </div>
     </div>
 
-    <div v-if="orientation === 'horizontal' && (actions?.length || !!slots.actions) || close" :class="ui.actions({ class: props.ui?.actions, orientation: 'horizontal' })">
+    <div v-if="orientation === 'horizontal' && (actions?.length || !!slots.actions) || close" data-slot="actions" :class="ui.actions({ class: props.ui?.actions, orientation: 'horizontal' })">
       <template v-if="orientation === 'horizontal' && (actions?.length || !!slots.actions)">
         <slot name="actions">
           <UButton v-for="(action, index) in actions" :key="index" size="xs" v-bind="action" />
@@ -79,6 +79,7 @@ const ui = computed(() => tv({ extend: tv(theme), ...appConfig.ui?.alert || {} }
           variant="link"
           :aria-label="t('alert.close')"
           v-bind="typeof close === 'object' ? close : {}"
+          data-slot="close"
           :class="ui.close({ class: props.ui?.close })"
           @click="emits('update:open', false)"
         />

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

@@ -56,14 +56,14 @@ export interface AlertEmits {
     'update:open': [value: boolean];
 }
 export interface AlertSlots {
-    leading(props?: {}): any;
+    leading(props: {
+        ui: Alert['ui'];
+    }): any;
     title(props?: {}): any;
     description(props?: {}): any;
     actions(props?: {}): any;
     close(props: {
-        ui: {
-            [K in keyof Required<Alert['slots']>]: (props?: Record<string, any>) => string;
-        };
+        ui: Alert['ui'];
     }): any;
 }
 declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<AlertProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {

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

@@ -1,7 +1,7 @@
 import type { ConfigProviderProps, TooltipProviderProps } from 'reka-ui';
 import type { ToasterProps } from '../types';
 import type { Locale, Messages } from '../types/locale';
-export interface AppProps<T extends Messages = Messages> extends Omit<ConfigProviderProps, 'useId' | 'dir' | 'locale'> {
+export interface AppProps<T extends Messages = Messages> extends Omit<ConfigProviderProps, 'useId' | 'locale'> {
     tooltip?: TooltipProviderProps;
     toaster?: ToasterProps | null;
     locale?: Locale<T>;

package/dist/runtime/components/App.vue

@@ -17,6 +17,7 @@ const props = defineProps({
   toaster: { type: [Object, null], required: false },
   locale: { type: Object, required: false },
   portal: { type: [Boolean, String], required: false, skipCheck: true, default: "body" },
+  dir: { type: String, required: false },
   scrollBody: { type: [Boolean, Object], required: false },
   nonce: { type: String, required: false }
 });
@@ -31,7 +32,7 @@ provide(portalTargetInjectionKey, portal);
 </script>
 
 <template>
-  <ConfigProvider :use-id="() => useId()" :dir="locale?.dir" :locale="locale?.code" v-bind="configProviderProps">
+  <ConfigProvider :use-id="() => useId()" :dir="props.dir || locale?.dir" :locale="locale?.code" v-bind="configProviderProps">
     <TooltipProvider v-bind="tooltipProps">
       <UToaster v-if="toaster !== null" v-bind="toasterProps">
         <slot />

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

@@ -1,7 +1,7 @@
 import type { ConfigProviderProps, TooltipProviderProps } from 'reka-ui';
 import type { ToasterProps } from '../types';
 import type { Locale, Messages } from '../types/locale';
-export interface AppProps<T extends Messages = Messages> extends Omit<ConfigProviderProps, 'useId' | 'dir' | 'locale'> {
+export interface AppProps<T extends Messages = Messages> extends Omit<ConfigProviderProps, 'useId' | 'locale'> {
     tooltip?: TooltipProviderProps;
     toaster?: ToasterProps | null;
     locale?: Locale<T>;

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

@@ -2,17 +2,19 @@ import type { AppConfig } from '@nuxt/schema';
 import theme from '#build/ui/auth-form';
 import type { ButtonProps, FormProps, FormFieldProps, SeparatorProps, InputProps, CheckboxProps, SelectMenuProps, PinInputProps, IconProps } from '../types';
 import type { FormSchema, FormSubmitEvent, InferInput } from '../types/form';
+import type { FormHTMLAttributes } from '../types/html';
+import type { NonUnion } from '../types/utils';
 import type { ComponentConfig } from '../types/tv';
 type AuthForm = ComponentConfig<typeof theme, AppConfig, 'authForm'>;
-type AuthFormCheckboxField = Omit<FormFieldProps, 'name'> & CheckboxProps & {
+export type AuthFormCheckboxField = Omit<FormFieldProps, 'name'> & CheckboxProps & {
     name: string;
     type: 'checkbox';
 };
-type AuthFormSelectField = Omit<FormFieldProps, 'name'> & SelectMenuProps & {
+export type AuthFormSelectField = Omit<FormFieldProps, 'name'> & SelectMenuProps & {
     name: string;
     type: 'select';
 };
-type AuthFormOtpField = Omit<FormFieldProps, 'name'> & Omit<PinInputProps, 'type' | 'otp'> & {
+export type AuthFormOtpField = Omit<FormFieldProps, 'name'> & Omit<PinInputProps, 'type' | 'otp'> & {
     name: string;
     type: 'otp';
     /**
@@ -22,14 +24,13 @@ type AuthFormOtpField = Omit<FormFieldProps, 'name'> & Omit<PinInputProps, 'type
      */
     otp?: boolean | PinInputProps;
 };
-type AuthFormInputFieldType = 'password' | 'text' | 'email' | 'number';
-type AuthFormInputField<T extends AuthFormInputFieldType = AuthFormInputFieldType> = Omit<FormFieldProps, 'name'> & InputProps & {
+export type AuthFormInputFieldType = 'password' | 'text' | 'email' | 'number';
+export type AuthFormInputField<T extends AuthFormInputFieldType & NonUnion<T> = 'text'> = Omit<FormFieldProps, 'name'> & Omit<InputProps, 'type'> & {
     name: string;
     type: T;
 };
-type AuthFormFieldType = 'checkbox' | 'select' | 'otp' | 'password' | 'text' | 'email' | 'number';
-export type AuthFormField<T extends AuthFormFieldType = AuthFormFieldType> = T extends 'checkbox' ? AuthFormCheckboxField : T extends 'select' ? AuthFormSelectField : T extends 'otp' ? AuthFormOtpField : T extends AuthFormInputFieldType ? AuthFormInputField<T> : never;
-export interface AuthFormProps<T extends FormSchema = FormSchema<object>, F extends AuthFormField = AuthFormField> {
+export type AuthFormField = AuthFormCheckboxField | AuthFormSelectField | AuthFormOtpField | AuthFormInputField<'password'> | AuthFormInputField<'text'> | AuthFormInputField<'email'> | AuthFormInputField<'number'>;
+export interface AuthFormProps<T extends FormSchema = FormSchema<object>, F extends AuthFormField = AuthFormField> extends /** @vue-ignore */ FormHTMLAttributes {
     /**
      * The element or component this component should render as.
      * @defaultValue 'div'
@@ -79,7 +80,9 @@ type DynamicFieldSlots<T, F, SlotProps = {
 type DynamicFormFieldSlots<T> = Record<string, (props?: {}) => any> & Record<`${keyof T extends string ? keyof T : never}-${'label' | 'description' | 'hint' | 'help' | 'error'}`, (props?: {}) => any>;
 export type AuthFormSlots<T extends object = object, F extends AuthFormField = AuthFormField> = {
     header(props?: {}): any;
-    leading(props?: {}): any;
+    leading(props: {
+        ui: AuthForm['ui'];
+    }): any;
     title(props?: {}): any;
     description(props?: {}): any;
     providers(props?: {}): any;

package/dist/runtime/components/AuthForm.vue

@@ -18,6 +18,7 @@ import UCheckbox from "./Checkbox.vue";
 import USelectMenu from "./SelectMenu.vue";
 import UInput from "./Input.vue";
 import UPinInput from "./PinInput.vue";
+defineOptions({ inheritAttrs: false });
 const props = defineProps({
   as: { type: null, required: false },
   icon: { type: [String, Object], required: false },
@@ -48,13 +49,10 @@ defineEmits(["submit"]);
 const slots = defineSlots();
 const { t } = useLocale();
 const appConfig = useAppConfig();
+const ui = computed(() => tv({ extend: tv(theme), ...appConfig.ui?.authForm || {} })());
 const formRef = useTemplateRef("formRef");
 const passwordVisibility = ref(false);
-const ui = computed(() => tv({ extend: tv(theme), ...appConfig.ui?.authForm || {} })());
-defineExpose({
-  formRef,
-  state
-});
+const passwordRef = useTemplateRef("passwordRef");
 function pickFieldProps(field) {
   const fields = ["name", "errorPattern", "help", "error", "hint", "size", "required", "eagerValidation", "validateOnInputDelay"];
   if (field.type === "checkbox") {
@@ -72,25 +70,29 @@ function omitFieldProps(field) {
   }
   return omit(field, [...fields, "label", "description"]);
 }
+defineExpose({
+  formRef,
+  state
+});
 </script>
 
 <template>
-  <Primitive :as="as" :class="ui.root({ class: [props.ui?.root, props.class] })">
-    <div v-if="icon || !!slots.icon || (title || !!slots.title) || (description || !!slots.description) || !!slots.header" :class="ui.header({ class: props.ui?.header })">
+  <Primitive :as="as" data-slot="root" :class="ui.root({ class: [props.ui?.root, props.class] })">
+    <div v-if="icon || !!slots.leading || (title || !!slots.title) || (description || !!slots.description) || !!slots.header" data-slot="header" :class="ui.header({ class: props.ui?.header })">
       <slot name="header">
-        <div v-if="icon || !!slots.leading" :class="ui.leading({ class: props.ui?.leading })">
-          <slot name="leading">
-            <UIcon v-if="icon" :name="icon" :class="ui.leadingIcon({ class: props.ui?.leadingIcon })" />
+        <div v-if="icon || !!slots.leading" data-slot="leading" :class="ui.leading({ class: props.ui?.leading })">
+          <slot name="leading" :ui="ui">
+            <UIcon v-if="icon" :name="icon" data-slot="leadingIcon" :class="ui.leadingIcon({ class: props.ui?.leadingIcon })" />
           </slot>
         </div>
 
-        <div v-if="title || !!slots.title" :class="ui.title({ class: props.ui?.title })">
+        <div v-if="title || !!slots.title" data-slot="title" :class="ui.title({ class: props.ui?.title })">
           <slot name="title">
             {{ title }}
           </slot>
         </div>
 
-        <div v-if="description || !!slots.description" :class="ui.description({ class: props.ui?.description })">
+        <div v-if="description || !!slots.description" data-slot="description" :class="ui.description({ class: props.ui?.description })">
           <slot name="description">
             {{ description }}
           </slot>
@@ -98,8 +100,8 @@ function omitFieldProps(field) {
       </slot>
     </div>
 
-    <div :class="ui.body({ class: props.ui?.body })">
-      <div v-if="providers?.length || !!slots.providers" :class="ui.providers({ class: props.ui?.providers })">
+    <div data-slot="body" :class="ui.body({ class: props.ui?.body })">
+      <div v-if="providers?.length || !!slots.providers" data-slot="providers" :class="ui.providers({ class: props.ui?.providers })">
         <slot name="providers">
           <UButton
             v-for="(provider, index) in providers"
@@ -115,6 +117,7 @@ function omitFieldProps(field) {
       <USeparator
         v-if="providers?.length && fields?.length"
         v-bind="typeof separator === 'object' ? separator : { label: separator }"
+        data-slot="separator"
         :class="ui.separator({ class: props.ui?.separator })"
       />
 
@@ -125,9 +128,11 @@ function omitFieldProps(field) {
         :schema="schema"
         :validate="validate"
         :validate-on="validateOn"
-        :class="ui.form({ class: props.ui?.form })"
         :disabled="disabled"
         :loading-auto="loadingAuto"
+        data-slot="form"
+        :class="ui.form({ class: props.ui?.form })"
+        v-bind="$attrs"
         @submit="onSubmit"
       >
         <UFormField
@@ -139,12 +144,14 @@ function omitFieldProps(field) {
             <UCheckbox
               v-if="field.type === 'checkbox'"
               v-model="state[field.name]"
+              data-slot="checkbox"
               :class="ui.checkbox({ class: props.ui?.checkbox })"
               v-bind="omitFieldProps(field)"
             />
             <USelectMenu
               v-else-if="field.type === 'select'"
               v-model="state[field.name]"
+              data-slot="select"
               :class="ui.select({ class: props.ui?.select })"
               v-bind="omitFieldProps(field)"
             />
@@ -152,16 +159,16 @@ function omitFieldProps(field) {
               v-else-if="field.type === 'otp'"
               :id="field.name"
               v-model="state[field.name]"
+              data-slot="otp"
               :class="ui.otp({ class: props.ui?.otp })"
-              v-bind="{
-  ...omitFieldProps(field),
-  ...typeof field.otp === 'object' ? field.otp : {}
-}"
+              v-bind="Object.assign({}, omitFieldProps(field), typeof field.otp === 'object' ? field.otp : {})"
               otp
             />
             <UInput
               v-else-if="field.type === 'password'"
+              ref="passwordRef"
               v-model="state[field.name]"
+              data-slot="password"
               :class="ui.password({ class: props.ui?.password })"
               v-bind="omitFieldProps(field)"
               :type="passwordVisibility ? 'text' : 'password'"
@@ -174,7 +181,7 @@ function omitFieldProps(field) {
                   :icon="passwordVisibility ? appConfig.ui.icons.eyeOff : appConfig.ui.icons.eye"
                   :aria-label="passwordVisibility ? t('authForm.hidePassword') : t('authForm.showPassword')"
                   :aria-pressed="passwordVisibility"
-                  aria-controls="password"
+                  :aria-controls="passwordRef?.[0]?.inputRef?.id"
                   @click="passwordVisibility = !passwordVisibility"
                 />
               </template>
@@ -182,6 +189,7 @@ function omitFieldProps(field) {
             <UInput
               v-else
               v-model="state[field.name]"
+              data-slot="input"
               :class="ui.input({ class: props.ui?.input })"
               v-bind="omitFieldProps(field)"
             />
@@ -219,7 +227,7 @@ function omitFieldProps(field) {
       </UForm>
     </div>
 
-    <div v-if="!!slots.footer" :class="ui.footer({ class: props.ui?.footer })">
+    <div v-if="!!slots.footer" data-slot="footer" :class="ui.footer({ class: props.ui?.footer })">
       <slot name="footer" />
     </div>
   </Primitive>