From a3932bf0f5cbc75651ff84c252f73b9b091b3a86 Mon Sep 17 00:00:00 2001
From: Hugh Barnes <dev@hubns.com>
Date: Fri, 11 Aug 2017 18:32:29 +1200
Subject: [PATCH 1/4] Add block for additional outer field attributes in
 template, defaulting to add any data properties defined in the field's YAML

---
 templates/forms/default/field.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/forms/default/field.html.twig b/templates/forms/default/field.html.twig
index b8d8d98f..a200b30f 100644
--- a/templates/forms/default/field.html.twig
+++ b/templates/forms/default/field.html.twig
@@ -5,7 +5,7 @@
 {% set errors = attribute(form.messages, field.name) %}
 
 {% block field %}
-    <div class="form-field {% if field.outerclasses is defined %} {{ field.outerclasses }}{% endif %}{% if errors %} has-errors{% endif %} {% block outer_field_classes %}{% endblock %}">
+    <div class="form-field {% if field.outerclasses is defined %} {{ field.outerclasses }}{% endif %}{% if errors %} has-errors{% endif %} {% block outer_field_classes %}{% endblock %}" {%- block outer_field_attributes %}{% for dname,dval in field.data %} data-{{dname}}="{{ dval }}"{% endfor %}{% endblock %}>
         {% block contents %}
             {% if field.label is not same as(false) %}
                 <div class="form-label">

From 32f5847f0eb367ceb77691c213b00d11af60ae40 Mon Sep 17 00:00:00 2001
From: Hugh Barnes <dev@hubns.com>
Date: Mon, 14 Aug 2017 11:03:02 +1200
Subject: [PATCH 2/4] Replace apparently special data property on form fields
 for 'data-attributes'

---
 templates/forms/default/field.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/forms/default/field.html.twig b/templates/forms/default/field.html.twig
index a200b30f..b085dbee 100644
--- a/templates/forms/default/field.html.twig
+++ b/templates/forms/default/field.html.twig
@@ -5,7 +5,7 @@
 {% set errors = attribute(form.messages, field.name) %}
 
 {% block field %}
-    <div class="form-field {% if field.outerclasses is defined %} {{ field.outerclasses }}{% endif %}{% if errors %} has-errors{% endif %} {% block outer_field_classes %}{% endblock %}" {%- block outer_field_attributes %}{% for dname,dval in field.data %} data-{{dname}}="{{ dval }}"{% endfor %}{% endblock %}>
+    <div class="form-field {% if field.outerclasses is defined %} {{ field.outerclasses }}{% endif %}{% if errors %} has-errors{% endif %} {% block outer_field_classes %}{% endblock %}" {%- block outer_field_attributes %}{% for dname,dval in field.data-attributes %} data-{{dname}}="{{ dval }}"{% endfor %}{% endblock %}>
         {% block contents %}
             {% if field.label is not same as(false) %}
                 <div class="form-label">

From 37b9b559e4c4b69d4d852a2075283a4a44ee7d58 Mon Sep 17 00:00:00 2001
From: Hugh Barnes <dev@hubns.com>
Date: Mon, 14 Aug 2017 11:39:33 +1200
Subject: [PATCH 3/4] Fix twig selector for property/attribute name with hiphen

---
 templates/forms/default/field.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/forms/default/field.html.twig b/templates/forms/default/field.html.twig
index b085dbee..3e209e9d 100644
--- a/templates/forms/default/field.html.twig
+++ b/templates/forms/default/field.html.twig
@@ -5,7 +5,7 @@
 {% set errors = attribute(form.messages, field.name) %}
 
 {% block field %}
-    <div class="form-field {% if field.outerclasses is defined %} {{ field.outerclasses }}{% endif %}{% if errors %} has-errors{% endif %} {% block outer_field_classes %}{% endblock %}" {%- block outer_field_attributes %}{% for dname,dval in field.data-attributes %} data-{{dname}}="{{ dval }}"{% endfor %}{% endblock %}>
+    <div class="form-field {% if field.outerclasses is defined %} {{ field.outerclasses }}{% endif %}{% if errors %} has-errors{% endif %} {% block outer_field_classes %}{% endblock %}" {%- block outer_field_attributes %}{% for dname,dval in attribute(field, 'data-attributes') %} data-{{dname}}="{{ dval }}"{% endfor %}{% endblock %}>
         {% block contents %}
             {% if field.label is not same as(false) %}
                 <div class="form-label">

From 1b51e74dd8c59524df821eafe74ad6a58957a356 Mon Sep 17 00:00:00 2001
From: Hugh Barnes <dev@hubns.com>
Date: Sun, 22 Nov 2020 12:02:23 +1300
Subject: [PATCH 4/4] Move label block wrapper out to prevent empty label
 wrapper divs

---
 templates/forms/layouts/field.html.twig | 34 ++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/templates/forms/layouts/field.html.twig b/templates/forms/layouts/field.html.twig
index 394cb93c..e375a9f2 100644
--- a/templates/forms/layouts/field.html.twig
+++ b/templates/forms/layouts/field.html.twig
@@ -1,23 +1,23 @@
 {% block field %}
 <div class="form-field {{ layout_form_field_outer_classes|trim -}} {{- form_field_outer_core|trim -}}">
   {% block contents %}
-    {% if show_label %}
-      <div class="{{- layout_form_field_outer_label_classes -}}">
-        {{- form_field_toggleable -}}
-        <label class="{{ layout_form_field_label_classes }}{{ form_field_label_trim }}" {% if field.id %}for="{{ form_field_for }}"{% endif %}>
-          {%- block label -%}
-            {%- if form_field_help -%}
-              <span class="tooltip" data-tooltip="{{ form_field_help|e }}">{{ form_field_label|raw }}</span>
-            {%- else -%}
-              {{ form_field_label|raw }}
-            {%- endif -%}
-            {%- if form_field_required %}
-              <span class="required">*</span>
-            {%- endif -%}
-          {%- endblock -%}
-        </label>
-      </div>
-    {% endif %}
+    {%- block label -%}
+      {% if show_label %}
+        <div class="{{- layout_form_field_outer_label_classes -}}">
+          {{- form_field_toggleable -}}
+          <label class="{{ layout_form_field_label_classes }}{{ form_field_label_trim }}" {% if field.id %}for="{{ form_field_for }}"{% endif %}>
+              {%- if form_field_help -%}
+                <span class="tooltip" data-tooltip="{{ form_field_help }}">{{ form_field_label|raw }}</span>
+              {%- else -%}
+                {{ form_field_label|raw }}
+              {%- endif -%}
+              {%- if form_field_required %}
+                <span class="required">*</span>
+              {%- endif -%}
+          </label>
+        </div>
+      {% endif %}
+    {%- endblock -%}
     <div class="{{ layout_form_field_outer_data_classes }}"
         {% block global_attributes %}{% endblock %}
     >