govuk-components 6.4.0 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97cb13bbf94f21942d186a15574ab81753e4c14b26382775ab5dcc748043ce68
-  data.tar.gz: b10e0c6b31295930c300d84f51501fedb36de8e33bfb4de528bfd1ae237b5729
+  metadata.gz: f54ed28b71fcc66df0f020e4760ffc756ab559fc71ae04b6754ff9b124d2364e
+  data.tar.gz: 01f758424641f2c494e0764d706ffc1c1ea079fbb36b90e9dd0751e330e6eedb
 SHA512:
-  metadata.gz: 3b5077e7da99cd661503e8625735a2b13d322f772f2b83b65da20caf697ba24818b454d35a6dcd7ef48a4477e2d0710c7e3eeb976167a66f6acd4e75922504c5
-  data.tar.gz: d80c55dca5308bb77e4158274d47e93a5ce22fa98aef05441c314951232696304ce1ee083bf851e2abe1ee97c3b0edd67a18dfc2195fb512bacb64a76a9b4bf0
+  metadata.gz: c016303e309e6a59c33982fafe8983a4a15190847c46bc7ecac2e0967f76f2a60e07b008e9ab9efea6132d34d82163fd312ff990b53ec46557a748e48f977f78
+  data.tar.gz: 30d7b1cd9fb766513bafc9aa0bdc8f362409d2628b31bfc950e06dc6bf10ee3258a3d3a249d5dab89e07612631da05eba175890c2ea4946603cfdd26b6261c0e

data/README.md

