govuk_publishing_components 34.11.0 → 34.13.0

data/app/views/govuk_publishing_components/components/_signup_link.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("signup-link")
+
   local_assigns[:heading_level] ||= 3
   local_assigns[:margin_bottom] ||= 0
   link_text ||= false

data/app/views/govuk_publishing_components/components/_single_page_notification_button.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("single-page-notification-button")
+
   component_helper = GovukPublishingComponents::Presenters::SinglePageNotificationButtonHelper.new(local_assigns)
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 

data/app/views/govuk_publishing_components/components/_skip_link.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("skip-link")
+
   href ||= '#main-content'
   text ||= t('components.skip_link.text')
 %>

data/app/views/govuk_publishing_components/components/_step_by_step_nav.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("step-by-step-nav")
+
   options = {}
   options[:heading_level] = heading_level ||= 2
 

data/app/views/govuk_publishing_components/components/_step_by_step_nav_header.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("step-by-step-nav-header")
+
   title ||= false
   path ||= false
   breadcrumbs = [
@@ -20,7 +22,7 @@
   end
 
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
-  classes = %w(gem-c-step-nav-header)
+  classes = %w[gem-c-step-nav-header]
   classes << shared_helper.get_margin_bottom if local_assigns[:margin_bottom]
 %>
 <% if title %>

data/app/views/govuk_publishing_components/components/_step_by_step_nav_related.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("step-by-step-nav-related")
+
   links ||= []
   pretitle ||= t("components.step_by_step_nav_related.part_of")
   always_display_as_list ||= false

data/app/views/govuk_publishing_components/components/_subscription_links.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("subscription-links")
+
   brand ||= false
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
 

data/app/views/govuk_publishing_components/components/_success_alert.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("success-alert")
+
   description ||= nil
   title_id ||= "govuk-notification-banner-title-#{SecureRandom.hex(4)}"
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)

data/app/views/govuk_publishing_components/components/_summary_list.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("summary-list")
+
   local_assigns[:heading_level] ||= 3
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   heading_size = "m" unless shared_helper.valid_heading_size?(heading_size)

data/app/views/govuk_publishing_components/components/_table.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("table")
+
   caption ||= nil
   head ||= []
   rows ||= []
@@ -16,7 +18,7 @@
   <%= GovukPublishingComponents::AppHelpers::TableHelper.helper(self, caption, {
       sortable: sortable,
       filterable: filterable,
-      caption_classes: caption_classes, 
+      caption_classes: caption_classes,
       table_id: table_id
     }) do |t| %>
 

data/app/views/govuk_publishing_components/components/_tabs.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("tabs")
+
   tabs ||= []
   panel_border ||= true unless panel_border == false
   panel_css_classes = %w(govuk-tabs__panel)

data/app/views/govuk_publishing_components/components/_textarea.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("textarea")
+
   id ||= "textarea-#{SecureRandom.hex(4)}"
   value ||= nil
   rows ||= 5

data/app/views/govuk_publishing_components/components/_title.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("title")
+
   average_title_length ||= false
 
   context ||= false

data/app/views/govuk_publishing_components/components/_translation_nav.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("translation-nav")
+
   brand ||= false
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
   translation_helper = GovukPublishingComponents::Presenters::TranslationNavHelper.new(local_assigns)

data/app/views/govuk_publishing_components/components/_warning_text.html.erb

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("warning-text")
+
   id ||= "warning-text-#{SecureRandom.hex(4)}"
   text_assistive ||= 'Warning'
   text_icon ||= '!'

data/app/views/govuk_publishing_components/components/docs/related_navigation.yml

@@ -333,3 +333,23 @@ examples:
             - title: UK-China High-Level People to People Dialogue 2017
               base_path: /government/topical-events/uk-china-high-level-people-to-people-dialogue-2017
               document_type: topical_event
+          world_locations:
+            - title: Algeria
+              base_path: /world/algeria/news
+            - title: Austria
+              base_path: /world/austria/news
+            - title: Belarus
+              base_path: /world/belarus/news
+            - title: Belgium
+              base_path: /world/belgium/news
+            - title: Bolivia
+              base_path: /world/bolivia/news
+            - title: Brazil
+              base_path: /world/brazil/news
+            - title: Canada
+              base_path: /world/canada/news
+            - title: Chile
+              base_path: /world/chile/news
+            - title: China
+              base_path: /world/China/news
+ 

