@aerogel/core 0.0.0-next.fcfbfdc3428c34c4d1c0e781b61d244f13232fc9 → 0.1.0-next.c4b24f52d8b652bd5c14c2d12e1b38b779ab7682

package/src/components/headless/HeadlessSwitch.vue

@@ -0,0 +1,96 @@
+<template>
+    <div :class="rootClass">
+        <label v-if="label" :for="expose.id" :class="labelClass">
+            {{ label }}
+        </label>
+        <SwitchRoot
+            :id="expose.id"
+            :name
+            :model-value="expose.value.value"
+            v-bind="$attrs"
+            :class="inputClass"
+            @update:model-value="$emit('update:modelValue', $event)"
+        >
+            <SwitchThumb :class="thumbClass" />
+        </SwitchRoot>
+    </div>
+</template>
+
+<script setup lang="ts" generic="T extends boolean = boolean">
+import { SwitchRoot, SwitchThumb } from 'reka-ui';
+import { computed, inject, readonly, watchEffect } from 'vue';
+import { uuid } from '@noeldemartin/utils';
+import type { HTMLAttributes } from 'vue';
+
+import type FormController from '@aerogel/core/forms/FormController';
+import type { FormFieldValue } from '@aerogel/core/forms/FormController';
+import type { InputEmits, InputExpose, InputProps } from '@aerogel/core/components/contracts/Input';
+
+defineOptions({ inheritAttrs: false });
+
+const {
+    name,
+    label,
+    description,
+    modelValue,
+    class: rootClass,
+} = defineProps<
+    InputProps<T> & {
+        class?: HTMLAttributes['class'];
+        labelClass?: HTMLAttributes['class'];
+        inputClass?: HTMLAttributes['class'];
+        thumbClass?: HTMLAttributes['class'];
+    }
+>();
+const emit = defineEmits<InputEmits>();
+const form = inject<FormController | null>('form', null);
+const errors = computed(() => {
+    if (!form || !name) {
+        return null;
+    }
+
+    return form.errors[name] ?? null;
+});
+
+const expose = {
+    id: `switch-${uuid()}`,
+    name: computed(() => name),
+    label: computed(() => label),
+    description: computed(() => description),
+    value: computed(() => {
+        if (form && name) {
+            return form.getFieldValue(name) as boolean;
+        }
+
+        return modelValue;
+    }),
+    errors: readonly(errors),
+    required: computed(() => {
+        if (!name || !form) {
+            return;
+        }
+
+        return form.getFieldRules(name).includes('required');
+    }),
+    update(value) {
+        if (form && name) {
+            form.setFieldValue(name, value as FormFieldValue);
+
+            return;
+        }
+
+        emit('update:modelValue', value);
+    },
+} satisfies InputExpose;
+
+defineExpose(expose);
+
+watchEffect(() => {
+    if (!description && !errors.value) {
+        return;
+    }
+
+    // eslint-disable-next-line no-console
+    console.warn('Errors and description not implemented in <HeadlessSwitch>');
+});
+</script>

package/src/components/headless/index.ts

@@ -16,4 +16,5 @@ export { default as HeadlessSelectOption } from './HeadlessSelectOption.vue';
 export { default as HeadlessSelectOptions } from './HeadlessSelectOptions.vue';
 export { default as HeadlessSelectTrigger } from './HeadlessSelectTrigger.vue';
 export { default as HeadlessSelectValue } from './HeadlessSelectValue.vue';
+export { default as HeadlessSwitch } from './HeadlessSwitch.vue';
 export { default as HeadlessToast } from './HeadlessToast.vue';

package/src/components/ui/AdvancedOptions.vue

@@ -1,7 +1,7 @@
 <template>
     <details class="group">
         <summary
