govuk_publishing_components 27.14.1 → 27.17.0

data/lib/govuk_publishing_components/presenters/button_helper.rb

@@ -11,6 +11,7 @@ module GovukPublishingComponents
                   :rel,
                   :data_attributes,
                   :margin_bottom,
+                  :id,
                   :inline_layout,
                   :target,
                   :type,
@@ -49,16 +50,39 @@ module GovukPublishingComponents
         @value = local_assigns[:value]
         @classes = local_assigns[:classes]
         @aria_label = local_assigns[:aria_label]
+        @info_text_id = "info-text-id-#{SecureRandom.hex(4)}"
+        @button_id = "button-id-#{SecureRandom.hex(4)}"
       end
 
       def link?
         href.present?
       end
 
+      def info_text?
+        info_text.present?
+      end
+
+      def aria_labelledby
+        if info_text?
+          text = "#{@button_id} "
+          text << @info_text_id
+          text
+        end
+      end
+
+      def info_text_options
+        options = { class: info_text_classes }
+        options[:aria] = { hidden: true } if info_text?
+        options[:id] = @info_text_id if info_text?
+        options
+      end
+
       def html_options
         options = { class: css_classes }
         options[:role] = "button" if link?
         options[:type] = button_type
+        options[:id] = @button_id if info_text?
+        options[:aria] = { labelledby: aria_labelledby }
         options[:rel] = rel if rel
         options[:data] = data_attributes if data_attributes
         options[:title] = title if title

data/lib/govuk_publishing_components/presenters/intervention_helper.rb

@@ -1,10 +1,17 @@
 module GovukPublishingComponents
   module Presenters
     class InterventionHelper
-      attr_reader :query_string
-
       def initialize(local_assigns)
+        @accessible_text_suffix = I18n.t("components.intervention.accessible_link_text_suffix")
         @query_string = local_assigns[:query_string]
+        @suggestion_link_text = local_assigns[:suggestion_link_text]
+        @suggestion_link_url = local_assigns[:suggestion_link_url]
+      end
+
+      def accessible_text
+        @suggestion_link_text << @accessible_text_suffix unless @suggestion_link_text.include?(@accessible_text_suffix)
+
+        @suggestion_link_text
       end
 
       def dismiss_link
@@ -14,6 +21,17 @@ module GovukPublishingComponents
           "?hide-intervention=true"
         end
       end
+
+      def security_attr
+        rel = "noopener noreferrer"
+        rel << " external" unless @suggestion_link_url.start_with?("/", "https://gov.uk", "https://www.gov.uk")
+
+        rel
+      end
+
+    private
+
+      attr_reader :accessible_text_suffix, :query_string, :suggestion_link_text, :suggestion_link_url
     end
   end
 end

data/lib/govuk_publishing_components/presenters/single_page_notification_button_helper.rb

@@ -14,15 +14,12 @@ module GovukPublishingComponents
       end
 
       def data
-        module_names = %w[gem-track-click]
-        module_names << "single-page-notification-button" if js_enhancement
-
-        @data_attributes[:label] = base_path
+        @data_attributes[:track_label] = base_path
         # data-action for tracking should have the format of e.g. "Unsubscribe-button-top", or "Subscribe-button-bottom"
         # when button_location is not present data-action will fall back to "Unsubscribe-button"/"Subscribe-button"
-        @data_attributes[:action] = [button_type, "button", button_location].compact.join("-")
-        @data_attributes[:module] = module_names.join(" ")
-        @data_attributes[:category] = "Single-page-notification-button"
+        @data_attributes[:track_action] = [button_type, "button", button_location].compact.join("-")
+        @data_attributes[:module] = "single-page-notification-button" if js_enhancement
+        @data_attributes[:track_category] = "Single-page-notification-button"
         # This attribute is passed through to the personalisation API to ensure when a new button is returned from the API, it has the same button_location
         @data_attributes[:button_location] = button_location
         @data_attributes

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "27.14.1".freeze
+  VERSION = "27.17.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 27.14.1
+  version: 27.17.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config