@@ -4,7 +4,7 @@
 [![Gem version](https://badge.fury.io/rb/govuk-components.svg)](https://badge.fury.io/rb/govuk-components)
 [![Gem](https://img.shields.io/gem/dt/govuk-components?logo=rubygems)](https://rubygems.org/gems/govuk-components)
 [![Licence](https://img.shields.io/github/license/x-govuk/govuk-components)](https://github.com/x-govuk/govuk-components/blob/main/LICENSE.txt)
-[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-6.3.0-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-6.5.0-brightgreen)](https://design-system.service.gov.uk)
 [![ViewComponent](https://img.shields.io/badge/ViewComponent-4.6.0-brightgreen)](https://viewcomponent.org/)
 [![Rails](https://img.shields.io/badge/Rails-7.2.2%20%E2%95%B1%208.0.2%20%E2%95%B1%208.1.0-E16D6D)](https://weblog.rubyonrails.org/releases/)
 [![Ruby](https://img.shields.io/badge/Ruby-3.3.11%20%20%E2%95%B1%204.0.2-E16D6D)](https://www.ruby-lang.org/en/downloads/)
@@ -31,6 +31,7 @@ The provided components are:
 * [Cookie banner](https://govuk-components.x-govuk.org/components/cookie-banner)
 * [Details](https://govuk-components.x-govuk.org/components/details)
 * [Exit this page](https://govuk-components.x-govuk.org/components/exit-this-page)
+* [Generic header](https://govuk-components.x-govuk.org/components/generic-header)
 * [GOV.UK footer](https://govuk-components.x-govuk.org/components/footer)
 * [GOV.UK header](https://govuk-components.x-govuk.org/components/header)
 * [Inset text](https://govuk-components.x-govuk.org/components/inset-text)
@@ -39,6 +40,7 @@ The provided components are:
 * [Pagination](https://govuk-components.x-govuk.org/components/pagination)
 * [Phase banner](https://govuk-components.x-govuk.org/components/phase-banner)
 * [Section break](https://govuk-components.x-govuk.org/components/section-break)
+* [Service navigation](https://govuk-components.x-govuk.org/components/service-navigation)
 * [Start button](https://govuk-components.x-govuk.org/components/start-button)
 * [Summary list](https://govuk-components.x-govuk.org/components/summary-list)
 * [Tabs](https://govuk-components.x-govuk.org/components/tabs)

data/app/components/govuk_component/feedback_component.rb

@@ -0,0 +1,48 @@
+class GovukComponent::FeedbackComponent < GovukComponent::Base
+  attr_reader :title_text, :text, :heading_level
+
+  renders_one :header
+  renders_one :body
+
+  def initialize(title_text: nil, text: nil, heading_level: 2, classes: [], html_attributes: {})
+    @title_text = title_text
+    @text = text
+    @heading_level = %(h#{heading_level})
+
+    super(classes:, html_attributes:)
+  end
+
+  def call
+    tag.div(**html_attributes) do
+      tag.div(class: "#{brand}-grid-row") do
+        tag.div(class: "#{brand}-grid-column-two-thirds") do
+          safe_join([title_content, text_content])
+        end
+      end
+    end
+  end
+
+private
+
+  def title_content
+    content = header || title_text
+
+    fail(ArgumentError, 'title_text or header is missing') if content.blank?
+
+    content_tag(heading_level, content, class: "#{brand}-feedback__title")
+  end
+
+  def text_content
+    content = body || text
+
+    fail(ArgumentError, 'text or body is missing') if content.blank?
+
+    tag.div(class: "#{brand}-feedback__body") do
+      tag.p(content, class: "#{brand}-body")
+    end
+  end
+
+  def default_attributes
+    { class: ["#{brand}-feedback", "#{brand}-width-container"] }
+  end
+end

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

@@ -1,4 +1,4 @@
-<%= tag.footer(**footer_attributes) do %>
+<%= tag.footer(**footer_html_attributes) do %>
   <%= content %>
   <%= tag.div(**html_attributes) do %>
     <%= tag.div(**container_html_attributes) do %>

data/app/components/govuk_component/footer_component.rb

@@ -10,7 +10,7 @@ class GovukComponent::FooterComponent < GovukComponent::Base
   renders_one :content_after_meta_items
   renders_one :meta_licence_html
 
-  attr_reader :meta_items, :meta_text, :meta_items_title, :meta_licence, :copyright_text, :copyright_url, :custom_container_classes, :footer_attributes
+  attr_reader :meta_items, :meta_text, :meta_items_title, :meta_licence, :copyright_text, :copyright_url, :custom_container_classes, :footer_html_attributes
 
   def initialize(
     classes: [],
@@ -18,7 +18,7 @@ class GovukComponent::FooterComponent < GovukComponent::Base
     container_html_attributes: {},
     copyright_text: config.default_footer_copyright_text,
     copyright_url: config.default_footer_copyright_url,
-    footer_attributes: {},
+    footer_html_attributes: {},
     html_attributes: {},
     meta_items: {},
     meta_items_title: "Support links",
@@ -37,7 +37,7 @@ class GovukComponent::FooterComponent < GovukComponent::Base
     @copyright_url                    = copyright_url
     @custom_container_classes         = container_classes
     @custom_container_html_attributes = container_html_attributes
-    @footer_attributes                = footer_attributes
+    @footer_html_attributes           = footer_html_attributes
 
     super(classes:, html_attributes:)
   end

data/app/components/govuk_component/language_navigation_component.rb

@@ -0,0 +1,95 @@
+class GovukComponent::LanguageNavigationComponent < GovukComponent::Base
+  attr_reader :inverse, :any_rtl
+
+  renders_many :items, "GovukComponent::LanguageNavigationComponent::Item"
+
+  def initialize(items: [], inverse: false, classes: [], html_attributes: {})
+    @items = items
+    @any_rtl = items.any? { |item| item.symbolize_keys[:dir] == 'rtl' }
+    @inverse = inverse
+
+    super(classes:, html_attributes:)
+  end
+
+  def before_render
+    @items.each { |item| with_item(**item, any_rtl:) }
+  end
+
+  def call
+    tag.nav(**html_attributes) do
+      tag.ul(class: "#{brand}-language-navigation__list") do
+        safe_join(items)
+      end
+    end
+  end
+
+  def render?
+    items.any?
+  end
+
+  def default_attributes
+    {
+      class: class_names(
+        "#{brand}-language-navigation",
+        "#{brand}-language-navigation--inverse" => inverse
+      ),
+      aria: { label: 'language' }
+    }
+  end
+
+  class GovukComponent::LanguageNavigationComponent::Item < GovukComponent::Base
+    include GovukVisuallyHiddenHelper
+
+    attr_reader :text, :lang, :current, :href, :href_lang, :language_description_text, :any_rtl, :dir
+
+    def initialize(text:, lang:, href: nil, language_description_text: nil, current: false, href_lang: nil, dir: 'ltr', any_rtl: false, classes: [], html_attributes: {})
+      @text = text
+      @lang = lang
+      @href = href
+      @href_lang = href_lang || lang
+      @current = current
+      @language_description_text = language_description_text
+      @dir = dir if any_rtl
+
+      super(classes:, html_attributes:)
+    end
+
+    def call
+      tag.li(content, **default_attributes)
+    end
+
+  private
+
+    def content
+      common = { dir: dir, lang: lang }
+
+      if current
+        tag.span(
+          text,
+          class: "#{brand}-language-navigation__text",
+          aria: { current: true },
+          **common
+        )
+      else
+        link_text = if language_description_text.present?
+                      text + govuk_visually_hidden(' ' + language_description_text)
+                    else
+                      text
+                    end
+        tag.a(
+          link_text,
+          class: "#{brand}-language-navigation__link",
+          href:,
+          lang: lang,
+          hreflang: href_lang,
+          rel: 'alternate',
+          **common
+        )
+      end
+    end
+
+    def default_attributes
+      { class: "#{brand}-language-navigation__list-item" }
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+<%= tag.div(id:, **html_attributes) do %>
+  <%= panel_title %>
+  <%= panel_body %>
+
+  <% if show_actions? %>
+    <%= tag.div(class: "#{brand}-panel__actions") do %>
+      <%= tag.div(class: "#{brand}-button-group") do %>
+        <% actions.each do |action| %>
+          <%= action %>
+        <% end %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/govuk_component/panel_component.rb

@@ -1,27 +1,29 @@
 class GovukComponent::PanelComponent < GovukComponent::Base
-  attr_reader :id, :title_text, :text, :heading_level
+  attr_reader :id, :title_text, :text, :heading_level, :interruption
 
   renders_one :title_html
+  renders_many :actions, "Action"
 
-  def initialize(title_text: nil, text: nil, heading_level: 1, id: nil, classes: [], html_attributes: {})
+  def initialize(title_text: nil, text: nil, interruption: false, heading_level: 1, id: nil, classes: [], html_attributes: {})
     @heading_level = heading_level
     @title_text    = title_text
     @text          = text
     @id            = id
+    @interruption  = interruption
 
     super(classes:, html_attributes:)
   end
 
-  def call
-    tag.div(id:, **html_attributes) do
-      safe_join([panel_title, panel_body].compact)
-    end
-  end
-
 private
 
   def default_attributes
-    { class: "#{brand}-panel #{brand}-panel--confirmation" }
+    {
+      class: "#{brand}-panel #{brand}-panel--#{mode}",
+    }
+  end
+
+  def mode
+    interruption ? 'interruption' : 'confirmation'
   end
 
   def heading_tag
@@ -53,4 +55,39 @@ private
   def render?
     title.present? || panel_content.present?
   end
+
+  def show_actions?
+    if !interruption && actions?
+      Rails.logger.warn(%(Actions will not be rendered unless the panel is in interruption mode))
+    end
+
+    interruption && actions?
+  end
+
+  class Action < GovukComponent::Base
+    include GovukLinkHelper
+    include GovukVisuallyHiddenHelper
+
+    attr_reader :text, :href, :type
+
+    def initialize(text:, href:, type: :button, classes: [], html_attributes: {})
+      @text = text
+      @href = href
+      @type = type
+
+      super(classes:, html_attributes:)
+    end
+
+    def default_attributes
+      {}
+    end
+
+    def call
+      case type.to_sym
+      when :button then govuk_button_link_to(text, href, inverse: true, **html_attributes)
+      when :link then govuk_link_to(text, href, inverse: true, **html_attributes)
+      else fail ArgumentError, "unrecognised type (must be :link or :button)"
+      end
+    end
+  end
 end

data/app/components/govuk_component/service_navigation_component.rb

@@ -1,6 +1,8 @@
 class GovukComponent::ServiceNavigationComponent < GovukComponent::Base
-  renders_one :start_slot
-  renders_one :end_slot
+  renders_one :navigation_start
+  renders_one :navigation_end
+  renders_one :content_before
+  renders_one :content_after
 
   renders_one :service_name, "GovukComponent::ServiceNavigationComponent::ServiceNameComponent"
   renders_many :navigation_items, ->(text:, href: nil, current_path: nil, active_when: nil, current: false, active: false, classes: [], html_attributes: {}) do
@@ -16,15 +18,16 @@ class GovukComponent::ServiceNavigationComponent < GovukComponent::Base
     )
   end
 
-  attr_reader :aria_label_text, :navigation_id, :inverse
+  attr_reader :aria_label_text, :navigation_id, :inverse, :inline
 
-  def initialize(service_name: nil, service_url: nil, navigation_items: [], current_path: nil, aria_label: "Service information", navigation_id: 'navigation', inverse: false, classes: [], html_attributes: {})
+  def initialize(service_name: nil, service_url: nil, navigation_items: [], current_path: nil, aria_label: "Service information", navigation_id: 'navigation', inverse: false, inline: false, classes: [], html_attributes: {})
     @service_name_text = service_name
     @service_url = service_url
     @current_path = current_path
     @aria_label_text = aria_label
     @navigation_id = navigation_id
     @inverse = inverse
+    @inline = inline
 
     if @service_name_text.present?
       with_service_name(service_name: @service_name_text, service_url:)
@@ -37,17 +40,21 @@ class GovukComponent::ServiceNavigationComponent < GovukComponent::Base
 
   def call
     outer_element do
-      tag.div(class: "#{brand}-width-container") do
-        safe_join(
-          [
-            start_slot,
-            tag.div(class: "#{brand}-service-navigation__container") do
-              safe_join([service_name, navigation].compact)
-            end,
-            end_slot
-          ]
-        )
-      end
+      safe_join(
+        [
+          tag.div(class: class_names("#{brand}-width-container", "#{brand}-service-navigation__inlining-container" => inline)) do
+            safe_join(
+              [
+                content_before,
+                tag.div(class: "#{brand}-service-navigation__container") do
+                  safe_join([service_name, navigation].compact)
+                end,
+                content_after
+              ]
+            )
+          end
+        ]
+      )
     end
   end
 
@@ -60,7 +67,7 @@ class GovukComponent::ServiceNavigationComponent < GovukComponent::Base
   end
 
   def navigation_list
-    tag.ul(safe_join(navigation_items), id: navigation_id, class: "#{brand}-service-navigation__list")
+    tag.ul(safe_join([navigation_start, *navigation_items, navigation_end]), id: navigation_id, class: "#{brand}-service-navigation__list")
   end
 
 private

data/app/helpers/govuk_components_helper.rb

@@ -6,10 +6,12 @@ module GovukComponentsHelper
     govuk_cookie_banner: 'GovukComponent::CookieBannerComponent',
     govuk_details: 'GovukComponent::DetailsComponent',
     govuk_exit_this_page: 'GovukComponent::ExitThisPageComponent',
+    govuk_feedback: 'GovukComponent::FeedbackComponent',
     govuk_footer: 'GovukComponent::FooterComponent',
     govuk_generic_header: 'GovukComponent::GenericHeaderComponent',
     govuk_header: 'GovukComponent::HeaderComponent',
     govuk_inset_text: 'GovukComponent::InsetTextComponent',
+    govuk_language_navigation: 'GovukComponent::LanguageNavigationComponent',
     govuk_notification_banner: 'GovukComponent::NotificationBannerComponent',
     govuk_pagination: 'GovukComponent::PaginationComponent',
     govuk_panel: 'GovukComponent::PanelComponent',

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '6.4.0'.freeze
+    VERSION = '6.5.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.5.0
 platform: ruby
 authors:
 - DfE developers
@@ -58,7 +58,7 @@ dependencies:
         version: '4.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.13'
+        version: '4.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -68,9 +68,9 @@ dependencies:
         version: '4.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.13'
+        version: '4.16'
 - !ruby/object:Gem::Dependency
-  name: deep_merge
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -84,7 +84,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ostruct
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -98,7 +98,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -173,14 +173,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -243,14 +243,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
@@ -313,14 +313,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: 0.37.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: 0.37.0
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -357,6 +357,7 @@ files:
 - app/components/govuk_component/cookie_banner_component/message_component.rb
 - app/components/govuk_component/details_component.rb
 - app/components/govuk_component/exit_this_page_component.rb
+- app/components/govuk_component/feedback_component.rb
 - app/components/govuk_component/footer_component.html.erb
 - app/components/govuk_component/footer_component.rb
 - app/components/govuk_component/generic_header_component.html.erb
@@ -364,6 +365,7 @@ files:
 - app/components/govuk_component/header_component.html.erb
 - app/components/govuk_component/header_component.rb
 - app/components/govuk_component/inset_text_component.rb
+- app/components/govuk_component/language_navigation_component.rb
 - app/components/govuk_component/notification_banner_component.html.erb
 - app/components/govuk_component/notification_banner_component.rb
 - app/components/govuk_component/pagination_component.rb
@@ -371,6 +373,7 @@ files:
 - app/components/govuk_component/pagination_component/item.rb
 - app/components/govuk_component/pagination_component/next_page.rb
 - app/components/govuk_component/pagination_component/previous_page.rb
+- app/components/govuk_component/panel_component.html.erb
 - app/components/govuk_component/panel_component.rb
 - app/components/govuk_component/phase_banner_component.html.erb
 - app/components/govuk_component/phase_banner_component.rb