Merge pull request #239 from DFE-Digital/move-navigation-link-generat…

…ion-to-call Move navigation entry generation to call method
x-govuk · Aug 19, 2021 · 9a43ea7 · 9a43ea7
2 parents 3815d63 + a8d1b3d
commit 9a43ea7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/app/components/govuk_component/header_component.html.erb b/app/components/govuk_component/header_component.html.erb
@@ -33,11 +33,7 @@
             <%= tag.ul(class: navigation_classes, id: "navigation", aria: { label: navigation_label }) do %>
               <% navigation_items.each do |item| %>
                 <%= tag.li(class: item.classes.append(item.active_class), **item.html_attributes) do %>
-                  <% if item.link? %>
-                    <%= link_to(item.text, item.href, class: "govuk-header__link") %>
-                  <% else %>
-                    <%= item.text %>
-                  <% end %>
+                  <%= item %>
                 <% end %>
               <% end %>
             <% end %>

diff --git a/app/components/govuk_component/header_component.rb b/app/components/govuk_component/header_component.rb
@@ -75,6 +75,14 @@ def link?
       href.present?
     end
 
+    def call
+      if link?
+        link_to(text, href, class: "govuk-header__link")
+      else
+        text
+      end
+    end
+
   private
 
     def default_classes