From 6899002925dad7533581751e7668a21c5fca1602 Mon Sep 17 00:00:00 2001
From: Stefan Dragomir <stefand@ENSRO0422.local>
Date: Mon, 27 Oct 2025 16:30:43 +0200
Subject: [PATCH 1/2] FORMS-18646: Desktop, RWD Tablet, RWD Mobile - State:
 Expand/collapse state of the element is missing or incorrect @sunnym
 @vavarshn

---
 .../components/af-commons/v1/fieldTemplates/questionMark.html   | 2 +-
 ui.frontend/src/view/FormFieldBase.js                           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/questionMark.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/questionMark.html
index 0ebd6098e9..a468e0635a 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/questionMark.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/questionMark.html
@@ -1,4 +1,4 @@
 <template data-sly-template.questionMark="${@ componentId, longDescription, bemBlock}">
-  <button class="${bemBlock}__questionmark" data-sly-test="${longDescription}" title="Help text">
+  <button class="${bemBlock}__questionmark" data-sly-test="${longDescription}" aria-expanded="false" title="Help text">
   </button>
 </template>
diff --git a/ui.frontend/src/view/FormFieldBase.js b/ui.frontend/src/view/FormFieldBase.js
index 876441501a..aedb60c36a 100644
--- a/ui.frontend/src/view/FormFieldBase.js
+++ b/ui.frontend/src/view/FormFieldBase.js
@@ -707,11 +707,13 @@ class FormFieldBase extends FormField {
                     if (tooltipAlwaysVisible) {
                         self.#showHideTooltipDiv(false);
                     }
+                    questionMarkDiv.setAttribute('aria-expanded', true);
                 } else {
                     self.#showHideLongDescriptionDiv(false);
                     if (tooltipAlwaysVisible) {
                         self.#showHideTooltipDiv(true);
                     }
+                    questionMarkDiv.setAttribute('aria-expanded', false);
                 }
             });
         }

From c36250d58bbe1d6d1dfec1bcad14b2021fa39d05 Mon Sep 17 00:00:00 2001
From: Stefan Dragomir <stefand@ENSRO0422.local>
Date: Mon, 24 Nov 2025 15:11:17 +0200
Subject: [PATCH 2/2] FORMS-18646: Add test case for expanded state

---
 ui.tests/test-module/libs/support/commands.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ui.tests/test-module/libs/support/commands.js b/ui.tests/test-module/libs/support/commands.js
index 08d6d6e06b..813a24d1d5 100644
--- a/ui.tests/test-module/libs/support/commands.js
+++ b/ui.tests/test-module/libs/support/commands.js
@@ -655,6 +655,9 @@ Cypress.Commands.add("toggleDescriptionTooltip", (bemBlock, fieldId, shortDescri
     //initially long description should have data-cmp-visible="false" to avoid flickering on page load
     cy.get(`#${fieldId}`).find(`.${bemBlock}__longdescription`).invoke('attr', 'data-cmp-visible')
     .should('eq', 'false');
+    // check if questiionmark is collapsed
+    cy.get(`#${fieldId}`).find(`.${bemBlock}__questionmark`).invoke('attr', 'aria-expanded')
+    .should('eq', 'false');
     // click on ? mark
     cy.get(`#${fieldId}`).find(`.${bemBlock}__questionmark`).click();
     // long description should be shown
@@ -665,6 +668,9 @@ Cypress.Commands.add("toggleDescriptionTooltip", (bemBlock, fieldId, shortDescri
     // short description should be hidden.
     cy.get(`#${fieldId}`).find(`.${bemBlock}__shortdescription`).invoke('attr', 'data-cmp-visible')
     .should('eq', 'false');
+    // check if questiionmark is expanded
+    cy.get(`#${fieldId}`).find(`.${bemBlock}__questionmark`).invoke('attr', 'aria-expanded')
+    .should('eq', 'true');
 });
 
 Cypress.Commands.add("openSidePanelTab", (tab) => {