govuk_design_system_formbuilder 2.5.3 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dde3d10e811cb75c61423193a1f19acd4c3f55c9abc7cbc0a72cee8aab40fde
-  data.tar.gz: f7e7eb253f038b1a392ee0c111c36a336649b2bfdaeb1c83a4e71018eaab2936
+  metadata.gz: 06a3aa374a6a6fa23d1fb52cdb7585fe50e067580328683b5dcbbcd8c6444aab
+  data.tar.gz: 15c814a5314cbf8aa97fd9e8d47c640062286d6a2239be89265015f6eafab172
 SHA512:
-  metadata.gz: 8aeed919d9f6e25e6d2b70ebc16206ba7f41e72b86fe8ea20888ac6870bc81255f9ebb8c9ee7a3d6cebe0f067e0a5c13d3fbef5a46c3cfff9432a09c6967074b
-  data.tar.gz: 16d556b230c3241c7f28c208a11eaf8bfa11634178dc52d8aa7f19c654271304acc6d3f1f916138a1fef66f1fa8c305fe48c2c6fe4e6ac41459b1777442059f7
+  metadata.gz: c4319d5fbd9168b1869aa94a1206f57c50f4e2d1a238a06da0bbcae0a55b82a020895ca1cfc59de86fdb9ee0248cbd283a3f5b22142946b9951a96906e870c9e
+  data.tar.gz: eec0ec045b248bd16cf671b4d289ea91429338693c541c74c30d92d481b2f2a833c490b064ed58bce7e95a49af03725faa6cb58b0222f0a5411153d1673d4a89

data/README.md

