govuk_design_system_formbuilder 6.2.1 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1f14a5bb4e888c201532b6ac4b9ba859eef9236b0753bc9644227371f635e82
-  data.tar.gz: 5a9748d1d93aafb656f223a6c4252655e36d3f6198b33de065a7de7e11a40718
+  metadata.gz: dfdf0864ed3515a6d8288ba92293650d4430b91f9cf1e72663d2b813c6576ba6
+  data.tar.gz: 640b2dc86d4d105734f069c16c80ed5fc9f777935ff1c2e10333d7c9d9807c57
 SHA512:
-  metadata.gz: 0fd6aff410c40600ae4e4b02a42f5fc6092c5a67c67ac26f7dec253ae55f51c5894632805318ceca59a2a4f58efd8701b9b9987f61f6358bcf8f87005b2a9ae9
-  data.tar.gz: 9055a684952bf061edc0ea766565e1d028ff2478fb7b8937b3fbb94cd04f86c1ec8567cbd61e31b959532239195413998e85b14f851edf7229499c45648308bb
+  metadata.gz: ea11dba93d248dcd5a767fb22def76b7d25d95a117d4091c58a5c6110c761167d38094b4e2a460f88ec98767a9e64948ff65a5d990d2b2d48063d35cc51c7bb5
+  data.tar.gz: 32ea4ccb138206c492aa2e484baf58bd7c6be8769cb4dee660126a6a616027540b658812032bd9957bd08fbfb7f955138019f45abad5747ecdf9734866466c39

data/README.md

