Skip to content

A platform for community discussion. Free, open, simple.

DEV: flexible titles checkboxes (#38433)

Joffrey JAFFEUX9855456403a3
diff --git a/app/assets/stylesheets/common/form-kit/_control-checkbox.scss b/app/assets/stylesheets/common/form-kit/_control-checkbox.scss
index 4010161e0ca..4755c3d4c57 100644
--- a/app/assets/stylesheets/common/form-kit/_control-checkbox.scss
+++ b/app/assets/stylesheets/common/form-kit/_control-checkbox.scss
@@ -14,10 +14,6 @@
color: var(--primary);
font-size: var(--font-down-1-rem);
- .form-kit__control-checkbox-title {
- font-weight: 600 !important;
- }
-
.form-kit__field[data-disabled] & {
cursor: not-allowed;
}
diff --git a/frontend/discourse/app/components/edit-category-type-schema-fields.gjs b/frontend/discourse/app/components/edit-category-type-schema-fields.gjs
index fb1b400260a..368ce592c3e 100644
--- a/frontend/discourse/app/components/edit-category-type-schema-fields.gjs
+++ b/frontend/discourse/app/components/edit-category-type-schema-fields.gjs
@@ -14,6 +14,7 @@ const SchemaFormField = <template>
@title={{@entry.label}}
@validation={{if @entry.required "required"}}
@format="full"
+ @showTitle={{false}}
as |field|
>
<field.Checkbox>{{@entry.description}}</field.Checkbox>
diff --git a/frontend/discourse/app/form-kit/components/fk/control/checkbox.gjs b/frontend/discourse/app/form-kit/components/fk/control/checkbox.gjs
index b37e8a265fc..98cc72a4903 100644
--- a/frontend/discourse/app/form-kit/components/fk/control/checkbox.gjs
+++ b/frontend/discourse/app/form-kit/components/fk/control/checkbox.gjs
@@ -30,7 +30,7 @@ export default class FKControlCheckbox extends FKBaseControl {
/>
<span class="form-kit__control-checkbox-content">
<span class="form-kit__control-checkbox-title">
- <span>{{@field.title}}</span>
+ <span>{{or @title @field.title}}</span>
{{#if @field.required}}
<FKRequired @field={{@field}} />
diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/checkbox-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/checkbox-test.gjs
index 8c8925b7e51..ceaec4b6324 100644
--- a/frontend/discourse/tests/integration/components/form-kit/controls/checkbox-test.gjs
+++ b/frontend/discourse/tests/integration/components/form-kit/controls/checkbox-test.gjs
@@ -104,6 +104,20 @@ module(
assert.form().field("foo").hasTitle("Foo");
});
+ test("@title", async function (assert) {
+ await render(
+ <template>
+ <Form as |form|>
+ <form.Field @name="foo" @title="Foo" as |field|>
+ <field.Checkbox @title="Bar" />
+ </form.Field>
+ </Form>
+ </template>
+ );
+
+ assert.form().field("foo").hasTitle("Bar");
+ });
+
test("when value is string 'true'", async function (assert) {
let data = { foo: "true" };
const mutateData = (x) => (data = x);