From dc0de5efbbd13f490177e8da8284464169298015 Mon Sep 17 00:00:00 2001
From: Rishi Mehta <rismehta@adobe.com>
Date: Tue, 17 Dec 2024 10:21:31 +0530
Subject: [PATCH 1/2] Sample for help text in individual radio button

---
 .../models/v1/form/RadioButtonImpl.java       |  8 +++++
 .../v1/radiobutton/radiobutton.html           | 35 ++++++++++---------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImpl.java
index 28318f8f1f..c19879e540 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImpl.java
@@ -50,6 +50,14 @@ public class RadioButtonImpl extends AbstractOptionsFieldImpl implements RadioBu
     protected String orientationJcr;
     private Orientation orientation;
 
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_ORIENTATION)
+    @Nullable
+    private String[] helpTexts;
+
+    public String[] getHelpTexts() {
+        return helpTexts;
+    }
+
     @PostConstruct
     private void initRadioButtonModel() {
         orientation = Orientation.fromString(orientationJcr);
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html
index 361f3d1fca..e6df598852 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html
@@ -34,25 +34,26 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[radioButton.id, 'widget']}">
     <div class="cmp-adaptiveform-radiobutton__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=radioButton.label.value, labelVisible=radioButton.label.visible, labelRichText=radioButton.label.richText, bemBlock='cmp-adaptiveform-radiobutton'}" data-sly-unwrap></div>
-      <div data-sly-call="${questionMark.questionMark @componentId=radiobutton.id, longDescription=radioButton.description, bemBlock='cmp-adaptiveform-radiobutton'}" data-sly-unwrap></div>
+        <div data-sly-call="${label.label @componentId=widgetId, labelValue=radioButton.label.value, labelVisible=radioButton.label.visible, labelRichText=radioButton.label.richText, bemBlock='cmp-adaptiveform-radiobutton'}" data-sly-unwrap></div>
+        <div data-sly-call="${questionMark.questionMark @componentId=radiobutton.id, longDescription=radioButton.description, bemBlock='cmp-adaptiveform-radiobutton'}" data-sly-unwrap></div>
     </div>
     <div class="cmp-adaptiveform-radiobutton__widget ${radioButton.orientation}" id="${widgetId}" role="radiogroup">
-      <div data-sly-list="${radioButton.enums}" data-sly-unwrap>
-          <div class="cmp-adaptiveform-radiobutton__option">
-              <label class="cmp-adaptiveform-radiobutton__option-label"
-                    title="${radioButton.tooltipVisible ? '' : radioButton.tooltipText}">
-                  <input type="radio"
-                        name="${radioButton.name}"
-                        class="cmp-adaptiveform-radiobutton__option__widget"
-                        value="${item.toString}"
-                        disabled="${!radioButton.enabled || radioButton.readOnly}"
-                        checked="${radioButton.enums[itemList.index] == radioButton.default[0]}"
-                        />
-                  <span>${radioButton.enumNames[itemList.index] @ context = 'html'}</span>
-              </label>
-          </div>
-      </div>
+        <div data-sly-list="${radioButton.enums}" data-sly-unwrap>
+            <div class="cmp-adaptiveform-radiobutton__option">
+                <label class="cmp-adaptiveform-radiobutton__option-label"
+                       title="${radioButton.tooltipVisible ? '' : radioButton.tooltipText}">
+                    <input type="radio"
+                           name="${radioButton.name}"
+                           class="cmp-adaptiveform-radiobutton__option__widget"
+                           value="${item.toString}"
+                           disabled="${!radioButton.enabled || radioButton.readOnly}"
+                           checked="${radioButton.enums[itemList.index] == radioButton.default[0]}"
+                    />
+                    <span>${radioButton.enumNames[itemList.index] @ context = 'html'}</span>
+                    <div data-sly-call="${questionMark.questionMark @componentId=widgetId, longDescription=radioButton.helpTexts[itemList.index], bemBlock='cmp-adaptiveform-radiobutton__option'}" data-sly-unwrap></div>
+                </label>
+            </div>
+        </div>
     </div>
     <div data-sly-call="${shortDescription.shortDescription @componentId=radiobutton.id, shortDescriptionVisible=radioButton.tooltipVisible, shortDescription=radioButton.tooltip, bemBlock='cmp-adaptiveform-radiobutton'}" data-sly-unwrap></div>
     <div data-sly-call="${longDescription.longDescription @componentId=radiobutton.id, longDescription=radioButton.description, bemBlock='cmp-adaptiveform-radiobutton'}" data-sly-unwrap></div>

From 4cf2533e7857beb9297b398af947486fa3b533c6 Mon Sep 17 00:00:00 2001
From: Rishi Mehta <rismehta@adobe.com>
Date: Tue, 17 Dec 2024 10:32:08 +0530
Subject: [PATCH 2/2] Adding todo in sling model

---
 .../components/internal/models/v1/form/RadioButtonImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImpl.java
index c19879e540..a8aea16a18 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImpl.java
@@ -50,7 +50,8 @@ public class RadioButtonImpl extends AbstractOptionsFieldImpl implements RadioBu
     protected String orientationJcr;
     private Orientation orientation;
 
-    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_ORIENTATION)
+    // todo: inject this by taking this property as input from edit dialog based on the requirement
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
     @Nullable
     private String[] helpTexts;