govuk_publishing_components 54.0.0 → 55.0.0

data/config/locales/uz.yml

@@ -27,6 +27,8 @@ uz:
       request_format_text: Ушбу файл ёрдамчи технологиялардан фойдаланаётган шахслар учун мос келмаслиги мумкин.
     back_link:
       back: Орқага
+    back_to_top_link:
+      contents: Мундарижа
     character_count:
       body: Сиз %{number} %{type} гача киритишингиз мумкин
       type:
@@ -89,6 +91,8 @@ uz:
       what_doing: Сиз нима қилаётган эдингиз?
       what_wrong: Қандай хатолик бўлди?
       'yes': Ҳа
+    figure:
+      image_credit: 'График материаллар тақдим этилган: %{credit}'
     intervention:
       accessible_link_text_suffix:
     layout_footer:
@@ -108,10 +112,7 @@ uz:
             manage:
               link_text:
     layout_header:
-      hide_button: Излашни яшириш
       menu: Меню
-      search_button: GOV.UK излаш
-      show_button: Излашни кўрсатиш
       top_level: Юқори даража
     layout_super_navigation_header:
       logo_link_title:
@@ -124,7 +125,6 @@ uz:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:
@@ -160,6 +160,13 @@ uz:
       previous:
     print_link:
       text: Ушбу саҳифани чоп этиш
+    published_dates:
+      hidden_heading:
+      hide_all_updates: Барча янгиланишларни яшириш
+      last_updated: Сўнгги янгиланиш %{date}
+      published: Нашр қилинган %{date}
+      see_all_updates: Барча янгиланишларни кўриш
+      show_all_updates: янгиланишларни барчасини кўрсатиш
     radio:
       or: ёки
     related_footer_navigation:

data/config/locales/vi.yml

@@ -26,6 +26,8 @@ vi:
       request_format_text: Tệp này có thể không phù hợp với người dùng công nghệ hỗ trợ.
     back_link:
       back: Quay lại
+    back_to_top_link:
+      contents: Mục lục
     character_count:
       body: Bạn có thể nhập tối đa %{number} %{type}
       type:
@@ -86,6 +88,8 @@ vi:
       what_doing: Bạn đang làm gì?
       what_wrong: Sự cố gì đã xảy ra?
       'yes': Có
+    figure:
+      image_credit: 'Nguồn hình ảnh: %{credit}'
     intervention:
       accessible_link_text_suffix:
     layout_footer:
@@ -105,10 +109,7 @@ vi:
             manage:
               link_text:
     layout_header:
-      hide_button: Ẩn tìm kiếm
       menu: Menu
-      search_button: Tìm kiếm trên GOV.UK
-      show_button: Hiển thị tìm kiếm
       top_level: Mức cao nhất
     layout_super_navigation_header:
       logo_link_title:
@@ -121,7 +122,6 @@ vi:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:
@@ -157,6 +157,13 @@ vi:
       previous:
     print_link:
       text: In trang này
+    published_dates:
+      hidden_heading:
+      hide_all_updates: ẩn tất cả các cập nhật
+      last_updated: Lần cập nhật gần đây nhất %{date}
+      published: Ngày xuất bản %{date}
+      see_all_updates: xem tất cả nội dung cập nhật
+      show_all_updates: hiển thị tất cả nội dung cập nhật
     radio:
       or: hoặc
     related_footer_navigation:

data/config/locales/zh-hk.yml

@@ -26,6 +26,8 @@ zh-hk:
       request_format_text: 此文檔或許不適合輔助技術使用者。
     back_link:
       back: 返回
+    back_to_top_link:
+      contents: 內容
     character_count:
       body: 您最多可輸入 %{number} %{type}
       type:
@@ -85,6 +87,8 @@ zh-hk:
       what_doing: 您剛才在做什麼？
       what_wrong: 出現什麼錯誤？
       'yes': 是
+    figure:
+      image_credit: 圖片來源： %{credit}
     intervention:
       accessible_link_text_suffix:
     layout_footer:
@@ -104,10 +108,7 @@ zh-hk:
             manage:
               link_text:
     layout_header:
-      hide_button: 隱藏搜尋項
       menu: 選單
