govuk_publishing_components 32.1.0 → 33.1.0

data/lib/govuk_publishing_components/presenters/button_helper.rb

@@ -23,7 +23,9 @@ module GovukPublishingComponents
                   :name,
                   :value,
                   :classes,
-                  :aria_label
+                  :aria_label,
+                  :aria_controls,
+                  :aria_describedby
 
       def initialize(local_assigns)
         @href = local_assigns[:href]
@@ -36,7 +38,8 @@ module GovukPublishingComponents
           @info_text_classes << margin_class
         end
         @rel = local_assigns[:rel]
-        @data_attributes = local_assigns[:data_attributes]
+        @data_attributes = local_assigns[:data_attributes]&.symbolize_keys || {}
+        @data_attributes[:module] = "govuk-button #{data_attributes[:module]}".strip if link?
         @margin_bottom = local_assigns[:margin_bottom]
         @inline_layout = local_assigns[:inline_layout]
         @target = local_assigns[:target]
@@ -52,6 +55,8 @@ module GovukPublishingComponents
         @aria_label = local_assigns[:aria_label]
         @info_text_id = "info-text-id-#{SecureRandom.hex(4)}"
         @button_id = "button-id-#{SecureRandom.hex(4)}"
+        @aria_controls = local_assigns[:aria_controls]
+        @aria_describedby = local_assigns[:aria_describedby]
       end
 
       def link?
@@ -90,6 +95,8 @@ module GovukPublishingComponents
         options[:name] = name if name.present? && value.present?
         options[:value] = value if name.present? && value.present?
         options[:aria] = { label: aria_label } if aria_label
+        options[:aria][:controls] =  aria_controls if aria_controls
+        options[:aria][:describedby] = aria_describedby if aria_describedby
         options[:draggable] = false if link?
         options
       end

data/lib/govuk_publishing_components/presenters/single_page_notification_button_helper.rb

@@ -13,6 +13,8 @@ module GovukPublishingComponents
         @button_type = @local_assigns[:already_subscribed] ? "Unsubscribe" : "Subscribe"
         @classes = %w[gem-c-single-page-notification-button]
         @classes << "js-personalisation-enhancement" if js_enhancement
+        @button_text_subscribe = custom_button_text_is_valid? ? custom_subscribe_text : default_subscribe_text
+        @button_text_unsubscribe = custom_button_text_is_valid? ? custom_unsubscribe_text : default_unsubscribe_text
       end
 
       def data
@@ -24,6 +26,8 @@ module GovukPublishingComponents
         @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[:button_text_subscribe] = @button_text_subscribe
+        @data_attributes[:button_text_unsubscribe] = @button_text_unsubscribe
         @data_attributes
       end
 
@@ -32,7 +36,27 @@ module GovukPublishingComponents
       end
 
       def button_text
-        @already_subscribed ? I18n.t("components.single_page_notification_button.unsubscribe_text") : I18n.t("components.single_page_notification_button.subscribe_text")
+        @already_subscribed ? @button_text_unsubscribe : @button_text_subscribe
+      end
+
+      def custom_button_text_is_valid?
+        custom_subscribe_text.present? && custom_unsubscribe_text.present?
+      end
+
+      def custom_subscribe_text
+        @local_assigns.dig(:button_text, :subscribe)
+      end
+
+      def custom_unsubscribe_text
+        @local_assigns.dig(:button_text, :unsubscribe)
+      end
+
+      def default_subscribe_text
+        I18n.t("components.single_page_notification_button.subscribe_text")
+      end
+
+      def default_unsubscribe_text
+        I18n.t("components.single_page_notification_button.unsubscribe_text")
       end
     end
   end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "32.1.0".freeze
+  VERSION = "33.1.0".freeze
 end