-            class="-ml-2 flex w-[max-content] cursor-pointer items-center rounded-lg py-2 pr-3 pl-1 hover:bg-gray-100 focus-visible:outline focus-visible:outline-gray-700"
+            class="-ml-2 flex w-[max-content] items-center rounded-lg py-2 pr-3 pl-1 hover:bg-gray-100 focus-visible:outline focus-visible:outline-gray-700"
         >
             <IconCheveronRight class="size-6 transition-transform group-open:rotate-90" />
             <span>{{ $td('ui.advancedOptions', 'Advanced options') }}</span>

package/src/components/ui/AlertModal.vue

@@ -1,5 +1,5 @@
 <template>
-    <Modal :title>
+    <Modal :title="renderedTitle" :title-hidden="titleHidden">
         <Markdown :text="message" />
     </Modal>
 </template>
@@ -7,7 +7,11 @@
 <script setup lang="ts">
 import Modal from '@aerogel/core/components/ui/Modal.vue';
 import Markdown from '@aerogel/core/components/ui/Markdown.vue';
-import type { AlertModalProps } from '@aerogel/core/components/contracts/AlertModal';
+import { useAlertModal } from '@aerogel/core/components/contracts/AlertModal';
+import type { AlertModalExpose, AlertModalProps } from '@aerogel/core/components/contracts/AlertModal';
 
-defineProps<AlertModalProps>();
+const props = defineProps<AlertModalProps>();
+const { renderedTitle, titleHidden } = useAlertModal(props);
+
+defineExpose<AlertModalExpose>();
 </script>

package/src/components/ui/Button.vue

@@ -5,8 +5,10 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue';
+
 import HeadlessButton from '@aerogel/core/components/headless/HeadlessButton.vue';
-import { computedVariantClasses } from '@aerogel/core/utils/classes';
+import { variantClasses } from '@aerogel/core/utils/classes';
 import type { ButtonProps } from '@aerogel/core/components/contracts/Button';
 import type { Variants } from '@aerogel/core/utils/classes';
 
@@ -14,10 +16,10 @@ const { class: baseClasses, size, variant, disabled, ...props } = defineProps<Bu
 
 /* eslint-disable vue/max-len */
 // prettier-ignore
