govuk-components 2.0.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc521c772f5513d62d1b8fd78e77a504c4c1eb913770ffc1dd5d2d3020946980
-  data.tar.gz: ee85598308825985ca7e84120562fbecb04c7b6f359aba0bc37386e2a33f8a9f
+  metadata.gz: 1ff2f2871745bc313242de390b143fd475f0983e6ddf03c627512d26e5c52b8c
+  data.tar.gz: c191fa0f05fea8fa6bc19d9fddf8528802086a05f63217e4b48079329cf25a87
 SHA512:
-  metadata.gz: 0c20bba8e5c5b9457d2065edd6f496f8ad93f1baebc7206e5a89260629db9713b59385f61857312aff3947716bc2d1e14064843dd6543655a619e1a050a88f4c
-  data.tar.gz: 8f1c590b69e35bb0ba47840a7fc7f3b12eb6ec6ee30ef92e58cfb67852a1954633808911100160491a0fd1a1d8a1353603cdbcc2eae55fa0686782717a9aa250
+  metadata.gz: ea255c815feebd10555c8f403b4cd3ebac0d807cd1f4fe9a34442318a2f95d75cbbe309fb0f18aebbfcc0a7c32ee3bc962c971717fe7f9506ab10844eea8cda0
+  data.tar.gz: 6dada7350b560d7b967fa1bba83231d82173b1f81c90c563d803583fc4d99347a9973e193adda2eb58af86a86183d5e22d3b17d5e7be3aa9fb0ec8066af75c04

data/README.md

