[FIX] Corriger le rendu de bouton radio inline (#215)

* fix(form_field_snippet): inline radioselect were not displayed inline

* fix(form_field_snippet): inline CheckboxSelectMultiple were not displayed inline

* feat(example_app): inline radio and checkboxes without explicit calls to the templatetag

* refactor(example_app): remove unused import

Co-authored-by: Sylvain Boissel <sylvain@boissel.dev>

* fix(widgets): inline checkboxes are still checkboxes

Co-authored-by: Sylvain Boissel <sylvain@boissel.dev>

* fix(widgets): include InlineCheckboxSelectMultiple in __all__

Co-authored-by: Sylvain Boissel <sylvain@boissel.dev>

---------

Co-authored-by: Sylvain Boissel <sylvain@boissel.dev>

Author: David-Guillot

dsfr/templates/dsfr/form_field_snippets/field_snippet.html

@@ -3,9 +3,9 @@
   {{ field.as_hidden }}
 {% elif field|widget_type == "checkboxinput" %}
   {% include "dsfr/form_field_snippets/checkbox_snippet.html" %}
-{% elif field|widget_type == "checkboxselectmultiple" %}
+{% elif field|widget_type == "checkboxselectmultiple" or field|widget_type == "inlinecheckboxselectmultiple" %}
   {% include "dsfr/form_field_snippets/checkboxselectmultiple_snippet.html" %}
-{% elif field|widget_type == "radioselect" %}
+{% elif field|widget_type == "radioselect" or field|widget_type == "inlineradioselect" %}
   {% include "dsfr/form_field_snippets/radioselect_snippet.html" %}
 {% elif field|widget_type == "richradioselect" %}
   {% include "dsfr/form_field_snippets/richradioselect_snippet.html" %}

dsfr/test/test_form_field_snippets.py

@@ -0,0 +1,70 @@
+from django import forms
+from django.template import Context, Template
+from django.test import SimpleTestCase
+
+from dsfr.forms import DsfrBaseForm
+from dsfr.widgets import InlineRadioSelect, InlineCheckboxSelectMultiple
+
+
+class RadioSelectTestCase(SimpleTestCase):
+    class DummyForm(DsfrBaseForm):
+        radio_field = forms.ChoiceField(
+            choices=(("a", "bla"), ("i", "bli"), ("o", "blo")),
+            widget=forms.RadioSelect(),
+        )
+
+    class DummyFormWithInlineRadioSelect(DsfrBaseForm):
+        radio_field = forms.ChoiceField(
+            choices=(("a", "bla"), ("i", "bli"), ("o", "blo")),
+            widget=InlineRadioSelect(),
+        )
+
+    def test_not_inline(self):
+        rendered = Template("{{form}}").render(
+            Context({"form": RadioSelectTestCase.DummyForm()})
+        )
+        self.assertFalse(
+            'class="fr-fieldset__element fr-fieldset__element--inline"' in rendered
+        )
+
+    def test_inline(self):
+        rendered = Template("{{form}}").render(
+            Context({"form": RadioSelectTestCase.DummyFormWithInlineRadioSelect()})
+        )
+        self.assertTrue(
+            'class="fr-fieldset__element fr-fieldset__element--inline"' in rendered
+        )
+
+
+class CheckboxSelectMultipleTestCase(SimpleTestCase):
+    class DummyForm(DsfrBaseForm):
+        checkbox_field = forms.ChoiceField(
+            choices=(("a", "bla"), ("i", "bli"), ("o", "blo")),
+            widget=forms.CheckboxSelectMultiple(),
+        )
+
+    class DummyFormWithInlineCheckboxSelectMultiple(DsfrBaseForm):
+        checkbox_field = forms.ChoiceField(
+            choices=(("a", "bla"), ("i", "bli"), ("o", "blo")),
+            widget=InlineCheckboxSelectMultiple(),
+        )
+
+    def test_not_inline(self):
+        rendered = Template("{{form}}").render(
+            Context({"form": CheckboxSelectMultipleTestCase.DummyForm()})
+        )
+        self.assertFalse(
+            'class="fr-fieldset__element fr-fieldset__element--inline"' in rendered
+        )
+
+    def test_inline(self):
+        rendered = Template("{{form}}").render(
+            Context(
+                {
+                    "form": CheckboxSelectMultipleTestCase.DummyFormWithInlineCheckboxSelectMultiple()
+                }
+            )
+        )
+        self.assertTrue(
+            'class="fr-fieldset__element fr-fieldset__element--inline"' in rendered
+        )

dsfr/widgets.py

@@ -1,11 +1,11 @@
 from typing import Type
 
-from django.forms.widgets import RadioSelect, ChoiceWidget
+from django.forms.widgets import RadioSelect, ChoiceWidget, CheckboxSelectMultiple
 
 from dsfr.enums import RichRadioButtonChoices
 
 
-__all__ = ["RichRadioSelect"]
+__all__ = ["RichRadioSelect", "InlineRadioSelect", "InlineCheckboxSelectMultiple"]
 
 
 class _RichChoiceWidget(ChoiceWidget):
@@ -131,3 +131,11 @@ class RichRadioSelect(_RichChoiceWidget, RadioSelect):
 
     template_name = "dsfr/widgets/rich_radio.html"
     option_template_name = "dsfr/widgets/rich_radio_option.html"
+
+
+class InlineRadioSelect(RadioSelect):
+    inline = True
+
+
+class InlineCheckboxSelectMultiple(CheckboxSelectMultiple):
+    inline = True

example_app/forms.py

@@ -16,9 +16,12 @@
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Fieldset, Field
 
-from dsfr.templatetags.dsfr_tags import dsfr_inline
 from dsfr.utils import lazy_static
-from dsfr.widgets import RichRadioSelect
+from dsfr.widgets import (
+    RichRadioSelect,
+    InlineRadioSelect,
+    InlineCheckboxSelectMultiple,
+)
 from example_app.models import Author, Book
 from example_app.utils import populate_genre_choices
 
@@ -138,7 +141,7 @@ class ExampleForm(DsfrBaseForm):
         label="Boutons radio inline",
         required=False,
         choices=[(1, "Premier choix"), (2, "Second choix"), (3, "Troisième choix")],
-        widget=forms.RadioSelect,
+        widget=InlineRadioSelect,
     )
 
     sample_checkbox = forms.MultipleChoiceField(
@@ -154,14 +157,14 @@ class ExampleForm(DsfrBaseForm):
     )
 
     sample_checkbox_inline = forms.MultipleChoiceField(
-        label="Cases à cocher",
+        label="Cases à cocher inline",
         required=False,
         choices=[
             ("1", "Premier choix"),
             ("2", "Second choix"),
             ("3", "Troisième choix"),
         ],
-        widget=forms.CheckboxSelectMultiple,
+        widget=InlineCheckboxSelectMultiple,
     )
 
     sample_rich_radio = forms.ChoiceField(
@@ -218,8 +221,6 @@ def clean_sample_checkbox(self):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.set_autofocus_on_first_error()
-        dsfr_inline(self["sample_radio_inline"])
-        dsfr_inline(self["sample_checkbox_inline"])
 
 
 class AuthorCreateForm(ModelForm, DsfrBaseForm):