From 0414f82d53ec2b784c0652affa94492ce1d5519f Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Fri, 5 Jul 2024 17:02:53 +0200
Subject: [PATCH] refactor: AdressItem typing

---
 .../globals/formItems/AdressItem.vue          | 85 ++++++++++---------
 app/src/composables/form.ts                   |  5 ++
 app/src/types/form.ts                         | 28 ++++++
 3 files changed, 79 insertions(+), 39 deletions(-)
 create mode 100644 app/src/composables/form.ts
 create mode 100644 app/src/types/form.ts

diff --git a/app/src/components/globals/formItems/AdressItem.vue b/app/src/components/globals/formItems/AdressItem.vue
index 6d6a0a4d..5e2caf72 100644
--- a/app/src/components/globals/formItems/AdressItem.vue
+++ b/app/src/components/globals/formItems/AdressItem.vue
@@ -1,35 +1,36 @@
 <script setup lang="ts">
-type CustomEmail = {
-  localPart: string | null
-  separator: string
-  domain: string | null
-}
+import type {
+  AdressItemProps,
+  AdressModelValue,
+  BaseItemComputedProps,
+} from '@/types/form'
 
-const props = withDefaults(
-  defineProps<{
-    modelValue: CustomEmail
-    choices: string[]
-    placeholder?: string
-    id?: string
-    state?: false | null
-    type?: string
-  }>(),
+withDefaults(
+  defineProps<AdressItemProps & BaseItemComputedProps<AdressModelValue>>(),
   {
-    placeholder: undefined,
     id: undefined,
-    state: undefined,
+    name: undefined,
+    placeholder: undefined,
+    touchKey: undefined,
     type: 'email',
+
+    modelValue: undefined,
+    state: undefined,
+    validation: undefined,
+    ariaDescribedby: undefined,
   },
 )
 
 const emit = defineEmits<{
-  'update:modelValue': [value: CustomEmail]
+  'update:modelValue': [value: AdressModelValue]
 }>()
 
-function onInput(key: 'localPart' | 'domain', modelValue: string | null) {
+const model = defineModel<AdressModelValue>({ required: true })
+
+function onInput(key: 'localPart' | 'domain', value: string | null) {
   emit('update:modelValue', {
-    ...props.modelValue,
-    [key]: modelValue,
+    ...model.value,
+    [key]: value,
   })
 }
 </script>
@@ -37,32 +38,38 @@ function onInput(key: 'localPart' | 'domain', modelValue: string | null) {
 <template>
   <BInputGroup v-bind="$attrs">
     <InputItem
-      :id="id"
-      :modelValue="modelValue.localPart"
+      :id="`${id}-local-part`"
       :placeholder="placeholder"
-      :state="state"
-      :aria-describedby="id + 'local-part-desc'"
-      @update:modelValue="onInput('localPart', $event)"
+      touch-key="localPart"
+      :model-value="model.localPart"
+      :aria-describedby="`${id}-local-part-desc`"
+      :state="validation?.localPart?.$error ? false : null"
+      :validation="validation?.localPart"
+      @update:model-value="onInput('localPart', $event as string)"
     />
 
     <BInputGroupText>{{ modelValue.separator }}</BInputGroupText>
 
     <SelectItem
-      :modelValue="modelValue.domain"
+      :id="`${id}-domain`"
+      touch-key="domain"
+      :model-value="modelValue.domain"
       :choices="choices"
-      :aria-describedby="id + 'domain-desc'"
-      @update:modelValue="onInput('domain', $event)"
-    />
-
-    <span
-      class="visually-hidden"
-      :id="id + 'local-part-desc'"
-      v-t="'address.local_part_description.' + type"
-    />
-    <span
-      class="visually-hidden"
-      :id="id + 'domain-desc'"
-      v-t="'address.domain_description.' + type"
+      :aria-describedby="`${id}-domain-desc`"
+      :state="validation?.domain?.$error ? false : null"
+      :validation="validation?.domain"
+      @update:model-value="onInput('domain', $event)"
     />
   </BInputGroup>
+
+  <span
+    :id="`${id}-local-part-desc`"
+    v-t="'address.local_part_description.' + type"
+    class="visually-hidden"
+  />
+  <span
+    :id="`${id}-domain-desc`"
+    v-t="'address.domain_description.' + type"
+    class="visually-hidden"
+  />
 </template>
diff --git a/app/src/composables/form.ts b/app/src/composables/form.ts
new file mode 100644
index 00000000..ff2b6803
--- /dev/null
+++ b/app/src/composables/form.ts
@@ -0,0 +1,5 @@
+import type { InjectionKey } from 'vue'
+
+export const ValidationTouchSymbol = Symbol() as InjectionKey<
+  (key?: string) => void
+>
diff --git a/app/src/types/form.ts b/app/src/types/form.ts
new file mode 100644
index 00000000..0ac585ad
--- /dev/null
+++ b/app/src/types/form.ts
@@ -0,0 +1,28 @@
+import type { BaseValidation } from '@vuelidate/core'
+type StateValidation = false | null
+
+// WRITABLE
+
+type BaseWritableItemProps = {
+  id?: string
+  name?: string
+  placeholder?: string
+  touchKey?: string
+}
+
+export type BaseItemComputedProps<MV extends any = any> = {
+  ariaDescribedby?: string | string[]
+  modelValue?: MV
+  state?: StateValidation
+  validation?: BaseValidation
+}
+
+export type AdressItemProps = BaseWritableItemProps & {
+  choices: string[]
+  type?: 'domain' | 'email'
+}
+export type AdressModelValue = {
+  localPart: string | null
+  separator: string
+  domain: string | null
+}