govuk-components 5.0.2 → 5.1.0b1

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

@@ -2,7 +2,7 @@ class GovukComponent::TableComponent::ColGroupComponent < GovukComponent::Base
   renders_many :cols, "ColComponent"
 
   def initialize(classes: [], cols: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
+    super(classes:, html_attributes:)
 
     return if cols.blank?
 
@@ -29,11 +29,11 @@ private
     def initialize(span: 1, classes: [], html_attributes: {})
       @span = span.to_s
 
-      super(classes: classes, html_attributes: html_attributes)
+      super(classes:, html_attributes:)
     end
 
     def call
-      tag.col(span: span, **html_attributes)
+      tag.col(span:, **html_attributes)
     end
 
   private

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

@@ -1,10 +1,10 @@
 class GovukComponent::TableComponent::FootComponent < GovukComponent::Base
   renders_many :rows, ->(cell_data: nil, first_cell_is_header: false, classes: [], html_attributes: {}, &block) do
     GovukComponent::TableComponent::RowComponent.from_foot(
-      cell_data: cell_data,
-      first_cell_is_header: first_cell_is_header,
-      classes: classes,
-      html_attributes: html_attributes,
+      cell_data:,
+      first_cell_is_header:,
+      classes:,
+      html_attributes:,
       &block
     )
   end
@@ -15,7 +15,7 @@ class GovukComponent::TableComponent::FootComponent < GovukComponent::Base
     @rows = rows
     @first_cell_is_header = first_cell_is_header
 
-    super(classes: classes, html_attributes: html_attributes)
+    super(classes:, html_attributes:)
 
     return unless rows.presence
 
@@ -35,7 +35,7 @@ private
   def build_rows_from_row_data(data)
     return if data.blank?
 
-    with_row(cell_data: data, first_cell_is_header: first_cell_is_header)
+    with_row(cell_data: data, first_cell_is_header:)
   end
 
   def default_attributes

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

@@ -1,9 +1,9 @@
 class GovukComponent::TableComponent::HeadComponent < GovukComponent::Base
   renders_many :rows, ->(cell_data: nil, classes: [], html_attributes: {}, &block) do
     GovukComponent::TableComponent::RowComponent.from_head(
-      cell_data: cell_data,
-      classes: classes,
-      html_attributes: html_attributes,
+      cell_data:,
+      classes:,
+      html_attributes:,
       &block
     )
   end
@@ -11,7 +11,7 @@ class GovukComponent::TableComponent::HeadComponent < GovukComponent::Base
   attr_reader :row_data
 
   def initialize(rows: nil, classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
+    super(classes:, html_attributes:)
 
     build_rows_from_row_data(rows)
   end

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

@@ -1,16 +1,16 @@
 class GovukComponent::TableComponent::RowComponent < GovukComponent::Base
   renders_many :cells, ->(scope: nil, header: nil, text: nil, numeric: false, width: nil, rowspan: nil, colspan: nil, classes: [], html_attributes: {}, &block) do
     GovukComponent::TableComponent::CellComponent.new(
-      scope: scope,
-      header: header,
-      text: text,
-      numeric: numeric,
-      width: width,
-      parent: parent,
-      rowspan: rowspan,
-      colspan: colspan,
-      classes: classes,
-      html_attributes: html_attributes,
+      scope:,
+      header:,
+      text:,
+      numeric:,
+      width:,
+      parent:,
+      rowspan:,
+      colspan:,
+      classes:,
+      html_attributes:,
       &block
     )
   end
@@ -21,7 +21,7 @@ class GovukComponent::TableComponent::RowComponent < GovukComponent::Base
     @first_cell_is_header = first_cell_is_header
     @parent = parent
 
-    super(classes: classes, html_attributes: html_attributes)
+    super(classes:, html_attributes:)
 
     build_cells_from_cell_data(cell_data)
   end

data/app/components/govuk_component/table_component.rb

@@ -14,7 +14,7 @@ module GovukComponent
       @first_cell_is_header = first_cell_is_header
       @caption_text         = caption
 
-      super(classes: classes, html_attributes: html_attributes)
+      super(classes:, html_attributes:)
 
       # when no rows are passed in it's likely we're taking the slot approach
       return unless rows.presence
@@ -32,12 +32,12 @@ module GovukComponent
     def build(head_data, body_data, foot_data, caption_text)
       with_caption(text: caption_text)
       with_head(rows: [head_data])
-      with_body(rows: body_data, first_cell_is_header: first_cell_is_header)
-      with_foot(rows: foot_data, first_cell_is_header: first_cell_is_header)
+      with_body(rows: body_data, first_cell_is_header:)
+      with_foot(rows: foot_data, first_cell_is_header:)
     end
 
     def default_attributes
-      { id: id, class: "#{brand}-table" }
+      { id:, class: "#{brand}-table" }
     end
   end
 end

data/app/components/govuk_component/tag_component.rb

@@ -7,7 +7,7 @@ class GovukComponent::TagComponent < GovukComponent::Base
     @text   = text
     @colour = colour
 
-    super(classes: classes, html_attributes: html_attributes)
+    super(classes:, html_attributes:)
   end
 
   def call

data/app/components/govuk_component/task_list_component/item_component.rb

@@ -4,10 +4,10 @@ module GovukComponent
       GovukComponent::TaskListComponent::StatusComponent.new(
         id_prefix: @id_prefix,
         count: @count,
-        text: text,
-        cannot_start_yet: cannot_start_yet,
-        classes: classes,
-        html_attributes: html_attributes,
+        text:,
+        cannot_start_yet:,
+        classes:,
+        html_attributes:,
         &block
       )
     end
@@ -16,11 +16,11 @@ module GovukComponent
       GovukComponent::TaskListComponent::TitleComponent.new(
         id_prefix: @id_prefix,
         count: @count,
-        text: text,
-        href: href,
-        hint: hint,
-        classes: classes,
-        html_attributes: html_attributes,
+        text:,
+        href:,
+        hint:,
+        classes:,
+        html_attributes:,
         &block
       )
     end
@@ -36,7 +36,7 @@ module GovukComponent
       @id_prefix  = id_prefix
       @count      = count
 
-      super(classes: classes, html_attributes: html_attributes)
+      super(classes:, html_attributes:)
     end
 
     def call
@@ -64,15 +64,15 @@ module GovukComponent
     end
 
     def default_attributes
-      { class: 'govuk-task-list__item' }
+      { class: "#{brand}-task-list__item" }
     end
 
     def title_attributes
-      { text: raw_title, href: href, hint: hint }
+      { text: raw_title, href:, hint: }
     end
 
     def html_attributes_with_link_class
-      html_attributes.tap { |h| h[:class].append("govuk-task-list__item--with-link") }
+      html_attributes.tap { |h| h[:class].append("#{brand}-task-list__item--with-link") }
     end
 
     def status_attributes

data/app/components/govuk_component/task_list_component/status_component.rb

@@ -8,7 +8,7 @@ module GovukComponent
       @id_prefix        = id_prefix
       @cannot_start_yet = cannot_start_yet
 
-      super(classes: classes, html_attributes: html_attributes)
+      super(classes:, html_attributes:)
     end
 
     def call
@@ -24,8 +24,8 @@ module GovukComponent
     def default_attributes
       {
         class: class_names(
-          "govuk-task-list__status",
-          "govuk-task-list__status--cannot-start-yet" => cannot_start_yet,
+          "#{brand}-task-list__status",
+          "#{brand}-task-list__status--cannot-start-yet" => cannot_start_yet,
         ),
         id: [id_prefix, count, "status"].compact.join("-"),
       }

data/app/components/govuk_component/task_list_component/title_component.rb

@@ -11,7 +11,7 @@ module GovukComponent
       @id_prefix  = id_prefix
       @count      = count
 
-      super(classes: classes, html_attributes: html_attributes)
+      super(classes:, html_attributes:)
     end
 
     def call
@@ -27,15 +27,15 @@ module GovukComponent
     def hint_content
       return if hint.blank?
 
-      tag.div(hint, class: "govuk-task-list__hint", id: hint_id)
+      tag.div(hint, class: "#{brand}-task-list__hint", id: hint_id)
     end
 
     def default_attributes
-      { class: "govuk-task-list__name-and-hint" }
+      { class: "#{brand}-task-list__name-and-hint" }
     end
 
     def link_attributes
-      { class: "govuk-task-list__link", **aria_described_by_attributes }
+      { class: "#{brand}-task-list__link", **aria_described_by_attributes }
     end
 
     def aria_described_by_attributes

data/app/components/govuk_component/task_list_component.rb

@@ -2,14 +2,14 @@ module GovukComponent
   class TaskListComponent < GovukComponent::Base
     renders_many :items, ->(title: nil, href: nil, hint: nil, status: {}, classes: [], html_attributes: {}) do
       GovukComponent::TaskListComponent::ItemComponent.new(
-        title: title,
-        href: href,
-        hint: hint,
+        title:,
+        href:,
+        hint:,
         id_prefix: @id_prefix,
         count: @count,
-        status: status,
-        classes: classes,
-        html_attributes: html_attributes
+        status:,
+        classes:,
+        html_attributes:
       )
     end
 
@@ -17,7 +17,7 @@ module GovukComponent
       @id_prefix = id_prefix
       @count = 0
 
-      super(classes: classes, html_attributes: html_attributes)
+      super(classes:, html_attributes:)
     end
 
     def call
@@ -31,7 +31,7 @@ module GovukComponent
   private
 
     def default_attributes
-      { class: 'govuk-task-list' }
+      { class: "#{brand}-task-list" }
     end
   end
 end

data/app/components/govuk_component/warning_text_component.rb

@@ -6,7 +6,7 @@ class GovukComponent::WarningTextComponent < GovukComponent::Base
     @icon = icon
     @icon_fallback_text = icon_fallback_text
 
-    super(classes: classes, html_attributes: html_attributes)
+    super(classes:, html_attributes:)
   end
 
   def call

data/app/helpers/govuk_link_helper.rb

@@ -3,41 +3,49 @@ require "html_attributes_utils"
 module GovukLinkHelper
   using HTMLAttributesUtils
 
-  def govuk_link_to(name, href = nil, new_tab: false, inverse: false, muted: false, no_underline: false, no_visited_state: false, text_colour: false, visually_hidden_prefix: nil, visually_hidden_suffix: nil, **kwargs, &block)
-    link_args = extract_link_args(new_tab: new_tab, inverse: inverse, muted: muted, no_underline: no_underline, no_visited_state: no_visited_state, text_colour: text_colour, **kwargs)
-    link_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix)
+  def govuk_link_to(a, b = nil, new_tab: false, inverse: false, muted: false, no_underline: false, no_visited_state: false, text_colour: false, visually_hidden_prefix: nil, visually_hidden_suffix: nil, **kwargs, &block)
+    (block_given?) ? (name, href = nil, a) : (name, href = a, b)
+
+    link_args = extract_link_args(new_tab:, inverse:, muted:, no_underline:, no_visited_state:, text_colour:, **kwargs)
+    link_text = build_text(name, new_tab:, visually_hidden_prefix:, visually_hidden_suffix:)
 
     if block_given?
-      link_to(link_text, **link_args, &block)
+      link_to(href, **link_args, &block)
     else
       link_to(link_text, href, **link_args)
     end
   end
 
-  def govuk_mail_to(email_address, name = nil, new_tab: false, inverse: false, muted: false, no_underline: false, no_visited_state: false, text_colour: false, visually_hidden_prefix: nil, visually_hidden_suffix: nil, **kwargs, &block)
-    link_args = extract_link_args(new_tab: new_tab, inverse: inverse, muted: muted, no_underline: no_underline, no_visited_state: no_visited_state, text_colour: text_colour, **kwargs)
-    link_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix)
+  def govuk_mail_to(a, b = nil, inverse: false, muted: false, no_underline: false, no_visited_state: false, text_colour: false, visually_hidden_prefix: nil, visually_hidden_suffix: nil, **kwargs, &block)
+    (block_given?) ? (email_address, name = a, nil) : (email_address, name = a, b)
+
+    link_args = extract_link_args(inverse:, muted:, no_underline:, no_visited_state:, text_colour:, **kwargs)
+    link_text = build_text(name, visually_hidden_prefix:, visually_hidden_suffix:)
 
     mail_to(email_address, link_text, **link_args, &block)
   end
 
