@nuxt/ui 3.0.2 → 3.1.1

package/dist/runtime/components/Drawer.vue

@@ -1,90 +1,56 @@
-<script lang="ts">
-import type { DrawerRootProps, DrawerRootEmits } from 'vaul-vue'
-import type { DialogContentProps, DialogContentEmits } from 'reka-ui'
-import type { AppConfig } from '@nuxt/schema'
-import _appConfig from '#build/app.config'
-import theme from '#build/ui/drawer'
-import { tv } from '../utils/tv'
-import type { EmitsToProps } from '../types/utils'
-
-const appConfigDrawer = _appConfig as AppConfig & { ui: { drawer: Partial<typeof theme> } }
-
-const drawer = tv({ extend: tv(theme), ...(appConfigDrawer.ui?.drawer || {}) })
-
-export interface DrawerProps extends Pick<DrawerRootProps, 'activeSnapPoint' | 'closeThreshold' | 'shouldScaleBackground' | 'setBackgroundColorOnScale' | 'scrollLockTimeout' | 'fixed' | 'dismissible' | 'modal' | 'open' | 'defaultOpen' | 'nested' | 'direction' | 'noBodyStyles' | 'handleOnly' | 'preventScrollRestoration' | 'snapPoints'> {
-  /**
-   * The element or component this component should render as.
-   * @defaultValue 'div'
-   */
-  as?: any
-  title?: string
-  description?: string
-  /**
-   * Whether to inset the drawer from the edges.
-   * @defaultValue false
-   */
-  inset?: boolean
-  /** The content of the drawer. */
-  content?: Omit<DialogContentProps, 'as' | 'asChild' | 'forceMount'> & Partial<EmitsToProps<DialogContentEmits>>
-  /**
-   * Render an overlay behind the drawer.
-   * @defaultValue true
-   */
-  overlay?: boolean
-  /**
-   * Render a handle on the drawer.
-   * @defaultValue true
-   */
-  handle?: boolean
-  /**
-   * Render the drawer in a portal.
-   * @defaultValue true
-   */
-  portal?: boolean
-  class?: any
-  ui?: Partial<typeof drawer.slots>
-}
-
-export interface DrawerEmits extends DrawerRootEmits {}
-
-export interface DrawerSlots {
-  default(props?: {}): any
-  content(props?: {}): any
-  header(props?: {}): any
-  title(props?: {}): any
-  description(props?: {}): any
-  body(props?: {}): any
-  footer(props?: {}): any
-}
+<script>
+import theme from "#build/ui/drawer";
 </script>
 