data/app/views/govuk_publishing_components/components/related_navigation/_section.html.erb

@@ -63,17 +63,23 @@
     <% end %>
 
     <% if links.length > section_link_limit %>
-      <li class="gem-c-related-navigation__link toggle-wrap">
-        <a href="#"
-          class="gem-c-related-navigation__toggle"
-          data-controls="toggle_<%= section_title %>"
-          data-expanded="false"
-          data-toggled-text="<%= t("common.toggle_less") %>">
+      <%
+        classes = "gem-c-related-navigation__link toggle-wrap"      
+        data_attributes_li = { module: "ga4-event-tracker" } if ga4_tracking
+        data_attributes_link = {
+          controls: "toggle_#{section_title}",
+          expanded: "false",
+          toggled_text: t("common.toggle_less")
+        }
+        data_attributes_link[:ga4_event] = { "event_name": "select_content", "type": "related content" } if ga4_tracking
+      %>
+      <%= tag.li(class: classes, data: data_attributes_li) do %>
+        <%= link_to("#", class: "gem-c-related-navigation__toggle", data: data_attributes_link) do %>
           <%= t("common.toggle_more",
             show: t('common.show'),
-            number: related_nav_helper.remaining_link_count(links)) %>
-        </a>
-      </li>
+            number: related_nav_helper.remaining_link_count(links)) %>        
+        <% end %>
+      <% end %>
 
       <li class="gem-c-related-navigation__link gem-c-related-navigation__link--truncated-links">
         <span id="toggle_<%= section_title %>" class="gem-c-related-navigation__toggle-more js-hidden">

data/config/locales/en.yml

@@ -293,7 +293,7 @@ en:
         - label: 'Homes for Ukraine: record your interest'
           href: https://www.gov.uk/register-interest-homes-ukraine
         - label: Find out about the UK’s response
-          href: https://ukstandswithukraine.campaign.gov.uk/
+          href: https://www.gov.uk/government/topical-events/russian-invasion-of-ukraine-uk-government-response
         title: Invasion of Ukraine
       world_locations: World locations
     search_box:

data/lib/govuk_publishing_components/app_helpers/asset_helper.rb

@@ -0,0 +1,86 @@
+module GovukPublishingComponents
+  module AppHelpers
+    module AssetHelper
+      # This is a list of all the components that have stylesheets - so a new
+      # component needs to be added to this list rather than being laboriously
+      # added and removed from every single rendering application.
+      COMPONENT_CSS_PATHS = Dir.glob("#{GovukPublishingComponents::Config.gem_directory}/app/assets/stylesheets/govuk_publishing_components/components/_*.scss").map { |path|
+        filename = path.split("/").last
+        component_name = filename.sub("_", "").sub(".scss", "")
+        "govuk_publishing_components/components/_#{component_name}.css"
+      }.freeze
+
+      # This list includes components already included in Static; taken from
+      # https://github.com/alphagov/static/blob/198a598682df40ce4a2c3c286c06244297c18cf0/app/assets/stylesheets/application.scss
+
+      # 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/_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/_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
+      ].freeze
+
+      def add_stylesheet_path(component_path)
+        unless is_already_used?(component_path)
+          all_component_stylesheets_being_used << component_path
+        end
+      end
+
+      # Used to add a component that exists in the gem to the list
+      def add_gem_component_stylesheet(gem_component)
+        add_stylesheet_path("govuk_publishing_components/components/_#{gem_component}.css")
+      end
+
+      # Used to add a component that exists in the application to the list
+      def add_app_component_stylesheet(app_component)
+        add_stylesheet_path("components/_#{app_component}.css")
+      end
+
+      # Some applications have view-specific stylesheets - use this method
+      # to add them to the list
+      def add_view_stylesheet(view_component)
+        add_stylesheet_path("views/_#{view_component}.css")
+      end
+
+      def all_component_stylesheets_being_used
+        @all_component_stylesheets_being_used ||= []
+      end
+
+      def render_component_stylesheets
+        list_of_stylesheets = all_component_stylesheets_being_used.map do |component|
+          stylesheet_link_tag(component, integrity: false)
+        end
+        raw(list_of_stylesheets.join(""))
+      end
+
+      def get_component_css_paths
+        COMPONENT_CSS_PATHS
+      end
+
+    private
+
+      def is_already_used?(component)
+        if GovukPublishingComponents::Config.exclude_css_from_static
+          all_component_stylesheets_being_used.include?(component) || STATIC_STYLESHEET_LIST.include?(component)
+        else
+          all_component_stylesheets_being_used.include?(component)
+        end
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/config.rb

