feat(button): improve quality, fix leak (#55)

This PR removes unnecessary dashes in the button template + it fixes a leak in the includes. Jira: INNO-1359
ec-europa · Mar 7, 2019 · 130f14d · 130f14d
1 parent 8d2ea6e
commit 130f14d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 23 deletions.
diff --git a/src/ec/packages/ec-component-accordion/__snapshots__/accordion.test.js.snap b/src/ec/packages/ec-component-accordion/__snapshots__/accordion.test.js.snap
@@ -20,10 +20,8 @@ exports[`EC - Accordion renders correctly 1`] = `
         class="ecl-button__container"
       >
         <svg
-          aria-controls="accordion-example"
           aria-hidden="true"
           class="ecl-icon ecl-icon--s ecl-button__icon ecl-button__icon--before"
-          data-ecl-accordion-toggle="true"
           focusable="false"
         >
           <use
@@ -61,10 +59,8 @@ exports[`EC - Accordion renders correctly 1`] = `
         class="ecl-button__container"
       >
         <svg
-          aria-controls="accordion-example2"
           aria-hidden="true"
           class="ecl-icon ecl-icon--s ecl-button__icon ecl-button__icon--before"
-          data-ecl-accordion-toggle="true"
           focusable="false"
         >
           <use
@@ -102,10 +98,8 @@ exports[`EC - Accordion renders correctly 1`] = `
         class="ecl-button__container"
       >
         <svg
-          aria-controls="accordion-example3"
           aria-hidden="true"
           class="ecl-icon ecl-icon--s ecl-button__icon ecl-button__icon--before"
-          data-ecl-accordion-toggle="true"
           focusable="false"
         >
           <use

diff --git a/src/ec/packages/ec-component-button/button.html.twig b/src/ec/packages/ec-component-button/button.html.twig
@@ -54,13 +54,19 @@
 
 <button class="{{ _css_class }}" type="{{ _type }}"{{ _extra_attributes|raw }}>
   <span class="ecl-button__container">
-    {%- if _icon.name is not empty and _icon_position == 'before' -%}
-      {%- include '../ec-component-icon/icon.html.twig' with { icon: _icon, extra_classes: 'ecl-button__icon ecl-button__icon--before' } -%}
-    {%- endif -%}
-    <span class="ecl-button__label" data-ecl-label> {% block label _label %} </span>
-    {%- if _icon.name is not empty and _icon_position == 'after' -%}
-      {%- include '../ec-component-icon/icon.html.twig' with { icon: _icon, extra_classes: 'ecl-button__icon ecl-button__icon--after' } -%}
-    {%- endif -%}
+    {% if _icon.name is not empty and _icon_position == 'before' %}
+      {% include '../ec-component-icon/icon.html.twig' with {
+        icon: _icon,
+        extra_classes: 'ecl-button__icon ecl-button__icon--before'
+      } only %}
+    {% endif %}
+    <span class="ecl-button__label" data-ecl-label>{% block label _label %}</span>
+    {% if _icon.name is not empty and _icon_position == 'after' %}
+      {% include '../ec-component-icon/icon.html.twig' with {
+        icon: _icon,
+        extra_classes: 'ecl-button__icon ecl-button__icon--after'
+      } only %}
+    {% endif %}
   </span>
 </button>
 

diff --git a/src/ec/packages/ec-component-expandable/__snapshots__/expandable.test.js.snap b/src/ec/packages/ec-component-expandable/__snapshots__/expandable.test.js.snap
@@ -23,12 +23,8 @@ exports[`EC - Expandable renders correctly 1`] = `
         Collapsed button
       </span>
       <svg
-        aria-controls="expandable-example-content"
         aria-hidden="true"
         class="ecl-icon ecl-icon--fluid ecl-icon--rotate-180 ecl-button__icon ecl-button__icon--after"
-        data-ecl-expandable-toggle="true"
-        data-ecl-label-collapsed="Collapsed button"
-        data-ecl-label-expanded="Expanded button"
         focusable="false"
       >
         <use
@@ -75,13 +71,8 @@ exports[`EC - Expandable renders correctly when expanded 1`] = `
         Collapsed button
       </span>
       <svg
-        aria-controls="expandable-example-content"
-        aria-expanded="true"
         aria-hidden="true"
         class="ecl-icon ecl-icon--fluid ecl-icon--rotate-180 ecl-button__icon ecl-button__icon--after"
-        data-ecl-expandable-toggle="true"
-        data-ecl-label-collapsed="Collapsed button"
-        data-ecl-label-expanded="Expanded button"
         focusable="false"
       >
         <use

diff --git a/src/ec/packages/ec-component-file/__snapshots__/file.test.js.snap b/src/ec/packages/ec-component-file/__snapshots__/file.test.js.snap
@@ -80,7 +80,6 @@ exports[`EC - File With translation renders correctly 1`] = `
         <svg
           aria-hidden="true"
           class="ecl-icon ecl-icon--fluid ecl-icon--rotate-180 ecl-button__icon ecl-button__icon--after"
-          data-ecl-file-translation-toggle=""
           focusable="false"
         >
           <use