govuk_design_system_formbuilder 6.0.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5cdce7fa87b070e4c8335c43ee6a23e8ad7ca61933f1ad0a3a80339c3e1959a
-  data.tar.gz: b3446d561dc3a96c23d6140ad0f966edd39517891eac18e1a3c41d894c8b48c5
+  metadata.gz: 2cf25eca1fc9e5160b36b37bd946844b4662453bb3d7ad41761b669b3ee8bebe
+  data.tar.gz: 7173d16c0574e1f4e2477c08ffe2a0bdc5325047d323dd21427d8fc2bdf42b31
 SHA512:
-  metadata.gz: d74467eeac3d4b1001452df29de4d3a6e92159346f820b7d70b06ea74a34e175748891abebdc0867245fbaafffae30bef8d36c8637104f46ce11d82ac832790d
-  data.tar.gz: c4752085f758ddf51b544c9a6b59425fdcccfc5ea316560ccafedb18a40f002bd3f228da78d8df379e3cc588266ad3fa871f84aa56b3f9c4123e31f73c2e8cba
+  metadata.gz: 2b34a3a4c6792f6bcfd13c0415f07b9e144e64d97350d9c6cb700feffbc1b90242f05f765ae292523a87ccf212528687c42285442f2b4eab8d9c46ec8a9aa594
+  data.tar.gz: ad04540f4c3788b828e154c67b733fdb63fbd46a708e3f83b94400d57ae5016095ab9203c4603c22a4c49f9d01b054590679142fc3e90ee5f852c92bc30960ec

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.0.0-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-6.2.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

@@ -385,6 +385,11 @@ module GOVUKDesignSystemFormBuilder
     # @option form_group kwargs [Hash] additional attributes added to the form group
     # @option kwargs [Hash] kwargs additional arguments are applied as attributes to the +textarea+ element
     # @param block [Block] arbitrary HTML that will be rendered between the hint and the input
+    # @param characters_under_limit_other_text [String] Text that informs the user they have X word/characters remaining. Default is "%{count} characters to go". If javascript is not provided, this option will be ignored.
+    # @param characters_under_limit_one_text [String] Text that informs the user they have 1 word/character remaining. Default is "%{count} character to go". If javascript is not provided, this option will be ignored.
+    # @param characters_at_limit_text [String] The text that informs the user they've reached the character limit. Default is "No characters left". If javascript is not provided, this option will be ignored.
+    # @param characters_over_limit_other_text [String] Text that informs the user they have added X words/characters too many. Default is "%{count} characters to go". If javascript is not provided, this option will be ignored.
+    # @param characters_over_limit_one_text [String] Text that informs the user they have added 1 word/character too many. Default is "%{count} character to go". If javascript is not provided, this option will be ignored.
     # @return [ActiveSupport::SafeBuffer] HTML output
     # @see https://design-system.service.gov.uk/components/textarea/ GOV.UK text area component
     # @see https://design-system.service.gov.uk/components/character-count GOV.UK character count component
@@ -409,8 +414,46 @@ module GOVUKDesignSystemFormBuilder
     #   = f.govuk_text_area :instructions,
     #     label: -> { tag.h3("How do you set it up?") }
     #
-    def govuk_text_area(attribute_name, hint: {}, label: {}, caption: {}, max_words: nil, max_chars: nil, rows: 5, threshold: nil, form_group: {}, **kwargs, &block)
-      Elements::TextArea.new(self, object_name, attribute_name, hint:, label:, caption:, max_words:, max_chars:, rows:, threshold:, form_group:, **kwargs, &block).html
+    def govuk_text_area(
+      attribute_name,
+      hint: {},
+      label: {},
+      caption: {},
+      max_words: nil,
+      max_chars: nil,
+      rows: 5,
+      threshold: nil,
+      form_group: {},
+      description_other_text: nil,
+      under_limit_other_text: nil,
+      under_limit_one_text: nil,
+      at_limit_text: nil,
+      over_limit_one_text: nil,
+      over_limit_other_text: nil,
+      **kwargs,
+      &block
+    )
+      Elements::TextArea.new(
+        self,
+        object_name,
+        attribute_name,
+        hint:,
+        label:,
+        caption:,
+        max_words:,
+        max_chars:,
+        rows:,
+        threshold:,
+        form_group:,
+        description_other_text:,
+        under_limit_other_text:,
+        under_limit_one_text:,
+        at_limit_text:,
+        over_limit_one_text:,
+        over_limit_other_text:,
+        **kwargs,
+        &block
+      ).html
     end
 
     # Generates a +select+ element containing +option+ for each member in the provided collection
