From 0fbce0aa85b67d842de2049e433dfd2aff02db57 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 24 Jul 2024 14:25:34 +0200
Subject: [PATCH] DEV: adds a way to set a title/description to a radio
 (#28049)

Usage:

```
<Form as |form|>
  <form.Field @name="foo" @title="Foo" as |field|>
    <field.RadioGroup as |RadioGroup|>
      <RadioGroup.Radio @value="one" as |radio|>
        <radio.Title>One title</radio.Title>
        <radio.Description>One description</radio.Description>
      </RadioGroup.Radio>
    </field.RadioGroup>
  </form.Field>
</Form>
```
---
 .../fk/control/radio-group/radio.gjs          | 13 +++++-
 .../form-kit/controls/radio-test.gjs          | 45 +++++++++++++++++++
 .../common/form-kit/_control-radio.scss       | 34 ++++++++------
 .../components/sections/atoms/05-forms.hbs    |  9 +++-
 4 files changed, 85 insertions(+), 16 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/radio-test.gjs

diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/control/radio-group/radio.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/control/radio-group/radio.gjs
index 7ae2fba4abd..a0e4dd4a39d 100644
--- a/app/assets/javascripts/discourse/app/form-kit/components/fk/control/radio-group/radio.gjs
+++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/control/radio-group/radio.gjs
@@ -1,9 +1,18 @@
+import { hash } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { eq } from "truth-helpers";
 import FKLabel from "discourse/form-kit/components/fk/label";
 import uniqueId from "discourse/helpers/unique-id";
 import withEventValue from "discourse/helpers/with-event-value";
 
+const radioTitle = <template>
+  <span class="form-kit__control-radio-title">{{yield}}</span>
+</template>;
+
+const radioDescription = <template>
+  <span class="form-kit__control-radio-description">{{yield}}</span>
+</template>;
+
 const FKControlRadioGroupRadio = <template>
   {{#let (uniqueId) as |uuid|}}
     <div class="form-kit__field form-kit__field-radio">
@@ -19,7 +28,9 @@ const FKControlRadioGroupRadio = <template>
           ...attributes
           {{on "change" (withEventValue @field.set)}}
         />
-        <span>{{yield}}</span>
+        <span class="form-kit__control-radio-content">
+          {{yield (hash Title=radioTitle Description=radioDescription)}}
+        </span>
       </FKLabel>
     </div>
   {{/let}}
diff --git a/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/radio-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/radio-test.gjs
new file mode 100644
index 00000000000..1357e74c535
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/radio-test.gjs
@@ -0,0 +1,45 @@
+import { render } from "@ember/test-helpers";
+import { module, test } from "qunit";
+import Form from "discourse/components/form";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+
+module(
+  "Integration | Component | FormKit | Controls | Radio",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("default", async function (assert) {
+      await render(<template>
+        <Form as |form|>
+          <form.Field @name="foo" @title="Foo" as |field|>
+            <field.RadioGroup as |RadioGroup|>
+              <RadioGroup.Radio @value="one">One</RadioGroup.Radio>
+            </field.RadioGroup>
+          </form.Field>
+        </Form>
+      </template>);
+
+      assert.dom(".form-kit__control-radio-content").hasText("One");
+    });
+
+    test("title/description", async function (assert) {
+      await render(<template>
+        <Form as |form|>
+          <form.Field @name="foo" @title="Foo" as |field|>
+            <field.RadioGroup as |RadioGroup|>
+              <RadioGroup.Radio @value="one" as |radio|>
+                <radio.Title>One title</radio.Title>
+                <radio.Description>One description</radio.Description>
+              </RadioGroup.Radio>
+            </field.RadioGroup>
+          </form.Field>
+        </Form>
+      </template>);
+
+      assert.dom(".form-kit__control-radio-title").hasText("One title");
+      assert
+        .dom(".form-kit__control-radio-description")
+        .hasText("One description");
+    });
+  }
+);
diff --git a/app/assets/stylesheets/common/form-kit/_control-radio.scss b/app/assets/stylesheets/common/form-kit/_control-radio.scss
index 225365db816..a925d7b6ed5 100644
--- a/app/assets/stylesheets/common/form-kit/_control-radio.scss
+++ b/app/assets/stylesheets/common/form-kit/_control-radio.scss
@@ -1,18 +1,26 @@
-.form-kit__control-radio {
-  &-label {
-    display: flex;
-    gap: 0.5em;
-    font-weight: normal !important;
-    margin: 0;
-    color: var(--primary);
+.form-kit__control-radio-label {
+  display: flex;
+  gap: 0.5em;
+  font-weight: normal !important;
+  margin: 0;
+  color: var(--primary);
 
-    .form-kit__field[data-disabled] & {
-      cursor: not-allowed;
-    }
-    input[type="radio"] {
-      margin-right: 0; //old input overrule
-    }
+  .form-kit__field[data-disabled] & {
+    cursor: not-allowed;
   }
+  input[type="radio"] {
+    margin-right: 0; //old input overrule
+  }
+}
+
+.form-kit__control-radio-content {
+  display: flex;
+  flex-direction: column;
+  gap: 0.25rem;
+}
+
+.form-kit__control-radio-description {
+  color: var(--primary-medium);
 }
 
 .form-kit__inline-radio {
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-forms.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-forms.hbs
index 500051d4d55..e002dea9ea4 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-forms.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-forms.hbs
@@ -117,10 +117,15 @@
 
 <StyleguideExample @title="RadioGroup">
   <Form as |form|>
-    <form.Field @title="Enabled" @name="enabled" as |field|>
+    <form.Field @title="Enabled" @name="enabled" @format="full" as |field|>
       <field.RadioGroup as |radioGroup|>
         <radioGroup.Radio @value="true">Yes</radioGroup.Radio>
-        <radioGroup.Radio @value="false">No</radioGroup.Radio>
+        <radioGroup.Radio @value="false" as |radio|>
+          <radio.Title>No</radio.Title>
+          <radio.Description>
+            Choosing no, will make you inelligible for the contest.
+          </radio.Description>
+        </radioGroup.Radio>
       </field.RadioGroup>
     </form.Field>
   </Form>