-  def govuk_button_to(name, href = nil, disabled: false, inverse: false, secondary: false, warning: false, visually_hidden_prefix: nil, visually_hidden_suffix: nil, **kwargs, &block)
-    button_args = extract_button_args(new_tab: false, disabled: disabled, inverse: inverse, secondary: secondary, warning: warning, **kwargs)
-    button_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix)
+  def govuk_button_to(a, b = nil, disabled: false, inverse: false, secondary: false, warning: false, visually_hidden_prefix: nil, visually_hidden_suffix: nil, **kwargs, &block)
+    (block_given?) ? (name, href = nil, a) : (name, href = a, b)
+
+    button_args = extract_button_args(new_tab: false, disabled:, inverse:, secondary:, warning:, **kwargs)
+    button_text = build_text(name, visually_hidden_prefix:, visually_hidden_suffix:)
 
     if block_given?
-      button_to(name, **button_args, &block)
+      button_to(href, **button_args, &block)
     else
       button_to(button_text, href, **button_args)
     end
   end
 
-  def govuk_button_link_to(name, href = nil, new_tab: false, disabled: false, inverse: false, secondary: false, warning: false, visually_hidden_prefix: nil, visually_hidden_suffix: nil, **kwargs, &block)
-    button_args = extract_button_link_args(new_tab: new_tab, disabled: disabled, inverse: inverse, secondary: secondary, warning: warning, **kwargs)
-    button_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix)
+  def govuk_button_link_to(a, b = nil, new_tab: false, disabled: false, inverse: false, secondary: false, warning: false, visually_hidden_prefix: nil, visually_hidden_suffix: nil, **kwargs, &block)
+    (block_given?) ? (name, href = nil, a) : (name, href = a, b)
+
+    button_args = extract_button_link_args(new_tab:, disabled:, inverse:, secondary:, warning:, **kwargs)
+    button_text = build_text(name, new_tab:, visually_hidden_prefix:, visually_hidden_suffix:)
 
     if block_given?