@@ -15,6 +15,9 @@ module GovukPublishingComponents
     mattr_accessor :application_javascript
     self.application_javascript = "application"
 
+    mattr_accessor :exclude_css_from_static
+    self.exclude_css_from_static = true
+
     def self.component_directory_name
       APP_COMPONENT_DIRECTORY
     end

data/lib/govuk_publishing_components/presenters/related_navigation_helper.rb

@@ -69,7 +69,7 @@ module GovukPublishingComponents
         # Force English so we can still understand what is being tracked if translated.
         underscores_to_spaces = true
         underscores_to_spaces = false if section == "related_content"
-        I18n.with_locale("en") do
+        I18n.with_locale(:en) do
           construct_section_text(section, underscores_to_spaces)
         end
       end

data/lib/govuk_publishing_components/railtie.rb

@@ -0,0 +1,7 @@
+module GovukPublishingComponents
+  class Railtie < Rails::Railtie
+    initializer "govuk_publishing_components.view_helpers" do
+      ActiveSupport.on_load(:action_view) { include GovukPublishingComponents::AppHelpers::AssetHelper }
+    end
+  end
+end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "34.11.0".freeze
+  VERSION = "34.13.0".freeze
 end

data/lib/govuk_publishing_components.rb

@@ -40,6 +40,9 @@ require "govuk_publishing_components/app_helpers/taxon_breadcrumbs"
 require "govuk_publishing_components/app_helpers/table_helper"
 require "govuk_publishing_components/app_helpers/brand_helper"
 require "govuk_publishing_components/app_helpers/environment"
+require "govuk_publishing_components/app_helpers/asset_helper"
+
+require "govuk_publishing_components/railtie" if defined?(Rails::Railtie)
 
 # Add i18n paths and views for usage outside of a Rails app
 I18n.load_path.unshift(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 34.11.0
+  version: 34.13.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -525,6 +525,7 @@ files:
 - app/assets/javascripts/govuk_publishing_components/vendor/polyfills/indexOf.js
 - app/assets/stylesheets/component_guide/application.scss
 - app/assets/stylesheets/govuk_publishing_components/_all_components.scss
+- app/assets/stylesheets/govuk_publishing_components/_individual_component_support.scss
 - app/assets/stylesheets/govuk_publishing_components/component_support.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_accordion.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_action-link.scss
@@ -905,6 +906,7 @@ files:
 - lib/generators/govuk_publishing_components/templates/_component.scss
 - lib/generators/govuk_publishing_components/templates/component.yml.erb
 - lib/govuk_publishing_components.rb
+- lib/govuk_publishing_components/app_helpers/asset_helper.rb
 - lib/govuk_publishing_components/app_helpers/brand_helper.rb
 - lib/govuk_publishing_components/app_helpers/environment.rb
 - lib/govuk_publishing_components/app_helpers/table_helper.rb
@@ -957,6 +959,7 @@ files:
 - lib/govuk_publishing_components/presenters/step_by_step_nav_helper.rb
 - lib/govuk_publishing_components/presenters/subscription_links_helper.rb
 - lib/govuk_publishing_components/presenters/translation_nav_helper.rb
+- lib/govuk_publishing_components/railtie.rb
 - lib/govuk_publishing_components/version.rb
 - node_modules/axe-core/LICENSE
 - node_modules/axe-core/README.md