From 175229384fa3a6c55fcdd9ec06d14795aadd96d5 Mon Sep 17 00:00:00 2001
From: Romain Hamel <rom.hml@gmail.com>
Date: Tue, 10 Sep 2024 14:09:42 +0200
Subject: [PATCH] chore(Form): catch-up with `v2` changes (#2165)

Co-authored-by: Benjamin Canac <canacb1@gmail.com>
---
 src/runtime/components/Form.vue         |  9 +++------
 src/runtime/components/FormField.vue    |  5 +++--
 src/runtime/components/RadioGroup.vue   |  2 +-
 src/runtime/components/Textarea.vue     |  4 ++++
 src/runtime/composables/useFormField.ts | 22 +++++++++++++---------
 src/runtime/types/form.ts               |  1 -
 test/components/Form.spec.ts            |  3 ++-
 test/components/RadioGroup.spec.ts      |  8 +++++++-
 8 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/runtime/components/Form.vue b/src/runtime/components/Form.vue
index 9437c0e6..ee824ad7 100644
--- a/src/runtime/components/Form.vue
+++ b/src/runtime/components/Form.vue
@@ -157,15 +157,12 @@ async function _validate(opts: { name?: string | string[], silent?: boolean, nes
 }
 
 async function onSubmit(payload: Event) {
-  const event = payload as SubmitEvent
+  const event = payload as FormSubmitEvent<any>
 
   try {
     await _validate({ nested: true })
-    const submitEvent: FormSubmitEvent<any> = {
-      ...event,
-      data: props.state
-    }
-    emits('submit', submitEvent)
+    event.data = props.state
+    emits('submit', event)
   } catch (error) {
     if (!(error instanceof FormValidationException)) {
       throw error
diff --git a/src/runtime/components/FormField.vue b/src/runtime/components/FormField.vue
index 30ed69f3..1d682f1c 100644
--- a/src/runtime/components/FormField.vue
+++ b/src/runtime/components/FormField.vue
@@ -38,7 +38,7 @@ export interface FormFieldSlots {
 <script setup lang="ts">
 import { computed, ref, inject, provide, type Ref, useId } from 'vue'
 import { Label } from 'radix-vue'
-import { formFieldInjectionKey } from '../composables/useFormField'
+import { formFieldInjectionKey, inputIdInjectionKey } from '../composables/useFormField'
 import type { FormError, FormFieldInjectedOptions } from '../types/form'
 
 const props = defineProps<FormFieldProps>()
@@ -55,8 +55,9 @@ const error = computed(() => props.error || formErrors?.value?.find(error => err
 
 const id = ref(useId())
 
+provide(inputIdInjectionKey, id)
+
 provide(formFieldInjectionKey, computed(() => ({
-  id: id.value,
   error: error.value,
   name: props.name,
   size: props.size,
diff --git a/src/runtime/components/RadioGroup.vue b/src/runtime/components/RadioGroup.vue
index feafcf49..d226d9f6 100644
--- a/src/runtime/components/RadioGroup.vue
+++ b/src/runtime/components/RadioGroup.vue
@@ -69,7 +69,7 @@ const slots = defineSlots<RadioGroupSlots<T>>()
 
 const rootProps = useForwardPropsEmits(reactivePick(props, 'as', 'modelValue', 'defaultValue', 'orientation', 'loop', 'required'), emits)
 
-const { emitFormChange, emitFormInput, color, name, size, id: _id, disabled } = useFormField<RadioGroupProps<T>>(props)
+const { emitFormChange, emitFormInput, color, name, size, id: _id, disabled } = useFormField<RadioGroupProps<T>>(props, { bind: false })
 const id = _id.value ?? useId()
 
 const ui = computed(() => radioGroup({
diff --git a/src/runtime/components/Textarea.vue b/src/runtime/components/Textarea.vue
index 63cf188e..b06e9276 100644
--- a/src/runtime/components/Textarea.vue
+++ b/src/runtime/components/Textarea.vue
@@ -132,6 +132,8 @@ function autoResize() {
     }
 
     textareaRef.value.rows = props.rows
+    const overflow = textareaRef.value.style.overflow
+    textareaRef.value.style.overflow = 'hidden'
 
     const styles = window.getComputedStyle(textareaRef.value)
     const paddingTop = Number.parseInt(styles.paddingTop)
@@ -144,6 +146,8 @@ function autoResize() {
     if (newRows > props.rows) {
       textareaRef.value.rows = props.maxrows ? Math.min(newRows, props.maxrows) : newRows
     }
+
+    textareaRef.value.style.overflow = overflow
   }
 }
 
diff --git a/src/runtime/composables/useFormField.ts b/src/runtime/composables/useFormField.ts
index b896c46a..87c7f098 100644
--- a/src/runtime/composables/useFormField.ts
+++ b/src/runtime/composables/useFormField.ts
@@ -18,22 +18,26 @@ type Props<T> = {
 export const formOptionsInjectionKey: InjectionKey<ComputedRef<FormInjectedOptions>> = Symbol('nuxt-ui.form-options')
 export const formBusInjectionKey: InjectionKey<UseEventBusReturn<FormEvent, string>> = Symbol('nuxt-ui.form-events')
 export const formFieldInjectionKey: InjectionKey<ComputedRef<FormFieldInjectedOptions<FormFieldProps>>> = Symbol('nuxt-ui.form-field')
+export const inputIdInjectionKey: InjectionKey<Ref<string | undefined>> = Symbol('nuxt-ui.input-id')
 export const formInputsInjectionKey: InjectionKey<Ref<Record<string, string>>> = Symbol('nuxt-ui.form-inputs')
 
-export function useFormField<T>(props?: Props<T>) {
+export function useFormField<T>(props?: Props<T>, opts?: { bind?: boolean }) {
   const formOptions = inject(formOptionsInjectionKey, undefined)
   const formBus = inject(formBusInjectionKey, undefined)
   const formField = inject(formFieldInjectionKey, undefined)
   const formInputs = inject(formInputsInjectionKey, undefined)
+  const inputId = inject(inputIdInjectionKey, undefined)
 
-  if (formField) {
-    if (props?.id) {
-      // Updates for="..." attribute on label if props.id is provided
-      formField.value.id = props?.id
+  if (formField && inputId) {
+    if (opts?.bind === false || props?.legend) {
+      // Removes for="..." attribute on label for RadioGroup and alike.
+      inputId.value = undefined
+    } else if (props?.id) {
+      // Updates for="..." attribute on label if props.id is provided.
+      inputId.value = props?.id
     }
-
-    if (formInputs && formField.value.name) {
-      formInputs.value[formField.value.name] = formField.value.id
+    if (formInputs && formField.value.name && inputId.value) {
+      formInputs.value[formField.value.name] = inputId.value
     }
   }
 
@@ -62,7 +66,7 @@ export function useFormField<T>(props?: Props<T>) {
   )
 
   return {
-    id: computed(() => props?.id ?? formField?.value.id),
+    id: computed(() => props?.id ?? inputId?.value),
     name: computed(() => props?.name ?? formField?.value.name),
     size: computed(() => props?.size ?? formField?.value.size),
     color: computed(() => formField?.value.error ? 'error' : props?.color),
diff --git a/src/runtime/types/form.ts b/src/runtime/types/form.ts
index cdcacdab..9b49161e 100644
--- a/src/runtime/types/form.ts
+++ b/src/runtime/types/form.ts
@@ -71,7 +71,6 @@ export interface FormInjectedOptions {
 }
 
 export interface FormFieldInjectedOptions<T> {
-  id: string
   name?: string
   size?: GetObjectField<T, 'size'>
   error?: string | boolean
diff --git a/test/components/Form.spec.ts b/test/components/Form.spec.ts
index 8a2f0c31..4af10d91 100644
--- a/test/components/Form.spec.ts
+++ b/test/components/Form.spec.ts
@@ -228,7 +228,7 @@ describe('Form', () => {
       expect(passwordField.text()).toBe('Required')
     })
 
-    test('valid submit works', async () => {
+    test('validate on submit works', async () => {
       state.email = 'bob@dylan.com'
       state.password = 'strongpassword'
 
@@ -236,6 +236,7 @@ describe('Form', () => {
 
       expect(wrapper.setupState.onSubmit).toHaveBeenCalledTimes(1)
       expect(wrapper.setupState.onSubmit).toHaveBeenCalledWith(expect.objectContaining({
+        type: 'submit',
         data: {
           email: 'bob@dylan.com',
           password: 'strongpassword'
diff --git a/test/components/RadioGroup.spec.ts b/test/components/RadioGroup.spec.ts
index 77a12b09..1f043fcd 100644
--- a/test/components/RadioGroup.spec.ts
+++ b/test/components/RadioGroup.spec.ts
@@ -72,7 +72,7 @@ describe('RadioGroup', () => {
           items: ['Option 1', 'Option 2']
         },
         slotTemplate: `
-        <UFormField name="value">
+        <UFormField name="value" label="Radio group">
           <URadioGroup id="input" v-model="state.value" :items="items" />
         </UFormField>
         `
@@ -107,5 +107,11 @@ describe('RadioGroup', () => {
       await flushPromises()
       expect(wrapper.text()).not.toContain('Error message')
     })
+
+    test('no label for=... on FormField', async () => {
+      const { wrapper } = await createForm()
+      const formFieldLabel = wrapper.findAll('label').map(label => label.attributes()).filter(label => !label.for?.includes('Option'))[0]
+      expect(formFieldLabel.for).toBeUndefined()
+    })
   })
 })