@@ -4,7 +4,7 @@
 [![Gem version](https://badge.fury.io/rb/govuk_design_system_formbuilder.svg)](https://badge.fury.io/rb/govuk_design_system_formbuilder)
 [![Gem](https://img.shields.io/gem/dt/govuk_design_system_formbuilder?logo=rubygems)](https://rubygems.org/gems/govuk_design_system_formbuilder)
 ![GitHub license](https://img.shields.io/github/license/x-govuk/govuk-form-builder)
-[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-6.2.0-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-6.3.0-brightgreen)](https://design-system.service.gov.uk)
 [![Rails](https://img.shields.io/badge/Rails-7.2.3%20%E2%95%B1%208.0.1%20%E2%95%B1%208.1.2-E16D6D)](https://weblog.rubyonrails.org/releases/)
 [![Ruby](https://img.shields.io/badge/Ruby-3.2.10%20%20%E2%95%B1%203.4.8%20%20%E2%95%B1%204.0.1-E16D6D)](https://www.ruby-lang.org/en/downloads/)
 

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -329,12 +329,12 @@ module GOVUKDesignSystemFormBuilder
       label: {},
       caption: {},
       form_group: {},
-      show_password_text: config.default_show_password_text,
-      hide_password_text: config.default_hide_password_text,
-      show_password_aria_label_text: config.default_show_password_aria_label_text,
-      hide_password_aria_label_text: config.default_hide_password_aria_label_text,
-      password_shown_announcement_text: config.default_password_shown_announcement_text,
-      password_hidden_announcement_text: config.default_password_hidden_announcement_text,
+      show_password_text: nil,
+      hide_password_text: nil,
+      show_password_aria_label_text: nil,
+      hide_password_aria_label_text: nil,
+      password_shown_announcement_text: nil,
+      password_hidden_announcement_text: nil,
       **kwargs,
       &block
     )
@@ -1165,6 +1165,9 @@ module GOVUKDesignSystemFormBuilder
     # @param choose_files_button_text [String] The text of the button that opens the file picker. Default is "Choose file". If javascript is not provided, this option will be ignored.
     # @param drop_instruction_text [String] The text informing users they can drop files. Default is "or drop file". If javascript is not provided, this option will be ignored.
     # @param multiple_files_chosen_text [Hash] The text displayed when multiple files have been chosen by the user. The component will replace the %{count} placeholder with the number of files selected. This uses the govuk-frontend pluralisation rules. If javascript is not provided, this option will be ignored.
+    # @param multiple_files_chosen_one_text [String] The text displayed when JavaScript is enabled and one file has been chosen by the user. The component will replace the %{count} placeholder with the number of files selected. This can also be set by passing a hash with key +one:+ to +multiple_files_chosen_text+.
+    # @param multiple_files_chosen_other_text [String] The text displayed when JavaScript is enabled and multiple files have been chosen by the user. The component will replace the %{count} placeholder with the number of files selected. This can also be set by passing a hash with key +other:+ to +multiple_files_chosen_text+.
+
     # @param no_file_chosen_text [String] The text displayed when no file has been chosen by the user. Default is "No file chosen". If javascript is not provided, this option will be ignored.
     # @param entered_drop_zone_text [String] The text announced by assistive technology when user drags files and enters the drop zone. Default is "Entered drop zone". If javascript is not provided, this option will be ignored.
     # @param left_drop_zone_text [String] The text announced by assistive technology when user drags files and leaves the drop zone without dropping. Default is "Left drop zone". If javascript is not provided, this option will be ignored.
@@ -1198,6 +1201,8 @@ module GOVUKDesignSystemFormBuilder
       choose_files_button_text: nil,
       drop_instruction_text: nil,
       multiple_files_chosen_text: nil,
+      multiple_files_chosen_one_text: nil,
+      multiple_files_chosen_other_text: nil,
       no_file_chosen_text: nil,
       entered_drop_zone_text: nil,
       left_drop_zone_text: nil,
@@ -1218,6 +1223,8 @@ module GOVUKDesignSystemFormBuilder
         choose_files_button_text:,
         drop_instruction_text:,
         multiple_files_chosen_text:,
+        multiple_files_chosen_one_text:,
+        multiple_files_chosen_other_text:,
         no_file_chosen_text:,
         entered_drop_zone_text:,
         left_drop_zone_text:,

data/lib/govuk_design_system_formbuilder/containers/form_group.rb

@@ -4,10 +4,9 @@ module GOVUKDesignSystemFormBuilder
       include Traits::HTMLAttributes
       include Traits::HTMLClasses
 
-      def initialize(builder, object_name, attribute_name, options: {}, **kwargs)
+      def initialize(builder, object_name, attribute_name, **kwargs)
         super(builder, object_name, attribute_name)
 
-        @options = options
         @html_attributes = kwargs
       end
 
@@ -19,7 +18,6 @@ module GOVUKDesignSystemFormBuilder
 
       def options
         {
-          **@options,
           class: build_classes(
             %(#{brand}-form-group),
             %(#{brand}-form-group--error) => has_errors?

data/lib/govuk_design_system_formbuilder/elements/file.rb

@@ -10,8 +10,9 @@ module GOVUKDesignSystemFormBuilder
       include Traits::HTMLAttributes
       include Traits::HTMLClasses
       include Traits::ContentBeforeAndAfter
+      include Traits::DataAttributesI18n
 
-      def initialize(builder, object_name, attribute_name, hint:, label:, caption:, form_group:, javascript:, before_input:, after_input:, choose_files_button_text:, drop_instruction_text:, multiple_files_chosen_text:, no_file_chosen_text:, entered_drop_zone_text:, left_drop_zone_text:, **kwargs, &block)
+      def initialize(builder, object_name, attribute_name, hint:, label:, caption:, form_group:, javascript:, before_input:, after_input:, choose_files_button_text:, drop_instruction_text:, multiple_files_chosen_text:, multiple_files_chosen_one_text:, multiple_files_chosen_other_text:, no_file_chosen_text:, entered_drop_zone_text:, left_drop_zone_text:, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
         @label = label
@@ -26,6 +27,8 @@ module GOVUKDesignSystemFormBuilder
         @choose_files_button_text = choose_files_button_text
         @drop_instruction_text = drop_instruction_text
         @multiple_files_chosen_text = multiple_files_chosen_text
+        @multiple_files_chosen_one_text = multiple_files_chosen_one_text
+        @multiple_files_chosen_other_text = multiple_files_chosen_other_text
         @no_file_chosen_text = no_file_chosen_text
         @entered_drop_zone_text = entered_drop_zone_text
         @left_drop_zone_text = left_drop_zone_text
@@ -64,21 +67,28 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def i18n_data
-        data = {
-          "data-i18n.choose-files-button" => @choose_files_button_text,
-          "data-i18n.drop-instruction" => @drop_instruction_text,
-          "data-i18n.no-file-chosen" => @no_file_chosen_text,
-          "data-i18n.entered-drop-zone" => @entered_drop_zone_text,
-          "data-i18n.left-drop-zone" => @left_drop_zone_text,
-        }
+        attrs = [
+          I18nAttr.new("data-i18n.choose-files-button",         @choose_files_button_text,         :default_file_choose_files_button_text),
+          I18nAttr.new("data-i18n.drop-instruction",            @drop_instruction_text,            :default_file_drop_instruction_text),
+          I18nAttr.new("data-i18n.no-file-chosen",              @no_file_chosen_text,              :default_file_no_file_chosen_text),
+          I18nAttr.new("data-i18n.multiple-files-chosen.one",   @multiple_files_chosen_one_text,   :default_file_multiple_files_chosen_one_text),
+          I18nAttr.new("data-i18n.multiple-files-chosen.other", @multiple_files_chosen_other_text, :default_file_multiple_files_chosen_other_text),
+          I18nAttr.new("data-i18n.entered-drop-zone",           @entered_drop_zone_text,           :default_file_entered_drop_zone),
+          I18nAttr.new("data-i18n.left-drop-zone",              @left_drop_zone_text,              :default_file_left_drop_zone)
+        ]
 
+        # deal with the Nunjucks stlye hash format as an alternative
         if @multiple_files_chosen_text.is_a?(Hash)
-          @multiple_files_chosen_text.each do |key, value|
-            data["data-i18n.multiple-files-chosen.#{key}"] = value
+          if (text = @multiple_files_chosen_text.symbolize_keys[:other])
+            attrs << I18nAttr.new("data-i18n.multiple-files-chosen.other", text, :default_file_multiple_files_chosen_other_text)
+          end
+
+          if (text = @multiple_files_chosen_text.symbolize_keys[:one])
+            attrs << I18nAttr.new("data-i18n.multiple-files-chosen.one", text, :default_file_multiple_files_chosen_one_text)
           end
         end
 
-        data.compact
+        build_data_attr_hash(attrs)
       end
     end
   end

data/lib/govuk_design_system_formbuilder/elements/password.rb

@@ -2,14 +2,14 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     class Password < Base
       using PrefixableArray
+      using HTMLAttributesUtils
 
       include Traits::Error
       include Traits::Hint
       include Traits::Label
       include Traits::HTMLAttributes
       include Traits::HTMLClasses
-
-      I18nAttr = Struct.new(:key, :text, :default)
+      include Traits::DataAttributesI18n
 
       def initialize(builder, object_name, attribute_name, label:, caption:, hint:, form_group:, show_password_text:, hide_password_text:, show_password_aria_label_text:, hide_password_aria_label_text:, password_hidden_announcement_text:, password_shown_announcement_text:, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
@@ -31,7 +31,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        Containers::FormGroup.new(*bound, options: @form_group, **form_group_options).html do
+        Containers::FormGroup.new(*bound, **form_group_options).html do
           safe_join([label_element, hint_element, error_element, password_input_and_button])
         end
       end
@@ -60,7 +60,7 @@ module GOVUKDesignSystemFormBuilder
           **i18n_data,
           class: %(#{brand}-password-input),
           data: { module: %(#{brand}-password-input) },
-        }
+        }.deep_merge_html_attributes(@form_group)
       end
 
       def password_input
@@ -90,16 +90,16 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def i18n_data
-        [
-          I18nAttr.new("data-i18n.show-password",                @show_password_text,                config.default_show_password_text),
-          I18nAttr.new("data-i18n.hide-password",                @hide_password_text,                config.default_hide_password_text),
-          I18nAttr.new("data-i18n.show-password-aria-label",     @show_password_aria_label_text,     config.default_show_password_aria_label_text),
-          I18nAttr.new("data-i18n.hide-password-aria-label",     @hide_password_aria_label_text,     config.default_hide_password_aria_label_text),
-          I18nAttr.new("data-i18n.password-shown-announcement",  @password_shown_announcement_text,  config.default_password_shown_announcement_text),
-          I18nAttr.new("data-i18n.password-hidden-announcement", @password_hidden_announcement_text, config.default_password_hidden_announcement_text),
-        ].each_with_object({}) do |attr, h|
-          h[attr.key] = attr.text unless attr.text == attr.default
-        end
+        attrs = [
+          I18nAttr.new("data-i18n.show-password",                @show_password_text,                :default_show_password_text),
+          I18nAttr.new("data-i18n.hide-password",                @hide_password_text,                :default_hide_password_text),
+          I18nAttr.new("data-i18n.show-password-aria-label",     @show_password_aria_label_text,     :default_show_password_aria_label_text),
+          I18nAttr.new("data-i18n.hide-password-aria-label",     @hide_password_aria_label_text,     :default_hide_password_aria_label_text),
+          I18nAttr.new("data-i18n.password-shown-announcement",  @password_shown_announcement_text,  :default_password_shown_announcement_text),
+          I18nAttr.new("data-i18n.password-hidden-announcement", @password_hidden_announcement_text, :default_password_hidden_announcement_text),
+        ]
+
+        build_data_attr_hash(attrs)
       end
     end
   end

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -9,6 +9,7 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Supplemental
       include Traits::HTMLAttributes
       include Traits::HTMLClasses
+      include Traits::DataAttributesI18n
 
       def initialize(
         builder,
@@ -138,25 +139,28 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def i18n_data
-        # "data-i18n.textarea-description.other" => @textarea_description_other_text,
-        case limit_type
-        when 'characters'
-          {
-            'data-i18n.characters-at-limit' => @at_limit_text,
-            'data-i18n.characters-under-limit.other' => @under_limit_other_text,
-            'data-i18n.characters-under-limit.one' => @under_limit_one_text,
-            'data-i18n.characters-over-limit.other' => @over_limit_other_text,
-            'data-i18n.characters-over-limit.one' => @over_limit_one_text,
-          }.compact
-        when 'words'
-          {
-            'data-i18n.words-at-limit' => @at_limit_text,
-            'data-i18n.words-under-limit.other' => @under_limit_other_text,
-            'data-i18n.words-under-limit.one' => @under_limit_one_text,
-            'data-i18n.words-over-limit.other' => @over_limit_other_text,
-            'data-i18n.words-over-limit.one' => @over_limit_one_text,
-          }.compact
-        end
+        return {} unless limit_quantity
+
+        attrs = case limit_type
+                when 'characters'
+                  [
+                    I18nAttr.new('data-i18n.characters-under-limit.other', @under_limit_other_text, :default_text_area_characters_under_limit_other_text),
+                    I18nAttr.new('data-i18n.characters-under-limit.one',   @under_limit_one_text,   :default_text_area_characters_under_limit_one_text),
+                    I18nAttr.new('data-i18n.characters-at-limit',          @at_limit_text,          :default_text_area_characters_at_limit_text),
+                    I18nAttr.new('data-i18n.characters-over-limit.other',  @over_limit_other_text,  :default_text_area_characters_over_limit_other_text),
+                    I18nAttr.new('data-i18n.characters-over-limit.one',    @over_limit_one_text,    :default_text_area_characters_over_limit_one_text),
+                  ]
+                when 'words'
+                  [
+                    I18nAttr.new('data-i18n.words-under-limit.other', @under_limit_other_text, :default_text_area_words_under_limit_other_text),
+                    I18nAttr.new('data-i18n.words-under-limit.one',   @under_limit_one_text,   :default_text_area_words_under_limit_one_text),
+                    I18nAttr.new('data-i18n.words-at-limit',          @at_limit_text,          :default_text_area_words_at_limit_text),
+                    I18nAttr.new('data-i18n.words-over-limit.other',  @over_limit_other_text,  :default_text_area_words_over_limit_other_text),
+                    I18nAttr.new('data-i18n.words-over-limit.one',    @over_limit_one_text,    :default_text_area_words_over_limit_one_text),
+                  ]
+                end
+
+        build_data_attr_hash(attrs)
       end
     end
   end

data/lib/govuk_design_system_formbuilder/traits/data_attributes_i18n.rb

@@ -0,0 +1,25 @@
+module GOVUKDesignSystemFormBuilder
+  module Traits
+    module DataAttributesI18n
+      I18nAttr = Struct.new(:data_attribute_key, :text, :config_key) do
+        def default
+          GOVUKDesignSystemFormBuilder.config[config_key]
+        end
+      end
+
+    private
+
+      def build_data_attr_hash(attrs)
+        attrs.each_with_object({}) do |attr, h|
+          text = attr.text || attr.default
+
+          h[attr.data_attribute_key] = text unless govuk_default?(attr.config_key, text)
+        end
+      end
+
+      def govuk_default?(key, value)
+        GOVUKDesignSystemFormBuilder::GOVUK_FRONTEND_DEFAULTS.fetch(key) == value
+      end
+    end
+  end
+end

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '6.2.1'.freeze
+  VERSION = '6.3.0'.freeze
 end

data/lib/govuk_design_system_formbuilder.rb

@@ -17,6 +17,38 @@ module GOVUKDesignSystemFormBuilder
     end
   end
 
+  GOVUK_FRONTEND_DEFAULTS = {
+    # password field
+    default_show_password_text: 'Show',
+    default_hide_password_text: 'Hide',
+    default_show_password_aria_label_text: 'Show password',
+    default_hide_password_aria_label_text: 'Hide password',
+    default_password_shown_announcement_text: 'Your password is visible',
+    default_password_hidden_announcement_text: 'Your password is hidden',
+
+    # text area (character count)
+    default_text_area_description_text: nil,
+    default_text_area_words_under_limit_other_text: 'You have %{count} words remaining',
+    default_text_area_words_under_limit_one_text: 'You have %{count} word remaining',
+    default_text_area_words_at_limit_text: 'You have 0 words remaining',
+    default_text_area_words_over_limit_other_text: 'You have %{count} words too many',
+    default_text_area_words_over_limit_one_text: 'You have %{count} word too many',
+    default_text_area_characters_under_limit_other_text: 'You have %{count} characters remaining',
+    default_text_area_characters_under_limit_one_text: 'You have %{count} character remaining',
+    default_text_area_characters_at_limit_text: 'You have 0 characters remaining',
+    default_text_area_characters_over_limit_other_text: 'You have %{count} characters too many',
+    default_text_area_characters_over_limit_one_text: 'You have %{count} character too many',
+
+    # file upload
+    default_file_choose_files_button_text: 'Choose file',
+    default_file_drop_instruction_text: 'or drop file',
+    default_file_no_file_chosen_text: 'No file chosen',
+    default_file_multiple_files_chosen_one_text: 'One file chosen',
+    default_file_multiple_files_chosen_other_text: '%{count} files chosen',
+    default_file_entered_drop_zone: 'Entered drop zone',
+    default_file_left_drop_zone: 'Left drop zone',
+  }.freeze
+
   # @!group Defaults
 
   # Default form builder configuration
@@ -82,6 +114,86 @@ module GOVUKDesignSystemFormBuilder
   #   When nil, no data attribute will be added. Defaults to turbo since Rails 7,
   #   change to 'turbolinks' for Rails 6.1
   #
+  # * +:default_text_area_description_text+ sets the text that's displayed beneath
+  #   the text area when word counts are enabled. Defaults to nil
+  #
+  # * +:default_text_area_words_under_limit_other_text+ sets the text displayed when the
+  #   user is approaching the limit of words. Defaults to "You have %{count} words remaining"
+  #
+  # * +:default_text_area_words_under_limit_one_text+ sets the text that's displayed when the
+  #   user is 1 word below the limit. Defaults to "You have %{count} word remaining"
+  #
+  # * +:default_text_area_words_at_limit_text+ sets the text that's displayed when the user
+  #   has reached the limit. Defaults to "You have 0 words remaining"
+  #
+  # * +:default_text_area_words_over_limit_other_text+ sets the text displayed when the
+  #   user is more than 1 word above the limit. Defaults to "You have %{count}
+  #   words too many"
+  #
+  # * +:default_text_area_words_over_limit_one_text+ sets the text that's displayed when the
+  #   user is 1 word above the limit. Defaults to "You have %{count} word too many"
+  #
+  # * +:default_text_area_characters_under_limit_other_text+ sets the text displayed when the
+  #   user is approaching the limit of characters. Defaults to "You have %{count} characters
+  #   remaining"
+  #
+  # * +:default_text_area_characters_under_limit_one_text+ sets the text that's displayed when the
+  #   user is 1 character below the limit. Defaults to "You have %{count} character remaining"
+  #
+  # * +:default_text_area_characters_at_limit_text+ sets the text that's displayed when the user
+  #   has reached the limit. Defaults to "You have 0 characters remaining"
+  #
+  # * +:default_text_area_characters_over_limit_other_text+ sets the text displayed when the
+  #   user is more than 1 character above the limit. Defaults to "You have %{count}
+  #   characters too many"
+  #
+  # * +:default_text_area_characters_over_limit_one_text+ sets the text that's displayed when the
+  #   user is 1 character above the limit. Defaults to "You have %{count} character too many"
+  #
+  # * +:default_show_password_text+ Button text when the password is hidden. Defaults to 'Show'
+  #
+  # * +:default_hide_password_text+ Button text when the password is revealed. Defaults to 'Hide'
+  #
+  # * +:default_show_password_aria_label_text+ Button text exposed to assistive technologies like
+  #   screen readers, when the password is hidden. Defaults to "Show password"
+  #
+  # * +:default_hide_password_aria_label_text+ Button text exposed to assistive technologies like
+  #   screen readers, when the password is visible. Defaults to "Hide password".
+  #
+  # * +:default_password_shown_announcement_text+ Announcement made to screen reader users when
+  #   their password has become visible in plain text. Defaults to "Your password is visible"
+  #
+  # * +:default_password_hidden_announcement_text+ Announcement made to screen reader users when
+  #   their password has been obscured and is not visible. Defaults to "Your password is hidden"
+  #
+  # * +:default_file_choose_files_button_text+ The text of the button that opens the file picker.
+  #   Default is "Choose file". If javascript is not provided, this option will be ignored
+  #
+  # * +:default_file_drop_instruction_text+ The text informing users they can drop files.
+  #   Default is "or drop file". If javascript is not provided, this option will be ignore
+  #
+  # * +:default_file_no_file_chosen_text+ The text displayed when no file has been chosen by
+  #   the user. Default is "No file chosen". If javascript is not provided, this option will be
+  #   ignored
+  #
+  # * +:default_file_multiple_files_chosen_one_text+ The text displayed when multiple files are
+  #   enabled and one file has been chosen by the user. The component will replace the %{count}
+  #   placeholder with the number of files selected. If javascript is not provided, this option
+  #   will be ignored. Defaults to 'One file chosen'
+  #
+  # * +:default_file_multiple_files_chosen_other_text+ The text displayed when multiple files are
+  #   enabled and multiple files have been chosen by the user. The component will replace the %{count}
+  #   placeholder with the number of files selected. If javascript is not provided, this option
+  #   will be ignored. Defaults to '%{count} files chosen'
+  #
+  # * +:default_file_entered_drop_zone+ The text announced by assistive technology when user drags
+  #   files and enters the drop zone. Default is "Entered drop zone". If javascript is not provided,
+  #   this option will be ignored
+  #
+  # * +:default_file_left_drop_zone+ The text announced by assistive technology when user drags
+  #   files and leaves the drop zone without dropping. Default is "Left drop zone". If javascript
+  #   is not provided, this option will be ignored.
+  #
   # * +:localisation_schema_fallback+ sets the prefix elements for the array
   #   used to build the localisation string. The final two elements are always
   #   are the object name and attribute name. The _special_ value +__context__+,
@@ -124,12 +236,6 @@ module GOVUKDesignSystemFormBuilder
     default_collection_radio_buttons_include_hidden: true,
     default_collection_radio_buttons_auto_bold_labels: true,
     default_submit_validate: false,
-    default_show_password_text: "Show",
-    default_hide_password_text: "Hide",
-    default_show_password_aria_label_text: "Show password",
-    default_hide_password_aria_label_text: "Hide password",
-    default_password_shown_announcement_text: "Your password is visible",
-    default_password_hidden_announcement_text: "Your password is hidden",
     localisation_schema_fallback: %i(helpers __context__),
     localisation_schema_label: nil,
     localisation_schema_hint: nil,
@@ -142,6 +248,8 @@ module GOVUKDesignSystemFormBuilder
     # temporarily allow the new nested localisation functionality to be
     # disabled
     enable_nested_localisation: true,
+
+    **GOVUK_FRONTEND_DEFAULTS
   }.freeze
 
   DEFAULTS.each do |key, value|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.3.0
 platform: ruby
 authors:
 - Peter Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-17 00:00:00.000000000 Z
+date: 2026-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -344,6 +344,7 @@ files:
 - lib/govuk_design_system_formbuilder/traits/caption.rb
 - lib/govuk_design_system_formbuilder/traits/collection_item.rb
 - lib/govuk_design_system_formbuilder/traits/content_before_and_after.rb
+- lib/govuk_design_system_formbuilder/traits/data_attributes_i18n.rb
 - lib/govuk_design_system_formbuilder/traits/date_input.rb
 - lib/govuk_design_system_formbuilder/traits/error.rb
 - lib/govuk_design_system_formbuilder/traits/fieldset_item.rb
@@ -374,7 +375,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -384,5 +385,5 @@ requirements: []
 rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
-summary: GOV.UK Form Builder for Ryby on Rails
+summary: GOV.UK Form Builder for Ruby on Rails
 test_files: []