-      link_to(name, **button_args, &block)
+      link_to(href, **button_args, &block)
     else
       link_to(button_text, href, **button_args)
     end
@@ -80,7 +88,7 @@ module GovukLinkHelper
 private
 
   def new_tab_args(new_tab)
-    new_tab ? { target: "_blank", rel: "noreferrer noopener" } : {}
+    new_tab != false ? { target: "_blank", rel: "noreferrer noopener" } : {}
   end
 
   def button_attributes(disabled)
@@ -91,7 +99,7 @@ private
     Rails.logger.warn(actions_warning_message(kwargs.fetch(:action))) if kwargs.key?(:action)
     Rails.logger.warn(controller_warning_message(kwargs.fetch(:controller))) if kwargs.key?(:controller)
 
-    link_classes = extract_link_classes(inverse: inverse, muted: muted, no_underline: no_underline, no_visited_state: no_visited_state, text_colour: text_colour)
+    link_classes = extract_link_classes(inverse:, muted:, no_underline:, no_visited_state:, text_colour:)
 
     { **link_classes, **new_tab_args(new_tab) }.deep_merge_html_attributes(kwargs)
   end
@@ -100,13 +108,13 @@ private
     Rails.logger.warn(actions_warning_message(kwargs.fetch(:action))) if kwargs.key?(:action)
     Rails.logger.warn(controller_warning_message(kwargs.fetch(:controller))) if kwargs.key?(:controller)
 