-const renderedClasses = computedVariantClasses<Variants<Pick<ButtonProps, 'size' | 'variant' | 'disabled'>>>(
+const renderedClasses = computed(() => variantClasses<Variants<Pick<ButtonProps, 'size' | 'variant' | 'disabled'>>>(
     { baseClasses, variant, size, disabled },
     {
-        baseClasses: 'flex items-center justify-center gap-1 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2',
+        baseClasses: 'focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2',
         variants: {
             variant: {
                 default: 'bg-primary-600 text-white focus-visible:outline-primary-600',
@@ -25,12 +27,12 @@ const renderedClasses = computedVariantClasses<Variants<Pick<ButtonProps, 'size'
                 danger: 'bg-red-600 text-white focus-visible:outline-red-600',
                 ghost: 'bg-transparent',
                 outline: 'bg-transparent text-primary-600 ring-primary-600',
-                link: 'text-primary-600',
+                link: 'text-links',
             },
             size: {
-                small: 'text-xs',
-                default: 'text-sm',
-                large: 'text-base',
+                small: 'text-xs min-h-6',
+                default: 'text-sm min-h-8',
+                large: 'text-base min-h-10',
                 icon: 'rounded-full p-2.5',
             },
             disabled: {
@@ -41,7 +43,7 @@ const renderedClasses = computedVariantClasses<Variants<Pick<ButtonProps, 'size'
         compoundVariants: [
             {
                 variant: ['default', 'secondary', 'danger', 'ghost', 'outline'],
-                class: 'font-medium',
+                class: 'flex items-center justify-center gap-1 font-medium',
             },
             {
                 variant: ['default', 'danger'],
@@ -79,13 +81,28 @@ const renderedClasses = computedVariantClasses<Variants<Pick<ButtonProps, 'size'
             {
                 variant: 'danger',
                 disabled: false,
-                class: 'hover:bg-red-50',
+                class: 'hover:bg-red-500',
             },
             {
                 variant: 'link',
                 disabled: false,
                 class: 'hover:underline',
             },
+            {
+                variant: 'link',
+                size: 'small',
+                class: 'leading-6',
+            },
+            {
+                variant: 'link',
+                size: 'default',
+                class: 'leading-8',
+            },
+            {
+                variant: 'link',
+                size: 'large',
+                class: 'leading-10',
+            },
         ],
         defaultVariants: {
             variant: 'default',
@@ -93,6 +110,6 @@ const renderedClasses = computedVariantClasses<Variants<Pick<ButtonProps, 'size'
             disabled: false,
         },
     },
-);
+));
 /* eslint-enable vue/max-len */
 </script>

package/src/components/ui/ConfirmModal.vue

@@ -1,5 +1,11 @@
 <template>
-    <Modal v-slot="{ close }" :title persistent>
+    <!-- @vue-generic {import('@aerogel/core/ui/UI').ModalExposeResult<ConfirmModalExpose>} -->
+    <Modal
+        v-slot="{ close }"
+        :title="renderedTitle"
+        :title-hidden="titleHidden"
+        persistent
+    >
         <Form :form @submit="close([true, form.data()])">
             <Markdown :text="message" :actions />
 
@@ -35,8 +41,10 @@ import Markdown from '@aerogel/core/components/ui/Markdown.vue';
 import Button from '@aerogel/core/components/ui/Button.vue';
 import Modal from '@aerogel/core/components/ui/Modal.vue';
 import { useConfirmModal } from '@aerogel/core/components/contracts/ConfirmModal';
-import type { ConfirmModalProps } from '@aerogel/core/components/contracts/ConfirmModal';
+import type { ConfirmModalExpose, ConfirmModalProps } from '@aerogel/core/components/contracts/ConfirmModal';
 
 const { cancelVariant = 'secondary', ...props } = defineProps<ConfirmModalProps>();
-const { form, renderedAcceptText, renderedCancelText } = useConfirmModal(props);
+const { form, renderedTitle, titleHidden, renderedAcceptText, renderedCancelText } = useConfirmModal(props);
+
+defineExpose<ConfirmModalExpose>();
 </script>

package/src/components/ui/DropdownMenuOption.vue

@@ -1,14 +1,22 @@
 <template>
-    <DropdownMenuItem
-        class="flex w-full items-center gap-2 rounded-lg px-2 py-2 text-sm text-gray-900 data-[highlighted]:bg-gray-100"
-        @select="$emit('select')"
-    >
+    <DropdownMenuItem :class="renderedClasses" v-bind="props" @select="$emit('select')">
         <slot />
     </DropdownMenuItem>
 </template>
 
 <script setup lang="ts">
+import { classes } from '@aerogel/core/utils';
+import { computed } from 'vue';
 import { DropdownMenuItem } from 'reka-ui';
+import type { HTMLAttributes } from 'vue';
+import type { PrimitiveProps } from 'reka-ui';
 
 defineEmits<{ select: [] }>();
+
+const { class: rootClass, ...props } = defineProps<{ class?: HTMLAttributes['class'] } & PrimitiveProps>();
+const renderedClasses = computed(() =>
+    classes(
+        'flex w-full items-center gap-2 rounded-lg px-2 py-2 text-sm text-gray-900 data-[highlighted]:bg-gray-100',
+        rootClass,
+    ));
 </script>

package/src/components/ui/DropdownMenuOptions.vue

@@ -5,7 +5,23 @@
         :side="dropdownMenu.side"
     >
         <slot>
-            <DropdownMenuOption v-for="(option, key) in dropdownMenu.options" :key @select="option.click">
+            <DropdownMenuOption
+                v-for="(option, key) in dropdownMenu.options"
+                :key
+                :as="option.route || option.href ? HeadlessButton : undefined"
+                :class="option.class"
+                v-bind="
+                    option.route || option.href
+                        ? {
+                            href: option.href,
+                            route: option.route,
+                            routeParams: option.routeParams,
+                            routeQuery: option.routeQuery,
+                        }
+                        : {}
+                "
+                @select="option.click?.()"
+            >
                 {{ option.label }}
             </DropdownMenuOption>
         </slot>
@@ -19,6 +35,7 @@ import { injectReactiveOrFail } from '@aerogel/core/utils';
 import type { DropdownMenuExpose } from '@aerogel/core/components/contracts/DropdownMenu';
 
 import DropdownMenuOption from './DropdownMenuOption.vue';
+import HeadlessButton from '../headless/HeadlessButton.vue';
 
 const dropdownMenu = injectReactiveOrFail<DropdownMenuExpose>(
     'dropdown-menu',

package/src/components/ui/ErrorLogs.vue

@@ -0,0 +1,19 @@
+<template>
+    <Button
+        v-if="$errors.logs.length > 0"
+        size="icon"
+        variant="ghost"
+        :title="$td('errors.viewLogs', 'View error logs')"
+        :aria-label="$td('errors.viewLogs', 'View error logs')"
+        @click="$ui.modal(ErrorLogsModal)"
+    >
+        <IconWarning class="size-6 text-red-500" />
+    </Button>
+</template>
+
+<script setup lang="ts">
+import IconWarning from '~icons/ion/warning';
+
+import Button from '@aerogel/core/components/ui/Button.vue';
+import ErrorLogsModal from '@aerogel/core/components/ui/ErrorLogsModal.vue';
+</script>

package/src/components/ui/ErrorLogsModal.vue

@@ -0,0 +1,48 @@
+<template>
+    <Modal :title="$td('errors.report', 'Errors ({count})', { count: $errors.logs.length })">
+        <ol>
+            <li
+                v-for="(log, index) of $errors.logs"
+                :key="index"
+                class="mb-2 flex max-w-prose min-w-56 justify-between py-2 last:mb-0"
+            >
+                <div>
+                    <h3 class="font-medium">
+                        {{ log.report.title }}
+                    </h3>
+                    <time :datetime="log.date.toISOString()" class="text-xs text-gray-700">
+                        {{ log.date.toLocaleTimeString() }}
+                    </time>
+                    <Markdown
+                        class="text-sm text-gray-500"
+                        :text="log.report.description ?? getErrorMessage(log.report)"
+                    />
+                </div>
+                <Button
+                    size="icon"
+                    variant="ghost"
+                    :aria-label="$td('errors.viewDetails', 'View details')"
+                    :title="$td('errors.viewDetails', 'View details')"
+                    class="self-center"
+                    @click="
+                        $errors.inspect(
+                            log.report,
+                            $errors.logs.map(({ report }) => report)
+                        )
+                    "
+                >
+                    <IconViewShow class="size-4" aria-hidden="true" />
+                </Button>
+            </li>
+        </ol>
+    </Modal>
+</template>
+
+<script setup lang="ts">
+import IconViewShow from '~icons/zondicons/view-show';
+
+import Button from '@aerogel/core/components/ui/Button.vue';
+import Modal from '@aerogel/core/components/ui/Modal.vue';
+import Markdown from '@aerogel/core/components/ui/Markdown.vue';
+import { getErrorMessage } from '@aerogel/core/errors';
+</script>

package/src/components/ui/ErrorReportModal.vue

@@ -1,12 +1,18 @@
 <template>
-    <Modal wrapper-class="p-0 sm:w-auto sm:min-w-lg sm:max-w-[80vw]">
+    <Modal
+        :title="$td('errors.report', 'Error report')"
+        title-hidden
+        close-hidden
+        class="p-0"
+        wrapper-class="sm:w-auto sm:min-w-lg sm:max-w-[80vw]"
+    >
         <div class="px-4 pt-5 pb-4">
             <h2 class="flex justify-between gap-4">
                 <div class="flex items-center gap-2">
                     <IconExclamationSolid class="size-5 text-red-600" />
                     <ErrorReportModalTitle
                         class="text-lg leading-6 font-semibold text-gray-900"
-                        :report="report"
+                        :report="activeReport"
                         :current-report="activeReportIndex + 1"
                         :total-reports="reports.length"
                     />
@@ -33,11 +39,11 @@
                         </Button>
                     </span>
                 </div>
-                <ErrorReportModalButtons :report class="gap-0.5" />
+                <ErrorReportModalButtons :report="activeReport" class="gap-0.5" />
             </h2>
-            <Markdown v-if="report.description" :text="report.description" class="text-gray-600" />
+            <Markdown v-if="activeReport.description" :text="activeReport.description" class="text-gray-600" />
         </div>
-        <div class="-mt-2 max-h-[80vh] overflow-auto bg-red-800/10">
+        <div class="-mt-2 max-h-[75vh] overflow-auto bg-red-800/10">
             <pre class="p-4 text-xs text-red-800" v-text="details" />
         </div>
     </Modal>
@@ -54,9 +60,14 @@ import ErrorReportModalButtons from '@aerogel/core/components/ui/ErrorReportModa
 import ErrorReportModalTitle from '@aerogel/core/components/ui/ErrorReportModalTitle.vue';
 import Modal from '@aerogel/core/components/ui/Modal.vue';
 import { useErrorReportModal } from '@aerogel/core/components/contracts/ErrorReportModal';
-import type { ErrorReportModalProps } from '@aerogel/core/components/contracts/ErrorReportModal';
+import type {
+    ErrorReportModalExpose,
+    ErrorReportModalProps,
+} from '@aerogel/core/components/contracts/ErrorReportModal';
 
 const props = defineProps<ErrorReportModalProps>();
 
-const { activeReportIndex, details, nextReportText, previousReportText, report } = useErrorReportModal(props);
+const { activeReportIndex, details, nextReportText, previousReportText, activeReport } = useErrorReportModal(props);
+
+defineExpose<ErrorReportModalExpose>();
 </script>

package/src/components/ui/Input.vue

@@ -48,8 +48,8 @@ const renderedInputClasses = computed(() =>
         'block w-full rounded-md border-0 py-1.5 ring-1 ring-inset focus:ring-2 focus:ring-inset sm:text-sm sm:leading-6',
         {
             'focus:ring-primary-600': !$input.value?.errors,
-            'text-gray-900 shadow-2xs ring-gray-300 placeholder:text-gray-400': !$input.value?.errors,
-            'pr-10 text-red-900 ring-red-300 placeholder:text-red-300 focus:ring-red-500': $input.value?.errors,
+            'text-gray-900 shadow-2xs ring-gray-900/10 placeholder:text-gray-400': !$input.value?.errors,
+            'pr-10 text-red-900 ring-red-900/10 placeholder:text-red-300 focus:ring-red-500': $input.value?.errors,
         },
         inputClass,
     ));

package/src/components/ui/LoadingModal.vue

@@ -25,8 +25,10 @@ import Markdown from '@aerogel/core/components/ui/Markdown.vue';
 import Modal from '@aerogel/core/components/ui/Modal.vue';
 import ProgressBar from '@aerogel/core/components/ui/ProgressBar.vue';
 import { useLoadingModal } from '@aerogel/core/components/contracts/LoadingModal';
-import type { LoadingModalProps } from '@aerogel/core/components/contracts/LoadingModal';
+import type { LoadingModalExpose, LoadingModalProps } from '@aerogel/core/components/contracts/LoadingModal';
 
 const props = defineProps<LoadingModalProps>();
 const { renderedTitle, renderedMessage, titleHidden, showProgress } = useLoadingModal(props);
+
+defineExpose<LoadingModalExpose>();
 </script>

package/src/components/ui/Markdown.vue

@@ -7,7 +7,7 @@ import { computed, h, useAttrs } from 'vue';
 import { isInstanceOf } from '@noeldemartin/utils';
 import type { VNode } from 'vue';
 
-import { renderMarkdown } from '@aerogel/core/utils/markdown';
+import { getMarkdownRouter, renderMarkdown } from '@aerogel/core/utils/markdown';
 import { translate, translateWithDefault } from '@aerogel/core/lang';
 import { renderVNode } from '@aerogel/core/utils/vue';
 
@@ -65,5 +65,33 @@ async function onClick(event: Event) {
 
         return;
     }
+
+    if (isInstanceOf(target, HTMLAnchorElement) && target.dataset.markdownRoute) {
+        const router = getMarkdownRouter();
+
+        if (router) {
+            event.preventDefault();
+
+            router.visit(target.dataset.markdownRoute);
+        }
+
+        return;
+    }
 }
 </script>
+
+<style scoped>
+/* @apply .text-links .font-normal .no-underline .hover:underline; */
+* :deep(a) {
+    --tw-font-weight: var(--font-weight-normal);
+    text-decoration-line: none;
+    color: var(--color-links);
+    font-weight: var(--font-weight-normal);
+}
+
+@media (hover: hover) {
+    * :deep(a:hover) {
+        text-decoration-line: underline;
+    }
+}
+</style>

package/src/components/ui/Modal.vue

@@ -1,29 +1,48 @@
 <template>
+    <!-- @vue-generic {T} -->
     <HeadlessModal
         v-slot="{ close }"
         v-bind="props"
         :ref="($modal) => forwardRef($modal as HeadlessModalInstance)"
         :persistent
     >
-        <HeadlessModalOverlay class="fixed inset-0 bg-black/30" />
+        <HeadlessModalOverlay
+            class="fixed inset-0 animate-[fade-in_var(--tw-duration)_ease-in-out] transition-opacity duration-300 will-change-[opacity]"
+            :class="{
+                'bg-black/30': context.childIndex === 1,
+                'opacity-0': context.childIndex === 1 && context.modal.closing,
+            }"
+        />
         <HeadlessModalContent v-bind="contentProps" :class="renderedWrapperClass">
-            <div v-if="!persistent && dismissable" class="absolute top-0 right-0 hidden pt-1.5 pr-1.5 sm:block">
-                <Button variant="ghost" size="icon" @click="close()">
+            <div v-if="!persistent && !closeHidden" class="absolute top-0 right-0 hidden pt-3.5 pr-2.5 sm:block">
+                <button
+                    type="button"
+                    class="clickable z-10 rounded-full p-2.5 text-gray-400 hover:text-gray-500"
+                    @click="close()"
+                >
                     <span class="sr-only">{{ $td('ui.close', 'Close') }}</span>
-                    <IconClose class="size-3 text-gray-400" />
-                </Button>
+                    <IconClose class="size-4" />
+                </button>
             </div>
 
             <HeadlessModalTitle
                 v-if="title"
-                class="text-base font-semibold text-gray-900"
-                :class="{ 'sr-only': titleHidden }"
+                class="px-4 pt-5 text-base font-semibold text-gray-900"
+                :class="{
+                    'sr-only': titleHidden,
+                    'pb-0': description && !descriptionHidden,
+                    'pb-2': !description || descriptionHidden,
+                }"
             >
                 <Markdown :text="title" inline />
             </HeadlessModalTitle>
 
