Add option to warning text component for no icon

alphagov · Nov 22, 2018 · 2fd3cc4 · 2fd3cc4
1 parent 4d06a76
commit 2fd3cc4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss b/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss
@@ -1,2 +1,7 @@
 @import "helpers/govuk-frontend-settings";
 @import "govuk-frontend/components/warning-text/warning-text";
+
+.gem-c-warning-text__text--no-indent {
+  padding-left: 0;
+  margin-left: 0;
+}
diff --git a/app/views/govuk_publishing_components/components/_warning_text.html.erb b/app/views/govuk_publishing_components/components/_warning_text.html.erb
@@ -1,15 +1,18 @@
 <%
   id ||= "warning-text-#{SecureRandom.hex(4)}"
   classes ||= ''
-  css_classes = %w(gem-c-warning-text govuk-warning-text)
-  css_classes << classes if classes
   text_assistive ||= 'Warning'
   text_icon ||= '!'
+
+  css_classes = %w(gem-c-warning-text govuk-warning-text)
+  css_classes << classes if classes
 %>
 
 <%= tag.div id: id, class: css_classes do %>
-  <%= tag.span text_icon, class: "govuk-warning-text__icon", "aria-hidden": "true" %>
-  <%= tag.strong class: "govuk-warning-text__text" do %>
+  <% unless text_icon.empty? %>
+    <%= tag.span text_icon, class: "govuk-warning-text__icon", "aria-hidden": "true" %>
+  <% end %>
+  <%= tag.strong class: "govuk-warning-text__text #{'gem-c-warning-text__text--no-indent' if text_icon.empty?}" do %>
     <%= tag.span text_assistive, class: "govuk-warning-text__assistive" %>
     <%= text %>
   <% end %>

diff --git a/app/views/govuk_publishing_components/components/docs/warning_text.yml b/app/views/govuk_publishing_components/components/docs/warning_text.yml
@@ -17,3 +17,7 @@ examples:
     data:
       text_icon: "£"
       text: "You can be fined up to £5,000 if you don’t register."
+  without_icon:
+    data:
+      text_icon: ""
+      text: "You can be fined up to £320 if you don't register."
diff --git a/spec/components/warning_text_spec.rb b/spec/components/warning_text_spec.rb
@@ -21,4 +21,10 @@ def component_name
     render_component(text_icon: ":(", text: "You can be fined up to £5,000 if you don’t register.")
     assert_select(".govuk-warning-text__icon", text: ":(")
   end
+
+  it "renders no icon" do
+    render_component(text_icon: "", text: "You can be fined up to £5,000 if you don’t register.")
+    assert_select(".govuk-warning-text__icon", false)
+    assert_select(".gem-c-warning-text__text--no-indent", text: /You can be fined up to £5,000 if you don’t register/i)
+  end
 end