@byyuurin/ui 0.0.11 → 0.1.0

package/dist/runtime/components/Link.vue

@@ -3,13 +3,14 @@
 </script>
 
 <script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { diff, isEqual } from "ohash/utils";
+import { reactiveOmit, reactivePick } from "@vueuse/core";
+import { isEqual } from "ohash/utils";
 import { useForwardProps } from "reka-ui";
-import { hasProtocol } from "ufo";
-import { computed, getCurrentInstance, resolveComponent } from "vue";
-import { useNuxtApp, useRoute } from "#imports";
-import { useTheme } from "../composables/useTheme";
+import { computed } from "vue";
+import theme from "#build/ui/link";
+import { useAppConfig, useRoute } from "#imports";
+import { isPartiallyEqual } from "../utils/link";
+import { cv, merge } from "../utils/style";
 import LinkBase from "./LinkBase.vue";
 defineOptions({ inheritAttrs: false });
 const props = defineProps({
@@ -17,21 +18,19 @@ const props = defineProps({
   type: { type: null, required: false, default: "button" },
   label: { type: String, required: false },
   disabled: { type: Boolean, required: false },
-  active: { 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 },
-  disableClass: { type: String, required: false },
   custom: { type: Boolean, required: false },
-  underline: { type: Boolean, required: false },
   raw: { type: Boolean, required: false },
-  class: { type: null, required: false },
+  class: { type: [Object, String, Number, Boolean, null, Array], required: false, skipCheck: true },
   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 },
+  target: { type: [String, Object], required: false },
+  rel: { type: [String, Object], required: false },
   noRel: { type: Boolean, required: false },
   prefetchedClass: { type: String, required: false },
   prefetch: { type: Boolean, required: false },
@@ -39,75 +38,25 @@ const props = defineProps({
   noPrefetch: { type: Boolean, required: false },
   activeClass: { type: String, required: false },
   exactActiveClass: { type: String, required: false },
-  ariaCurrentValue: { type: String, required: false },
+  ariaCurrentValue: { type: String, required: false, default: "page" },
   viewTransition: { type: Boolean, required: false },
   replace: { type: Boolean, required: false }
 });
 defineSlots();
-const hasRouter = computed(() => {
-  const app = getCurrentInstance()?.appContext.app;
-  return !!app?.config?.globalProperties?.$router;
-});
-const nuxtApp = useNuxtApp();
-const hasNuxtLink = !!nuxtApp.$router;
-const linkComponent = computed(() => ({
-  NuxtLink: nuxtApp.$router ? resolveComponent("NuxtLink") : null,
-  RouterLink: hasRouter.value ? resolveComponent("RouterLink") : null
-}));
-const route = computed(() => {
-  if (!hasRouter.value)
-    return null;
-  try {
-    return useRoute();
-  } catch {
-    return null;
-  }
-});
-const linkProps = useForwardProps(reactiveOmit(
-  props,
-  "as",
-  "type",
-  "disabled",
-  "active",
-  "exact",
-  "exactQuery",
-  "exactHash",
-  "activeClass",
-  "inactiveClass",
-  "raw",
-  "class",
-  ...hasNuxtLink ? [] : ["to"]
-));
-function isPartiallyEqual(item1, item2) {
-  const diffedKeys = diff(item1, item2).reduce((filtered, q) => {
-    if (q.type === "added")
-      filtered.add(q.key);
-    return filtered;
-  }, /* @__PURE__ */ new Set());
-  const item1Filtered = Object.fromEntries(Object.entries(item1).filter(([key]) => !diffedKeys.has(key)));
-  const item2Filtered = Object.fromEntries(Object.entries(item2).filter(([key]) => !diffedKeys.has(key)));
-  return isEqual(item1Filtered, item2Filtered);
-}
-const isExternalLink = computed(() => {
-  const to = props.to || props.href;
-  if (!to)
-    return false;
-  if (props.target === "_blank")
-    return true;
-  return typeof to === "string" && hasProtocol(to, { acceptRelative: true });
-});
+const route = useRoute();
+const inheritProps = useForwardProps(reactivePick(props, "as", "type", "disabled"));
+const nuxtLinkProps = useForwardProps(reactiveOmit(props, "as", "type", "disabled", "active", "exact", "exactQuery", "exactHash", "activeClass", "inactiveClass", "to", "href", "raw", "custom", "class"));
+const to = computed(() => props.to ?? props.href);
 function isLinkActive({ route: linkRoute, isActive, isExactActive }) {
   if (props.active !== void 0)
     return props.active;
-  if (isExternalLink.value || !props.to)
-    return false;
   if (props.exactQuery === "partial") {
-    if (!isPartiallyEqual(linkRoute?.query, route.value?.query))
+    if (!isPartiallyEqual(linkRoute.query, route.query))
       return false;
-  } else if (props.exactQuery === true && !isEqual(linkRoute?.query, route.value?.query)) {
+  } else if (props.exactQuery === true && !isEqual(linkRoute.query, route.query)) {
     return false;
   }
-  if (props.exactHash && linkRoute?.hash !== route.value?.hash)
+  if (props.exactHash && linkRoute.hash !== route.hash)
     return false;
   if (props.exact && isExactActive)
     return true;
@@ -115,139 +64,47 @@ function isLinkActive({ route: linkRoute, isActive, isExactActive }) {
     return true;
   return false;
 }
-const { theme, createStyler } = useTheme();
-function resolveLinkClass({ route: route2, isActive, isExactActive } = {}) {
-  const { link } = theme.value;
-  const active = isLinkActive({ route: route2, isActive, isExactActive });
-  if (props.raw)
-    return [props.class, active ? props.activeClass : props.inactiveClass];
-  const styler = createStyler({
-    ...link,
+const appConfig = useAppConfig();
+const ui = computed(() => {
+  const link = merge(theme, {
+    ...appConfig.ui.link,
     variants: {
-      ...link.variants,
+      ...appConfig.ui.link?.variants,
       active: {
-        true: [link.variants.active.true, props.activeClass],
-        false: [link.variants.active.false, props.inactiveClass]
-      },
-      disabled: {
-        true: [link.variants.disabled.true, props.disableClass]
+        true: [appConfig.ui.link?.variants?.active?.true, props.activeClass].filter(Boolean).join(" "),
+        false: [appConfig.ui.link?.variants?.active?.false, props.inactiveClass].filter(Boolean).join(" ")
       }
     }
   });
-  return styler({ ...props, active }).base();
+  return cv(link)();
+});
+function resolveLinkClass({ route: route2, isActive, isExactActive }) {
+  const active = isLinkActive({ route: route2, isActive, isExactActive });
+  if (props.raw)
+    return [props.class, active ? props.activeClass : props.inactiveClass];
+  return ui.value.base({ ...props, active });
 }
 </script>
 
 <template>
-  <template v-if="hasRouter">
-    <component
-      :is="linkComponent.NuxtLink"
-      v-if="hasNuxtLink"
-      v-slot="{ href, navigate, route: linkRoute, rel, target, isExternal, isActive, isExactActive }"
-      v-bind="linkProps"
-      :href="to ? void 0 : href"
-      custom
-    >
-      <template v-if="custom">
-        <slot
-          v-bind="{
+  <NuxtLink
+    v-slot="{ href, navigate, route: linkRoute, rel, target, isExternal, isActive, isExactActive }"
+    v-bind="nuxtLinkProps"
+    :to="to"
+    custom
+  >
+    <template v-if="custom">
+      <slot
+        v-bind="{
   ...$attrs,
-  as,
-  type,
-  disabled,
+  ...props.exact && isExactActive ? { 'aria-current': props.ariaCurrentValue } : {},
+  ...inheritProps,
   href,
   navigate,
   rel,
   target,
   isExternal,
   active: isLinkActive({ route: linkRoute, isActive, isExactActive })
-}"
-        >
-          {{ props.label }}
-        </slot>
-      </template>
-      <LinkBase
-        v-else
-        v-bind="{
-  ...$attrs,
-  as,
-  type,
-  disabled,
-  href,
-  navigate,
-  rel,
-  target,
-  isExternal
-}"
-        :class="resolveLinkClass({ route: linkRoute, isActive, isExactActive })"
-        :data-part="$attrs['data-part'] ?? 'base'"
-      >
-        <slot :active="isLinkActive({ route: linkRoute, isActive, isExactActive })">
-          {{ props.label }}
-        </slot>
-      </LinkBase>
-    </component>
-    <component
-      :is="linkComponent.RouterLink"
-      v-else
-      v-slot="{ href, navigate, route: linkRoute, isActive, isExactActive }"
-      v-bind="linkProps"
-      :to="isExternalLink ? '#' : to || '#'"
-      custom
-    >
-      <template v-if="custom">
-        <slot
-          v-bind="{
-  ...$attrs,
-  ...isExternalLink ? {
-    href: to || props.href,
-    target: props.target
-  } : {
-    href: to ? href : void 0,
-    target: void 0
-  },
-  as,
-  type,
-  disabled,
-  navigate,
-  active: isLinkActive({ route: linkRoute, isActive, isExactActive }),
-  isExternal: isExternalLink
-}"
-        >
-          {{ props.label }}
-        </slot>
-      </template>
-      <LinkBase
-        v-else
-        v-bind="{
-  ...$attrs,
-  as,
-  type,
-  disabled,
-  href: to ? href : void 0,
-  navigate
-}"
-        :is-external="isExternalLink"
-        :class="resolveLinkClass({ route: linkRoute, isActive, isExactActive })"
-        :data-part="$attrs['data-part'] ?? 'base'"
-      >
-        <slot :active="isLinkActive({ route: linkRoute, isActive, isExactActive })">
-          {{ props.label }}
-        </slot>
-      </LinkBase>
-    </component>
-  </template>
-  <template v-else>
-    <template v-if="props.custom">
-      <slot
-        v-bind="{
-  ...$attrs,
-  as,
-  type,
-  disabled,
-  href: to || href,
-  target: target || (isExternalLink ? '_blank' : void 0),
-  active: false
 }"
       >
         {{ props.label }}
@@ -257,19 +114,19 @@ function resolveLinkClass({ route: route2, isActive, isExactActive } = {}) {
       v-else
       v-bind="{
   ...$attrs,
-  as,
-  type,
-  disabled,
-  href: typeof to === 'string' ? to : href,
-  target: target || (isExternalLink ? '_blank' : void 0)
+  ...props.exact && isExactActive ? { 'aria-current': props.ariaCurrentValue } : {},
+  ...inheritProps,
+  href,
+  navigate,
+  rel,
+  target,
+  isExternal
 }"
-      :is-external="isExternalLink"
-      :class="resolveLinkClass()"
-      :data-part="$attrs['data-part'] ?? 'base'"
+      :class="resolveLinkClass({ route: linkRoute, isActive, isExactActive })"
     >
-      <slot :active="false">
+      <slot :active="isLinkActive({ route: linkRoute, isActive, isExactActive })">
         {{ props.label }}
       </slot>
     </LinkBase>
-  </template>
+  </NuxtLink>
 </template>

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

@@ -1,13 +1,8 @@
 import type { PrimitiveProps } from 'reka-ui';
 import type { ButtonHTMLAttributes } from 'vue';
 import type { RouteLocationRaw, RouterLinkProps } from 'vue-router';
-import type { link } from '../theme/index.js';
-import type { ComponentAttrs } from '../types/index.js';
-export interface LinkSlots {
-    default?: (props: {
-        active: boolean;
-    }) => any;
-}
+import type { ComponentBaseProps } from '../types';
+import type { StaticSlot } from '../types/utils';
 interface NuxtLinkProps extends Omit<RouterLinkProps, 'to'> {
     /**
      * Route Location the link should navigate to when clicked on.
@@ -24,11 +19,11 @@ interface NuxtLinkProps extends Omit<RouterLinkProps, 'to'> {
     /**
      * Where to display the linked URL, as the name for a browsing context.
      */
-    target?: '_blank' | '_parent' | '_self' | '_top' | (string & {}) | null;
+    target?: '_blank' | '_parent' | '_self' | '_top' | (string & {});
     /**
      * A rel attribute value to apply on the link. Defaults to "noopener noreferrer" for external links.
      */
-    rel?: 'noopener' | 'noreferrer' | 'nofollow' | 'sponsored' | 'ugc' | (string & {}) | null;
+    rel?: 'noopener' | 'noreferrer' | 'nofollow' | 'sponsored' | 'ugc' | (string & {});
     /**
      * If set to true, no rel attribute will be added to the link
      */
@@ -53,7 +48,7 @@ interface NuxtLinkProps extends Omit<RouterLinkProps, 'to'> {
      */
     noPrefetch?: boolean;
 }
-export interface LinkProps extends Omit<ComponentAttrs<typeof link>, 'ui'>, NuxtLinkProps {
+export interface LinkProps extends ComponentBaseProps, NuxtLinkProps {
     /**
      * The element or component this component should render as when not a link.
      * @default "button"
@@ -70,23 +65,28 @@ export interface LinkProps extends Omit<ComponentAttrs<typeof link>, 'ui'>, Nuxt
     active?: boolean;
     /** Will only be active if the current route is an exact match. */
     exact?: boolean;
-    /** Will only be active if the current route query is an exact match. */
+    /** Allows controlling how the current route query sets the link as active. */
     exactQuery?: boolean | 'partial';
     /** Will only be active if the current route hash is an exact match. */
     exactHash?: boolean;
     /** The class to apply when the link is inactive. */
     inactiveClass?: string;
-    /** The class to apply when the link is disabled. */
-    disableClass?: string;
     custom?: boolean;
-    underline?: boolean;
-    /** When `true`, only styles from `class`, `ui.active`, and `ui.inactive` will be applied. */
+    /** When `true`, only styles from `class`, `activeClass`, and `inactiveClass` will be applied. */
     raw?: boolean;
 }
-declare const _default: __VLS_WithSlots<import("vue").DefineComponent<LinkProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<LinkProps> & Readonly<{}>, {
-    type: "button" | "submit" | "reset";
+export interface LinkSlots {
+    default: StaticSlot<{
+        active: boolean;
+    }>;
+}
+declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<LinkProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<LinkProps> & Readonly<{}>, {
+    active: boolean;
+    type: "reset" | "submit" | "button";
+    ariaCurrentValue: "page" | "step" | "location" | "date" | "time" | "true" | "false";
     as: import("reka-ui").AsTag | import("vue").Component;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, LinkSlots>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/runtime/components/LinkBase.vue

@@ -12,38 +12,19 @@ const props = defineProps({
   onClick: { type: [Function, Array], required: false },
   href: { type: String, required: false },
   navigate: { type: Function, required: false },
-  rel: { type: String, required: false },
-  target: { type: String, required: false },
+  target: { type: null, required: false },
+  rel: { type: null, required: false },
+  active: { type: Boolean, required: false },
   isExternal: { type: Boolean, required: false }
 });
-const wrapperProps = computed(() => {
-  const { href, rel, target, disabled } = props;
-  const baseProps = {
-    rel,
-    target
-  };
-  if (props.href) {
-    return {
-      ...baseProps,
-      "as": "a",
-      "href": disabled ? void 0 : href,
-      "aria-disabled": disabled ? "true" : void 0,
-      "role": disabled ? "link" : void 0,
-      "tabindex": disabled ? -1 : void 0
-    };
+const linkProps = computed(() => {
+  const { as, type, href, rel, target, disabled } = props;
+  if (href) {
+    return disabled ? { as: "a", ariaDisabled: "true", role: "link", tabindex: -1, rel, target } : { as: "a", href, rel, target };
   }
-  if (props.as === "button") {
-    return {
-      ...baseProps,
-      as: props.as,
-      type: props.type,
-      disabled
-    };
-  }
-  return {
-    ...baseProps,
-    as: props.as
-  };
+  if (as === "button")
+    return { as, type, disabled, rel, target };
+  return { as, rel, target };
 });
 function onClickWrapper(e) {
   if (props.disabled) {
@@ -61,10 +42,7 @@ function onClickWrapper(e) {
 </script>
 
 <template>
-  <Primitive
-    v-bind="wrapperProps"
-    @click="onClickWrapper"
-  >
+  <Primitive v-bind="linkProps" @click="onClickWrapper">
     <slot></slot>
   </Primitive>
 </template>

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

@@ -1,25 +1,30 @@
 import type { PrimitiveProps } from 'reka-ui';
+import type { LinkProps } from '../types';
+import type { MaybeNull } from '../types/utils';
 export interface LinkBaseProps {
     /**
      * The element or component this component should render as.
      * @default "button"
      */
     as?: PrimitiveProps['as'];
+    /** @default "button" */
     type?: string;
     disabled?: boolean;
     onClick?: ((e: MouseEvent) => void | Promise<void>) | Array<((e: MouseEvent) => void | Promise<void>)>;
     href?: string;
     navigate?: (e: MouseEvent) => void;
-    rel?: string;
-    target?: string;
+    target?: MaybeNull<LinkProps['target']>;
+    rel?: MaybeNull<LinkProps['rel']>;
+    active?: boolean;
     isExternal?: boolean;
 }
-declare const _default: __VLS_WithSlots<import("vue").DefineComponent<LinkBaseProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<LinkBaseProps> & Readonly<{}>, {
+declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<LinkBaseProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<LinkBaseProps> & Readonly<{}>, {
     type: string;
     as: import("reka-ui").AsTag | import("vue").Component;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
     default?: (props: {}) => any;
 }>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/runtime/components/Modal.vue

@@ -1,79 +1,92 @@
 <script>
-
+import theme from "#build/ui/modal";
 </script>
 
 <script setup>
 import { reactivePick } from "@vueuse/core";
 import { DialogClose, DialogContent, DialogDescription, DialogOverlay, DialogPortal, DialogRoot, DialogTitle, DialogTrigger, useForwardPropsEmits, VisuallyHidden } from "reka-ui";
 import { computed, toRef } from "vue";
+import { useAppConfig } from "#imports";
 import { useLocale } from "../composables/useLocale";
-import { useTheme } from "../composables/useTheme";
+import { usePortal } from "../composables/usePortal";
+import { cv, merge } from "../utils/style";
 import Button from "./Button.vue";
 const props = defineProps({
   title: { type: String, required: false },
   description: { type: String, required: false },
-  size: { type: null, required: false },
   content: { type: Object, required: false },
-  portal: { type: Boolean, required: false, default: true },
   overlay: { type: Boolean, required: false, default: true },
   transition: { type: Boolean, required: false, default: true },
+  fullscreen: { type: Boolean, required: false },
+  portal: { type: [Boolean, String], required: false, skipCheck: true, default: true },
+  close: { type: [Boolean, Object], required: false, default: true },
+  closeIcon: { type: [String, Object], required: false },
   dismissible: { type: Boolean, required: false, default: true },
-  close: { type: [Object, Boolean], required: false, default: true },
-  closeIcon: { type: String, required: false },
-  class: { type: null, required: false },
   ui: { type: null, required: false },
+  class: { type: [Object, String, Number, Boolean, null, Array], required: false, skipCheck: true },
   open: { type: Boolean, required: false },
   defaultOpen: { type: Boolean, required: false },
   modal: { type: Boolean, required: false, default: true }
 });
-const emit = defineEmits(["after-leave", "update:open"]);
+const emit = defineEmits(["after-leave", "after-enter", "close-prevent", "update:open"]);
 const slots = defineSlots();
 const rootProps = useForwardPropsEmits(reactivePick(props, "open", "defaultOpen", "modal"), emit);
-const contentProps = toRef(() => ({
+const portalProps = usePortal(toRef(() => props.portal));
+const contentProps = computed(() => ({
   ...props.content,
-  ...slots.content || slots.header || !props.description && !slots.description ? { "aria-describedby": void 0 } : {}
+  ...!!slots.content || !!slots.header || !props.description && !slots.description ? { "aria-describedby": void 0 } : {}
 }));
 const contentEvents = computed(() => {
   if (props.dismissible)
     return {};
-  return {
-    pointerDownOutside: (e) => e.preventDefault(),
-    interactOutside: (e) => e.preventDefault(),
-    escapeKeyDown: (e) => e.preventDefault()
-  };
+  const events = ["pointerDownOutside", "interactOutside", "escapeKeyDown"];
+  return events.reduce((acc, curr) => {
+    acc[curr] = (e) => {
+      e.preventDefault();
+      emit("close-prevent");
+    };
+    return acc;
+  }, {});
 });
 const { t } = useLocale();
-const { theme, generateStyle } = useTheme();
-const style = computed(() => generateStyle("modal", props));
+const appConfig = useAppConfig();
+const ui = computed(() => {
+  const styler = cv(merge(theme, appConfig.ui.modal));
+  return styler(props);
+});
 </script>
 
 <template>
-  <DialogRoot v-slot="{ open }" v-bind="rootProps">
-    <DialogTrigger
-      v-if="slots.default"
-      :class="props.class"
-      as-child
-    >
+  <DialogRoot v-slot="{ open, close }" v-bind="rootProps">
+    <DialogTrigger v-if="!!slots.default" as-child :class="props.class">
       <slot :open="open"></slot>
     </DialogTrigger>
-    <DialogPortal :disabled="!props.portal">
-      <DialogOverlay v-if="props.overlay" :class="style.overlay({ class: props.ui?.overlay })" data-part="overlay" />
 
-      <DialogContent :class="style.content({ class: props.ui?.content })" data-part="content" v-bind="contentProps" v-on="contentEvents" @after-leave="emit('after-leave')">
-        <VisuallyHidden v-if="slots.content || slots.header || !props.title && !slots.title">
+    <DialogPortal v-bind="portalProps">
+      <DialogOverlay v-if="props.overlay" :class="ui.overlay({ class: props.ui?.overlay })" data-part="overlay" />
+
+      <DialogContent
+        :class="ui.content({ class: [props.ui?.content, !slots.default && props.class] })"
+        v-bind="contentProps"
+        data-part="content"
+        @after-enter="emit('after-enter')"
+        @after-leave="emit('after-leave')"
+        v-on="contentEvents"
+      >
+        <VisuallyHidden v-if="!!slots.content || !!slots.header || !props.title && !slots.title">
           <DialogTitle />
         </VisuallyHidden>
 
-        <slot name="content">
+        <slot name="content" :close="close">
           <div
             v-if="slots.header || props.title || slots.title || props.description || slots.description || props.close || slots.close"
-            :class="style.header({ class: props.ui?.header })"
+            :class="ui.header({ class: props.ui?.header })"
             data-part="header"
           >
-            <slot name="header">
+            <slot name="header" :close="close">
               <DialogTitle
                 v-if="props.title || slots.title"
-                :class="style.title({ class: props.ui?.title })"
+                :class="ui.title({ class: props.ui?.title })"
                 data-part="title"
               >
                 <slot name="title">
@@ -82,13 +95,14 @@ const style = computed(() => generateStyle("modal", props));
               </DialogTitle>
 
               <DialogClose v-if="props.close || slots.close" as-child>
-                <slot name="close" :ui="props.ui">
+                <slot name="close" :close="close" :ui="ui">
                   <Button
                     variant="ghost"
-                    :icon="props.closeIcon || theme.app.icons.close"
+                    color="neutral"
+                    :icon="props.closeIcon || appConfig.ui.icons.close"
                     v-bind="typeof props.close === 'boolean' ? {} : props.close"
                     :aria-label="t('modal.close')"
-                    :class="style.close({ class: props.ui?.close })"
+                    :class="ui.close({ class: props.ui?.close })"
                     data-part="close"
                   />
                 </slot>
@@ -96,7 +110,7 @@ const style = computed(() => generateStyle("modal", props));
 
               <DialogDescription
                 v-if="props.description || slots.description"
-                :class="style.description({ class: props.ui?.description })"
+                :class="ui.description({ class: props.ui?.description })"
                 data-part="description"
               >
                 <slot name="description">
@@ -106,12 +120,12 @@ const style = computed(() => generateStyle("modal", props));
             </slot>
           </div>
 
-          <div v-if="slots.body" :class="style.body({ class: props.ui?.body })" data-part="body">
-            <slot name="body"></slot>
+          <div v-if="slots.body" :class="ui.body({ class: props.ui?.body })" data-part="body">
+            <slot name="body" :close="close"></slot>
           </div>
 
-          <div v-if="slots.footer" :class="style.footer({ class: props.ui?.footer })" data-part="footer">
-            <slot name="footer"></slot>
+          <div v-if="slots.footer" :class="ui.footer({ class: props.ui?.footer })" data-part="footer">
+            <slot name="footer" :close="close"></slot>
           </div>
         </slot>
       </DialogContent>