@@ -4,7 +4,7 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/cbcbc140f300b920d833/maintainability)](https://codeclimate.com/github/DFE-Digital/govuk-components/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/cbcbc140f300b920d833/test_coverage)](https://codeclimate.com/github/DFE-Digital/govuk-components/test_coverage)
 [![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk-components)](https://github.com/DFE-Digital/govuk-components/blob/master/LICENSE)
-[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.13.0-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.13.1-brightgreen)](https://design-system.service.gov.uk)
 
 This gem provides a suite of reusable components for the [GOV.UK Design System](https://design-system.service.gov.uk/). It is intended to provide a lightweight alternative to the [GOV.UK Publishing Components](https://github.com/alphagov/govuk_publishing_components) library and is built with Github's [ViewComponent](https://github.com/github/view_component) framework.
 
@@ -32,6 +32,7 @@ The provided components are:
 * [Start button](https://dfe-digital.github.io/govuk-components/#start-button)
 * [Summary list](https://dfe-digital.github.io/govuk-components/#summary-list)
 * [Tabs](https://dfe-digital.github.io/govuk-components/#tabs)
+* [Tables](https://dfe-digital.github.io/govuk-components/#table)
 * [Tags](https://dfe-digital.github.io/govuk-components/#tags)
 * [Warning text](https://dfe-digital.github.io/govuk-components/#warning-text)
 
@@ -44,7 +45,7 @@ All of the components can be rendered in two ways:
 * directly using Rails' `#render` method:
 
   ```erb
-    <%= render GovukComponent::GovukComponent::WarningTextComponent.new do %>
+    <%= render GovukComponent::WarningTextComponent.new do %>
       A serious warning
     <% end %>
   ```

data/app/components/govuk_component/breadcrumbs_component.rb

@@ -33,7 +33,7 @@ private
     if link.present?
       list_item { link_to(text, link, class: "govuk-breadcrumbs__link") }
     else
-      list_item(aria: { current: "page" }) { text }
+      list_item(aria: { current: "page" }) { text.to_s }
     end
   end
 

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

@@ -51,7 +51,7 @@ private
   def wrap_in_p(message_text)
     return if message_text.blank?
 
-    tag.p(message_text)
+    tag.p(message_text, class: "govuk-body")
   end
 
   def actions_element

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

@@ -7,11 +7,19 @@
             <%= custom_logo %>
           <% else %>
             <% if crown %>
+              <!--[if gt IE 8]><!-->
               <svg aria-hidden="true" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 132 97" height="30" width="36">
                 <path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
-                <image src="/assets/images/govuk-logotype-crown.png" xlink:href="" class="govuk-header__logotype-crown-fallback-image" width="36" height="32"></image>
               </svg>
+              <!--<![endif]-->
             <% end %>
+
+            <% if crown_fallback_image_path.present? %>
+              <!--[if IE 8]>
+                <%= image_tag(crown_fallback_image_path, **crown_fallback_image_attributes) %>
+              <![endif]-->
+            <% end %>
+
             <%= tag.span(logotype, class: "govuk-header__logotype-text") %>
           <% end %>
         </span>
@@ -32,9 +40,7 @@
           <nav>
             <%= 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 %>
-                  <%= item %>
-                <% end %>
+                <%= item %>
               <% end %>
             <% end %>
           </nav>

data/app/components/govuk_component/header_component.rb

@@ -5,6 +5,7 @@ class GovukComponent::HeaderComponent < GovukComponent::Base
 
   attr_reader :logotype,
               :crown,
+              :crown_fallback_image_path,
               :homepage_url,
               :service_name,
               :service_url,
@@ -17,6 +18,7 @@ class GovukComponent::HeaderComponent < GovukComponent::Base
                  html_attributes: {},
                  logotype: 'GOV.UK',
                  crown: true,
+                 crown_fallback_image_path: nil,
                  homepage_url: '/',
                  menu_button_label: 'Show or hide navigation menu',
                  navigation_classes: [],
@@ -29,6 +31,7 @@ class GovukComponent::HeaderComponent < GovukComponent::Base
 
     @logotype                  = logotype
     @crown                     = crown
+    @crown_fallback_image_path = crown_fallback_image_path
     @homepage_url              = homepage_url
     @service_name              = service_name
     @service_url               = service_url
@@ -52,23 +55,33 @@ private
     combine_classes(%w(govuk-header__container govuk-width-container), custom_container_classes)
   end
 
+  def crown_fallback_image_attributes
+    {
+      class: "govuk-header__logotype-crown-fallback-image",
+      width: "36",
+      height: "32",
+    }
+  end
+
   class NavigationItem < GovukComponent::Base
-    attr_reader :text, :href, :active
+    attr_reader :text, :href, :options, :active
 
-    def initialize(text:, href: nil, active: false, classes: [], html_attributes: {})
+    def initialize(text:, href: nil, options: {}, active: nil, classes: [], html_attributes: {})
       super(classes: classes, html_attributes: html_attributes)
 
-      @text   = text
-      @href   = href
-      @active = active
+      @text    = text
+      @href    = href
+      @options = options
+
+      @active_override = active
     end
 
-    def active?
-      active
+    def before_render
+      @active = active?(@active_override)
     end
 
     def active_class
-      %w(govuk-header__navigation-item--active) if active?
+      %w(govuk-header__navigation-item--active) if @active
     end
 
     def link?
@@ -76,15 +89,23 @@ private
     end
 
     def call
-      if link?
-        link_to(text, href, class: "govuk-header__link")
-      else
-        text
+      tag.li(class: classes.append(active_class), **html_attributes) do
+        if link?
+          link_to(text, href, **options, class: "govuk-header__link")
+        else
+          text
+        end
       end
     end
 
   private
 
+    def active?(active_override)
+      return current_page?(href) if active_override.nil?
+
+      active_override
+    end
+
     def default_classes
       %w(govuk-header__navigation-item)
     end

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

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

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

@@ -0,0 +1,21 @@
+class GovukComponent::TableComponent::BodyComponent < GovukComponent::Base
+  renders_many :rows, GovukComponent::TableComponent::RowComponent
+
+  def initialize(rows: nil, first_cell_is_header: false, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    build_rows_from_row_data(rows, first_cell_is_header)
+  end
+
+private
+
+  def build_rows_from_row_data(data, first_cell_is_header)
+    return if data.blank?
+
+    data.each { |d| row(cell_data: d, first_cell_is_header: first_cell_is_header) }
+  end
+
+  def default_classes
+    %w(govuk-table__body)
+  end
+end

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

@@ -0,0 +1,39 @@
+class GovukComponent::TableComponent::CaptionComponent < GovukComponent::Base
+  attr_reader :text, :size
+
+  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
+  end
+
+  def call
+    tag.caption(caption_content, class: classes, **html_attributes)
+  end
+
+  def render?
+    caption_content.present?
+  end
+
+private
+
+  def caption_content
+    @caption_content ||= (content || text)
+  end
+
+  def default_classes
+    %w(govuk-table__caption).tap do |c|
+      c << caption_size_class if @size
+    end
+  end
+
+  def caption_size_class
+    fail(ArgumentError, "bad size #{size}, must be in #{SIZES}") unless size.in?(SIZES)
+
+    %(govuk-table__caption--#{size})
+  end
+end

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

@@ -0,0 +1 @@
+<%= content_tag(cell_element, cell_content, class: classes, **html_attributes) %>

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

@@ -0,0 +1,55 @@
+class GovukComponent::TableComponent::CellComponent < GovukComponent::Base
+  attr_reader :text, :header, :numeric, :width
+
+  alias_method :numeric?, :numeric
+
+  WIDTHS = {
+    "full"           => "govuk-input govuk-!-width-full",
+    "three-quarters" => "govuk-input govuk-!-width-three-quarters",
+    "two-thirds"     => "govuk-input govuk-!-width-two-thirds",
+    "one-half"       => "govuk-input govuk-!-width-one-half",
+    "one-third"      => "govuk-input govuk-!-width-one-third",
+    "one-quarter"    => "govuk-input govuk-!-width-one-quarter",
+  }.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
+  end
+
+private
+
+  def width?
+    width.present?
+  end
+
+  def cell_content
+    content || text
+  end
+
+  def cell_element
+    header ? :th : :td
+  end
+
+  def default_classes
+    if header
+      %w(govuk-table__header).tap do |c|
+        c << "govuk-table__header--numeric" if numeric?
+        c << width_class if width?
+      end
+    else
+      %w(govuk-table__cell).tap do |c|
+        c << "govuk-table__cell--numeric" if numeric?
+        c << width_class if width?
+      end
+    end
+  end
+
+  def width_class
+    WIDTHS.fetch(width)
+  end
+end

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

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

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

@@ -0,0 +1,23 @@
+class GovukComponent::TableComponent::HeadComponent < GovukComponent::Base
+  renders_many :rows, GovukComponent::TableComponent::RowComponent
+
+  attr_reader :row_data
+
+  def initialize(rows: nil, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    build_rows_from_row_data(rows)
+  end
+
+private
+
+  def build_rows_from_row_data(data)
+    return if data.blank?
+
+    data.each { |d| row(cell_data: d, header: true) }
+  end
+
+  def default_classes
+    %w(govuk-table__head)
+  end
+end

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

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

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

@@ -0,0 +1,30 @@
+class GovukComponent::TableComponent::RowComponent < GovukComponent::Base
+  renders_many :cells, GovukComponent::TableComponent::CellComponent
+
+  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
+
+    build_cells_from_cell_data(cell_data)
+  end
+
+private
+
+  def build_cells_from_cell_data(cell_data)
+    return if cell_data.blank?
+
+    cell_data.map.with_index { |cd, i| cell(header: cell_is_header?(i), text: cd) }
+  end
+
+  def cell_is_header?(count)
+    header || (first_cell_is_header && count.zero?)
+  end
+
+  def default_classes
+    %w(govuk-table__row)
+  end
+end

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

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

data/app/components/govuk_component/table_component.rb

@@ -0,0 +1,33 @@
+class GovukComponent::TableComponent < GovukComponent::Base
+  renders_one :caption, GovukComponent::TableComponent::CaptionComponent
+  renders_one :head, GovukComponent::TableComponent::HeadComponent
+  renders_many :bodies, GovukComponent::TableComponent::BodyComponent
+
+  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
+
+    # when no rows are passed in it's likely we're taking the slot approach
+    return unless rows.presence
+
+    # if no head is passed in,use the first row for headers
+    build(*(head ? [head, rows] : [rows[0], rows[1..]]), caption_text)
+  end
+
+private
+
+  def build(head_data, body_data, caption_text)
+    caption(text: caption_text)
+    head(rows: [head_data])
+    body(rows: body_data, first_cell_is_header: first_cell_is_header)
+  end
+
+  def default_classes
+    %w(govuk-table)
+  end
+end

data/app/helpers/govuk_components_helper.rb

@@ -13,6 +13,7 @@ module GovukComponentsHelper
     govuk_phase_banner: 'GovukComponent::PhaseBannerComponent',
     govuk_start_button: 'GovukComponent::StartButtonComponent',
     govuk_summary_list: 'GovukComponent::SummaryListComponent',
+    govuk_table: 'GovukComponent::TableComponent',
     govuk_tabs: 'GovukComponent::TabComponent',
     govuk_tag: 'GovukComponent::TagComponent',
     govuk_warning_text: 'GovukComponent::WarningTextComponent',

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '2.0.1'.freeze
+    VERSION = '2.1.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.3
 platform: ruby
 authors:
 - DfE developers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.36.0
+        version: 2.39.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.36.0
+        version: 2.39.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +191,17 @@ files:
 - 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/table_component.html.erb
+- app/components/govuk_component/table_component.rb
+- app/components/govuk_component/table_component/body_component.html.erb
+- app/components/govuk_component/table_component/body_component.rb
+- app/components/govuk_component/table_component/caption_component.rb
+- app/components/govuk_component/table_component/cell_component.html.erb
+- app/components/govuk_component/table_component/cell_component.rb
+- app/components/govuk_component/table_component/head_component.html.erb
+- app/components/govuk_component/table_component/head_component.rb
+- app/components/govuk_component/table_component/row_component.html.erb
+- app/components/govuk_component/table_component/row_component.rb
 - app/components/govuk_component/tag_component.rb
 - app/components/govuk_component/traits/custom_classes.rb
 - app/components/govuk_component/traits/custom_html_attributes.rb
@@ -209,7 +220,7 @@ homepage: https://github.com/DFE-Digital/govuk-components
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -224,8 +235,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Lightweight set of reusable GOV.UK Design System components
 test_files: []