-<script setup lang="ts">
-import { computed, toRef } from 'vue'
-import { useForwardPropsEmits } from 'reka-ui'
-import { DrawerRoot, DrawerTrigger, DrawerPortal, DrawerOverlay, DrawerContent, DrawerTitle, DrawerDescription, DrawerHandle } from 'vaul-vue'
-import { reactivePick } from '@vueuse/core'
-
-const props = withDefaults(defineProps<DrawerProps>(), {
-  direction: 'bottom',
-  portal: true,
-  overlay: true,
-  handle: true,
-  modal: true,
-  dismissible: true
-})
-const emits = defineEmits<DrawerEmits>()
-const slots = defineSlots<DrawerSlots>()
-
-const rootProps = useForwardPropsEmits(reactivePick(props, 'activeSnapPoint', 'closeThreshold', 'shouldScaleBackground', 'setBackgroundColorOnScale', 'scrollLockTimeout', 'fixed', 'dismissible', 'modal', 'open', 'defaultOpen', 'nested', 'direction', 'noBodyStyles', 'handleOnly', 'preventScrollRestoration', 'snapPoints'), emits)
-const contentProps = toRef(() => props.content)
+<script setup>
+import { computed, toRef } from "vue";
+import { useForwardPropsEmits } from "reka-ui";
+import { DrawerRoot, DrawerTrigger, DrawerPortal, DrawerOverlay, DrawerContent, DrawerTitle, DrawerDescription, DrawerHandle } from "vaul-vue";
+import { reactivePick } from "@vueuse/core";
+import { useAppConfig } from "#imports";
+import { usePortal } from "../composables/usePortal";
+import { tv } from "../utils/tv";
+const props = defineProps({
+  as: { type: null, required: false },
+  title: { type: String, required: false },
+  description: { type: String, required: false },
+  inset: { type: Boolean, required: false },
+  content: { type: Object, required: false },
+  overlay: { type: Boolean, required: false, default: true },
+  handle: { type: Boolean, required: false, default: true },
+  portal: { type: [Boolean, String], required: false, skipCheck: true, default: true },
+  class: { type: null, required: false },
+  ui: { type: null, required: false },
+  activeSnapPoint: { type: [Number, String, null], required: false },
+  closeThreshold: { type: Number, required: false },
+  shouldScaleBackground: { type: Boolean, required: false },
+  setBackgroundColorOnScale: { type: Boolean, required: false },
+  scrollLockTimeout: { type: Number, required: false },
+  fixed: { type: Boolean, required: false },
+  dismissible: { type: Boolean, required: false, default: true },
+  modal: { type: Boolean, required: false, default: true },
+  open: { type: Boolean, required: false },
+  defaultOpen: { type: Boolean, required: false },
+  nested: { type: Boolean, required: false },
+  direction: { type: String, required: false, default: "bottom" },
+  noBodyStyles: { type: Boolean, required: false },
+  handleOnly: { type: Boolean, required: false },
+  preventScrollRestoration: { type: Boolean, required: false },
+  snapPoints: { type: Array, required: false }
+});
+const emits = defineEmits(["drag", "release", "close", "update:open", "update:activeSnapPoint", "animationEnd"]);
+const slots = defineSlots();
+const appConfig = useAppConfig();
+const rootProps = useForwardPropsEmits(reactivePick(props, "activeSnapPoint", "closeThreshold", "shouldScaleBackground", "setBackgroundColorOnScale", "scrollLockTimeout", "fixed", "dismissible", "modal", "open", "defaultOpen", "nested", "direction", "noBodyStyles", "handleOnly", "preventScrollRestoration", "snapPoints"), emits);
+const portalProps = usePortal(toRef(() => props.portal));
+const contentProps = toRef(() => props.content);
 const contentEvents = {
-  closeAutoFocus: (e: Event) => e.preventDefault()
-}
-
-const ui = computed(() => drawer({
+  closeAutoFocus: (e) => e.preventDefault()
+};
+const ui = computed(() => tv({ extend: tv(theme), ...appConfig.ui?.drawer || {} })({
   direction: props.direction,
   inset: props.inset
-}))
+}));
 </script>
 
 <template>
