govuk-components 2.0.0b7 → 2.0.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 841141c88cfcaed118afa205d0b0cee4652d73367807e19568325bc751d87e7b
-  data.tar.gz: 6fa945dffee2ad40ca4b94b1c3847e1324442580611f1b9e372b684b0ea4ecd7
+  metadata.gz: f5515548e238de9a79246999e6690822115fd16a02a6122205b3c79622e2c8fd
+  data.tar.gz: 046d7a25d4c6e80c04dce6064c96f38b655e00d69d9cafaecb598da66f5526a7
 SHA512:
-  metadata.gz: d2a5f01d9e108932a99fdf57d8bfd0837151a8ff96254f2115dc8a4a02d50e16b60539749705fc9b3e54ee8a75269901ffc9ff9965a67fcb5f68b05ab5374d6b
-  data.tar.gz: 767021e9a660ddcf0b6ce3df61f7363341ec0181d4f16fb0584a6c8ac19978eb717997a7c1773dad1ccda68e6a141225c7f67f2fde0ed99e841a6ca2cbac7c71
+  metadata.gz: 61b82755a3220d4323abfba65e4f4473dfa98bb5cdd7712066e74b18c17360e6fae854db1bb713705ec5467cdb45b59d4d6d692052d5c9b3cee13df8bcabc242
+  data.tar.gz: 93d9ae24e9b26dc2f49899369fc0bc92eae4b0439740fb6406d314c1f57dff435b5d7f4b13f62bc50f0a93c4671dc7c311f57feaef225878fdc9988971df693c

data/app/components/govuk_component/cookie_banner_component.rb

@@ -1,14 +1,19 @@
 class GovukComponent::CookieBannerComponent < GovukComponent::Base
-  renders_one :body
-  renders_one :actions
+  renders_many :messages, GovukComponent::CookieBannerComponent::MessageComponent
 
-  attr_accessor :title, :aria_label
+  attr_accessor :aria_label, :hidden
 
