govuk-components 3.0.4 → 3.0.5

data/app/components/govuk_component/phase_banner_component.rb

@@ -2,10 +2,10 @@ class GovukComponent::PhaseBannerComponent < GovukComponent::Base
   attr_reader :text, :phase_tag
 
   def initialize(tag: nil, text: nil, classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
-
     @phase_tag = tag
     @text      = text
+
+    super(classes: classes, html_attributes: html_attributes)
   end
 
   def phase_tag_component
@@ -14,7 +14,7 @@ class GovukComponent::PhaseBannerComponent < GovukComponent::Base
 
 private
 
-  def default_classes
-    %w(govuk-phase-banner)
+  def default_attributes
+    { class: %w(govuk-phase-banner) }
   end
 end

data/app/components/govuk_component/section_break_component.rb

@@ -0,0 +1,44 @@
+class GovukComponent::SectionBreakComponent < GovukComponent::Base
+  SIZES = %w(m l xl).freeze
+
+  def initialize(visible: false, size: nil, classes: [], html_attributes: {})
+    @visible = visible
+    @size    = size
+
+    super(classes: classes, html_attributes: html_attributes)
+  end
+
+  def call
+    tag.hr(**html_attributes)
+  end
+
+private
+
+  attr_reader :size, :visible
+
+  def default_attributes
+    { class: default_classes }
+  end
+
+  def default_classes
+    class_names(
+      "govuk-section-break",
+      size_class,
+      "govuk-section-break--visible" => visible?
+    ).split
+  end
+
+  def size_class
+    if size.blank?
+      ""
+    elsif size.in?(SIZES)
+      "govuk-section-break--#{size}"
+    else
+      raise ArgumentError, "invalid size #{size}, supported sizes are #{SIZES.to_sentence}"
+    end
+  end
+
+  def visible?
+    visible
+  end
+end

data/app/components/govuk_component/start_button_component.rb

@@ -1,15 +1,21 @@
 class GovukComponent::StartButtonComponent < GovukComponent::Base
+  BUTTON_ATTRIBUTES = {
+    role: 'button',
+    draggable: 'false',
+    data: { module: 'govuk-button' }
+  }.freeze
+
   attr_reader :text, :href
 
   def initialize(text:, href:, classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
-
     @text = text
     @href = href
+
+    super(classes: classes, html_attributes: html_attributes)
   end
 
   def call
-    link_to(href, **default_attributes, **html_attributes) do
+    link_to(href, **html_attributes) do
       safe_join([text, icon])
     end
   end
@@ -17,20 +23,17 @@ class GovukComponent::StartButtonComponent < GovukComponent::Base
 private
 
   def default_attributes
-    {
-      role: 'button',
-      draggable: 'false',
-      class: classes,
-      data: { module: 'govuk-button' }
-    }
+    BUTTON_ATTRIBUTES.merge({ class: %w(govuk-button govuk-button--start) })
   end
 
-  def default_classes
-    %w(govuk-button govuk-button--start)
+  def icon
+    tag.svg(**svg_attributes) do
+      tag.path(fill: "currentColor", d: "M0 0h13l20 20-20 20H0l20-20z")
+    end
   end
 
-  def icon
-    svg_attributes = {
+  def svg_attributes
+    {
       class: "govuk-button__start-icon",
       xmlns: "http://www.w3.org/2000/svg",
       width: "17.5",
@@ -39,9 +42,5 @@ private
       focusable: "false",
       aria: { hidden: "true" }
     }
-
-    tag.svg(**svg_attributes) do
-      tag.path(fill: "currentColor", d: "M0 0h13l20 20-20 20H0l20-20z")
-    end
   end
 end

data/app/components/govuk_component/summary_list_component/action_component.rb

@@ -14,15 +14,19 @@ class GovukComponent::SummaryListComponent::ActionComponent < GovukComponent::Ba
   end
 
   def call
-    link_classes = govuk_link_classes.append(classes).flatten
-
-    link_to(href, class: link_classes, **html_attributes) do
+    link_to(href, **html_attributes) do
       safe_join([action_text, visually_hidden_span].compact, " ")
     end
   end
 
 private
 
+  def default_attributes
+    link_classes = govuk_link_classes.append(classes).flatten
+
+    { class: link_classes }
+  end
+
   def action_text
     content || text || fail(ArgumentError, "no text or content")
   end

data/app/components/govuk_component/summary_list_component/key_component.rb

@@ -2,19 +2,19 @@ class GovukComponent::SummaryListComponent::KeyComponent < GovukComponent::Base
   attr_reader :text
 
   def initialize(text: nil, classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
-
     @text = text
+
+    super(classes: classes, html_attributes: html_attributes)
   end
 
   def call
-    tag.dt(key_content, class: classes, **html_attributes)
+    tag.dt(key_content, **html_attributes)
   end
 
 private
 
-  def default_classes
-    %w(govuk-summary-list__key)
+  def default_attributes
+    { class: %w(govuk-summary-list__key) }
   end
 
   def key_content

data/app/components/govuk_component/summary_list_component/row_component.rb

@@ -6,17 +6,23 @@ class GovukComponent::SummaryListComponent::RowComponent < GovukComponent::Base
   renders_many :actions, GovukComponent::SummaryListComponent::ActionComponent
 
   def initialize(show_actions_column: nil, classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
-
     @show_actions_column = show_actions_column
+
+    super(classes: classes, html_attributes: html_attributes)
   end
 
   def call
-    tag.div(class: classes, **html_attributes) do
+    tag.div(**html_attributes) do
       safe_join([key, value, actions_content])
     end
   end
 
+  def before_render
+    if show_actions_column && actions.none?
+      html_attributes[:class] << no_actions_class
+    end
+  end
+
 private
 
   def actions_content
@@ -37,13 +43,15 @@ private
     end
   end
 
-  def default_classes
-    %w(govuk-summary-list__row).tap do |c|
-      c << "govuk-summary-list__row--no-actions" if show_actions_column && actions.none?
-    end
+  def default_attributes
+    { class: %w(govuk-summary-list__row) }
   end
 
   def actions_class
     "govuk-summary-list__actions"
   end
+
+  def no_actions_class
+    "govuk-summary-list__row--no-actions"
+  end
 end

data/app/components/govuk_component/summary_list_component/value_component.rb

@@ -8,13 +8,13 @@ class GovukComponent::SummaryListComponent::ValueComponent < GovukComponent::Bas
   end
 
   def call
-    tag.dd(value_content, class: classes, **html_attributes)
+    tag.dd(value_content, **html_attributes)
   end
 
 private
 
-  def default_classes
-    %w(govuk-summary-list__value)
+  def default_attributes
+    { class: %w(govuk-summary-list__value) }
   end
 
   def value_content

data/app/components/govuk_component/summary_list_component.html.erb

@@ -1,4 +1,4 @@
-<%= tag.dl(class: classes, **html_attributes) do %>
+<%= tag.dl(**html_attributes) do %>
   <% rows.each do |row| %>
     <%= row %>
   <% end %>

data/app/components/govuk_component/summary_list_component.rb

@@ -12,28 +12,24 @@ module GovukComponent
     end
 
     def initialize(rows: nil, actions: true, borders: true, classes: [], html_attributes: {})
-      super(classes: classes, html_attributes: html_attributes)
-
       @borders             = borders
       @show_actions_column = actions
 
+      super(classes: classes, html_attributes: html_attributes)
+
       return unless rows.presence
 
       build(rows)
     end
 
-    def classes
-      super.append(borders_class).compact
-    end
-
   private
 
     def borders_class
       %(govuk-summary-list--no-border) unless borders
     end
 
-    def default_classes
-      %w(govuk-summary-list)
+    def default_attributes
+      { class: ["govuk-summary-list", borders_class].compact }
     end
 
     def build(rows)

data/app/components/govuk_component/tab_component.html.erb

@@ -1,4 +1,4 @@
-<%= tag.div(id: id, class: classes, data: { module: 'govuk-tabs' }, **html_attributes) do %>
+<%= tag.div(**html_attributes) do %>
   <%= tag.h2(title, class: "govuk-tabs__title") %>
   <ul class="govuk-tabs__list">
     <% tabs.each.with_index do |tab, i| %>
@@ -6,6 +6,6 @@
     <% end %>
   </ul>
   <% tabs.each.with_index do |tab, i| %>
-    <%= tag.div(tab, class: tab.classes.append(tab.hidden_class(i)), id: tab.id, **tab.html_attributes) %>
+    <%= tag.div(tab, **tab.combined_attributes(i)) %>
   <% end %>
 <% end %>

data/app/components/govuk_component/tab_component.rb

@@ -1,29 +1,31 @@
 class GovukComponent::TabComponent < GovukComponent::Base
+  using HTMLAttributesUtils
+
   renders_many :tabs, "Tab"
 
   attr_reader :title, :id
 
   def initialize(title:, id: nil, classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
-
     @title = title
     @id    = id
+
+    super(classes: classes, html_attributes: html_attributes)
   end
 
 private
 
-  def default_classes
-    %w(govuk-tabs)
+  def default_attributes
+    { id: id, class: %w(govuk-tabs), data: { module: 'govuk-tabs' } }
   end
 
   class Tab < GovukComponent::Base
     attr_reader :label, :text
 
     def initialize(label:, text: nil, classes: [], html_attributes: {})
-      super(classes: classes, html_attributes: html_attributes)
-
       @label = label
       @text  = text
+
+      super(classes: classes, html_attributes: html_attributes)
     end
 
     def id(prefix: nil)
@@ -31,7 +33,9 @@ private
     end
 
     def hidden_class(i = nil)
-      %(govuk-tabs__panel--hidden) unless i&.zero?
+      return [] if i&.zero?
+
+      %w(govuk-tabs__panel--hidden)
     end
 
     def li_classes(i = nil)
@@ -42,8 +46,12 @@ private
       link_to(label, id(prefix: '#'), class: "govuk-tabs__tab")
     end
 
-    def default_classes
-      %w(govuk-tabs__panel)
+    def default_attributes
+      { id: id, class: %w(govuk-tabs__panel) }
+    end
+
+    def combined_attributes(i)
+      html_attributes.deep_merge_html_attributes({ class: hidden_class(i) }).deep_tidy_html_attributes
     end
 
     def call

data/app/components/govuk_component/table_component/body_component.html.erb

@@ -1,4 +1,4 @@
-<%= tag.tbody(class: classes, **html_attributes) do %>
+<%= tag.tbody(**html_attributes) do %>
   <% rows.each do |row| %>
     <%= row %>
   <% end %>

data/app/components/govuk_component/table_component/body_component.rb

@@ -15,7 +15,7 @@ private
     data.each { |d| row(cell_data: d, first_cell_is_header: first_cell_is_header) }
   end
 
-  def default_classes
-    %w(govuk-table__body)
+  def default_attributes
+    { class: %w(govuk-table__body) }
   end
 end

data/app/components/govuk_component/table_component/caption_component.rb

@@ -4,15 +4,15 @@ class GovukComponent::TableComponent::CaptionComponent < GovukComponent::Base
   SIZES = %w(s m l xl).freeze
 
   def initialize(text: nil, id: nil, size: 'm', classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
-
     @id   = id
     @text = text
     @size = size
+
+    super(classes: classes, html_attributes: html_attributes)
   end
 
   def call
-    tag.caption(caption_content, class: classes, **html_attributes)
+    tag.caption(caption_content, **html_attributes)
   end
 
   def render?
@@ -25,8 +25,8 @@ private
     @caption_content ||= (content || text)
   end
 
-  def default_classes
-    class_names("govuk-table__caption", caption_size_class => size).split
+  def default_attributes
+    { class: class_names("govuk-table__caption", caption_size_class => size).split }
   end
 
   def caption_size_class

data/app/components/govuk_component/table_component/cell_component.rb

@@ -13,12 +13,16 @@ class GovukComponent::TableComponent::CellComponent < GovukComponent::Base
   }.freeze
 
   def initialize(header: false, text: nil, numeric: false, width: nil, classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
-
     @header  = header
     @text    = text
     @numeric = numeric
     @width   = width
+
+    super(classes: classes, html_attributes: html_attributes)
+  end
+
+  def call
+    content_tag(cell_element, cell_content, **html_attributes)
   end
 
 private
@@ -35,6 +39,10 @@ private
     header ? :th : :td
   end
 
+  def default_attributes
+    { class: default_classes }
+  end
+
   def default_classes
     if header
       class_names("govuk-table__header", "govuk-table__header--numeric" => numeric?, width_class => width?).split

data/app/components/govuk_component/table_component/head_component.html.erb

@@ -1,4 +1,4 @@
-<%= tag.thead(class: classes, **html_attributes) do %>
+<%= tag.thead(**html_attributes) do %>
   <% rows.each do |row| %>
     <%= row %>
   <% end %>

data/app/components/govuk_component/table_component/head_component.rb

@@ -17,7 +17,7 @@ private
     data.each { |d| row(cell_data: d, header: true) }
   end
 
-  def default_classes
-    %w(govuk-table__head)
+  def default_attributes
+    { class: %w(govuk-table__head) }
   end
 end

data/app/components/govuk_component/table_component/row_component.html.erb

@@ -1,4 +1,4 @@
-<%= tag.tr(class: classes, **html_attributes) do %>
+<%= tag.tr(**html_attributes) do %>
   <% cells.each do |cell| %>
     <%= cell %>
   <% end %>

data/app/components/govuk_component/table_component/row_component.rb

@@ -4,11 +4,11 @@ class GovukComponent::TableComponent::RowComponent < GovukComponent::Base
   attr_reader :header, :first_cell_is_header
 
   def initialize(cell_data: nil, first_cell_is_header: false, header: false, classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
-
     @header = header
     @first_cell_is_header = first_cell_is_header
 
+    super(classes: classes, html_attributes: html_attributes)
+
     build_cells_from_cell_data(cell_data)
   end
 
@@ -24,7 +24,7 @@ private
     header || (first_cell_is_header && count.zero?)
   end
 
-  def default_classes
-    %w(govuk-table__row)
+  def default_attributes
+    { class: %w(govuk-table__row) }
   end
 end

data/app/components/govuk_component/table_component.html.erb

@@ -1,4 +1,4 @@
-<%= tag.table(id: id, class: classes, **html_attributes) do %>
+<%= tag.table(**html_attributes) do %>
   <%= caption %>
   <%= head %>
   <% bodies.each do |body| %>

data/app/components/govuk_component/table_component.rb

@@ -7,12 +7,12 @@ module GovukComponent
     attr_accessor :id, :first_cell_is_header, :caption_text
 
     def initialize(id: nil, rows: nil, head: nil, caption: nil, first_cell_is_header: false, classes: [], html_attributes: {})
-      super(classes: classes, html_attributes: html_attributes)
-
       @id                   = id
       @first_cell_is_header = first_cell_is_header
       @caption_text         = caption
 
+      super(classes: classes, html_attributes: html_attributes)
+
       # when no rows are passed in it's likely we're taking the slot approach
       return unless rows.presence
 
@@ -28,8 +28,8 @@ module GovukComponent
       body(rows: body_data, first_cell_is_header: first_cell_is_header)
     end
 
-    def default_classes
-      %w(govuk-table)
+    def default_attributes
+      { id: id, class: %w(govuk-table) }
     end
   end
 end

data/app/components/govuk_component/tag_component.rb

@@ -4,14 +4,14 @@ class GovukComponent::TagComponent < GovukComponent::Base
   COLOURS = %w(grey green turquoise blue red purple pink orange yellow).freeze
 
   def initialize(text: nil, colour: nil, classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
-
     @text   = text
     @colour = colour
+
+    super(classes: classes, html_attributes: html_attributes)
   end
 
   def call
-    tag.strong(tag_content, class: classes.append(colour_class), **html_attributes)
+    tag.strong(tag_content, **html_attributes)
   end
 
 private
@@ -20,8 +20,10 @@ private
     @text || content || fail(ArgumentError, "no text or content")
   end
 
-  def default_classes
-    %w(govuk-tag)
+  def default_attributes
+    {
+      class: ["govuk-tag", colour_class]
+    }
   end
 
   def colour_class

data/app/components/govuk_component/traits/custom_classes.rb

@@ -1,28 +1,4 @@
 module GovukComponent
   module Traits
-    module CustomClasses
-      def classes
-        default_classes.concat(Array.wrap(@classes))
-      end
-
-      def default_classes
-        Rails.logger.warn(%(#default_classes hasn't been defined in #{self.class}))
-
-        []
-      end
-
-    private
-
-      def parse_classes(classes)
-        return [] if classes.blank?
-
-        case classes
-        when Array
-          classes
-        when String
-          classes.split
-        end
-      end
-    end
   end
 end

data/app/components/govuk_component/warning_text_component.rb

@@ -4,14 +4,14 @@ class GovukComponent::WarningTextComponent < GovukComponent::Base
   ICON = '!'.freeze
 
   def initialize(text: nil, icon_fallback_text: 'Warning', classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
-
     @text = text
     @icon_fallback_text = icon_fallback_text
+
+    super(classes: classes, html_attributes: html_attributes)
   end
 
   def call
-    tag.div(class: classes, **html_attributes) do
+    tag.div(**html_attributes) do
       safe_join([icon, warning_text])
     end
   end
@@ -32,7 +32,7 @@ private
     tag.span(icon_fallback_text, class: 'govuk-warning-text__assistive')
   end
 
-  def default_classes
-    %w(govuk-warning-text)
+  def default_attributes
+    { class: %w(govuk-warning-text) }
   end
 end

data/app/helpers/govuk_components_helper.rb

@@ -11,6 +11,7 @@ module GovukComponentsHelper
     govuk_notification_banner: 'GovukComponent::NotificationBannerComponent',
     govuk_panel: 'GovukComponent::PanelComponent',
     govuk_phase_banner: 'GovukComponent::PhaseBannerComponent',
+    govuk_section_break: 'GovukComponent::SectionBreakComponent',
     govuk_start_button: 'GovukComponent::StartButtonComponent',
     govuk_summary_list: 'GovukComponent::SummaryListComponent',
     govuk_table: 'GovukComponent::TableComponent',

data/app/helpers/govuk_link_helper.rb

@@ -68,7 +68,8 @@ module GovukLinkHelper
 
   def govuk_button_link_to(name = nil, options = nil, extra_options = {}, &block)
     extra_options = options if block_given?
-    html_options = build_html_options(extra_options, style: :button)
+    html_options = GovukComponent::StartButtonComponent::BUTTON_ATTRIBUTES
+      .merge build_html_options(extra_options, style: :button)
 
     if block_given?
       link_to(name, html_options, &block)

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '3.0.4'.freeze
+    VERSION = '3.0.5'.freeze
   end
 end

data/lib/govuk/components.rb

@@ -2,3 +2,4 @@ require "rails/engine"
 require "view_component"
 require "govuk/components/helpers/css_utilities"
 require "govuk/components/engine"
+require "html_attributes_utils"