@@ -1119,6 +1162,12 @@ module GOVUKDesignSystemFormBuilder
     # @param javascript [Boolean] Configures whether to add HTML for the javascript-enhanced version of the component
     # @param before_input [String,Proc] the content injected before the input. No content will be added if left +nil+
     # @param after_input [String,Proc] the content injected after the input. No content will be added if left +nil+
+    # @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 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.
     # @param block [Block] arbitrary HTML that will be rendered between the hint and the input
     #
     # @example A photo upload field with file type specifier and injected content
@@ -1137,8 +1186,44 @@ module GOVUKDesignSystemFormBuilder
     # @note Remember to set +multipart: true+ when creating a form with file
     #   uploads, {https://guides.rubyonrails.org/form_helpers.html#uploading-files see
     #   the Rails documentation} for more information
-    def govuk_file_field(attribute_name, label: {}, caption: {}, hint: {}, form_group: {}, javascript: false, before_input: nil, after_input: nil, **kwargs, &block)
-      Elements::File.new(self, object_name, attribute_name, label:, caption:, hint:, form_group:, javascript:, before_input:, after_input:, **kwargs, &block).html
+    def govuk_file_field(
+      attribute_name,
+      label: {},
+      caption: {},
+      hint: {},
+      form_group: {},
+      javascript: false,
+      before_input: nil,
+      after_input: nil,
+      choose_files_button_text: nil,
+      drop_instruction_text: nil,
+      multiple_files_chosen_text: nil,
+      no_file_chosen_text: nil,
+      entered_drop_zone_text: nil,
+      left_drop_zone_text: nil,
+      **kwargs,
+      &block
+    )
+      Elements::File.new(
+        self,
+        object_name,
+        attribute_name,
+        label:,
+        caption:,
+        hint:,
+        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
+      ).html
     end
   end
 end

data/lib/govuk_design_system_formbuilder/elements/check_boxes/collection.rb

@@ -36,7 +36,7 @@ module GOVUKDesignSystemFormBuilder
           {
             legend: @legend,
             caption: @caption,
-            described_by: [error_id, hint_id, supplemental_id]
+            described_by: [error_id, hint_id]
           }
         end
 

data/lib/govuk_design_system_formbuilder/elements/collection_select.rb

@@ -43,7 +43,7 @@ module GOVUKDesignSystemFormBuilder
         {
           id: field_id(link_errors: true),
           class: classes,
-          aria: { describedby: combine_references(hint_id, error_id, supplemental_id) }
+          aria: { describedby: combine_references(hint_id, error_id) }
         }
       end
 

data/lib/govuk_design_system_formbuilder/elements/file.rb

@@ -11,17 +11,24 @@ module GOVUKDesignSystemFormBuilder
       include Traits::HTMLClasses
       include Traits::ContentBeforeAndAfter
 
-      def initialize(builder, object_name, attribute_name, hint:, label:, caption:, form_group:, javascript:, before_input:, after_input:, **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:, no_file_chosen_text:, entered_drop_zone_text:, left_drop_zone_text:, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @label           = label
-        @caption         = caption
-        @hint            = hint
+        @label = label
+        @caption = caption
+        @hint = hint
         @html_attributes = kwargs
-        @form_group      = form_group
-        @javascript      = javascript
-        @before_input    = before_input
-        @after_input     = after_input
+        @form_group = form_group
+        @javascript = javascript
+        @before_input = before_input
+        @after_input = after_input
+
+        @choose_files_button_text = choose_files_button_text
+        @drop_instruction_text = drop_instruction_text
+        @multiple_files_chosen_text = multiple_files_chosen_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
       end
 
       def html
@@ -41,20 +48,38 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def file_with_javascript_markup
-        tag.div(class: "#{brand}-drop-zone", data: { module: "#{brand}-file-upload" }) { file }
+        tag.div(class: "#{brand}-drop-zone", data: { module: "#{brand}-file-upload" }, **i18n_data) { file }
       end
 
       def options
         {
           id: field_id(link_errors: true),
           class: classes,
-          aria: { describedby: combine_references(hint_id, error_id, supplemental_id) }
+          aria: { describedby: combine_references(hint_id, error_id) }
         }
       end
 
       def classes
         build_classes(%(file-upload), %(file-upload--error) => has_errors?).prefix(brand)
       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,
+        }
+
+        if @multiple_files_chosen_text.is_a?(Hash)
+          @multiple_files_chosen_text.each do |key, value|
+            data["data-i18n.multiple-files-chosen.#{key}"] = value
+          end
+        end
+
+        data.compact
+      end
     end
   end
 end

