@nuxt/ui 3.0.2 → 3.1.0

package/dist/runtime/components/Popover.vue

@@ -1,92 +1,55 @@
-<script lang="ts">
-import type { PopoverRootProps, HoverCardRootProps, PopoverRootEmits, PopoverContentProps, PopoverContentEmits, PopoverArrowProps } from 'reka-ui'
-import type { AppConfig } from '@nuxt/schema'
-import _appConfig from '#build/app.config'
-import theme from '#build/ui/popover'
-import { tv } from '../utils/tv'
-import type { EmitsToProps } from '../types/utils'
-
-const appConfigPopover = _appConfig as AppConfig & { ui: { popover: Partial<typeof theme> } }
-
-const popover = tv({ extend: tv(theme), ...(appConfigPopover.ui?.popover || {}) })
-
-export interface PopoverProps extends PopoverRootProps, Pick<HoverCardRootProps, 'openDelay' | 'closeDelay'> {
-  /**
-   * The display mode of the popover.
-   * @defaultValue 'click'
-   */
-  mode?: 'click' | 'hover'
-  /**
-   * The content of the popover.
-   * @defaultValue { side: 'bottom', sideOffset: 8, collisionPadding: 8 }
-   */
-  content?: Omit<PopoverContentProps, 'as' | 'asChild' | 'forceMount'> & Partial<EmitsToProps<PopoverContentEmits>>
-  /**
-   * Display an arrow alongside the popover.
-   * @defaultValue false
-   */
-  arrow?: boolean | Omit<PopoverArrowProps, 'as' | 'asChild'>
-  /**
-   * Render the popover in a portal.
-   * @defaultValue true
-   */
-  portal?: boolean
-  /**
-   * When `false`, the popover will not close when clicking outside or pressing escape.
-   * @defaultValue true
-   */
-  dismissible?: boolean
-  class?: any
-  ui?: Partial<typeof popover.slots>
-}
-
-export interface PopoverEmits extends PopoverRootEmits {}
-
-export interface PopoverSlots {
-  default(props: { open: boolean }): any
-  content(props?: {}): any
-}
+<script>
+import theme from "#build/ui/popover";
 </script>
 
-<script setup lang="ts">
-import { computed, toRef } from 'vue'
-import { defu } from 'defu'
-import { useForwardPropsEmits } from 'reka-ui'
-import { Popover, HoverCard } from 'reka-ui/namespaced'
-import { reactivePick } from '@vueuse/core'
-
-const props = withDefaults(defineProps<PopoverProps>(), {
-  portal: true,
-  mode: 'click',
-  openDelay: 0,
-  closeDelay: 0,
-  dismissible: true
-})
-const emits = defineEmits<PopoverEmits>()
-const slots = defineSlots<PopoverSlots>()
-
-const pick = props.mode === 'hover' ? reactivePick(props, 'defaultOpen', 'open', 'openDelay', 'closeDelay') : reactivePick(props, 'defaultOpen', 'open', 'modal')
-const rootProps = useForwardPropsEmits(pick, emits)
-const contentProps = toRef(() => defu(props.content, { side: 'bottom', sideOffset: 8, collisionPadding: 8 }) as PopoverContentProps)
+<script setup>
+import { computed, toRef } from "vue";
+import { defu } from "defu";
+import { useForwardPropsEmits } from "reka-ui";
+import { Popover, HoverCard } from "reka-ui/namespaced";
+import { reactivePick } from "@vueuse/core";
+import { useAppConfig } from "#imports";
+import { usePortal } from "../composables/usePortal";
+import { tv } from "../utils/tv";
+const props = defineProps({
+  mode: { type: String, required: false, default: "click" },
+  content: { type: Object, required: false },
+  arrow: { type: [Boolean, Object], required: false },
+  portal: { type: [Boolean, String], required: false, skipCheck: true, default: true },
+  dismissible: { type: Boolean, required: false, default: true },
+  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 },
+  openDelay: { type: Number, required: false, default: 0 },
+  closeDelay: { type: Number, required: false, default: 0 }
+});
+const emits = defineEmits(["close:prevent", "update:open"]);
+const slots = defineSlots();
+const appConfig = useAppConfig();
+const pick = props.mode === "hover" ? reactivePick(props, "defaultOpen", "open", "openDelay", "closeDelay") : reactivePick(props, "defaultOpen", "open", "modal");
+const rootProps = useForwardPropsEmits(pick, emits);
+const portalProps = usePortal(toRef(() => props.portal));
+const contentProps = toRef(() => defu(props.content, { side: "bottom", sideOffset: 8, collisionPadding: 8 }));
 const contentEvents = computed(() => {
   if (!props.dismissible) {
-    return {
-      pointerDownOutside: (e: Event) => e.preventDefault(),
-      interactOutside: (e: Event) => e.preventDefault(),
-      escapeKeyDown: (e: Event) => e.preventDefault()
-    }
+    const events = ["pointerDownOutside", "interactOutside", "escapeKeyDown"];
+    return events.reduce((acc, curr) => {
+      acc[curr] = (e) => {
+        e.preventDefault();
+        emits("close:prevent");
+      };
+      return acc;
+    }, {});
   }
-
-  return {}
-})
-const arrowProps = toRef(() => props.arrow as PopoverArrowProps)
-
-// eslint-disable-next-line vue/no-dupe-keys
-const ui = computed(() => popover({
+  return {};
+});
+const arrowProps = toRef(() => props.arrow);
+const ui = computed(() => tv({ extend: tv(theme), ...appConfig.ui?.popover || {} })({
   side: contentProps.value.side
-}))
-
-const Component = computed(() => props.mode === 'hover' ? HoverCard : Popover)
+}));
+const Component = computed(() => props.mode === "hover" ? HoverCard : Popover);
 </script>
 
 <template>
