feat(Form): improve form control and input validation trigger (#487)

Co-authored-by: Benjamin Canac <canacb1@gmail.com>
This commit is contained in:
Romain Hamel
2023-08-12 16:48:53 +02:00
committed by Benjamin Canac
parent 60bb74675c
commit 6d7973f6e1
23 changed files with 529 additions and 381 deletions

View File

@@ -1,7 +1,6 @@
<template>
<div :class="wrapperClass">
<input
:id="name"
ref="input"
v-model.number="value"
:name="name"
@@ -24,7 +23,7 @@ import { computed, defineComponent } from 'vue'
import type { PropType } from 'vue'
import { defu } from 'defu'
import { classNames } from '../../utils'
import { useFormEvents } from '../../composables/useFormEvents'
import { useFormGroup } from '../../composables/useFormGroup'
import { useAppConfig } from '#imports'
// TODO: Remove
// @ts-expect-error
@@ -83,7 +82,9 @@ export default defineComponent({
const ui = computed<Partial<typeof appConfig.ui.range>>(() => defu({}, props.ui, appConfig.ui.range))
const { emitFormBlur } = useFormEvents()
const { emitFormChange, formGroup } = useFormGroup()
const color = computed(() => formGroup?.error?.value ? 'red' : props.color)
const size = computed(() => formGroup?.size?.value ?? props.size)
const value = computed({
get () {
@@ -96,13 +97,13 @@ export default defineComponent({
const onChange = (event: Event) => {
emit('change', event)
emitFormBlur()
emitFormChange()
}
const wrapperClass = computed(() => {
return classNames(
ui.value.wrapper,
ui.value.size[props.size]
ui.value.size[size.value]
)
})
@@ -111,8 +112,8 @@ export default defineComponent({
ui.value.base,
ui.value.background,
ui.value.rounded,
ui.value.ring.replaceAll('{color}', props.color),
ui.value.size[props.size]
ui.value.ring.replaceAll('{color}', color.value),
ui.value.size[size.value]
)
})
@@ -120,10 +121,10 @@ export default defineComponent({
return classNames(
ui.value.thumb.base,
// Intermediate class to allow thumb ring or background color (set to `current`) as it's impossible to safelist with arbitrary values
ui.value.thumb.color.replaceAll('{color}', props.color),
ui.value.thumb.color.replaceAll('{color}', color.value),
ui.value.thumb.ring,
ui.value.thumb.background,
ui.value.thumb.size[props.size]
ui.value.thumb.size[size.value]
)
})
@@ -132,7 +133,7 @@ export default defineComponent({
ui.value.track.base,
ui.value.track.background,
ui.value.track.rounded,
ui.value.track.size[props.size]
ui.value.track.size[size.value]
)
})
@@ -140,8 +141,8 @@ export default defineComponent({
return classNames(
ui.value.progress.base,
ui.value.progress.rounded,
ui.value.progress.background.replaceAll('{color}', props.color),
ui.value.progress.size[props.size]
ui.value.progress.background.replaceAll('{color}', color.value),
ui.value.progress.size[size.value]
)
})