data/lib/govuk_design_system_formbuilder/elements/radios/collection.rb

@@ -43,7 +43,7 @@ module GOVUKDesignSystemFormBuilder
           {
             legend: @legend,
             caption: @caption,
-            described_by: [error_id, hint_id, supplemental_id]
+            described_by: [error_id, hint_id]
           }
         end
 

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -10,7 +10,27 @@ module GOVUKDesignSystemFormBuilder
       include Traits::HTMLAttributes
       include Traits::HTMLClasses
 
-      def initialize(builder, object_name, attribute_name, hint:, label:, caption:, rows:, max_words:, max_chars:, threshold:, form_group:, **kwargs, &block)
+      def initialize(
+        builder,
+        object_name,
+        attribute_name,
+        hint:,
+        label:,
+        caption:,
+        rows:,
+        max_words:,
+        max_chars:,
+        threshold:,
+        form_group:,
+        description_other_text:,
+        under_limit_other_text:,
+        under_limit_one_text:,
+        at_limit_text:,
+        over_limit_other_text:,
+        over_limit_one_text:,
+        **kwargs,
+        &block
+      )
         super(builder, object_name, attribute_name, &block)
 
         fail ArgumentError, 'limit can be words or chars' if max_words && max_chars
@@ -24,10 +44,17 @@ module GOVUKDesignSystemFormBuilder
         @rows            = rows
         @form_group      = form_group
         @html_attributes = kwargs
+
+        @description_other_text = description_other_text
+        @under_limit_other_text = under_limit_other_text
+        @under_limit_one_text   = under_limit_one_text
+        @at_limit_text          = at_limit_text
+        @over_limit_other_text  = over_limit_other_text
+        @over_limit_one_text    = over_limit_one_text
       end
 
       def html
-        Containers::FormGroup.new(*bound, **@form_group.merge(limit_form_group_options)).html do
+        Containers::FormGroup.new(*bound, **@form_group.merge(limit_form_group_options), **i18n_data).html do
           safe_join([label_element, supplemental_content, hint_element, error_element, text_area, limit_description])
         end
       end
@@ -47,7 +74,7 @@ module GOVUKDesignSystemFormBuilder
           id: field_id(link_errors: true),
           class: classes,
           rows: @rows,
-          aria: { describedby: combine_references(hint_id, error_id, supplemental_id, limit_description_id) },
+          aria: { describedby: combine_references(hint_id, error_id, limit_description_id) },
         }
       end
 
@@ -109,6 +136,28 @@ module GOVUKDesignSystemFormBuilder
       def limit_threshold_options
         { threshold: @threshold }
       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
+      end
     end
   end
 end

data/lib/govuk_design_system_formbuilder/traits/date_input.rb

@@ -27,7 +27,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def fieldset_options
-        { legend: @legend, caption: @caption, described_by: [error_id, hint_id, supplemental_id] }
+        { legend: @legend, caption: @caption, described_by: [error_id, hint_id] }
       end
 
       def segment_label_text(segment)

data/lib/govuk_design_system_formbuilder/traits/input.rb

@@ -55,7 +55,7 @@ module GOVUKDesignSystemFormBuilder
         {
           id: field_id(link_errors: true),
           class: classes,
-          aria: { describedby: combine_references(hint_id, error_id, supplemental_id) }
+          aria: { describedby: combine_references(hint_id, error_id) }
         }
       end
 

data/lib/govuk_design_system_formbuilder/traits/supplemental.rb

@@ -1,12 +1,6 @@
 module GOVUKDesignSystemFormBuilder
   module Traits
     module Supplemental
-      def supplemental_id
-        return if @block_content.blank?
-
-        build_id('supplemental')
-      end
-
     private
 
       def supplemental_content

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '6.0.0'.freeze
+  VERSION = '6.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Peter Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-28 00:00:00.000000000 Z
+date: 2026-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.33.0
+        version: 0.34.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.33.0
+        version: 0.34.0
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement