@aerogel/core 0.0.0-next.b18f4e0acd39431045c2f444c711303890143193 → 0.0.0-next.b3caf219a503ce9b8c65ef1463132c9507f56c0a

package/src/components/headless/HeadlessInput.vue

@@ -0,0 +1,59 @@
+<template>
+    <component :is="as">
+        <slot />
+    </component>
+</template>
+
+<script setup lang="ts">
+import { computed, inject, provide, readonly } from 'vue';
+import { uuid } from '@noeldemartin/utils';
+
+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';
+
+const { as = 'div', name, label, description, modelValue } = defineProps<InputProps & { as?: string }>();
+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 context = {
+    id: `input-${uuid()}`,
+    name: computed(() => name),
+    label: computed(() => label),
+    description: computed(() => description),
+    value: computed(() => {
+        if (form && name) {
+            return form.getFieldValue(name);
+        }
+
+        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;
+
+provide('input', context);
+defineExpose(context);
+</script>

package/src/components/headless/HeadlessInputDescription.vue

@@ -0,0 +1,27 @@
+<template>
+    <slot :id="`${input.id}-description`">
+        <AGMarkdown
+            v-if="show"
+            v-bind="$attrs"
+            :id="`${input.id}-description`"
+            :text="text"
+        />
+    </slot>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+
+import AGMarkdown from '@aerogel/core/components/lib/AGMarkdown.vue';
+import { injectReactiveOrFail } from '@aerogel/core/utils/vue';
+import type { InputExpose } from '@aerogel/core/components/contracts/Input';
+
+defineOptions({ inheritAttrs: false });
+
+const input = injectReactiveOrFail<InputExpose>(
+    'input',
+    '<HeadlessInputDescription> must be a child of a <HeadlessInput>',
+);
+const text = computed(() => (typeof input.description === 'string' ? input.description : ''));
+const show = computed(() => !!input.description);
+</script>

package/src/components/headless/{forms/AGHeadlessInputError.vue → HeadlessInputError.vue}

@@ -7,15 +7,11 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 
-import { injectReactiveOrFail } from '@/utils/vue';
-import { translateWithDefault } from '@/lang/utils';
+import { injectReactiveOrFail } from '@aerogel/core/utils/vue';
+import { translateWithDefault } from '@aerogel/core/lang/utils';
+import type { InputExpose } from '@aerogel/core/components/contracts/Input';
 
-import type { IAGHeadlessInput } from './AGHeadlessInput';
-
-const input = injectReactiveOrFail<IAGHeadlessInput>(
-    'input',
-    '<AGHeadlessInputError> must be a child of a <AGHeadlessInput>',
-);
+const input = injectReactiveOrFail<InputExpose>('input', '<HeadlessInputError> must be a child of a <HeadlessInput>');
 const errorMessage = computed(() => {
     if (!input.errors) {
         return null;

package/src/components/headless/HeadlessInputInput.vue

@@ -0,0 +1,75 @@
+<template>
+    <input
+        :id="input.id"
+        ref="$input"
+        :name="name"
+        :type="type"
+        :required="input.required ?? undefined"
+        :aria-invalid="input.errors ? 'true' : 'false'"
+        :aria-describedby="
+            input.errors ? `${input.id}-error` : input.description ? `${input.id}-description` : undefined
+        "
+        :checked="checked"
+        @input="update"
+    >
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watchEffect } from 'vue';
+
+import { injectReactiveOrFail } from '@aerogel/core/utils/vue';
+import { onFormFocus } from '@aerogel/core/components/utils';
+import type { FormFieldValue } from '@aerogel/core/forms/FormController';
+import type { InputExpose } from '@aerogel/core/components/contracts/Input';
+
+const { type = 'text' } = defineProps<{ type?: string }>();
+const $input = ref<HTMLInputElement>();
+const input = injectReactiveOrFail<InputExpose>('input', '<HeadlessInputInput> must be a child of a <HeadlessInput>');
+const name = computed(() => input.name ?? undefined);
+const value = computed(() => input.value);
+const checked = computed(() => {
+    if (type !== 'checkbox') {
+        return;
+    }
+
+    return !!value.value;
+});
+
+function update() {
+    if (!$input.value) {
+        return;
+    }
+
+    input.update(getValue());
+}
+
+function getValue(): FormFieldValue | null {
+    if (!$input.value) {
+        return null;
+    }
+
+    switch (type) {
+        case 'checkbox':
+            return $input.value.checked;
+        case 'date':
+            return $input.value.valueAsDate;
+        default:
+            return $input.value.value;
+    }
+}
+
+onFormFocus(input, () => $input.value?.focus());
+watchEffect(() => {
+    if (!$input.value) {
+        return;
+    }
+
+    if (type === 'date') {
+        $input.value.valueAsDate = value.value as Date;
+
+        return;
+    }
+
+    $input.value.value = (value.value as string) ?? null;
+});
+</script>

package/src/components/headless/{forms/AGHeadlessInputLabel.vue → HeadlessInputLabel.vue}

@@ -9,14 +9,10 @@
 <script setup lang="ts">
 import { computed, useSlots } from 'vue';
 
-import { injectReactiveOrFail } from '@/utils/vue';
+import { injectReactiveOrFail } from '@aerogel/core/utils/vue';
+import type { InputExpose } from '@aerogel/core/components/contracts/Input';
 
-import type { IAGHeadlessInput } from './AGHeadlessInput';
-
-const input = injectReactiveOrFail<IAGHeadlessInput>(
-    'input',
-    '<AGHeadlessInputLabel> must be a child of a <AGHeadlessInput>',
-);
+const input = injectReactiveOrFail<InputExpose>('input', '<HeadlessInputLabel> must be a child of a <HeadlessInput>');
 const slots = useSlots();
 const show = computed(() => !!(input.label || slots.default));
 </script>

package/src/components/headless/HeadlessInputTextArea.vue

@@ -0,0 +1,40 @@
+<template>
+    <textarea
+        :id="input.id"
+        ref="$textArea"
+        :name="name"
+        :required="input.required ?? undefined"
+        :value="value"
+        :aria-invalid="input.errors ? 'true' : 'false'"
+        :aria-describedby="
+            input.errors ? `${input.id}-error` : input.description ? `${input.id}-description` : undefined
+        "
+        @input="update"
+    />
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+
+import { onFormFocus } from '@aerogel/core/components/utils';
+import { injectReactiveOrFail } from '@aerogel/core/utils/vue';
+import type { InputExpose } from '@aerogel/core/components/contracts/Input';
+
+const $textArea = ref<HTMLTextAreaElement>();
+const input = injectReactiveOrFail<InputExpose>(
+    'input',
+    '<HeadlessInputTextArea> must be a child of a <HeadlessInput>',
+);
+const name = computed(() => input.name ?? undefined);
+const value = computed(() => input.value as string);
+
+function update() {
+    if (!$textArea.value) {
+        return;
+    }
+
+    input.update($textArea.value.value);
+}
+
+onFormFocus(input, () => $textArea.value?.focus());
+</script>

package/src/components/headless/{modals/AGHeadlessModal.vue → HeadlessModal.vue}

@@ -1,29 +1,30 @@
 <template>
-    <Dialog ref="$root" :open="true" @close="cancellable && close()">
-        <slot :close="close" />
-    </Dialog>
+    <DialogRoot ref="$root" :open="true" @update:open="persistent || close()">
+        <DialogPortal>
+            <slot :close="close" />
+        </DialogPortal>
+    </DialogRoot>
 </template>
 
 <script setup lang="ts">
-import { ref, toRef } from 'vue';
-import { Dialog } from '@headlessui/vue';
-import type { VNode } from 'vue';
+import { ref } from 'vue';
+import { DialogPortal, DialogRoot } from 'reka-ui';
 
-import Events from '@/services/Events';
-import { useEvent } from '@/utils/composition/events';
-import { injectReactiveOrFail } from '@/utils/vue';
-import type { IAGModalContext } from '@/components/modals/AGModalContext';
+import Events from '@aerogel/core/services/Events';
+import { useEvent } from '@aerogel/core/utils/composition/events';
+import { injectReactiveOrFail } from '@aerogel/core/utils/vue';
+import type { UIModalContext } from '@aerogel/core/ui/UI.state';
+import type { ModalProps, ModalSlots } from '@aerogel/core/components/contracts/Modal';
 
-import { useModalProps } from './AGHeadlessModal';
-import type { IAGHeadlessModal, IAGHeadlessModalDefaultSlotProps } from './AGHeadlessModal';
+defineProps<ModalProps>();
+defineSlots<ModalSlots>();
 
-const props = defineProps(useModalProps());
 const $root = ref<{ $el?: HTMLElement } | null>(null);
 const hidden = ref(true);
 const closed = ref(false);
-const { modal } = injectReactiveOrFail<IAGModalContext>(
+const { modal } = injectReactiveOrFail<UIModalContext>(
     'modal',
-    'could not obtain modal reference from <AGHeadlessModal>, ' +
+    'could not obtain modal reference from <HeadlessModal>, ' +
         'did you render this component manually? Show it using $ui.openModal() instead',
 );
 
@@ -80,7 +81,4 @@ useEvent('show-modal', async ({ id }) => {
 
     await show();
 });
-
-defineSlots<{ default(props: IAGHeadlessModalDefaultSlotProps): VNode[] }>();
-defineExpose<IAGHeadlessModal>({ close, cancellable: toRef(props, 'cancellable') });
 </script>

package/src/components/headless/HeadlessModalContent.vue

@@ -0,0 +1,24 @@
+<template>
+    <DialogContent>
+        <slot />
+
+        <ModalContext v-if="childModal" :child-index="childIndex + 1" :modal="childModal" />
+    </DialogContent>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import { DialogContent } from 'reka-ui';
+
+import ModalContext from '@aerogel/core/components/ui/ModalContext.vue';
+import UI from '@aerogel/core/ui/UI';
+import { injectReactiveOrFail } from '@aerogel/core/utils/vue';
+import type { UIModalContext } from '@aerogel/core/ui/UI.state';
+
+const { childIndex = 0 } = injectReactiveOrFail<UIModalContext>(
+    'modal',
+    'could not obtain modal reference from <HeadlessModalContent>, ' +
+        'did you render this component manually? Show it using $ui.openModal() instead',
+);
+const childModal = computed(() => UI.modals[childIndex] ?? null);
+</script>

package/src/components/headless/HeadlessModalOverlay.vue

@@ -0,0 +1,12 @@
+<template>
+    <DialogOverlay v-bind="props">
+        <slot />
+    </DialogOverlay>
+</template>
+
+<script setup lang="ts">
+import { DialogOverlay } from 'reka-ui';
+import type { DialogOverlayProps } from 'reka-ui';
+
+const props = defineProps<DialogOverlayProps>();
+</script>

package/src/components/headless/HeadlessModalTitle.vue

@@ -0,0 +1,12 @@
+<template>
+    <DialogTitle v-bind="props">
+        <slot />
+    </DialogTitle>
+</template>
+
+<script setup lang="ts">
+import { DialogTitle } from 'reka-ui';
+import type { DialogTitleProps } from 'reka-ui';
+
+const props = defineProps<DialogTitleProps>();
+</script>

package/src/components/headless/forms/AGHeadlessSelect.ts

@@ -1,9 +1,9 @@
 import type { ComputedRef, DeepReadonly, ExtractPropTypes, Ref } from 'vue';
 import type { Writable } from '@noeldemartin/utils';
 
-import { mixedProp, requiredArrayProp, stringProp } from '@/utils/vue';
-import { extractComponentProps } from '@/components/utils';
-import type { FormFieldValue } from '@/forms/Form';
+import { mixedProp, requiredArrayProp, stringProp } from '@aerogel/core/utils/vue';
+import { extractComponentProps } from '@aerogel/core/components/utils';
+import type { FormFieldValue } from '@aerogel/core/forms/FormController';
 
 export interface IAGHeadlessSelect {
     id: string;

package/src/components/headless/forms/AGHeadlessSelect.vue

@@ -1,23 +1,20 @@
 <template>
-    <Listbox
-        v-slot="{ value, open, disabled }: ComponentProps"
-        :model-value="selectedOption"
-        @update:model-value="update($event)"
-    >
-        <slot :value="value" :open="open" :disabled="disabled" />
-    </Listbox>
+    <SelectRoot v-slot="{ open }: ComponentProps" :model-value="selectedOption" @update:model-value="update($event)">
+        <slot :model-value="modelValue" :open="open" />
+    </SelectRoot>
 </template>
 
 <script setup lang="ts">
 import { computed, inject, provide } from 'vue';
 import { toString, uuid } from '@noeldemartin/utils';
-import { Listbox } from '@headlessui/vue';
+import { SelectRoot } from 'reka-ui';
+import type { AcceptableValue } from 'reka-ui';
 
-import { mixedProp } from '@/utils/vue';
-import { translateWithDefault } from '@/lang/utils';
-import type Form from '@/forms/Form';
-import type { FormFieldValue } from '@/forms/Form';
-import type { ComponentProps } from '@/utils/vue';
+import { mixedProp } from '@aerogel/core/utils/vue';
+import { translateWithDefault } from '@aerogel/core/lang/utils';
+import type FormController from '@aerogel/core/forms/FormController';
+import type { FormFieldValue } from '@aerogel/core/forms/FormController';
+import type { ComponentProps } from '@aerogel/core/utils/vue';
 
 import { useSelectEmits, useSelectProps } from './AGHeadlessSelect';
 import type { IAGHeadlessSelect } from './AGHeadlessSelect';
@@ -38,9 +35,11 @@ const renderText = computed(() => {
 
     return (option: FormFieldValue) => toString(option);
 });
-const form = inject<Form | null>('form', null);
+const form = inject<FormController | null>('form', null);
 const noSelectionText = computed(() => props.noSelectionText ?? translateWithDefault('select.noSelection', '-'));
-const selectedOption = computed(() => (form && props.name ? form.getFieldValue(props.name) : props.modelValue));
+const selectedOption = computed(
+    () => (form && props.name ? form.getFieldValue(props.name) : props.modelValue) as AcceptableValue,
+);
 const errors = computed(() => {
     if (!form || !props.name) {
         return null;
@@ -49,7 +48,8 @@ const errors = computed(() => {
     return form.errors[props.name] ?? null;
 });
 
-function update(value: FormFieldValue) {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function update(value: any) {
     if (form && props.name) {
         form.setFieldValue(props.name, value);
 

package/src/components/headless/forms/AGHeadlessSelectError.vue

@@ -7,8 +7,8 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 
-import { injectReactiveOrFail } from '@/utils/vue';
-import { translateWithDefault } from '@/lang/utils';
+import { injectReactiveOrFail } from '@aerogel/core/utils/vue';
+import { translateWithDefault } from '@aerogel/core/lang/utils';
 
 import type { IAGHeadlessSelect } from './AGHeadlessSelect';
 

package/src/components/headless/forms/AGHeadlessSelectOption.vue

@@ -1,31 +1,23 @@
 <template>
-    <ListboxOption v-slot="{ active, selected, disabled }: ComponentProps" :value="value" as="template">
-        <slot :active="active" :selected="selected" :disabled="disabled">
-            <li
-                :class="{
-                    [activeClass ?? 'active']: active,
-                    [inactiveClass ?? 'inactive']: !active,
-                    [selectedClass ?? 'selected']: selected,
-                    [unselectedClass ?? 'unselected']: !selected,
-                }"
-            >
+    <SelectItem :value="value" as="template">
+        <SelectItemText>
+            <slot>
                 {{ select.renderText(value) }}
-            </li>
-        </slot>
-    </ListboxOption>
+            </slot>
+        </SelectItemText>
+    </SelectItem>
 </template>
 
 <script setup lang="ts">
-import { ListboxOption } from '@headlessui/vue';
+import { SelectItem, SelectItemText } from 'reka-ui';
 
-import { injectReactiveOrFail, requiredMixedProp, stringProp } from '@/utils/vue';
-import type { ComponentProps } from '@/utils/vue';
-import type { FormFieldValue } from '@/forms/Form';
+import { injectReactiveOrFail, requiredMixedProp, stringProp } from '@aerogel/core/utils/vue';
 
 import type { IAGHeadlessSelect } from './AGHeadlessSelect';
 
 defineProps({
-    value: requiredMixedProp<FormFieldValue>(),
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    value: requiredMixedProp<any>(),
     selectedClass: stringProp(),
     unselectedClass: stringProp(),
     activeClass: stringProp(),

package/src/components/headless/forms/AGHeadlessSelectOptions.vue

@@ -0,0 +1,19 @@
+<template>
+    <SelectPortal>
+        <SelectContent :class="classes">
+            <SelectViewport>
+                <slot />
+            </SelectViewport>
+        </SelectContent>
+    </SelectPortal>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import { SelectContent, SelectPortal, SelectViewport } from 'reka-ui';
+
+import { stringProp } from '@aerogel/core/utils/vue';
+
+const props = defineProps({ class: stringProp('') });
+const classes = computed(() => props.class);
+</script>

package/src/components/headless/forms/AGHeadlessSelectTrigger.vue

@@ -0,0 +1,25 @@
+<template>
+    <SelectTrigger>
+        <SelectValue>
+            <slot>
+                <span :class="textClass">{{ select?.buttonText }}</span>
+            </slot>
+            <slot name="icon" />
+        </SelectValue>
+    </SelectTrigger>
+</template>
+
+<script setup lang="ts">
+import { SelectTrigger, SelectValue } from 'reka-ui';
+
+import { injectReactiveOrFail, stringProp } from '@aerogel/core/utils/vue';
+
+import type { IAGHeadlessSelect } from './AGHeadlessSelect';
+
+defineProps({ textClass: stringProp() });
+
+const select = injectReactiveOrFail<IAGHeadlessSelect>(
+    'select',
+    '<AGHeadlessSelectTrigger> must be a child of a <AGHeadlessSelect>',
+);
+</script>

package/src/components/headless/forms/composition.ts

@@ -0,0 +1,10 @@
+import { inject, onUnmounted } from 'vue';
+
+import type FormController from '@aerogel/core/forms/FormController';
+
+export function onFormFocus(input: { name: string | null }, listener: () => unknown): void {
+    const form = inject<FormController | null>('form', null);
+    const stop = form?.on('focus', (name) => input.name === name && listener());
+
+    onUnmounted(() => stop?.());
+}

package/src/components/headless/forms/index.ts

@@ -1,14 +1,8 @@
-export * from './AGHeadlessInput';
+export * from './composition';
 export * from './AGHeadlessSelect';
 export * from './AGHeadlessSelectOption';
-export { default as AGHeadlessButton } from './AGHeadlessButton.vue';
-export { default as AGHeadlessInput } from './AGHeadlessInput.vue';
-export { default as AGHeadlessInputError } from './AGHeadlessInputError.vue';
-export { default as AGHeadlessInputInput } from './AGHeadlessInputInput.vue';
-export { default as AGHeadlessInputLabel } from './AGHeadlessInputLabel.vue';
 export { default as AGHeadlessSelect } from './AGHeadlessSelect.vue';
-export { default as AGHeadlessSelectButton } from './AGHeadlessSelectButton.vue';
+export { default as AGHeadlessSelectTrigger } from './AGHeadlessSelectTrigger.vue';
 export { default as AGHeadlessSelectError } from './AGHeadlessSelectError.vue';
-export { default as AGHeadlessSelectLabel } from './AGHeadlessSelectLabel.vue';
 export { default as AGHeadlessSelectOption } from './AGHeadlessSelectOption.vue';
-export { default as AGHeadlessSelectOptions } from './AGHeadlessSelectOptions';
+export { default as AGHeadlessSelectOptions } from './AGHeadlessSelectOptions.vue';

package/src/components/headless/index.ts

@@ -1,3 +1,14 @@
 export * from './forms';
-export * from './modals';
 export * from './snackbars';
+
+export { default as HeadlessButton } from './HeadlessButton.vue';
+export { default as HeadlessInput } from './HeadlessInput.vue';
+export { default as HeadlessInputDescription } from './HeadlessInputDescription.vue';
+export { default as HeadlessInputError } from './HeadlessInputError.vue';
+export { default as HeadlessInputInput } from './HeadlessInputInput.vue';
+export { default as HeadlessInputLabel } from './HeadlessInputLabel.vue';
+export { default as HeadlessInputTextArea } from './HeadlessInputTextArea.vue';
+export { default as HeadlessModal } from './HeadlessModal.vue';
+export { default as HeadlessModalContent } from './HeadlessModalContent.vue';
+export { default as HeadlessModalOverlay } from './HeadlessModalOverlay.vue';
+export { default as HeadlessModalTitle } from './HeadlessModalTitle.vue';

package/src/components/headless/snackbars/index.ts

@@ -1,9 +1,9 @@
 import type { ExtractPropTypes } from 'vue';
 import type { ObjectWithoutEmpty } from '@noeldemartin/utils';
 
-import UI from '@/ui/UI';
-import { arrayProp, enumProp, requiredStringProp } from '@/utils/vue';
-import { Colors } from '@/components/constants';
+import UI from '@aerogel/core/ui/UI';
+import { arrayProp, enumProp, requiredStringProp } from '@aerogel/core/utils/vue';
+import { Colors } from '@aerogel/core/components/constants';
 import { objectWithout } from '@noeldemartin/utils';
 
 export { default as AGHeadlessSnackbar } from './AGHeadlessSnackbar.vue';

package/src/components/index.ts

@@ -1,11 +1,13 @@
-import AGAppLayout from './AGAppLayout.vue';
-import AGAppOverlays from './AGAppOverlays.vue';
+import AppLayout from './AppLayout.vue';
+import AppOverlays from './AppOverlays.vue';
 
-export { AGAppLayout, AGAppOverlays };
+export { AppLayout, AppOverlays };
 
+export * from './composition';
 export * from './constants';
+export * from './contracts';
 export * from './forms';
 export * from './headless';
 export * from './lib';
-export * from './modals';
 export * from './snackbars';
+export * from './ui';

package/src/components/lib/AGErrorMessage.vue

@@ -5,12 +5,12 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 
-import Errors from '@/errors/Errors';
-import { requiredObjectProp } from '@/utils/vue';
-import type { ErrorSource } from '@/errors/Errors.state';
+import { requiredObjectProp } from '@aerogel/core/utils/vue';
+import { getErrorMessage } from '@aerogel/core/errors/utils';
+import type { ErrorSource } from '@aerogel/core/errors/Errors.state';
 
 import AGMarkdown from './AGMarkdown.vue';
 
 const props = defineProps({ error: requiredObjectProp<ErrorSource>() });
-const message = computed(() => Errors.getErrorMessage(props.error));
+const message = computed(() => getErrorMessage(props.error));
 </script>