-            <HeadlessModalDescription v-if="description" :class="{ 'sr-only': descriptionHidden }">
-                <Markdown :text="description" class="mt-1 text-sm leading-6 text-gray-500" />
+            <HeadlessModalDescription
+                v-if="description"
+                class="px-4 pt-1 pb-2"
+                :class="{ 'sr-only': descriptionHidden }"
+            >
+                <Markdown :text="description" class="text-sm leading-6 text-gray-500" />
             </HeadlessModalDescription>
 
             <div :class="renderedContentClass">
@@ -33,59 +52,80 @@
     </HeadlessModal>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" generic="T = void">
 import IconClose from '~icons/zondicons/close';
 
+import { after } from '@noeldemartin/utils';
 import { computed } from 'vue';
 import { useForwardExpose } from 'reka-ui';
-import type { HTMLAttributes, Ref } from 'vue';
+import type { ComponentPublicInstance, HTMLAttributes, Ref } from 'vue';
 import type { Nullable } from '@noeldemartin/utils';
 
 import Markdown from '@aerogel/core/components/ui/Markdown.vue';
-import Button from '@aerogel/core/components/ui/Button.vue';
 import HeadlessModal from '@aerogel/core/components/headless/HeadlessModal.vue';
 import HeadlessModalContent from '@aerogel/core/components/headless/HeadlessModalContent.vue';
 import HeadlessModalDescription from '@aerogel/core/components/headless/HeadlessModalDescription.vue';
 import HeadlessModalOverlay from '@aerogel/core/components/headless/HeadlessModalOverlay.vue';
 import HeadlessModalTitle from '@aerogel/core/components/headless/HeadlessModalTitle.vue';
