From a8ee97baa07ef75cb899b09a1ef2f8049075b2fe Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 7 Dec 2023 19:29:40 -0300
Subject: [PATCH] feat: focus the first field, which depends

---
 frontend/src/components/grouping/ContactGroupComponent.vue | 6 +++++-
 frontend/src/pages/FormBCeIDPage.vue                       | 2 +-
 frontend/src/pages/bceidform/ContactWizardStep.vue         | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/grouping/ContactGroupComponent.vue b/frontend/src/components/grouping/ContactGroupComponent.vue
index 89d4cdaf2b..16496c19a0 100644
--- a/frontend/src/components/grouping/ContactGroupComponent.vue
+++ b/frontend/src/components/grouping/ContactGroupComponent.vue
@@ -92,7 +92,11 @@ const nameTypesToCodeDescr = (
 };
 
 onMounted(() => {
-  setFocusedComponent(`address_${props.id}`, 800);
+  if (props.id === 0) {
+    setFocusedComponent(`phoneNumber_${props.id}`, 800);
+  } else {
+    setFocusedComponent(`firstName_${props.id}`, 800);
+  }
 });
 
 const updateContactType = (value: CodeNameType | undefined) => {
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index f6d38d1936..9e4489c15f 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -355,7 +355,7 @@ const scrollToNewContact = () => {
     // Skip auto-focus so to do it only when scroll is done.
     const index = contactWizardRef.value.addContact(false) - 1;
     setScrollPoint(`additional-contact-${index}`, undefined, () => {
-      setFocusedComponent(`addressname_${index}`);
+      setFocusedComponent(`firstName_${index}`);
     });
   }
 };
diff --git a/frontend/src/pages/bceidform/ContactWizardStep.vue b/frontend/src/pages/bceidform/ContactWizardStep.vue
index f88b4e00ed..61dc55e8e5 100644
--- a/frontend/src/pages/bceidform/ContactWizardStep.vue
+++ b/frontend/src/pages/bceidform/ContactWizardStep.vue
@@ -75,7 +75,7 @@ const addContact = (autoFocus = true) => {
   );
   if (autoFocus) {
     const focusIndex = newLength - 1;
-    setFocusedComponent(`addressname_${focusIndex}`);
+    setFocusedComponent(`firstName_${focusIndex}`);
   }
   return newLength;
 };
@@ -129,7 +129,7 @@ const handleRemove = (index: number) => {
   });
 };
 
-onMounted(() => setFocusedComponent("addressname_0", 800));
+onMounted(() => setFocusedComponent("phoneNumber_0", 800));
 
 defineExpose({
   addContact,