govuk-components 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc5053813a261dbf7186f651f83acd14de2649b640fd92b6a4c3012caa6a8275
-  data.tar.gz: 43d9197a5f643ddd30e9b4eb65853f3426eb709788a208b5d9d627e394318a9f
+  metadata.gz: 8fa9844129aad4b89c9845af6db1fbd942d0bde94823f891f65164163b935295
+  data.tar.gz: 962375a05bc998a2b5caf5e3eeccb2a7f12a8dd120e8054857e79128287d3b8f
 SHA512:
-  metadata.gz: c23bc16a3acefaefc365388925f769529593371ec7352be230d255f75288610d8cd2c49ccb31ac5c18515bfbff008b7045fa00359c164b52c0a05133331b1147
-  data.tar.gz: e6dbb5cb608edb3c7f0412fdc7f1e90aa02cc8176ba312660323f2c2c18479c693735b41bc78bb84855aff50c455ac2ff94ff1f1c327716ede2167bae176ad25
+  metadata.gz: '048424bb98e6ed1ba126dfa971310ffa8b61629aea7394c1da291eeaa0c9bf31b1d1d547d190bcf8e31ce17f13b8b9d501bb8e9ccd01e2ba5c3a2f9444b6693d'
+  data.tar.gz: 4c30a89b2f53b0cdcc869ae766182249f7d0c34b2c81c507c8ae6835344cc2b734b065ada162643a1ad15cb701d5af2445abec5173a400470c5cf458f28146ba

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

@@ -5,6 +5,6 @@
     </span>
   </summary>
   <div class="govuk-details__text">
-    <%= @description || content %>
+    <%= content.presence || @description %>
   </div>
 <% end %>

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

@@ -12,6 +12,15 @@
           </span>
         </span>
       </a>
+      <% if @product_name.present? %>
+        <span class="govuk-header__product-name">
+          <%= @product_name %>
+        </span>
+      <% end %>
+
+      <% if product_description.present? %>
+        <%= product_description.content %>
+      <% end %>
     </div>
     <div class="govuk-header__content">
       <% if @service_name.present? %>

data/app/components/govuk_component/header.rb

@@ -1,18 +1,22 @@
 class GovukComponent::Header < GovukComponent::Base
   include ViewComponent::Slotable
 
-  attr_accessor :logo, :logo_href, :service_name, :service_name_href
+  attr_accessor :logo, :logo_href, :service_name, :service_name_href, :product_name
 
   with_slot :item, collection: true, class_name: 'Item'
   wrap_slot :item
 
-  def initialize(logo: 'GOV.UK', logo_href: '/', service_name: nil, service_name_href: '/', classes: [], html_attributes: {})
+  with_slot :product_description
+  wrap_slot :product_description
+
+  def initialize(logo: 'GOV.UK', logo_href: '/', service_name: nil, service_name_href: '/', product_name: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @logo              = logo
     @logo_href         = logo_href
     @service_name      = service_name
     @service_name_href = service_name_href
+    @product_name      = product_name
   end
 
 private

data/app/components/govuk_component/inset_text.rb

@@ -1,14 +1,18 @@
 class GovukComponent::InsetText < GovukComponent::Base
   attr_accessor :text
 
-  def initialize(text:, classes: [], html_attributes: {})
+  def initialize(text: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @text = text
   end
 
   def call
-    tag.div(class: classes, **html_attributes) { @text }
+    tag.div(class: classes, **html_attributes) { content.presence || @text }
+  end
+
+  def render?
+    @text.present? || content.present?
   end
 
 private

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

@@ -1,9 +1,13 @@
 <%= tag.div(class: classes, **html_attributes) do %>
-  <h1 class="govuk-panel__title">
-    <%= @title %>
-  </h1>
+  <% if display_title? %>
+    <h1 class="govuk-panel__title">
+      <%= @title %>
+    </h1>
+  <% end %>
 
-  <div class="govuk-panel__body">
-    <%= @body %>
-  </div>
+  <% if display_body? %>
+    <div class="govuk-panel__body">
+      <%= content.presence || @body %>
+    </div>
+  <% end %>
 <% end %>

data/app/components/govuk_component/panel.rb

@@ -1,7 +1,7 @@
 class GovukComponent::Panel < GovukComponent::Base
   attr_accessor :title, :body
 
-  def initialize(title:, body:, classes: [], html_attributes: {})
+  def initialize(title: nil, body: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @title = title
@@ -13,4 +13,16 @@ private
   def default_classes
     %w(govuk-panel govuk-panel--confirmation)
   end
+
+  def display_title?
+    @title.present?
+  end
+
+  def display_body?
+    [@body, content].any?(&:present?)
+  end
+
+  def render?
+    display_title? || display_body?
+  end
 end

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

@@ -1,10 +1,8 @@
 <%= tag.div(class: classes, **html_attributes) do %>
   <p class="govuk-phase-banner__content">
-    <strong class="govuk-tag govuk-phase-banner__content__tag">
-      <%= @phase %>
-    </strong>
+    <%= render(phase_tag) %>
     <span class="govuk-phase-banner__text">
-      <%= @text || content %>
+      <%= content.presence || @text %>
     </span>
   </p>
 <% end %>

data/app/components/govuk_component/phase_banner.rb

@@ -1,11 +1,11 @@
 class GovukComponent::PhaseBanner < GovukComponent::Base
-  attr_accessor :phase, :text
+  attr_accessor :phase_tag, :text
 
-  def initialize(phase:, text: nil, classes: [], html_attributes: {})
+  def initialize(phase_tag: nil, text: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @phase = phase
-    @text  = text
+    @phase_tag = GovukComponent::Tag.new(classes: "govuk-phase-banner__content__tag", **phase_tag)
+    @text      = text
   end
 
 private

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '1.1.6'.freeze
+    VERSION = '1.1.7'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - DfE developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties