govuk_design_system_formbuilder 1.2.7 → 2.0.0b1

data/lib/govuk_design_system_formbuilder/containers/check_boxes_fieldset.rb

@@ -4,20 +4,20 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Error
       include Traits::Hint
 
-      def initialize(builder, object_name, attribute_name, hint_text:, legend:, caption:, small:, classes:, form_group_classes:, &block)
+      def initialize(builder, object_name, attribute_name, hint:, legend:, caption:, small:, classes:, form_group:, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @legend             = legend
-        @caption            = caption
-        @hint_text          = hint_text
-        @small              = small
-        @classes            = classes
-        @form_group_classes = form_group_classes
-        @block_content      = capture { block.call }
+        @legend        = legend
+        @caption       = caption
+        @hint          = hint
+        @small         = small
+        @classes       = classes
+        @form_group    = form_group
+        @block_content = capture { block.call }
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, classes: @form_group_classes).html do
+        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
           Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
             safe_join([hint_element, error_element, checkboxes])
           end

data/lib/govuk_design_system_formbuilder/containers/form_group.rb

@@ -1,14 +1,15 @@
 module GOVUKDesignSystemFormBuilder
   module Containers
     class FormGroup < Base
-      def initialize(builder, object_name, attribute_name, classes: nil)
+      def initialize(builder, object_name, attribute_name, classes: nil, **kwargs)
         super(builder, object_name, attribute_name)
 
-        @classes = classes
+        @classes       = classes
+        @extra_options = kwargs
       end
 
       def html
-        tag.div(class: classes) { yield }
+        tag.div(class: classes, **@extra_options) { yield }
       end
 
     private

data/lib/govuk_design_system_formbuilder/containers/radio_buttons_fieldset.rb

@@ -4,21 +4,21 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Hint
       include Traits::Error
 
-      def initialize(builder, object_name, attribute_name, hint_text:, legend:, caption:, inline:, small:, classes:, form_group_classes:, &block)
+      def initialize(builder, object_name, attribute_name, hint:, legend:, caption:, inline:, small:, classes:, form_group:, &block)
         super(builder, object_name, attribute_name)
 
-        @inline             = inline
-        @small              = small
-        @legend             = legend
-        @caption            = caption
-        @hint_text          = hint_text
-        @classes            = classes
-        @form_group_classes = form_group_classes
-        @block_content      = capture { block.call }
+        @inline        = inline
+        @small         = small
+        @legend        = legend
+        @caption       = caption
+        @hint          = hint
+        @classes       = classes
+        @form_group    = form_group
+        @block_content = capture { block.call }
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, classes: @form_group_classes).html do
+        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
           Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
             safe_join([hint_element, error_element, radios])
           end

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

@@ -6,23 +6,23 @@ module GOVUKDesignSystemFormBuilder
         include Traits::Hint
         include Traits::Supplemental
 
-        def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, hint_method: nil, hint_text:, legend:, caption:, small:, classes:, form_group_classes:, &block)
+        def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, hint_method: nil, hint:, legend:, caption:, small:, classes:, form_group:, &block)
           super(builder, object_name, attribute_name, &block)
 
-          @collection         = collection
-          @value_method       = value_method
-          @text_method        = text_method
-          @hint_method        = hint_method
-          @small              = small
-          @legend             = legend
-          @caption            = caption
-          @hint_text          = hint_text
-          @classes            = classes
-          @form_group_classes = form_group_classes
+          @collection   = collection
+          @value_method = value_method
+          @text_method  = text_method
+          @hint_method  = hint_method
+          @small        = small
+          @legend       = legend
+          @caption      = caption
+          @hint         = hint
+          @classes      = classes
+          @form_group   = form_group
         end
 
         def html
-          Containers::FormGroup.new(@builder, @object_name, @attribute_name, classes: @form_group_classes).html do
+          Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
             Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
               safe_join([supplemental_content, hint_element, error_element, check_boxes])
             end

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

@@ -11,7 +11,7 @@ module GOVUKDesignSystemFormBuilder
           @checkbox    = checkbox
           @item        = checkbox.object
           @value       = checkbox.value
-          @hint_text   = retrieve(@item, hint_method)
+          @hint        = { text: retrieve(@item, hint_method) }
           @link_errors = link_errors
         end
 
@@ -40,7 +40,11 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def hint_element
-          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, @hint_text, @value, checkbox: true)
+          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_options, **hint_content)
+        end
+
+        def hint_options
+          { value: @value, checkbox: true }
         end
       end
     end

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

@@ -8,12 +8,12 @@ module GOVUKDesignSystemFormBuilder
         include Traits::Hint
         include Traits::Conditional
 
