arthur/ui
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/ui.git synced 2026-01-26 18:00:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

test(Form): fix (#2153)

Browse Source
This commit is contained in:
Romain Hamel
2024-09-06 18:58:24 +02:00
committed by GitHub
parent 62a2643a80
commit 8c886279b2
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/components/Form.vue
View File

@@ -46,7 +46,7 @@ const props = withDefaults(defineProps<FormProps<T>>(), {
const emits = defineEmits<FormEmits<T>>()
defineSlots<FormSlots>()
const formId = props.id ?? useId()
const formId = props.id ?? useId() as string
const bus = useEventBus<FormEvent>(`form-${formId}`)
const parentBus = inject(

11
src/runtime/components/FormField.vue
View File

@@ -39,7 +39,7 @@ export interface FormFieldSlots {
import { computed, ref, inject, provide, type Ref, useId } from 'vue'
import { Label } from 'radix-vue'
import { formFieldInjectionKey } from '../composables/useFormField'
import type { FormError } from '../types/form'
import type { FormError, FormFieldInjectedOptions } from '../types/form'
const props = defineProps<FormFieldProps>()
const slots = defineSlots<FormFieldSlots>()
@@ -51,12 +51,7 @@ const ui = computed(() => formField({
const formErrors = inject<Ref<FormError[]> | null>('form-errors', null)
const error = computed(() => {
return (props.error && typeof props.error === 'string')
|| typeof props.error === 'boolean'
? props.error
: formErrors?.value?.find(error => error.name === props.name)?.message
})
const error = computed(() => props.error || formErrors?.value?.find(error => error.name === props.name)?.message)
const id = ref(useId())
@@ -67,7 +62,7 @@ provide(formFieldInjectionKey, computed(() => ({
size: props.size,
eagerValidation: props.eagerValidation,
validateOnInputDelay: props.validateOnInputDelay
})))
}) as FormFieldInjectedOptions<FormFieldProps>))
</script>
<template>