-    button_classes = extract_button_classes(inverse: inverse, secondary: secondary, warning: warning)
+    button_classes = extract_button_classes(inverse:, secondary:, warning:)
 
     { **button_classes, **button_attributes(disabled), **new_tab_args(new_tab) }.deep_merge_html_attributes(kwargs)
   end
 
   def extract_button_args(disabled: false, inverse: false, secondary: false, warning: false, **kwargs)
-    button_classes = extract_button_classes(inverse: inverse, secondary: secondary, warning: warning)
+    button_classes = extract_button_classes(inverse:, secondary:, warning:)
 
     { **button_classes, **button_attributes(disabled) }.deep_merge_html_attributes(kwargs)
   end
@@ -114,11 +122,11 @@ private
   def extract_link_classes(inverse: false, muted: false, no_underline: false, no_visited_state: false, text_colour: false)
     {
       class: govuk_link_classes(
-        inverse: inverse,
-        muted: muted,
-        no_underline: no_underline,
-        no_visited_state: no_visited_state,
-        text_colour: text_colour,
+        inverse:,
+        muted:,
+        no_underline:,
+        no_visited_state:,
+        text_colour:,
       )
     }
   end
@@ -126,9 +134,9 @@ private
   def extract_button_classes(inverse: false, secondary: false, warning: false)
     {
       class: govuk_button_classes(
-        inverse: inverse,
-        secondary: secondary,
-        warning: warning
+        inverse:,
+        secondary:,
+        warning:
       )
     }
   end