-      search_button: 搜尋 GOV.UK
-      show_button: 顯示搜尋項
       top_level: 最高級別
     layout_super_navigation_header:
       logo_link_title:
@@ -120,7 +121,6 @@ zh-hk:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:
@@ -156,6 +156,13 @@ zh-hk:
       previous:
     print_link:
       text: 列印本頁面
+    published_dates:
+      hidden_heading:
+      hide_all_updates: 隱藏所有更新
+      last_updated: 最近更新 %{date}
+      published: 已發佈 %{date}
+      see_all_updates: 查看所有更新
+      show_all_updates: 顯示所有更新
     radio:
       or: 或
     related_footer_navigation:

data/config/locales/zh-tw.yml

@@ -26,6 +26,8 @@ zh-tw:
       request_format_text: 此文檔可能不適合輔助科技用戶。
     back_link:
       back: 返回
+    back_to_top_link:
+      contents: 內容
     character_count:
       body: 最多可以輸入 %{number} %{type}
       type:
@@ -85,6 +87,8 @@ zh-tw:
       what_doing: 你做了什麼？
       what_wrong: 哪出錯了？
       'yes': 是的
+    figure:
+      image_credit: 圖片來源： %{credit}
     intervention:
       accessible_link_text_suffix:
     layout_footer:
@@ -104,10 +108,7 @@ zh-tw:
             manage:
               link_text:
     layout_header:
-      hide_button: 隱藏搜尋
       menu: 菜單
-      search_button: 搜尋英國政府網站
-      show_button: 展開搜尋
       top_level: 最高層
     layout_super_navigation_header:
       logo_link_title:
@@ -120,7 +121,6 @@ zh-tw:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:
@@ -156,6 +156,13 @@ zh-tw:
       previous:
     print_link:
       text: 列印此頁面
+    published_dates:
+      hidden_heading:
+      hide_all_updates: 隱藏所有更新
+      last_updated: 最後更新於 %{date}
+      published: 發布於 %{date}
+      see_all_updates: 查看所有更新
+      show_all_updates: 展開所有更新
     radio:
       or: 或
     related_footer_navigation:

data/config/locales/zh.yml

@@ -26,6 +26,8 @@ zh:
       request_format_text: 此文件可能不适合辅助技术用户使用。
     back_link:
       back: 向后
+    back_to_top_link:
+      contents: 目录
     character_count:
       body: 您最多可以输入 %{number} 个 %{type}
       type:
@@ -85,6 +87,8 @@ zh:
       what_doing: 您在干什么？
       what_wrong: 发生了哪些错误？
       'yes': 是
+    figure:
+      image_credit: 图片提供：%{credit}
     intervention:
       accessible_link_text_suffix:
     layout_footer:
@@ -104,10 +108,7 @@ zh:
             manage:
               link_text:
     layout_header:
-      hide_button: 隐藏搜索
       menu: 菜单
-      search_button: 搜索GOV.UK
-      show_button: 显示搜索
       top_level: 最高级
     layout_super_navigation_header:
       logo_link_title:
@@ -120,7 +121,6 @@ zh:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:
@@ -156,6 +156,13 @@ zh:
       previous:
     print_link:
       text: 打印本页面
+    published_dates:
+      hidden_heading:
+      hide_all_updates: 隐藏全部更新
+      last_updated: 上次更新 %{date}
+      published: 发布 %{date}
+      see_all_updates: 查看全部更新
+      show_all_updates: 显示全部更新
     radio:
       or: 或
     related_footer_navigation:

data/lib/govuk_publishing_components/app_helpers/asset_helper.rb