+import UI from '@aerogel/core/ui/UI';
 import { classes } from '@aerogel/core/utils/classes';
+import { injectReactiveOrFail } from '@aerogel/core/utils/vue';
+import { useEvent } from '@aerogel/core/utils/composition/events';
+import type { AcceptRefs } from '@aerogel/core/utils/vue';
 import type { ModalExpose, ModalProps, ModalSlots } from '@aerogel/core/components/contracts/Modal';
-import type { AcceptRefs } from '@aerogel/core/utils';
+import type { UIModalContext } from '@aerogel/core/ui/UI';
 
-type HeadlessModalInstance = InstanceType<typeof HeadlessModal>;
+type HeadlessModalInstance = ComponentPublicInstance & ModalExpose<T>;
 
 const {
     class: contentClass = '',
-    dismissable = true,
     wrapperClass = '',
     title,
     titleHidden,
     description,
     persistent,
+    closeHidden,
     ...props
 } = defineProps<
     ModalProps & {
-        dismissable?: boolean;
         wrapperClass?: HTMLAttributes['class'];
         class?: HTMLAttributes['class'];
+        closeHidden?: boolean;
     }
 >();
 
-defineExpose<AcceptRefs<ModalExpose>>({
+defineSlots<ModalSlots<T>>();
+defineExpose<AcceptRefs<ModalExpose<T>>>({
     close: async (result) => $modal.value?.close(result),
     $content: computed(() => $modal.value?.$content),
 });
 
 const { forwardRef, currentRef } = useForwardExpose<HeadlessModalInstance>();
 const $modal = currentRef as Ref<Nullable<HeadlessModalInstance>>;
+const context = injectReactiveOrFail<UIModalContext>('modal');
+const inForeground = computed(() => !context.modal.closing && context.childIndex === UI.openModals.length);
 const contentProps = computed(() => (description ? {} : { 'aria-describedby': undefined }));
-const renderedContentClass = computed(() => classes({ 'mt-2': title && !titleHidden }, contentClass));
+const renderedContentClass = computed(() =>
+    classes('max-h-[90vh] overflow-auto px-4 pb-4', { 'pt-4': !title || titleHidden }, contentClass));
 const renderedWrapperClass = computed(() =>
     classes(
-        // eslint-disable-next-line vue/max-len
-        'fixed top-1/2 left-1/2 z-50 w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl sm:max-w-lg',
+        'isolate fixed top-1/2 left-1/2 z-50 w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2',
+        'overflow-hidden rounded-lg bg-white text-left shadow-xl sm:max-w-lg',
+        'animate-[fade-in_var(--tw-duration)_ease-in-out,grow_var(--tw-duration)_ease-in-out]',
+        'transition-[scale,opacity] will-change-[scale,opacity] duration-300',
+        {
+            'scale-50 opacity-0': !inForeground.value,
+            'scale-100 opacity-100': inForeground.value,
+        },
         wrapperClass,
     ));
 
-defineSlots<ModalSlots>();
+useEvent('modal-will-close', async ({ modal: { id } }) => {
+    if (id !== context.modal.id) {
+        return;
+    }
+
+    // Wait for transitions to finish
+    await after({ ms: 300 });
+});
 </script>