-  def initialize(title: nil, aria_label: "Cookie banner", classes: [], html_attributes: {})
+  def initialize(aria_label: "Cookie banner", hidden: false, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @title      = title
     @aria_label = aria_label
+    @hidden     = hidden
+  end
+
+  def call
+    tag.div(class: classes, role: "region", aria: { label: aria_label }, hidden: hidden, **html_attributes) do
+      safe_join(messages)
+    end
   end
 
 private

data/app/components/govuk_component/cookie_banner_component/message_component.rb

@@ -0,0 +1,59 @@
+class GovukComponent::CookieBannerComponent::MessageComponent < GovukComponent::Base
+  attr_reader :heading_text, :text, :hidden, :role
+
+  renders_many :actions
+  renders_one :heading_html
+
+  def initialize(heading_text: nil, text: nil, hidden: false, role: nil, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    @heading_text = heading_text
+    @text         = text
+    @hidden       = hidden
+    @role         = role
+  end
+
+  def call
+    tag.div(class: classes, role: role, hidden: hidden, **html_attributes) do
+      tag.div(class: "govuk-grid-row") do
+        tag.div(class: "govuk-grid-column-two-thirds") do
+          safe_join([heading_element, message_element, actions_element])
+        end
+      end
+    end
+  end
+
+private
+
+  def default_classes
+    %w(govuk-cookie-banner__message govuk-width-container)
+  end
+
+  def heading_element
+    tag.h2(heading_content, class: "govuk-cookie-banner__heading")
+  end
+
+  def heading_content
+    heading_html || heading_text || fail(ArgumentError, "no heading_text or heading_html")
+  end
+
+  def message_element
+    tag.div(message_content, class: "govuk-cookie-banner__content")
+  end
+
+  def message_content
+    content || wrap_in_p(text) || fail(ArgumentError, "no text or content")
+  end
+
+  def wrap_in_p(message_text)
+    return if message_text.blank?
+
+    tag.p(message_text)
+  end
+
+  def actions_element
+    return if actions.none?
+
+    tag.div(class: "govuk-button-group") { safe_join(actions) }
+  end
+end

data/app/components/govuk_component/details_component.rb

@@ -1,17 +1,19 @@
 class GovukComponent::DetailsComponent < GovukComponent::Base
-  attr_reader :summary_text, :text
+  attr_reader :summary_text, :text, :id, :open
 
   renders_one :summary_html
 
-  def initialize(summary_text:, text: nil, classes: [], html_attributes: {})
+  def initialize(summary_text:, text: nil, classes: [], id: nil, open: nil, html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @summary_text = summary_text
     @text         = text
+    @id           = id
+    @open         = open
   end
 
   def call
-    tag.details(class: classes, data: { module: "govuk-details" }, **html_attributes) do
+    tag.details(class: classes, data: { module: "govuk-details" }, id: id, open: open, **html_attributes) do
       safe_join([summary, description])
     end
   end

data/app/components/govuk_component/notification_banner_component.rb

@@ -4,14 +4,14 @@ class GovukComponent::NotificationBannerComponent < GovukComponent::Base
   renders_one :title_html
   renders_many :headings, "Heading"
 
-  def initialize(title_text: nil, text: nil, role: "region", success: false, title_heading_level: 2, title_id: "govuk-notification-banner-title", disable_auto_focus: nil, classes: [], html_attributes: {})
+  def initialize(title_text: nil, text: nil, role: nil, success: false, title_heading_level: 2, title_id: "govuk-notification-banner-title", disable_auto_focus: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @title_text          = title_text
     @title_id            = title_id
     @text                = text
-    @role                = role
     @success             = success
+    @role                = role || default_role
     @title_heading_level = title_heading_level
     @disable_auto_focus  = disable_auto_focus
   end
@@ -20,24 +20,6 @@ class GovukComponent::NotificationBannerComponent < GovukComponent::Base
     headings.any? || text.present? || content.present?
   end
 
-  def classes
-    super.append(success_class).compact
-  end
-
-  def success_class
-    %(govuk-notification-banner--success) if success
-  end
-
-  def title_content
-    title_html || title_text
-  end
-
-  def title_tag
-    fail "title_heading_level must be a number between 1 and 6" unless title_heading_level.is_a?(Integer) && title_heading_level.in?(1..6)
-
-    "h#{title_heading_level}"
-  end
-
   class Heading < GovukComponent::Base
     attr_reader :text, :link_href, :link_text
 
@@ -77,4 +59,26 @@ private
   def data_params
     { "module" => "govuk-notification-banner", "disable-auto-focus" => disable_auto_focus }.compact
   end
+
+  def classes
+    super.append(success_class).compact
+  end
+
+  def success_class
+    %(govuk-notification-banner--success) if success
+  end
+
+  def title_content
+    title_html || title_text
+  end
+
+  def title_tag
+    fail "title_heading_level must be a number between 1 and 6" unless title_heading_level.is_a?(Integer) && title_heading_level.in?(1..6)
+
+    "h#{title_heading_level}"
+  end
+
+  def default_role
+    success ? "alert" : "region"
+  end
 end

data/app/components/govuk_component/panel_component.rb

@@ -1,15 +1,19 @@
 class GovukComponent::PanelComponent < GovukComponent::Base
-  attr_reader :title, :body
+  attr_reader :id, :title_text, :text, :heading_level
 
-  def initialize(title: nil, body: nil, classes: [], html_attributes: {})
+  renders_one :title_html
+
+  def initialize(title_text: nil, text: nil, heading_level: 1, id: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @title = title
-    @body  = body
+    @heading_level = heading_level
+    @title_text    = title_text
+    @text          = text
+    @id            = id
   end
 
   def call
-    tag.div(class: classes, **html_attributes) do
+    tag.div(id: id, class: classes, **html_attributes) do
       safe_join([panel_title, panel_body].compact)
     end
   end
@@ -20,27 +24,33 @@ private
     %w(govuk-panel govuk-panel--confirmation)
   end
 
-  def display_title?
-    title.present?
+  def heading_tag
+    "h#{heading_level}"
+  end
+
+  def panel_content
+    content || text
   end
 
-  def display_body?
-    body.present? || content.present?
+  def title
+    title_html || title_text
   end
 
   def panel_title
-    tag.h1(title, class: "govuk-panel__title") if display_title?
+    return if title.blank?
+
+    content_tag(heading_tag, title, class: "govuk-panel__title")
   end
 
   def panel_body
-    if display_body?
-      tag.div(class: "govuk-panel__body") do
-        content.presence || body
-      end
+    return if panel_content.blank?
+
+    tag.div(class: "govuk-panel__body") do
+      panel_content
     end
   end
 
   def render?
-    display_title? || display_body?
+    title.present? || panel_content.present?
   end
 end

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

@@ -1,11 +1,5 @@
 <%= tag.dl(class: classes, **html_attributes) do %>
   <% rows.each do |row| %>
-    <%= tag.div(class: row.classes, **row.html_attributes) do %>
-      <%= tag.dt(row.key, class: "govuk-summary-list__key") %>
-      <%= tag.dd(row.value, class: "govuk-summary-list__value") %>
-      <% if any_row_has_actions? %>
-        <%= row.action %>
-      <% end %>
-    <% end %>
+    <%= row %>
   <% end %>
 <% end %>

data/app/components/govuk_component/summary_list_component.rb

@@ -1,7 +1,7 @@
 class GovukComponent::SummaryListComponent < GovukComponent::Base
   attr_reader :borders
 
-  renders_many :rows, "Row"
+  renders_many :rows, GovukComponent::SummaryListComponent::RowComponent
 
   def initialize(borders: true, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
@@ -26,41 +26,4 @@ private
   def default_classes
     %w(govuk-summary-list)
   end
-
-  class Row < GovukComponent::Base
-    attr_reader :key, :value, :href, :text, :visually_hidden_text, :action_classes, :action_attributes
-
-    def initialize(key:, value:, action: {}, classes: [], html_attributes: {})
-      super(classes: classes, html_attributes: html_attributes)
-
-      @key   = key
-      @value = value
-
-      if action.present?
-        @href                 = action[:href]
-        @text                 = action[:text] || "Change"
-        @visually_hidden_text = " #{action[:visually_hidden_text] || key.downcase}"
-        @action_classes       = action[:classes] || []
-        @action_attributes    = action[:html_attributes] || {}
-      end
-    end
-
-    def action
-      link_classes = govuk_link_classes.append(action_classes).flatten
-
-      tag.dd(class: "govuk-summary-list__actions") do
-        if href.present?
-          link_to(href, class: link_classes, **action_attributes) do
-            safe_join([text, tag.span(visually_hidden_text, class: "govuk-visually-hidden")])
-          end
-        end
-      end
-    end
-
-  private
-
-    def default_classes
-      %w(govuk-summary-list__row)
-    end
-  end
 end

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

@@ -0,0 +1,34 @@
+class GovukComponent::SummaryListComponent::ActionComponent < GovukComponent::Base
+  attr_reader :href, :text, :visually_hidden_text, :attributes, :classes
+
+  def initialize(href: nil, text: 'Change', visually_hidden_text: nil, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    @href                 = href
+    @text                 = text
+    @visually_hidden_text = visually_hidden_text
+  end
+
+  def call
+    # when no href is provided return an empty string so the dd container
+    # will render, it's useful in lists where some rows have actions
+    # and others don't
+    return "" if href.blank?
+
+    link_classes = govuk_link_classes.append(classes).flatten
+
+    link_to(href, class: link_classes, **html_attributes) do
+      safe_join([action_text, visually_hidden_span])
+    end
+  end
+
+private
+
+  def action_text
+    content || text || fail(ArgumentError, "no text or content")
+  end
+
+  def visually_hidden_span
+    tag.span(visually_hidden_text, class: "govuk-visually-hidden") if visually_hidden_text.present?
+  end
+end

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

@@ -0,0 +1,23 @@
+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
+  end
+
+  def call
+    tag.dt(key_content, class: classes, **html_attributes)
+  end
+
+private
+
+  def default_classes
+    %w(govuk-summary-list__key)
+  end
+
+  def key_content
+    content || text || fail(ArgumentError, "no text or content")
+  end
+end

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

@@ -0,0 +1,45 @@
+class GovukComponent::SummaryListComponent::RowComponent < GovukComponent::Base
+  attr_reader :href, :text, :visually_hidden_text
+
+  renders_one :key, GovukComponent::SummaryListComponent::KeyComponent
+  renders_one :value, GovukComponent::SummaryListComponent::ValueComponent
+  renders_many :actions, GovukComponent::SummaryListComponent::ActionComponent
+
+  def initialize(classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+  end
+
+  def call
+    tag.div(class: classes, **html_attributes) do
+      safe_join([key, value, actions_content])
+    end
+  end
+
+private
+
+  def actions_content
+    return if actions.blank?
+
+    (actions.one?) ? single_action : actions_list
+  end
+
+  def single_action
+    tag.dd(class: actions_class) { safe_join(actions) }
+  end
+
+  def actions_list
+    tag.dd(class: actions_class) do
+      tag.ul(class: "govuk-summary-list__actions-list") do
+        safe_join(actions.map { |action| tag.li(action, class: "govuk-summary-list__actions-list-item") })
+      end
+    end
+  end
+
+  def default_classes
+    %w(govuk-summary-list__row)
+  end
+
+  def actions_class
+    "govuk-summary-list__actions"
+  end
+end

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

@@ -0,0 +1,23 @@
+class GovukComponent::SummaryListComponent::ValueComponent < GovukComponent::Base
+  attr_reader :text
+
+  def initialize(text: nil, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    @text = text
+  end
+
+  def call
+    tag.dd(value_content, class: classes, **html_attributes)
+  end
+
+private
+
+  def default_classes
+    %w(govuk-summary-list__value)
+  end
+
+  def value_content
+    content || text || fail(ArgumentError, "no text or content")
+  end
+end

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

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

data/app/components/govuk_component/tab_component.rb

@@ -1,12 +1,13 @@
 class GovukComponent::TabComponent < GovukComponent::Base
   renders_many :tabs, "Tab"
 
-  attr_reader :title
+  attr_reader :title, :id
 
-  def initialize(title:, classes: [], html_attributes: {})
+  def initialize(title:, id: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @title = title
+    @id    = id
   end
 
 private
@@ -16,16 +17,17 @@ private
   end
 
   class Tab < GovukComponent::Base
-    attr_reader :title
+    attr_reader :label, :text
 
-    def initialize(title:, classes: [], html_attributes: {})
+    def initialize(label:, text: nil, classes: [], html_attributes: {})
       super(classes: classes, html_attributes: html_attributes)
 
-      @title = title
+      @label = label
+      @text  = text
     end
 
     def id(prefix: nil)
-      [prefix, title.parameterize].join
+      [prefix, label.parameterize].join
     end
 
     def hidden_class(i = nil)
@@ -39,7 +41,7 @@ private
     end
 
     def li_link
-      link_to(title, id(prefix: '#'), class: "govuk-tabs__tab")
+      link_to(label, id(prefix: '#'), class: "govuk-tabs__tab")
     end
 
     def default_classes
@@ -47,7 +49,7 @@ private
     end
 
     def call
-      content
+      content || text || fail(ArgumentError, "no text or content")
     end
   end
 end

data/app/components/govuk_component/warning_text_component.rb

@@ -1,13 +1,13 @@
 class GovukComponent::WarningTextComponent < GovukComponent::Base
-  attr_reader :text, :assistive_text
+  attr_reader :text, :icon_fallback_text
 
   ICON = '!'.freeze
 
-  def initialize(text:, assistive_text: 'Warning', classes: [], html_attributes: {})
+  def initialize(text:, icon_fallback_text: 'Warning', classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @text = text
-    @assistive_text = assistive_text
+    @icon_fallback_text = icon_fallback_text
   end
 
   def call
@@ -29,7 +29,7 @@ private
   end
 
   def assistive
-    tag.span(assistive_text, class: 'govuk-warning-text__assistive')
+    tag.span(icon_fallback_text, class: 'govuk-warning-text__assistive')
   end
 
   def default_classes

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '2.0.0b7'.freeze
+    VERSION = '2.0.0rc1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 2.0.0b7
+  version: 2.0.0rc1
 platform: ruby
 authors:
 - DfE developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-23 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -169,8 +169,8 @@ files:
 - app/components/govuk_component/base.rb
 - app/components/govuk_component/breadcrumbs_component.html.erb
 - app/components/govuk_component/breadcrumbs_component.rb
-- app/components/govuk_component/cookie_banner_component.html.erb
 - app/components/govuk_component/cookie_banner_component.rb
+- app/components/govuk_component/cookie_banner_component/message_component.rb
 - app/components/govuk_component/details_component.rb
 - app/components/govuk_component/footer_component.html.erb
 - app/components/govuk_component/footer_component.rb
@@ -185,6 +185,10 @@ files:
 - app/components/govuk_component/start_button_component.rb
 - app/components/govuk_component/summary_list_component.html.erb
 - app/components/govuk_component/summary_list_component.rb
+- app/components/govuk_component/summary_list_component/action_component.rb
+- app/components/govuk_component/summary_list_component/key_component.rb
+- app/components/govuk_component/summary_list_component/row_component.rb
+- app/components/govuk_component/summary_list_component/value_component.rb
 - app/components/govuk_component/tab_component.html.erb
 - app/components/govuk_component/tab_component.rb
 - app/components/govuk_component/tag_component.rb

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

@@ -1,17 +0,0 @@
-<%= tag.div(class: classes, role: "region", aria: { label: aria_label }, **html_attributes) do %>
-  <div class="govuk-cookie-banner__message govuk-width-container">
-    <div class="govuk-grid-row">
-      <div class="govuk-grid-column-two-thirds">
-        <% if title.present? %>
-          <%= tag.h2(title, class: %w(govuk-cookie-banner__heading govuk-heading-m)) %>
-        <% end %>
-
-        <%= tag.div(body, class: "govuk-cookie-banner__content") %>
-      </div>
-    </div>
-
-    <div class="govuk-button-group">
-      <%= actions %>
-    </div>
-  </div>
-<% end %>