@@ -15,26 +15,25 @@ module GovukPublishingComponents
 
       # This is used to dedupe stylesheets.
       STATIC_STYLESHEET_LIST = %w[
-        govuk_publishing_components/components/_breadcrumbs.css
-        govuk_publishing_components/components/_button.css
-        govuk_publishing_components/components/_error-message.css
-        govuk_publishing_components/components/_heading.css
-        govuk_publishing_components/components/_hint.css
-        govuk_publishing_components/components/_input.css
-        govuk_publishing_components/components/_label.css
-        govuk_publishing_components/components/_search.css
-        govuk_publishing_components/components/_search-with-autocomplete.css
-        govuk_publishing_components/components/_skip-link.css
-        govuk_publishing_components/components/_textarea.css
-        govuk_publishing_components/components/_title.css
-
-        govuk_publishing_components/components/_cookie-banner.css
-        govuk_publishing_components/components/_cross-service-header.css
-        govuk_publishing_components/components/_feedback.css
-        govuk_publishing_components/components/_layout-footer.css
-        govuk_publishing_components/components/_layout-for-public.css
-        govuk_publishing_components/components/_layout-header.css
-        govuk_publishing_components/components/_layout-super-navigation-header.css
+        breadcrumbs
+        button
+        error-message
+        heading
+        hint
+        input
+        label
+        search
+        search-with-autocomplete
+        skip-link
+        textarea
+        title
+        cookie-banner
+        cross-service-header
+        feedback
+        layout-footer
+        layout-for-public
+        layout-header
+        layout-super-navigation-header
       ].freeze
 
       def add_stylesheet_path(component_path)
@@ -81,15 +80,25 @@ module GovukPublishingComponents
     private
 
       def is_already_used?(component)
-        if GovukPublishingComponents::Config.exclude_css_from_static && !viewing_component_guide?
-          all_component_stylesheets_being_used.include?(component) || STATIC_STYLESHEET_LIST.include?(component)
-        else
-          all_component_stylesheets_being_used.include?(component)
-        end
+        (all_component_stylesheets_being_used + component_paths(css_exclude_list)).include?(component)
+      end
+
+      def css_exclude_list
+        return [] if viewing_component_guide?
+        return GovukPublishingComponents::Config.custom_css_exclude_list if GovukPublishingComponents::Config.custom_css_exclude_list&.any?
+        return STATIC_STYLESHEET_LIST if GovukPublishingComponents::Config.exclude_css_from_static
+
+        []
       end
 
       def viewing_component_guide?
-        request&.path&.include?("/component-guide")
+        return false unless request
+
+        request.path.include?("/component-guide")
+      end
+
+      def component_paths(component_list)
+        component_list.map { |c| "govuk_publishing_components/components/_#{c}.css" }
       end
     end
   end

data/lib/govuk_publishing_components/config.rb

@@ -18,6 +18,9 @@ module GovukPublishingComponents
     mattr_accessor :application_javascript
     self.application_javascript = "application"
 
+    mattr_accessor :custom_css_exclude_list
+    self.custom_css_exclude_list = []
+
     mattr_accessor :exclude_css_from_static
     self.exclude_css_from_static = true
 

data/lib/govuk_publishing_components/presenters/attachment_helper.rb

@@ -47,13 +47,9 @@ module GovukPublishingComponents
         )
       end
 
-      def content_type_abbr
-        content_type.abbr
-      end
+      delegate :abbr, to: :content_type, prefix: true
 
-      def content_type_name
-        content_type.name
-      end
+      delegate :name, to: :content_type, prefix: true
 
       def file_size
         attachment_data[:file_size]

data/lib/govuk_publishing_components/presenters/checkboxes_helper.rb

@@ -64,7 +64,7 @@ module GovukPublishingComponents
       end
 
       def heading_markup