@@ -137,13 +145,29 @@ private
     Govuk::Components.brand
   end
 
-  def build_text(text, visually_hidden_prefix:, visually_hidden_suffix:)
+  def build_text(text, visually_hidden_prefix:, visually_hidden_suffix:, new_tab: false)
     return nil if text.nil?
 
     prefix = (visually_hidden_prefix.present?) ? visually_hidden_prefix + " " : nil
     suffix = (visually_hidden_suffix.present?) ? " " + visually_hidden_suffix : nil
 
-    safe_join([govuk_visually_hidden(prefix), text, govuk_visually_hidden(suffix)].compact)
+    parts = [govuk_visually_hidden(prefix), text, govuk_visually_hidden(suffix), new_tab_text(new_tab)]
+
+    safe_join(parts.compact)
+  end
+
+  def new_tab_text(new_tab)
+    return if new_tab.blank?
+
+    text = if new_tab == true
+             Govuk::Components.config.default_link_new_tab_text
+           else
+             new_tab
+           end
+
+    return if text.blank?
+
+    text.starts_with?(" ") ? text : " " + text
   end
 
   def actions_warning_message(value)

data/app/helpers/govuk_visually_hidden_helper.rb

@@ -2,7 +2,13 @@ module GovukVisuallyHiddenHelper
   def govuk_visually_hidden(text = nil, &block)
     return if text.blank? && block.nil?
 
-    tag.span(text, class: "govuk-visually-hidden", &block)
+    tag.span(text, class: "#{brand}-visually-hidden", &block)
+  end
+
+private
+
+  def brand
+    Govuk::Components.brand
   end
 end
 

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '5.0.2'.freeze
+    VERSION = '5.1.0b1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.0b1
 platform: ruby
 authors:
 - DfE developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-05 00:00:00.000000000 Z
+date: 2024-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -53,7 +53,7 @@ dependencies:
         version: '3.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '3.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +126,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.13.0
+        version: 4.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.13.0
+        version: 4.14.0
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -294,14 +294,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -327,7 +327,6 @@ files:
 - README.md
 - Rakefile
 - app/components/govuk_component.rb
-- app/components/govuk_component/accordion_component.html.erb
 - app/components/govuk_component/accordion_component.rb
 - app/components/govuk_component/accordion_component/section_component.html.erb
 - app/components/govuk_component/accordion_component/section_component.rb
@@ -410,11 +409,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: GOV.UK Components for Ruby on Rails

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

@@ -1,5 +0,0 @@
-<%= tag.div(**html_attributes) do %>
-  <% sections.each do |section| %>
-    <%= section %>
-  <% end %>
-<% end %>