@@ -95,7 +58,7 @@ const Component = computed(() => props.mode === 'hover' ? HoverCard : Popover)
       <slot :open="open" />
     </Component.Trigger>
 
-    <Component.Portal :disabled="!portal">
+    <Component.Portal v-bind="portalProps">
       <Component.Content v-bind="contentProps" :class="ui.content({ class: [!slots.default && props.class, props.ui?.content] })" v-on="contentEvents">
         <slot name="content" />
 

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

@@ -0,0 +1,80 @@
+import { Popover } from 'reka-ui/namespaced';
+import type { PopoverRootProps, HoverCardRootProps, PopoverRootEmits, PopoverContentProps, PopoverContentEmits, PopoverArrowProps } from 'reka-ui';
+import type { AppConfig } from '@nuxt/schema';
+import theme from '#build/ui/popover';
+import type { EmitsToProps, ComponentConfig } from '../types/utils';
+type Popover = ComponentConfig<typeof theme, AppConfig, 'popover'>;
+export interface PopoverProps extends PopoverRootProps, Pick<HoverCardRootProps, 'openDelay' | 'closeDelay'> {
+    /**
+     * The display mode of the popover.
+     * @defaultValue 'click'
+     */
+    mode?: 'click' | 'hover';
+    /**
+     * The content of the popover.
+     * @defaultValue { side: 'bottom', sideOffset: 8, collisionPadding: 8 }
+     */
+    content?: Omit<PopoverContentProps, 'as' | 'asChild' | 'forceMount'> & Partial<EmitsToProps<PopoverContentEmits>>;
+    /**
+     * Display an arrow alongside the popover.
+     * @defaultValue false
+     */
+    arrow?: boolean | Omit<PopoverArrowProps, 'as' | 'asChild'>;
+    /**
+     * Render the popover in a portal.
+     * @defaultValue true
+     */
+    portal?: boolean | string | HTMLElement;
+    /**
+     * When `false`, the popover will not close when clicking outside or pressing escape.
+     * @defaultValue true
+     */
+    dismissible?: boolean;
+    class?: any;
+    ui?: Popover['slots'];
+}
+export interface PopoverEmits extends PopoverRootEmits {
+    'close:prevent': [];
+}
+export interface PopoverSlots {
+    default(props: {
+        open: boolean;
+    }): any;
+    content(props?: {}): any;
+}
+declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<PopoverProps>, {
+    portal: boolean;
+    mode: string;
+    openDelay: number;
+    closeDelay: number;
+    dismissible: boolean;
+}>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, any, string, import("vue").PublicProps, any, {
+    mode: "click" | "hover";
+    portal: boolean | string | HTMLElement;
+    dismissible: boolean;
+    openDelay: number;
+    closeDelay: number;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>, Readonly<PopoverSlots> & PopoverSlots>;
+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/Progress.vue

@@ -1,172 +1,111 @@
-<!-- eslint-disable vue/block-tag-newline -->
-<script lang="ts">
-import type { VariantProps } from 'tailwind-variants'
-import type { ProgressRootProps, ProgressRootEmits } from 'reka-ui'
-import type { AppConfig } from '@nuxt/schema'
-import _appConfig from '#build/app.config'
-import theme from '#build/ui/progress'
-import { tv } from '../utils/tv'
-
-const appConfigProgress = _appConfig as AppConfig & { ui: { progress: Partial<typeof theme> } }
-
-const progress = tv({ extend: tv(theme), ...(appConfigProgress.ui?.progress || {}) })
-
-type ProgressVariants = VariantProps<typeof progress>
-
-export interface ProgressProps extends Pick<ProgressRootProps, 'getValueLabel' | 'modelValue'> {
-  /**
-   * The element or component this component should render as.
-   * @defaultValue 'div'
-   */
-  as?: any
-  /** The maximum progress value. */
-  max?: number | Array<any>
-  /** Display the current progress value. */
-  status?: boolean
-  /** Whether the progress is visually inverted. */
-  inverted?: boolean
-  /**
-   * @defaultValue 'md'
-   */
-  size?: ProgressVariants['size']
-  /**
-   * @defaultValue 'primary'
-   */
-  color?: ProgressVariants['color']
-  /**
-   * The orientation of the progress bar.
-   * @defaultValue 'horizontal'
-   */
-  orientation?: ProgressVariants['orientation']
-  /**
-   * The animation of the progress bar.
-   * @defaultValue 'carousel'
-   */
-  animation?: ProgressVariants['animation']
-  class?: any
-  ui?: Partial<typeof progress.slots>
-}
-
-export interface ProgressEmits extends ProgressRootEmits {}
-
-export type ProgressSlots = {
-  status(props: { percent?: number }): any
-} & {
-  [key: string]: (props: { step: number }) => any
-}
-
+<script>
+import theme from "#build/ui/progress";
 </script>
 
-<script setup lang="ts">
-import { computed } from 'vue'
-import { Primitive, ProgressRoot, ProgressIndicator, useForwardPropsEmits } from 'reka-ui'
-import { reactivePick } from '@vueuse/core'
-import { useLocale } from '../composables/useLocale'
-
-const props = withDefaults(defineProps<ProgressProps>(), {
-  inverted: false,
-  modelValue: null,
-  orientation: 'horizontal'
-})
-const emits = defineEmits<ProgressEmits>()
-const slots = defineSlots<ProgressSlots>()
-
-const { dir } = useLocale()
-
-const rootProps = useForwardPropsEmits(reactivePick(props, 'getValueLabel', 'modelValue'), emits)
-
-const isIndeterminate = computed(() => rootProps.value.modelValue === null)
-const hasSteps = computed(() => Array.isArray(props.max))
-
+<script setup>
+import { computed } from "vue";
+import { Primitive, ProgressRoot, ProgressIndicator, useForwardPropsEmits } from "reka-ui";
+import { reactivePick } from "@vueuse/core";
+import { useAppConfig } from "#imports";
+import { useLocale } from "../composables/useLocale";
+import { tv } from "../utils/tv";
+const props = defineProps({
+  as: { type: null, required: false },
+  max: { type: [Number, Array], required: false },
+  status: { type: Boolean, required: false },
+  inverted: { type: Boolean, required: false, default: false },
+  size: { type: null, required: false },
+  color: { type: null, required: false },
+  orientation: { type: null, required: false, default: "horizontal" },
+  animation: { type: null, required: false },
+  class: { type: null, required: false },
+  ui: { type: null, required: false },
+  getValueLabel: { type: Function, required: false },
+  modelValue: { type: [Number, null], required: false, default: null }
+});
+const emits = defineEmits(["update:modelValue", "update:max"]);
+const slots = defineSlots();
+const { dir } = useLocale();
+const appConfig = useAppConfig();
+const rootProps = useForwardPropsEmits(reactivePick(props, "getValueLabel", "modelValue"), emits);
+const isIndeterminate = computed(() => rootProps.value.modelValue === null);
+const hasSteps = computed(() => Array.isArray(props.max));
 const realMax = computed(() => {
   if (isIndeterminate.value || !props.max) {
-    return undefined
+    return void 0;
   }
-
   if (Array.isArray(props.max)) {
-    return props.max.length - 1
+    return props.max.length - 1;
   }
-
-  return Number(props.max)
-})
-
+  return Number(props.max);
+});
 const percent = computed(() => {
   if (isIndeterminate.value) {
-    return undefined
+    return void 0;
   }
-
   switch (true) {
-    case rootProps.value.modelValue! < 0: return 0
-    case rootProps.value.modelValue! > (realMax.value ?? 100): return 100
-    default: return Math.round((rootProps.value.modelValue! / (realMax.value ?? 100)) * 100)
+    case rootProps.value.modelValue < 0:
+      return 0;
+    case rootProps.value.modelValue > (realMax.value ?? 100):
+      return 100;
+    default:
+      return Math.round(rootProps.value.modelValue / (realMax.value ?? 100) * 100);
   }
-})
-
+});
 const indicatorStyle = computed(() => {
-  if (percent.value === undefined) {
-    return
+  if (percent.value === void 0) {
+    return;
   }
-
-  if (props.orientation === 'vertical') {
+  if (props.orientation === "vertical") {
     return {
-      transform: `translateY(${props.inverted ? '' : '-'}${100 - percent.value}%)`
-    }
+      transform: `translateY(${props.inverted ? "" : "-"}${100 - percent.value}%)`
+    };
   } else {
-    if (dir.value === 'rtl') {
+    if (dir.value === "rtl") {
       return {
-        transform: `translateX(${props.inverted ? '-' : ''}${100 - percent.value}%)`
-      }
+        transform: `translateX(${props.inverted ? "-" : ""}${100 - percent.value}%)`
+      };
     } else {
       return {
-        transform: `translateX(${props.inverted ? '' : '-'}${100 - percent.value}%)`
-      }
+        transform: `translateX(${props.inverted ? "" : "-"}${100 - percent.value}%)`
+      };
     }
   }
-})
-
+});
 const statusStyle = computed(() => {
   return {
-    [props.orientation === 'vertical' ? 'height' : 'width']: percent.value ? `${percent.value}%` : 'fit-content'
-  }
-})
-
-function isActive(index: number) {
-  return index === Number(props.modelValue)
+    [props.orientation === "vertical" ? "height" : "width"]: percent.value ? `${percent.value}%` : "fit-content"
+  };
+});
+function isActive(index) {
+  return index === Number(props.modelValue);
 }