-        def initialize(builder, object_name, attribute_name, value, label:, hint_text:, link_errors:, multiple:, &block)
+        def initialize(builder, object_name, attribute_name, value, label:, hint:, link_errors:, multiple:, &block)
           super(builder, object_name, attribute_name)
 
           @value       = value
           @label       = label
-          @hint_text   = hint_text
+          @hint        = hint
           @multiple    = multiple
           @link_errors = link_errors
 
@@ -62,7 +62,11 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def hint_element
-          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, @hint_text, @value, checkbox: true)
+          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_options, **hint_content)
+        end
+
+        def hint_options
+          { checkbox: true }
         end
 
         def conditional_classes

data/lib/govuk_design_system_formbuilder/elements/date.rb

@@ -9,19 +9,19 @@ module GOVUKDesignSystemFormBuilder
 
       SEGMENTS = { day: '3i', month: '2i', year: '1i' }.freeze
 
-      def initialize(builder, object_name, attribute_name, legend:, caption:, hint_text:, date_of_birth: false, omit_day:, form_group_classes:, &block)
+      def initialize(builder, object_name, attribute_name, legend:, caption:, hint:, date_of_birth: false, omit_day:, form_group:, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @legend             = legend
-        @caption            = caption
-        @hint_text          = hint_text
-        @date_of_birth      = date_of_birth
-        @omit_day           = omit_day
-        @form_group_classes = form_group_classes
+        @legend        = legend
+        @caption       = caption
+        @hint          = hint
+        @date_of_birth = date_of_birth
+        @omit_day      = omit_day
+        @form_group    = form_group
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, classes: @form_group_classes).html do
+        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
           Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
             safe_join([supplemental_content, hint_element, error_element, date])
           end

data/lib/govuk_design_system_formbuilder/elements/file.rb

@@ -8,18 +8,18 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Label
       include Traits::Supplemental
 
-      def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, form_group_classes:, **kwargs, &block)
+      def initialize(builder, object_name, attribute_name, hint:, label:, caption:, form_group:, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @label              = label
-        @caption            = caption
-        @hint_text          = hint_text
-        @extra_options      = kwargs
-        @form_group_classes = form_group_classes
+        @label         = label
+        @caption       = caption
+        @hint          = hint
+        @extra_options = kwargs
+        @form_group    = form_group
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, classes: @form_group_classes).html do
+        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
           safe_join([label_element, supplemental_content, hint_element, error_element, file])
         end
       end

data/lib/govuk_design_system_formbuilder/elements/hint.rb

@@ -3,26 +3,53 @@ module GOVUKDesignSystemFormBuilder
     class Hint < Base
       using PrefixableArray
 
-      include Traits::Hint
       include Traits::Localisation
 
-      def initialize(builder, object_name, attribute_name, text, value = nil, radio: false, checkbox: false)
+      def initialize(builder, object_name, attribute_name, value: nil, text: nil, content: nil, radio: false, checkbox: false, **kwargs)
         super(builder, object_name, attribute_name)
 
-        @value     = value
-        @hint_text = retrieve_text(text)
-        @radio     = radio
-        @checkbox  = checkbox
+        @radio           = radio
+        @checkbox        = checkbox
+        @html_attributes = kwargs
+
+        if content
+          @content = capture { content.call }
+        else
+          @text  = retrieve_text(text)
+          @value = value
+        end
+      end
+
+      def active?
+        [@text, @content].any?(&:present?)
       end
 
       def html
-        return nil if @hint_text.blank?
+        return nil unless active?
+
+        content_tag(hint_tag, **hint_options, **@html_attributes) { hint_body }
+      end
+
+      def hint_id
+        return nil unless active?
 
-        tag.span(@hint_text, class: classes, id: hint_id)
+        build_id('hint')
       end
 
     private
 
+      def hint_options
+        { class: classes, id: hint_id }
+      end
+
+      def hint_tag
+        @content.presence ? 'div' : 'span'
+      end
+
+      def hint_body
+        @content || @text
+      end
+
       def retrieve_text(supplied)
         supplied.presence || localised_text(:hint)
       end

data/lib/govuk_design_system_formbuilder/elements/label.rb

@@ -12,7 +12,7 @@ module GOVUKDesignSystemFormBuilder
         # content is passed in directly via a proc and overrides
         # the other display options
         if content
-          @content = content.call
+          @content = capture { content.call }
         else
           @value       = value # used by field_id
           @text        = retrieve_text(text, hidden)