-        return unless @heading.present?
+        return if @heading.blank?
 
         if @is_page_heading
           content_tag(
@@ -87,7 +87,7 @@ module GovukPublishingComponents
         checkbox_id = checkbox[:id] || "#{@id}-#{index}"
         controls = checkbox[:controls]
         aria_controls = "#{checkbox_id}-conditional-#{index || rand(1..100)}" if checkbox[:conditional].present?
-        checkbox_name = checkbox[:name].present? ? checkbox[:name] : @name
+        checkbox_name = checkbox[:name].presence || @name
         checked = true if checkbox[:checked].present?
         data = checkbox[:data_attributes] || {}
         data[:controls] = controls

data/lib/govuk_publishing_components/presenters/component_wrapper_helper.rb

@@ -24,24 +24,24 @@ module GovukPublishingComponents
       def all_attributes
         attributes = {}
 
-        attributes[:id] = @options[:id] unless @options[:id].blank?
-        attributes[:data] = @options[:data_attributes] unless @options[:data_attributes].blank?
-        attributes[:aria] = @options[:aria] unless @options[:aria].blank?
+        attributes[:id] = @options[:id] if @options[:id].present?
+        attributes[:data] = @options[:data_attributes] if @options[:data_attributes].present?
+        attributes[:aria] = @options[:aria] if @options[:aria].present?
 
         ((@options[:classes] ||= "") << " govuk-!-margin-bottom-#{@options[:margin_bottom]}").strip! if @options[:margin_bottom]
-        attributes[:class] = @options[:classes] unless @options[:classes].blank?
+        attributes[:class] = @options[:classes] if @options[:classes].present?
 
-        attributes[:role] = @options[:role] unless @options[:role].blank?
-        attributes[:lang] = @options[:lang] unless @options[:lang].blank?
-        attributes[:open] = @options[:open] unless @options[:open].blank?
+        attributes[:role] = @options[:role] if @options[:role].present?
+        attributes[:lang] = @options[:lang] if @options[:lang].present?
+        attributes[:open] = @options[:open] if @options[:open].present?
         attributes[:hidden] = @options[:hidden] unless @options[:hidden].nil?
-        attributes[:tabindex] = @options[:tabindex] unless @options[:tabindex].blank?
-        attributes[:dir] = @options[:dir] unless @options[:dir].blank?
-        attributes[:type] = @options[:type] unless @options[:type].blank?
-        attributes[:draggable] = @options[:draggable] unless @options[:draggable].blank?
-        attributes[:rel] = @options[:rel] unless @options[:rel].blank?
-        attributes[:target] = @options[:target] unless @options[:target].blank?
-        attributes[:title] = @options[:title] unless @options[:title].blank?
+        attributes[:tabindex] = @options[:tabindex] if @options[:tabindex].present?
+        attributes[:dir] = @options[:dir] if @options[:dir].present?
+        attributes[:type] = @options[:type] if @options[:type].present?
+        attributes[:draggable] = @options[:draggable] if @options[:draggable].present?
+        attributes[:rel] = @options[:rel] if @options[:rel].present?
+        attributes[:target] = @options[:target] if @options[:target].present?
+        attributes[:title] = @options[:title] if @options[:title].present?
 
         attributes
       end

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_organisations.rb

@@ -24,7 +24,7 @@ module GovukPublishingComponents
 
       def organisation_breadcrumbs_items
         first_related_organisation = ContentItem.new(content_item.related_organisations.first)
-        return [] unless first_related_organisation.present?
+        return [] if first_related_organisation.blank?
 
         [{
           title: first_related_organisation.title,

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons.rb

@@ -14,7 +14,7 @@ module GovukPublishingComponents
         ordered_parents = all_parents.map.with_index do |parent, index|
           {
             title: parent.title,
-            url: parent.url_override.present? ? parent.url_override : parent.base_path,
+            url: parent.url_override.presence || parent.base_path,
             is_page_parent: index.zero?,
           }
         end

data/lib/govuk_publishing_components/presenters/content_item.rb

@@ -124,9 +124,7 @@ module GovukPublishingComponents
         content_id == other.content_id
       end
 
-      def hash
-        content_id.hash
-      end
+      delegate :hash, to: :content_id
 
       def eql?(other)
         self == other

data/lib/govuk_publishing_components/presenters/machine_readable/article_schema.rb

@@ -29,7 +29,7 @@ module GovukPublishingComponents
       # Not all formats have a `body` - some have their content split over
       # multiple fields. In this case we'll skip the `articleBody` field
       def body
-        return {} unless page.body.present?
+        return {} if page.body.blank?
 
         {
           "articleBody" => page.body,

data/lib/govuk_publishing_components/presenters/machine_readable/government_service_schema.rb

@@ -25,7 +25,7 @@ module GovukPublishingComponents
       def related_services
         related_links = page.content_item.dig("links", "ordered_related_items")
 
-        return {} unless related_links.present?
+        return {} if related_links.blank?
 
         {
           "isRelatedTo" => related_links.each_with_object([]) do |link, items|
@@ -43,7 +43,7 @@ module GovukPublishingComponents
       def provider
         organisations = page.content_item.dig("links", "organisations")
 
-        return {} unless organisations.present?
+        return {} if organisations.blank?
 
         providers = organisations.map do |organisation|
           {

data/lib/govuk_publishing_components/presenters/machine_readable/organisation_schema.rb

@@ -29,7 +29,7 @@ module GovukPublishingComponents
     private
 
       def members
-        return {} unless ministers.present?
+        return {} if ministers.blank?
 
         members = ministers_with_grouped_roles.map do |person, roles|
           person.merge("hasOccupation" => roles)
@@ -67,7 +67,7 @@ module GovukPublishingComponents
       end
 
       def role_for_minister(minister)
-        return {} unless minister["role"].present?
+        return {} if minister["role"].blank?
 
         {
           "@type" => "Role",
@@ -108,7 +108,7 @@ module GovukPublishingComponents
       def related_organisations(link_type, schema_name)
         organisations = page.content_item.dig("links", link_type)
 
-        return {} unless organisations.present?
+        return {} if organisations.blank?
 
         related_orgs = organisations.map do |org|
           page = Page.new(content_item: org)

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -47,8 +47,8 @@ module GovukPublishingComponents
         meta_tags["govuk:updated-at"] = content_item[:updated_at] if content_item[:updated_at]
         meta_tags["govuk:public-updated-at"] = content_item[:public_updated_at] if content_item[:public_updated_at]
         primary_publisher = content_item.dig(:links, :primary_publishing_organisation)
-        primary_publisher = primary_publisher.first[:title] unless primary_publisher.blank?
-        meta_tags["govuk:primary-publishing-organisation"] = primary_publisher unless primary_publisher.blank?
+        primary_publisher = primary_publisher.first[:title] if primary_publisher.present?
+        meta_tags["govuk:primary-publishing-organisation"] = primary_publisher if primary_publisher.present?
 
         # Some browse topics are nested in the content item, we want to grab these for GA4 tracking.
         ga4_browse_topic = content_item.dig(:links, :ordered_related_items, 0, :links, :mainstream_browse_pages, 0, :links, :parent, 0, :title)

data/lib/govuk_publishing_components/presenters/page_with_step_by_step_navigation.rb

@@ -140,7 +140,7 @@ module GovukPublishingComponents
       end
 
       def active_step_nav_content_id
-        @active_step_nav_content_id ||= @query_parameters["step-by-step-nav"].present? ? @query_parameters["step-by-step-nav"] : nil
+        @active_step_nav_content_id ||= @query_parameters["step-by-step-nav"].presence
       end
 
       def steps

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "54.0.0".freeze
+  VERSION = "55.0.0".freeze
 end

data/node_modules/axe-core/README.md

@@ -14,7 +14,7 @@ Axe is an accessibility testing engine for websites and other HTML-based user in
 
 ## The Accessibility Rules
 
-Axe-core has different types of rules, for WCAG 2.0, 2.1, 2.2 on level A, AA and AAA as well as a number of best practices that help you identify common accessibility practices like ensuring every page has an `h1` heading, and to help you avoid "gotchas" in ARIA like where an ARIA attribute you used will get ignored. The complete list of rules, grouped WCAG level and best practice, can found in [doc/rule-descriptions.md](./doc/rule-descriptions.md).
+Axe-core has different types of rules, for WCAG 2.0, 2.1, 2.2 on level A, AA and AAA as well as a number of best practices that help you identify common accessibility practices like ensuring every page has an `h1` heading, and to help you avoid "gotchas" in ARIA like where an ARIA attribute you used will get ignored. The complete list of rules, grouped WCAG level and best practice, can be found in [doc/rule-descriptions.md](./doc/rule-descriptions.md).
 
 With axe-core, you can find **on average 57% of WCAG issues automatically**. Additionally, axe-core will return elements as "incomplete" where axe-core could not be certain, and manual review is needed.
 
@@ -65,7 +65,7 @@ Axe was built to reflect how web development actually works. It works with all m
 - It's actively supported by [Deque Systems](https://www.deque.com), a major accessibility vendor.
 - It integrates with your existing functional/acceptance automated tests.
 - It automatically determines which rules to run based on the evaluation context.
-- Axe supports in-memory fixtures, static fixtures, integration tests and iframes of infinite depth.
+- Axe supports in-memory fixtures, static fixtures, integration tests, and iframes of infinite depth.
 - Axe is highly configurable.
 
 ## Supported Browsers