@@ -93,7 +59,7 @@ const ui = computed(() => drawer({
       <slot />
     </DrawerTrigger>
 
-    <DrawerPortal :disabled="!portal">
+    <DrawerPortal v-bind="portalProps">
       <DrawerOverlay v-if="overlay" :class="ui.overlay({ class: props.ui?.overlay })" />
 
       <DrawerContent :class="ui.content({ class: [!slots.default && props.class, props.ui?.content] })" v-bind="contentProps" v-on="contentEvents">

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

@@ -0,0 +1,78 @@
+import type { DrawerRootProps, DrawerRootEmits } from 'vaul-vue';
+import type { DialogContentProps, DialogContentEmits } from 'reka-ui';
+import type { AppConfig } from '@nuxt/schema';
+import theme from '#build/ui/drawer';
+import type { EmitsToProps, ComponentConfig } from '../types/utils';
+type Drawer = ComponentConfig<typeof theme, AppConfig, 'drawer'>;
+export interface DrawerProps extends Pick<DrawerRootProps, 'activeSnapPoint' | 'closeThreshold' | 'shouldScaleBackground' | 'setBackgroundColorOnScale' | 'scrollLockTimeout' | 'fixed' | 'dismissible' | 'modal' | 'open' | 'defaultOpen' | 'nested' | 'direction' | 'noBodyStyles' | 'handleOnly' | 'preventScrollRestoration' | 'snapPoints'> {
+    /**
+     * The element or component this component should render as.
+     * @defaultValue 'div'
+     */
+    as?: any;
+    title?: string;
+    description?: string;
+    /**
+     * Whether to inset the drawer from the edges.
+     * @defaultValue false
+     */
+    inset?: boolean;
+    /** The content of the drawer. */
+    content?: Omit<DialogContentProps, 'as' | 'asChild' | 'forceMount'> & Partial<EmitsToProps<DialogContentEmits>>;
+    /**
+     * Render an overlay behind the drawer.
+     * @defaultValue true
+     */
+    overlay?: boolean;
+    /**
+     * Render a handle on the drawer.
+     * @defaultValue true
+     */
+    handle?: boolean;
+    /**
+     * Render the drawer in a portal.
+     * @defaultValue true
+     */
+    portal?: boolean | string | HTMLElement;
+    class?: any;
+    ui?: Drawer['slots'];
+}
+export interface DrawerEmits extends DrawerRootEmits {
+}
+export interface DrawerSlots {
+    default(props?: {}): any;
+    content(props?: {}): any;
+    header(props?: {}): any;
+    title(props?: {}): any;
+    description(props?: {}): any;
+    body(props?: {}): any;
+    footer(props?: {}): any;
+}
+declare const _default: __VLS_WithSlots<import("vue").DefineComponent<DrawerProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+    close: () => any;
+    drag: (percentageDragged: number) => any;
+    "update:open": (open: boolean) => any;
+    release: (open: boolean) => any;
+    "update:activeSnapPoint": (val: string | number) => any;
+    animationEnd: (open: boolean) => any;
+}, string, import("vue").PublicProps, Readonly<DrawerProps> & Readonly<{
+    onClose?: (() => any) | undefined;
+    onDrag?: ((percentageDragged: number) => any) | undefined;
+    "onUpdate:open"?: ((open: boolean) => any) | undefined;
+    onRelease?: ((open: boolean) => any) | undefined;
+    "onUpdate:activeSnapPoint"?: ((val: string | number) => any) | undefined;
+    onAnimationEnd?: ((open: boolean) => any) | undefined;
+}>, {
+    modal: boolean;
+    portal: boolean | string | HTMLElement;
+    overlay: boolean;
+    direction: import("vaul-vue").DrawerDirection;
+    dismissible: boolean;
+    handle: boolean;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, DrawerSlots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/DropdownMenu.vue

@@ -1,146 +1,43 @@
-<!-- eslint-disable vue/block-tag-newline -->
-<script lang="ts">
-import type { VariantProps } from 'tailwind-variants'
-import type { DropdownMenuRootProps, DropdownMenuRootEmits, DropdownMenuContentProps, DropdownMenuContentEmits, DropdownMenuArrowProps } from 'reka-ui'
-import type { AppConfig } from '@nuxt/schema'
-import _appConfig from '#build/app.config'
-import theme from '#build/ui/dropdown-menu'
-import { tv } from '../utils/tv'
-import type { AvatarProps, KbdProps, LinkProps } from '../types'
-import type {
-  ArrayOrNested,
-  DynamicSlots,
-  MergeTypes,
-  NestedItem,
-  PartialString,
-  EmitsToProps
-} from '../types/utils'
-
-const appConfigDropdownMenu = _appConfig as AppConfig & { ui: { dropdownMenu: Partial<typeof theme> } }
-
-const dropdownMenu = tv({ extend: tv(theme), ...(appConfigDropdownMenu.ui?.dropdownMenu || {}) })
-
-type DropdownMenuVariants = VariantProps<typeof dropdownMenu>
-
-export interface DropdownMenuItem extends Omit<LinkProps, 'type' | 'raw' | 'custom'> {
-  label?: string
-  /**
-   * @IconifyIcon
-   */
-  icon?: string
-  color?: DropdownMenuVariants['color']
-  avatar?: AvatarProps
-  content?: Omit<DropdownMenuContentProps, 'as' | 'asChild' | 'forceMount'> & Partial<EmitsToProps<DropdownMenuContentEmits>>
-  kbds?: KbdProps['value'][] | KbdProps[]
-  /**
-   * The item type.
-   * @defaultValue 'link'
-   */
-  type?: 'label' | 'separator' | 'link' | 'checkbox'
-  slot?: string
-  loading?: boolean
-  disabled?: boolean
-  checked?: boolean
-  open?: boolean
-  defaultOpen?: boolean
-  children?: ArrayOrNested<DropdownMenuItem>
-  onSelect?(e: Event): void
-  onUpdateChecked?(checked: boolean): void
-  [key: string]: any
-}
-
-export interface DropdownMenuProps<T extends ArrayOrNested<DropdownMenuItem> = ArrayOrNested<DropdownMenuItem>> extends Omit<DropdownMenuRootProps, 'dir'> {
-  /**
-   * @defaultValue 'md'
-   */
-  size?: DropdownMenuVariants['size']
-  items?: T
-  /**
-   * The icon displayed when an item is checked.
-   * @defaultValue appConfig.ui.icons.check
-   * @IconifyIcon
-   */
-  checkedIcon?: string
-  /**
-   * The icon displayed when an item is loading.
-   * @defaultValue appConfig.ui.icons.loading
-   * @IconifyIcon
-   */
-  loadingIcon?: string
-  /**
-   * The icon displayed when the item is an external link.
-   * Set to `false` to hide the external icon.
-   * @defaultValue appConfig.ui.icons.external
-   * @IconifyIcon
-   */
-  externalIcon?: boolean | string
-  /**
-   * The content of the menu.
-   * @defaultValue { side: 'bottom', sideOffset: 8, collisionPadding: 8 }
-   */
-  content?: Omit<DropdownMenuContentProps, 'as' | 'asChild' | 'forceMount'> & Partial<EmitsToProps<DropdownMenuContentEmits>>
-  /**
-   * Display an arrow alongside the menu.
-   * @defaultValue false
-   */
-  arrow?: boolean | Omit<DropdownMenuArrowProps, 'as' | 'asChild'>
-  /**
-   * Render the menu in a portal.
-   * @defaultValue true
-   */
-  portal?: boolean
-  /**
-   * The key used to get the label from the item.
-   * @defaultValue 'label'
-   */
-  labelKey?: keyof NestedItem<T>
-  disabled?: boolean
-  class?: any
-  ui?: PartialString<typeof dropdownMenu.slots>
-}
-
-export interface DropdownMenuEmits extends DropdownMenuRootEmits {}
-
-type SlotProps<T extends DropdownMenuItem> = (props: { item: T, active?: boolean, index: number }) => any
-
-export type DropdownMenuSlots<
-  A extends ArrayOrNested<DropdownMenuItem> = ArrayOrNested<DropdownMenuItem>,
-  T extends NestedItem<A> = NestedItem<A>
-> = {
-  'default'(props: { open: boolean }): any
-  'item': SlotProps<T>
-  'item-leading': SlotProps<T>
-  'item-label': SlotProps<T>
-  'item-trailing': SlotProps<T>
-} & DynamicSlots<MergeTypes<T>, 'leading' | 'label' | 'trailing', { active?: boolean, index: number }>
-
+<script>
+import theme from "#build/ui/dropdown-menu";
 </script>
 
-<script setup lang="ts" generic="T extends ArrayOrNested<DropdownMenuItem>">
-import { computed, toRef } from 'vue'
-import { defu } from 'defu'
-import { DropdownMenuRoot, DropdownMenuTrigger, DropdownMenuArrow, useForwardPropsEmits } from 'reka-ui'
-import { reactivePick } from '@vueuse/core'
-import { omit } from '../utils'
-import UDropdownMenuContent from './DropdownMenuContent.vue'
-
-const props = withDefaults(defineProps<DropdownMenuProps<T>>(), {
-  portal: true,
-  modal: true,
-  externalIcon: true,
-  labelKey: 'label'
-})
-const emits = defineEmits<DropdownMenuEmits>()
-const slots = defineSlots<DropdownMenuSlots<T>>()
-
-const rootProps = useForwardPropsEmits(reactivePick(props, 'defaultOpen', 'open', 'modal'), emits)
-const contentProps = toRef(() => defu(props.content, { side: 'bottom', sideOffset: 8, collisionPadding: 8 }) as DropdownMenuContentProps)
-const arrowProps = toRef(() => props.arrow as DropdownMenuArrowProps)
-const proxySlots = omit(slots, ['default'])
-
-const ui = computed(() => dropdownMenu({
+<script setup>
+import { computed, toRef } from "vue";
+import { defu } from "defu";
+import { DropdownMenuRoot, DropdownMenuTrigger, DropdownMenuArrow, useForwardPropsEmits } from "reka-ui";
+import { reactivePick } from "@vueuse/core";
+import { useAppConfig } from "#imports";
+import { omit } from "../utils";
+import { tv } from "../utils/tv";
+import UDropdownMenuContent from "./DropdownMenuContent.vue";
+const props = defineProps({
+  size: { type: null, required: false },
+  items: { type: null, required: false },
+  checkedIcon: { type: String, required: false },
+  loadingIcon: { type: String, required: false },
+  externalIcon: { type: [Boolean, String], required: false, default: true },
+  content: { type: Object, required: false },
+  arrow: { type: [Boolean, Object], required: false },
+  portal: { type: [Boolean, String], required: false, skipCheck: true, default: true },
+  labelKey: { type: null, required: false, default: "label" },
+  disabled: { type: Boolean, required: false },
+  class: { type: null, required: false },
+  ui: { type: null, required: false },
+  defaultOpen: { type: Boolean, required: false },
+  open: { type: Boolean, required: false },
+  modal: { type: Boolean, required: false, default: true }
+});
+const emits = defineEmits(["update:open"]);
+const slots = defineSlots();
+const appConfig = useAppConfig();
+const rootProps = useForwardPropsEmits(reactivePick(props, "defaultOpen", "open", "modal"), emits);
+const contentProps = toRef(() => defu(props.content, { side: "bottom", sideOffset: 8, collisionPadding: 8 }));
+const arrowProps = toRef(() => props.arrow);
+const proxySlots = omit(slots, ["default"]);
+const ui = computed(() => tv({ extend: tv(theme), ...appConfig.ui?.dropdownMenu || {} })({
   size: props.size
-}))
+}));
 </script>
 
 <template>
@@ -156,13 +53,13 @@ const ui = computed(() => dropdownMenu({
       v-bind="contentProps"
       :items="items"
       :portal="portal"
-      :label-key="(labelKey as keyof NestedItem<T>)"
+      :label-key="labelKey"
       :checked-icon="checkedIcon"
       :loading-icon="loadingIcon"
       :external-icon="externalIcon"
     >
       <template v-for="(_, name) in proxySlots" #[name]="slotData">
-        <slot :name="(name as keyof DropdownMenuSlots<T>)" v-bind="slotData" />
+        <slot :name="name" v-bind="slotData" />
       </template>
 
       <DropdownMenuArrow v-if="!!arrow" v-bind="arrowProps" :class="ui.arrow({ class: props.ui?.arrow })" />

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

@@ -0,0 +1,117 @@
+import type { DropdownMenuRootProps, DropdownMenuRootEmits, DropdownMenuContentProps, DropdownMenuContentEmits, DropdownMenuArrowProps } from 'reka-ui';
+import type { AppConfig } from '@nuxt/schema';
+import theme from '#build/ui/dropdown-menu';
+import type { AvatarProps, KbdProps, LinkProps } from '../types';
+import type { ArrayOrNested, DynamicSlots, MergeTypes, NestedItem, EmitsToProps, ComponentConfig } from '../types/utils';
+type DropdownMenu = ComponentConfig<typeof theme, AppConfig, 'dropdownMenu'>;
+export interface DropdownMenuItem extends Omit<LinkProps, 'type' | 'raw' | 'custom'> {
+    label?: string;
+    /**
+     * @IconifyIcon
+     */
+    icon?: string;
+    color?: DropdownMenu['variants']['color'];
+    avatar?: AvatarProps;
+    content?: Omit<DropdownMenuContentProps, 'as' | 'asChild' | 'forceMount'> & Partial<EmitsToProps<DropdownMenuContentEmits>>;
+    kbds?: KbdProps['value'][] | KbdProps[];
+    /**
+     * The item type.
+     * @defaultValue 'link'
+     */
+    type?: 'label' | 'separator' | 'link' | 'checkbox';
+    slot?: string;
+    loading?: boolean;
+    disabled?: boolean;
+    checked?: boolean;
+    open?: boolean;
+    defaultOpen?: boolean;
+    children?: ArrayOrNested<DropdownMenuItem>;
+    onSelect?(e: Event): void;
+    onUpdateChecked?(checked: boolean): void;
+    [key: string]: any;
+}
+export interface DropdownMenuProps<T extends ArrayOrNested<DropdownMenuItem> = ArrayOrNested<DropdownMenuItem>> extends Omit<DropdownMenuRootProps, 'dir'> {
+    /**
+     * @defaultValue 'md'
+     */
+    size?: DropdownMenu['variants']['size'];
+    items?: T;
+    /**
+     * The icon displayed when an item is checked.
+     * @defaultValue appConfig.ui.icons.check
+     * @IconifyIcon
+     */
+    checkedIcon?: string;
+    /**
+     * The icon displayed when an item is loading.
+     * @defaultValue appConfig.ui.icons.loading
+     * @IconifyIcon
+     */
+    loadingIcon?: string;
+    /**
+     * The icon displayed when the item is an external link.
+     * Set to `false` to hide the external icon.
+     * @defaultValue appConfig.ui.icons.external
+     * @IconifyIcon
+     */
+    externalIcon?: boolean | string;
+    /**
+     * The content of the menu.
+     * @defaultValue { side: 'bottom', sideOffset: 8, collisionPadding: 8 }
+     */
+    content?: Omit<DropdownMenuContentProps, 'as' | 'asChild' | 'forceMount'> & Partial<EmitsToProps<DropdownMenuContentEmits>>;
+    /**
+     * Display an arrow alongside the menu.
+     * @defaultValue false
+     */
+    arrow?: boolean | Omit<DropdownMenuArrowProps, 'as' | 'asChild'>;
+    /**
+     * Render the menu in a portal.
+     * @defaultValue true
+     */
+    portal?: boolean | string | HTMLElement;
+    /**
+     * The key used to get the label from the item.
+     * @defaultValue 'label'
+     */
+    labelKey?: keyof NestedItem<T>;
+    disabled?: boolean;
+    class?: any;
+    ui?: DropdownMenu['slots'];
+}
+export interface DropdownMenuEmits extends DropdownMenuRootEmits {
+}
+type SlotProps<T extends DropdownMenuItem> = (props: {
+    item: T;
+    active?: boolean;
+    index: number;
+}) => any;
+export type DropdownMenuSlots<A extends ArrayOrNested<DropdownMenuItem> = ArrayOrNested<DropdownMenuItem>, T extends NestedItem<A> = NestedItem<A>> = {
+    'default'(props: {
+        open: boolean;
+    }): any;
+    'item': SlotProps<T>;
+    'item-leading': SlotProps<T>;
+    'item-label': SlotProps<T>;
+    'item-trailing': SlotProps<T>;
+    'content-top': (props?: {}) => any;
+    'content-bottom': (props?: {}) => any;
+} & DynamicSlots<MergeTypes<T>, 'leading' | 'label' | 'trailing', {
+    active?: boolean;
+    index: number;
+}>;
+declare const _default: <T extends ArrayOrNested<DropdownMenuItem>>(__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<Pick<Partial<{}> & Omit<{
+        readonly "onUpdate:open"?: ((payload: boolean) => any) | undefined;
+    } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, "onUpdate:open"> & DropdownMenuProps<T> & Partial<{}>> & import("vue").PublicProps;
+    expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
+    attrs: any;
+    slots: DropdownMenuSlots<T, NestedItem<T>>;
+    emit: (evt: "update:open", payload: boolean) => void;
+}>) => import("vue").VNode & {
+    __ctx?: Awaited<typeof __VLS_setup>;
+};
+export default _default;
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};