-
-function isFirst(index: number) {
-  return index === 0
+function isFirst(index) {
+  return index === 0;
 }
-
-function isLast(index: number) {
-  return index === realMax.value
+function isLast(index) {
+  return index === realMax.value;
 }
-
-function stepVariant(index: number | string) {
-  index = Number(index)
-
+function stepVariant(index) {
+  index = Number(index);
   if (isActive(index) && !isFirst(index)) {
-    return 'active'
+    return "active";
   }
-
   if (isFirst(index) && isActive(index)) {
-    return 'first'
+    return "first";
   }
-
   if (isLast(index) && isActive(index)) {
-    return 'last'
+    return "last";
   }
-
-  return 'other'
+  return "other";
 }
-
-const ui = computed(() => progress({
+const ui = computed(() => tv({ extend: tv(theme), ...appConfig.ui?.progress || {} })({
   animation: props.animation,
   size: props.size,
   color: props.color,
   orientation: props.orientation,
   inverted: props.inverted
-}))
+}));
 </script>
 
 <template>

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

@@ -0,0 +1,97 @@
+import type { ProgressRootProps, ProgressRootEmits } from 'reka-ui';
+import type { AppConfig } from '@nuxt/schema';
+import theme from '#build/ui/progress';
+import type { ComponentConfig } from '../types/utils';
+type Progress = ComponentConfig<typeof theme, AppConfig, 'progress'>;
+export interface ProgressProps extends Pick<ProgressRootProps, 'getValueLabel' | 'modelValue'> {
+    /**
+     * The element or component this component should render as.
+     * @defaultValue 'div'
+     */
+    as?: any;
+    /** The maximum progress value. */
+    max?: number | Array<any>;
+    /** Display the current progress value. */
+    status?: boolean;
+    /** Whether the progress is visually inverted. */
+    inverted?: boolean;
+    /**
+     * @defaultValue 'md'
+     */
+    size?: Progress['variants']['size'];
+    /**
+     * @defaultValue 'primary'
+     */
+    color?: Progress['variants']['color'];
+    /**
+     * The orientation of the progress bar.
+     * @defaultValue 'horizontal'
+     */
+    orientation?: Progress['variants']['orientation'];
+    /**
+     * The animation of the progress bar.
+     * @defaultValue 'carousel'
+     */
+    animation?: Progress['variants']['animation'];
+    class?: any;
+    ui?: Progress['slots'];
+}
+export interface ProgressEmits extends ProgressRootEmits {
+}
+export type ProgressSlots = {
+    status(props: {
+        percent?: number;
+    }): any;
+} & {
+    [key: string]: (props: {
+        step: number;
+    }) => any;
+};
+declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<ProgressProps>, {
+    inverted: boolean;
+    modelValue: null;
+    orientation: string;
+}>>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, any, string, import("vue").PublicProps, any, {
+    orientation: Progress["variants"]["orientation"];
+    inverted: boolean;
+    modelValue: number | null;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>, Readonly<{
+    status(props: {
+        percent?: number;
+    }): any;
+} & {
+    [key: string]: (props: {
+        step: number;
+    }) => any;
+}> & {
+    status(props: {
+        percent?: number;
+    }): any;
+} & {
+    [key: string]: (props: {
+        step: number;
+    }) => any;
+}>;
+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];
+} & {};