@@ -7,9 +7,9 @@
 [![Test Coverage](https://api.codeclimate.com/v1/badges/fde73b5dc9476197281b/test_coverage)](https://codeclimate.com/github/DFE-Digital/govuk_design_system_formbuilder/test_coverage)
 [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=DFE-Digital/govuk_design_system_formbuilder)](https://dependabot.com)
 [![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk_design_system_formbuilder)](https://github.com/DFE-Digital/govuk_design_system_formbuilder/blob/master/LICENSE)
-[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.12.0-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.13.0-brightgreen)](https://design-system.service.gov.uk)
 [![Rails](https://img.shields.io/badge/Ruby-2.6.7%20%E2%95%B1%202.7.3%20%E2%95%B1%203.0.1-E16D6D)](https://www.ruby-lang.org/en/downloads/)
-[![Ruby](https://img.shields.io/badge/Rails-6.0.3.6%20%E2%95%B1%206.1.3.1-E16D6D)](https://weblog.rubyonrails.org/releases/)
+[![Ruby](https://img.shields.io/badge/Rails-6.0.4%20%E2%95%B1%206.1.3.2-E16D6D)](https://weblog.rubyonrails.org/releases/)
 
 This library provides an easy-to-use form builder for the [GOV.UK Design System](https://design-system.service.gov.uk/).
 

data/lib/govuk_design_system_formbuilder.rb

@@ -27,6 +27,12 @@ module GOVUKDesignSystemFormBuilder
   # * +:default_submit_button_text+ sets the value assigned to +govuk_submit+,
   #   defaults to 'Continue'.
   #
+  # * +:default_radio_divider_text+ sets the text automatically added to the
+  #   radio button divider, defaults to 'or'
+  #
+  # * +:default_check_box_divider_text+ sets the text automatically added to the
+  #   checkbox divider, defaults to 'or'
+  #
   # * +:default_submit_button_text+ sets the text used to divide the last radio
   #   button in radio button fieldsets. As per the GOV.UK Design System spec,
   #   it defaults to 'or'.
@@ -41,6 +47,10 @@ module GOVUKDesignSystemFormBuilder
   # * +:default_collection_radio_buttons_include_hidden+ controls whether or not
   #   a hidden field is added when rendering a collection of radio buttons
   #
+  # * +:default_error_summary_error_order_method+ is the method that the library
+  #   will check for on the bound object to see whether or not to try ordering the
+  #   error messages
+  #
   # * +: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__+,
@@ -61,7 +71,9 @@ module GOVUKDesignSystemFormBuilder
     default_caption_size: 'm',
     default_submit_button_text: 'Continue',
     default_radio_divider_text: 'or',
+    default_check_box_divider_text: 'or',
     default_error_summary_title: 'There is a problem',
+    default_error_summary_error_order_method: nil,
     default_collection_check_boxes_include_hidden: true,
     default_collection_radio_buttons_include_hidden: true,
     default_submit_validate: false,
@@ -108,6 +120,8 @@ module GOVUKDesignSystemFormBuilder
     include GOVUKDesignSystemFormBuilder::Builder
   end
 
+  class FormBuilderProxy < FormBuilder; end
+
   # Disable Rails' div.field_with_error wrapper
   ActionView::Base.field_error_proc = ->(html_tag, _instance) { html_tag }
 end

data/lib/govuk_design_system_formbuilder/base.rb

@@ -15,21 +15,6 @@ module GOVUKDesignSystemFormBuilder
       html || ''
     end
 
-  private
-
-    # returns the attributes bound to the object that are
-    # required to build all contained elements
-    #
-    # @return [GOVUKDesignSystemFormBuilder::FormBuilder, Symbol, Symbol] an array containing the
-    #   builder, object name and attribute name
-    def bound
-      [@builder, @object_name, @attribute_name]
-    end
-
-    def brand(override = nil)
-      override || config.brand
-    end
-
     # returns the id value used for the input
     #
     # @note field_id is overridden so that the error summary can link to the
@@ -51,13 +36,28 @@ module GOVUKDesignSystemFormBuilder
       end
     end
 
+  private
+
+    # returns the attributes bound to the object that are
+    # required to build all contained elements
+    #
+    # @return [GOVUKDesignSystemFormBuilder::FormBuilder, Symbol, Symbol] an array containing the
+    #   builder, object name and attribute name
+    def bound
+      [@builder, @object_name, @attribute_name]
+    end
+
+    def brand(override = nil)
+      override || config.brand
+    end
+
     def has_errors?
       @builder.object.respond_to?(:errors) &&
         @builder.object.errors.any? &&
         @builder.object.errors.messages[@attribute_name].present?
     end
 
-    def described_by(*ids)
+    def combine_references(*ids)
       ids.flatten.compact
     end
 

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -813,6 +813,8 @@ module GOVUKDesignSystemFormBuilder
     # @option label hidden [Boolean] control the visability of the label. Hidden labels will stil be read by screenreaders
     # @option label kwargs [Hash] additional arguments are applied as attributes on the +label+ element
     # @param multiple [Boolean] controls whether the check box is part of a collection or represents a single attribute
+    # @param exclusive [Boolean] sets the checkbox so that when checked none of its siblings can be too. Usually
+    #   used for the 'None of these apply to me' option found beneath a {#govuk_check_box_divider}.
     # @option kwargs [Hash] kwargs additional arguments are applied as attributes to the +input+ element
     # @param block [Block] any HTML passed in will form the contents of the fieldset
     # @return [ActiveSupport::SafeBuffer] HTML output
@@ -825,7 +827,7 @@ module GOVUKDesignSystemFormBuilder
     #     label: { text: 'Do you agree with our terms and conditions?' },
     #     hint: { text: 'You will not be able to proceed unless you do' }
     #
-    def govuk_check_box(attribute_name, value, unchecked_value = false, hint: {}, label: {}, link_errors: false, multiple: true, **kwargs, &block)
+    def govuk_check_box(attribute_name, value, unchecked_value = false, hint: {}, label: {}, link_errors: false, multiple: true, exclusive: false, **kwargs, &block)
       Elements::CheckBoxes::FieldsetCheckBox.new(
         self,
         object_name,
@@ -836,14 +838,27 @@ module GOVUKDesignSystemFormBuilder
         label: label,
         link_errors: link_errors,
         multiple: multiple,
+        exclusive: exclusive,
         **kwargs,
         &block
       ).html
     end
 
+    # Inserts a text divider into a list of check boxes
+    #
+    # @param text [String] The divider text
+    # @note This should only be used from within a {#govuk_check_boxes_fieldset}
+    # @see https://design-system.service.gov.uk/components/checkboxes/#add-an-option-for-none- GOV.UK check boxes with a text divider
+    # @return [ActiveSupport::SafeBuffer] HTML output
+    # @example A custom divider
+    #   = govuk_check_box_divider 'On the other hand'
+    def govuk_check_box_divider(text = config.default_check_box_divider_text)
+      tag.div(text, class: %w(govuk-checkboxes__divider))
+    end
+
     # Generates a submit button, green by default
     #
-    # @param text [String] the button text
+    # @param text [String,Proc] the button text. When a +Proc+ is provided its contents will be rendered within the button element
     # @param warning [Boolean] makes the button red ({https://design-system.service.gov.uk/components/button/#warning-buttons warning}) when true
     # @param secondary [Boolean] makes the button grey ({https://design-system.service.gov.uk/components/button/#secondary-buttons secondary}) when true
     # @param classes [Array,String] Classes to add to the submit button
@@ -853,7 +868,7 @@ module GOVUKDesignSystemFormBuilder
     #   client-side validation provided by the browser. This is to provide a more consistent and accessible user
     #   experience
     # @param disabled [Boolean] makes the button disabled when true
-    # @option kwargs [Hash] kwargs additional arguments are applied as attributes to the +input+ element
+    # @option kwargs [Hash] kwargs additional arguments are applied as attributes to the +button+ element
     # @param block [Block] When content is passed in via a block the submit element and the block content will
     #   be wrapped in a +<div class="govuk-button-group">+ which will space the buttons and links within
     #   evenly.
@@ -861,8 +876,9 @@ module GOVUKDesignSystemFormBuilder
     # @return [ActiveSupport::SafeBuffer] HTML output
     # @note Only the first additional button or link (passed in via a block) will be given the
     #   correct left margin, subsequent buttons will need to be manually accounted for
-    # @note This helper always renders an +<input type='submit'>+ tag, HTML content is not supported inside. You
-    #   can place +<button>+ tags inside the form to have the same effect
+    # @note This helper always renders an +<button type='submit'>+ tag. Previous versions of this gem rendered
+    #   a +`<input type='submit'>' tag instead, but there is a {https://github.com/alphagov/govuk_elements/issues/545 longstanding bug}
+    #   with this approach where the top few pixels don't initiate a submission when clicked.
     # @see https://design-system.service.gov.uk/components/button/#stop-users-from-accidentally-sending-information-more-than-once
     #   GOV.UK double click prevention
     #
@@ -930,7 +946,11 @@ module GOVUKDesignSystemFormBuilder
     # @param title [String] the error summary heading
     # @param link_base_errors_to [Symbol,String] set the field that errors on +:base+ are linked
     #   to, as there won't be a field representing the object base.
+    # @param order [Array<Symbol>] the attribute order in which error messages are displayed. Ordered
+    #   attributes will appear first and unordered ones will be last, sorted in the default manner (in
+    #   which they were defined on the model).
     # @option kwargs [Hash] kwargs additional arguments are applied as attributes to the error summary +div+ element
+    # @param block [Block] arbitrary HTML that will be rendered between title and error message list
     #
     # @note Only the first error in the +#errors+ array for each attribute will
     #   be included.
@@ -939,8 +959,8 @@ module GOVUKDesignSystemFormBuilder
     #   = f.govuk_error_summary 'Uh-oh, spaghettios'
     #
     # @see https://design-system.service.gov.uk/components/error-summary/ GOV.UK error summary
-    def govuk_error_summary(title = config.default_error_summary_title, link_base_errors_to: nil, **kwargs)
-      Elements::ErrorSummary.new(self, object_name, title, link_base_errors_to: link_base_errors_to, **kwargs).html
+    def govuk_error_summary(title = config.default_error_summary_title, link_base_errors_to: nil, order: nil, **kwargs, &block)
+      Elements::ErrorSummary.new(self, object_name, title, link_base_errors_to: link_base_errors_to, order: order, **kwargs, &block).html
     end
 
     # Generates a fieldset containing the contents of the block

data/lib/govuk_design_system_formbuilder/builder_helper.rb

@@ -0,0 +1,65 @@
+module GOVUKDesignSystemFormBuilder
+  # NOTE: this is currently considered experimental, it's likely to change based on feedback.
+  #
+  # BuilderHelper contains methods that expose the form builder's functionality
+  # externally. The objectives are to allow:
+  #
+  # * rendering the error summary outside of the form
+  #
+  # * setting the id of custom form elements (rich text editors, date pickers,
+  #   sliders, etc) using the formbuilder's internal logic, allowing them to be
+  #   linked from the error summary
+  module BuilderHelper
+    # Returns the form builder generated id for an object's attribute, allowing
+    # users to force their custom element ids to match those that'll be generated
+    # by the error summary.
+    # @param object [ActiveRecord::Base,ActiveModel::Model,Object] the object that we want to
+    #   generate an id for
+    # @param object_name [Symbol] the object's name, the singular version of the object's class
+    #   name, e.g., +Person+ is +:person+.
+    # @param attribute_name [Symbol] the attribute we're generating an id for
+    # @param value [Object] the value of the attribute. Only necessary for fields with
+    #   multiple form elements like radio buttons and checkboxes
+    # @param link_errors [Boolean] toggles whether or not to override the field id with the
+    #   error id when there are errors on the +object+. Only relevant for radio buttons
+    #   and check boxes.
+    def govuk_field_id(object, attribute_name, object_name = nil, value: nil, link_errors: true)
+      (object_name = retrieve_object_name(object)) if object_name.nil?
+
+      proxy_base(object, object_name, attribute_name, value: value).field_id(link_errors: link_errors)
+    end
+
+    # Renders an error summary
+    # @param object [ActiveRecord::Base,ActiveModel::Model,Object] the object we'll be rendering
+    #   the errors for
+    # @param object_name [Symbol] the object's name, the singular version of the object's class
+    #   name, e.g., +Person+ is +:person+. If none is supplied we'll try to infer it from
+    #   the object, so it'll probably be necessary for regular Ruby objects
+    # @option args [Array] options passed through to the builder's +#govuk_error_summary+
+    # @option kwargs [Hash] keyword options passed through to the builder's +#govuk_error_summary+
+    #
+    # @example
+    #   = govuk_error_summary(@registration)
+    #
+    # @see https://design-system.service.gov.uk/components/error-summary/ GOV.UK error summary
+    def govuk_error_summary(object, object_name = nil, *args, **kwargs, &block)
+      (object_name = retrieve_object_name(object)) if object_name.nil?
+
+      proxy_builder(object, object_name, self, {}).govuk_error_summary(*args, **kwargs, &block)
+    end
+
+  private
+
+    def proxy_base(object, object_name, attribute_name, value: nil)
+      GOVUKDesignSystemFormBuilder::Proxy.new(object, object_name, attribute_name, value: value)
+    end
+
+    def proxy_builder(object, object_name, template, options)
+      GOVUKDesignSystemFormBuilder::FormBuilderProxy.new(object_name, object, template, options)
+    end
+
+    def retrieve_object_name(object)
+      object.to_model.model_name.singular
+    end
+  end
+end

data/lib/govuk_design_system_formbuilder/containers/check_boxes.rb

@@ -22,7 +22,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def classes
-        [%(#{brand}-checkboxes), small_class, custom_classes].flatten.compact
+        combine_references(%(#{brand}-checkboxes), small_class, custom_classes)
       end
 
       def small_class

data/lib/govuk_design_system_formbuilder/containers/check_boxes_fieldset.rb

@@ -5,6 +5,8 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Hint
 
       def initialize(builder, object_name, attribute_name, hint:, legend:, caption:, small:, classes:, form_group:, multiple:, &block)
+        fail LocalJumpError, 'no block given' unless block_given?
+
         super(builder, object_name, attribute_name, &block)
 
         @legend        = legend
@@ -14,7 +16,6 @@ module GOVUKDesignSystemFormBuilder
         @classes       = classes
         @form_group    = form_group
         @multiple      = multiple
-        @block_content = capture { block.call }
       end
 
       def html

data/lib/govuk_design_system_formbuilder/containers/fieldset.rb

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
 
         @legend          = legend
         @caption         = caption
-        @described_by    = described_by(described_by)
+        @described_by    = combine_references(described_by)
         @attribute_name  = attribute_name
         @html_attributes = kwargs
       end

data/lib/govuk_design_system_formbuilder/containers/form_group.rb

@@ -15,7 +15,7 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def classes
-        [form_group_class, error_class, custom_classes].flatten.compact
+        combine_references(form_group_class, error_class, custom_classes)
       end
 
       def form_group_class

data/lib/govuk_design_system_formbuilder/containers/radio_buttons_fieldset.rb

@@ -5,7 +5,9 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Error
 
       def initialize(builder, object_name, attribute_name, hint:, legend:, caption:, inline:, small:, classes:, form_group:, &block)
-        super(builder, object_name, attribute_name)
+        fail LocalJumpError, 'no block given' unless block_given?
+
+        super(builder, object_name, attribute_name, &block)
 
         @inline        = inline
         @small         = small
@@ -14,7 +16,6 @@ module GOVUKDesignSystemFormBuilder
         @hint          = hint
         @classes       = classes
         @form_group    = form_group
-        @block_content = capture { block.call }
       end
 
       def html

data/lib/govuk_design_system_formbuilder/containers/radios.rb

@@ -25,7 +25,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def classes
-        [%(#{brand}-radios), inline_class, small_class, custom_classes].flatten.compact
+        combine_references(%(#{brand}-radios), inline_class, small_class, custom_classes)
       end
 
       def inline_class

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

@@ -7,8 +7,8 @@ module GOVUKDesignSystemFormBuilder
         include Traits::HTMLAttributes
         include Traits::FieldsetItem
 
-        def initialize(builder, object_name, attribute_name, value, unchecked_value, label:, hint:, link_errors:, multiple:, **kwargs, &block)
-          super(builder, object_name, attribute_name)
+        def initialize(builder, object_name, attribute_name, value, unchecked_value, label:, hint:, link_errors:, multiple:, exclusive:, **kwargs, &block)
+          super(builder, object_name, attribute_name, &block)
 
           @value           = value
           @unchecked_value = unchecked_value
@@ -17,8 +17,9 @@ module GOVUKDesignSystemFormBuilder
           @multiple        = multiple
           @link_errors     = link_errors
           @html_attributes = kwargs
+          @exclusive       = exclusive
 
-          conditional_content(&block)
+          conditional_content(@block_content)
         end
 
       private
@@ -28,12 +29,18 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def input
-          @builder.check_box(@attribute_name, attributes(@html_attributes), @value, @unchecked_value)
+          @builder.check_box(@attribute_name, attributes(@html_attributes.deep_merge(exclusive_options)), @value, @unchecked_value)
         end
 
         def fieldset_options
           { checkbox: true }
         end
+
+        def exclusive_options
+          return {} unless @exclusive
+
+          { data: { behaviour: 'exclusive' } }
+        end
       end
     end
   end

data/lib/govuk_design_system_formbuilder/elements/collection_select.rb

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

data/lib/govuk_design_system_formbuilder/elements/error_summary.rb

@@ -4,12 +4,13 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Error
       include Traits::HTMLAttributes
 
-      def initialize(builder, object_name, title, link_base_errors_to:, **kwargs)
-        super(builder, object_name, nil)
+      def initialize(builder, object_name, title, link_base_errors_to:, order:, **kwargs, &block)
+        super(builder, object_name, nil, &block)
 
         @title               = title
         @link_base_errors_to = link_base_errors_to
         @html_attributes     = kwargs
+        @order               = order
       end
 
       def html
@@ -27,17 +28,45 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def summary
-        tag.div(class: summary_class('body')) do
-          tag.ul(class: [%(#{brand}-list), summary_class('list')]) do
-            safe_join(list)
-          end
-        end
+        tag.div(class: summary_class('body')) { safe_join([@block_content, list]) }
       end
 
       def list
-        @builder.object.errors.messages.map do |attribute, messages|
-          list_item(attribute, messages.first)
+        tag.ul(class: [%(#{brand}-list), summary_class('list')]) do
+          safe_join(error_messages.map { |attribute, messages| list_item(attribute, messages.first) })
+        end
+      end
+
+      def error_messages
+        messages = @builder.object.errors.messages
+
+        if reorder_errors?
+          adjustment = error_order.size + messages.size
+
+          return messages.sort_by.with_index do |(attr, _val), i|
+            error_order.index(attr) || (i + adjustment)
+          end
         end
+
+        @builder.object.errors.messages
+      end
+
+      def reorder_errors?
+        object = @builder.object
+
+        @order || (error_order_method &&
+                   object.respond_to?(error_order_method) &&
+                   object.send(error_order_method).present?)
+      end
+
+      def error_order
+        @order || @builder.object.send(config.default_error_summary_error_order_method)
+      end
+
+      # this method will be called on the bound object to see if custom error ordering
+      # has been enabled
+      def error_order_method
+        config.default_error_summary_error_order_method
       end
 
       def list_item(attribute, message)

data/lib/govuk_design_system_formbuilder/elements/file.rb

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

data/lib/govuk_design_system_formbuilder/elements/inputs/number.rb

@@ -9,6 +9,8 @@ module GOVUKDesignSystemFormBuilder
         include Traits::Supplemental
         include Traits::HTMLAttributes
 
+      private
+
         def builder_method
           :number_field
         end

data/lib/govuk_design_system_formbuilder/elements/inputs/password.rb

@@ -9,6 +9,8 @@ module GOVUKDesignSystemFormBuilder
         include Traits::Supplemental
         include Traits::HTMLAttributes
 
+      private
+
         def builder_method
           :password_field
         end

data/lib/govuk_design_system_formbuilder/elements/inputs/phone.rb

@@ -9,6 +9,8 @@ module GOVUKDesignSystemFormBuilder
         include Traits::Supplemental
         include Traits::HTMLAttributes
 
+      private
+
         def builder_method
           :phone_field
         end

data/lib/govuk_design_system_formbuilder/elements/inputs/text.rb

@@ -9,6 +9,8 @@ module GOVUKDesignSystemFormBuilder
         include Traits::Supplemental
         include Traits::HTMLAttributes
 
+      private
+
         def builder_method
           :text_field
         end

data/lib/govuk_design_system_formbuilder/elements/inputs/url.rb

@@ -9,6 +9,8 @@ module GOVUKDesignSystemFormBuilder
         include Traits::Supplemental
         include Traits::HTMLAttributes
 
+      private
+
         def builder_method
           :url_field
         end

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

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
         include Traits::FieldsetItem
 
         def initialize(builder, object_name, attribute_name, value, label:, hint:, link_errors:, **kwargs, &block)
-          super(builder, object_name, attribute_name)
+          super(builder, object_name, attribute_name, &block)
 
           @value           = value
           @label           = label
@@ -16,7 +16,7 @@ module GOVUKDesignSystemFormBuilder
           @link_errors     = has_errors? && link_errors
           @html_attributes = kwargs
 
-          conditional_content(&block)
+          conditional_content(@block_content)
         end
 
       private

data/lib/govuk_design_system_formbuilder/elements/select.rb

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

data/lib/govuk_design_system_formbuilder/elements/submit.rb

@@ -9,7 +9,7 @@ module GOVUKDesignSystemFormBuilder
 
         fail ArgumentError, 'buttons can be warning or secondary' if warning && secondary
 
-        @text                 = text
+        @text                 = build_text(text)
         @prevent_double_click = prevent_double_click
         @warning              = warning
         @secondary            = secondary
@@ -26,6 +26,17 @@ module GOVUKDesignSystemFormBuilder
 
     private
 
+      def build_text(text)
+        case text
+        when String
+          text
+        when Proc
+          capture { text.call }
+        else
+          fail(ArgumentError, %(text must be a String or Proc))
+        end
+      end
+
       def button_group
         Containers::ButtonGroup.new(@builder, buttons).html
       end
@@ -35,11 +46,12 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def submit
-        @builder.submit(@text, **attributes(@html_attributes))
+        @builder.tag.button(@text, **attributes(@html_attributes))
       end
 
       def options
         {
+          type: 'submit',
           formnovalidate: !@validate,
           disabled: @disabled,
           class: classes,

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

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

data/lib/govuk_design_system_formbuilder/proxy.rb

@@ -0,0 +1,13 @@
+require_relative 'base'
+
+module GOVUKDesignSystemFormBuilder
+  class Proxy < GOVUKDesignSystemFormBuilder::Base
+    NullBuilder = Struct.new(:object)
+
+    def initialize(object, object_name, attribute_name, value: nil)
+      super(NullBuilder.new(object), object_name, attribute_name)
+
+      @value = value
+    end
+  end
+end

data/lib/govuk_design_system_formbuilder/traits/fieldset_item.rb

@@ -4,7 +4,7 @@ module GOVUKDesignSystemFormBuilder
       using PrefixableArray
 
       def html
-        safe_join([item, @conditional])
+        safe_join([item, @conditional_content])
       end
 
     private
@@ -61,9 +61,9 @@ module GOVUKDesignSystemFormBuilder
         build_id('conditional')
       end
 
-      def conditional_content(&block)
-        if (conditional_block_content = block_given? && (capture { block.call }).presence)
-          @conditional    = conditional_container(conditional_block_content)
+      def conditional_content(block_content)
+        if block_content.present?
+          @conditional_content = conditional_container(block_content)
           @conditional_id = conditional_id
         end
       end

data/lib/govuk_design_system_formbuilder/traits/input.rb

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

data/lib/govuk_design_system_formbuilder/traits/select.rb

@@ -4,7 +4,7 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def classes
-        [%(#{brand}-select), error_class].flatten.compact
+        combine_references(%(#{brand}-select), error_class)
       end
 
       def error_class

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '2.5.3'.freeze
+  VERSION = '2.7.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.7.2
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -28,62 +28,44 @@ dependencies:
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.3.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.3.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.3.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.3.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.3.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.3.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
@@ -313,6 +295,7 @@ files:
 - lib/govuk_design_system_formbuilder.rb
 - lib/govuk_design_system_formbuilder/base.rb
 - lib/govuk_design_system_formbuilder/builder.rb
+- lib/govuk_design_system_formbuilder/builder_helper.rb
 - lib/govuk_design_system_formbuilder/containers/button_group.rb
 - lib/govuk_design_system_formbuilder/containers/character_count.rb
 - lib/govuk_design_system_formbuilder/containers/check_boxes.rb
@@ -348,6 +331,7 @@ files:
 - lib/govuk_design_system_formbuilder/elements/select.rb
 - lib/govuk_design_system_formbuilder/elements/submit.rb
 - lib/govuk_design_system_formbuilder/elements/text_area.rb
+- lib/govuk_design_system_formbuilder/proxy.rb
 - lib/govuk_design_system_formbuilder/refinements/prefixable_array.rb
 - lib/govuk_design_system_formbuilder/traits/caption.rb
 - lib/govuk_design_system_formbuilder/traits/collection_item.rb