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] 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);
                 }
             });
         }