@@ -26,7 +26,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        return nil if [@content, @text].all?(&:blank?)
+        return nil unless active?
 
         if @tag.present?
           content_tag(@tag, class: %(#{brand}-label-wrapper)) { label }
@@ -35,6 +35,10 @@ module GOVUKDesignSystemFormBuilder
         end
       end
 
+      def active?
+        [@content, @text].any?(&:present?)
+      end
+
     private
 
       def label

data/lib/govuk_design_system_formbuilder/elements/legend.rb

@@ -9,7 +9,7 @@ module GOVUKDesignSystemFormBuilder
 
         case legend
         when Proc
-          @raw = legend.call
+          @raw = capture { legend.call }
         when Hash
           defaults.merge(legend).tap do |l|
             @text    = text(l.dig(:text))

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

@@ -6,25 +6,25 @@ module GOVUKDesignSystemFormBuilder
         include Traits::Hint
         include Traits::Supplemental
 
-        def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, hint_method:, hint_text:, legend:, caption:, inline:, small:, bold_labels:, classes:, form_group_classes:, &block)
+        def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, hint_method:, hint:, legend:, caption:, inline:, small:, bold_labels:, classes:, form_group:, &block)
           super(builder, object_name, attribute_name, &block)
 
-          @collection         = collection
-          @value_method       = value_method
-          @text_method        = text_method
-          @hint_method        = hint_method
-          @inline             = inline
-          @small              = small
-          @legend             = legend
-          @caption            = caption
-          @hint_text          = hint_text
-          @classes            = classes
-          @form_group_classes = form_group_classes
-          @bold_labels        = hint_method.present? || bold_labels
+          @collection   = collection
+          @value_method = value_method
+          @text_method  = text_method
+          @hint_method  = hint_method
+          @inline       = inline
+          @small        = small
+          @legend       = legend
+          @caption      = caption
+          @hint         = hint
+          @classes      = classes
+          @form_group   = form_group
+          @bold_labels  = hint_method.present? || bold_labels
         end
 
         def html
-          Containers::FormGroup.new(@builder, @object_name, @attribute_name, classes: @form_group_classes).html do
+          Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
             Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
               safe_join([supplemental_content, hint_element, error_element, radios])
             end

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

@@ -41,7 +41,15 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def hint_element
-          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, @hint_text, @value, radio: true)
+          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_options, **hint_content)
+        end
+
+        def hint_content
+          { text: @hint_text }
+        end
+
+        def hint_options
+          { value: @value, radio: true }
         end
 
         def label_element

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

@@ -8,12 +8,12 @@ module GOVUKDesignSystemFormBuilder
         include Traits::Hint
         include Traits::Conditional
 
-        def initialize(builder, object_name, attribute_name, value, label:, hint_text:, link_errors:, &block)
+        def initialize(builder, object_name, attribute_name, value, label:, hint:, link_errors:, &block)
           super(builder, object_name, attribute_name)
 
           @value       = value
           @label       = label
-          @hint_text   = hint_text
+          @hint        = hint
           @link_errors = has_errors? && link_errors
 
           if block_given?
@@ -34,16 +34,24 @@ module GOVUKDesignSystemFormBuilder
           end
         end
 
+        def radio_options
+          { radio: true }
+        end
+
         def label_element
-          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, **label_content, **label_options)
+          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, **label_content, **label_options, **@label)
         end
 
         def label_options
-          { radio: true, value: @value, link_errors: @link_errors }
+          { value: @value, link_errors: @link_errors }.merge(radio_options)
         end
 
         def hint_element
-          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, @hint_text, @value, radio: true)
+          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_options, **hint_content)
+        end
+
+        def hint_options
+          { value: @value }.merge(radio_options)
         end
 
         def input

data/lib/govuk_design_system_formbuilder/elements/select.rb

@@ -6,22 +6,22 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Hint
       include Traits::Supplemental
 
-      def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, options: {}, html_options: {}, hint_text:, label:, caption:, form_group_classes:, &block)
+      def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, options: {}, html_options: {}, hint:, label:, caption:, form_group:, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @collection         = collection
-        @value_method       = value_method
-        @text_method        = text_method
-        @options            = options
-        @html_options       = html_options
-        @label              = label
-        @caption            = caption
-        @hint_text          = hint_text
-        @form_group_classes = form_group_classes
+        @collection   = collection
+        @value_method = value_method
+        @text_method  = text_method
+        @options      = options
+        @html_options = html_options
+        @label        = label
+        @caption      = caption
+        @hint         = hint
+        @form_group   = form_group
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, classes: @form_group_classes).html do
+        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
           safe_join([label_element, supplemental_content, hint_element, error_element, select])
         end
       end