From df6b5b16e1e1e774fec728300bddb960e045b50b Mon Sep 17 00:00:00 2001
From: Brandon Marshall <bmarshal@adobe.com>
Date: Wed, 19 Feb 2025 11:53:32 -0800
Subject: [PATCH] QA Fixes

---
 libs/blocks/marketo/marketo-multi.js |  4 +++-
 libs/blocks/marketo/marketo.css      | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/libs/blocks/marketo/marketo-multi.js b/libs/blocks/marketo/marketo-multi.js
index 19221332b0..4a4f5bafb2 100644
--- a/libs/blocks/marketo/marketo-multi.js
+++ b/libs/blocks/marketo/marketo-multi.js
@@ -10,6 +10,7 @@ const VALIDATION_STEP = {
   state: '3',
   postcode: '3',
   mktoFormsPrimaryProductInterest: '3',
+  mktoFormsCompanyType: '3',
 };
 
 function updateStepDetails(formEl, step, totalSteps) {
@@ -18,6 +19,7 @@ function updateStepDetails(formEl, step, totalSteps) {
   formEl.dataset.step = step;
   formEl.querySelector('.step-details .step').textContent = `Step ${step} of ${totalSteps}`;
   formEl.querySelector('#mktoButton_new').textContent = step === totalSteps ? 'Submit' : 'Next';
+  formEl.querySelector(`.mktoFormRowTop[data-validate="${step}"]:not(.mktoHidden) input`)?.focus();
 }
 
 function showPreviousStep(formEl, totalSteps) {
@@ -60,7 +62,7 @@ function setValidationSteps(formEl, totalSteps) {
   formEl.querySelectorAll('.mktoFormRowTop').forEach((row) => {
     const rowAttr = row.getAttribute('data-mktofield') || row.getAttribute('data-mkto_vis_src');
     const step = VALIDATION_STEP[rowAttr] ? Math.min(VALIDATION_STEP[rowAttr], totalSteps) : 1;
-    row.setAttribute('data-validate', step);
+    row.dataset.validate = rowAttr?.startsWith('adobe-privacy') ? totalSteps : step;
   });
 }
 
diff --git a/libs/blocks/marketo/marketo.css b/libs/blocks/marketo/marketo.css
index 53a47136db..f9c2b4cd29 100644
--- a/libs/blocks/marketo/marketo.css
+++ b/libs/blocks/marketo/marketo.css
@@ -100,7 +100,7 @@
 
 .marketo.multi-step .mktoForm[data-step="2"] .mktoFormRow.mktoFormRowTop[data-validate="2"],
 .marketo.multi-step .mktoForm[data-step="3"] .mktoFormRow.mktoFormRowTop[data-validate="3"] {
-  display: block;
+  display: contents;
 }
 
 .marketo.multi-step .mktoForm[data-step="2"] .mktoFormRow.mktoFormRowTop[data-validate="1"],
@@ -115,7 +115,7 @@
 
 .marketo.multi-step .mktoForm[data-step="3"] .mktoFormRow.mktoFormRowTop.adobe-privacy,
 .marketo.multi-step.multi-2 .mktoForm[data-step="2"] .mktoFormRow.mktoFormRowTop.adobe-privacy {
-  display: block;
+  display: grid;
 }
 
 .marketo.multi-step .step-details {
@@ -563,6 +563,16 @@
     grid-column: span 2;
   }
 
+  .marketo.multi-step .mktoForm[data-step="2"] .mktoFormRow.mktoFormRowTop[data-validate="2"].comments,
+  .marketo.multi-step .mktoForm[data-step="2"] .mktoFormRow.mktoFormRowTop[data-validate="2"].demo,
+  .marketo.multi-step .mktoForm[data-step="2"] .mktoFormRow.mktoFormRowTop[data-validate="2"].name,
+  .marketo.multi-step .mktoForm[data-step="3"] .mktoFormRow.mktoFormRowTop[data-validate="3"].comments,
+  .marketo.multi-step .mktoForm[data-step="3"] .mktoFormRow.mktoFormRowTop[data-validate="3"].demo,
+  .marketo.multi-step .mktoForm[data-step="3"] .mktoFormRow.mktoFormRowTop[data-validate="3"].name {
+    display: block;
+    grid-column: span 2;
+  }
+
   .marketo .mktoFormRow.mktoFormRowTop.name .mktoFormRow[data-mktofield="Salutation"] {
     grid-area: salutation;
   }