govuk_design_system_formbuilder 1.2.0b4 → 1.2.4

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

@@ -24,30 +24,40 @@ module GOVUKDesignSystemFormBuilder
 
         def html
           content_tag('div', class: %(#{brand}-radios__item)) do
-            safe_join(
-              [
-                @builder.radio_button(
-                  @attribute_name,
-                  @value,
-                  id: field_id(link_errors: @link_errors),
-                  aria: { describedby: hint_id },
-                  class: %w(radios__input).prefix(brand)
-                ),
-                label_element.html,
-                hint_element.html
-              ]
-            )
+            safe_join([radio, label_element, hint_element])
           end
         end
 
       private
 
+        def radio
+          @builder.radio_button(@attribute_name, @value, **radio_options)
+        end
+
+        def radio_options
+          {
+            id: field_id(link_errors: @link_errors),
+            aria: { describedby: hint_id },
+            class: %w(radios__input).prefix(brand)
+          }
+        end
+
         def hint_element
           @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, @hint_text, @value, radio: true)
         end
 
         def label_element
-          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, text: @label_text, value: @value, radio: true, size: label_size, link_errors: @link_errors)
+          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, **label_options)
+        end
+
+        def label_options
+          {
+            text: @label_text,
+            value: @value,
+            radio: true,
+            size: label_size,
+            link_errors: @link_errors
+          }
         end
 
         def label_size

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

@@ -23,26 +23,23 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def html
-          safe_join(
-            [
-              content_tag('div', class: %(#{brand}-radios__item)) do
-                safe_join(
-                  [
-                    input,
-                    label_element.html,
-                    hint_element.html,
-                  ]
-                )
-              end,
-              @conditional_content
-            ]
-          )
+          safe_join([radio, @conditional_content])
         end
 
       private
 
+        def radio
+          content_tag('div', class: %(#{brand}-radios__item)) do
+            safe_join([input, label_element, hint_element])
+          end
+        end
+
         def label_element
-          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, radio: true, value: @value, link_errors: @link_errors, **label_args)
+          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, **label_content, **label_options)
+        end
+
+        def label_options
+          { radio: true, value: @value, link_errors: @link_errors }
         end
 
         def hint_element
@@ -50,14 +47,16 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def input
-          @builder.radio_button(
-            @attribute_name,
-            @value,
+          @builder.radio_button(@attribute_name, @value, **input_options)
+        end
+
+        def input_options
+          {
             id: field_id(link_errors: @link_errors),
             aria: { describedby: hint_id },
             data: { 'aria-controls' => @conditional_id },
             class: %w(radios__input).prefix(brand)
-          )
+          }
         end
 
         def conditional_classes

data/lib/govuk_design_system_formbuilder/elements/select.rb

@@ -1,8 +1,6 @@
 module GOVUKDesignSystemFormBuilder
   module Elements
     class Select < Base
-      using PrefixableArray
-
       include Traits::Error
       include Traits::Label
       include Traits::Hint
@@ -23,28 +21,17 @@ module GOVUKDesignSystemFormBuilder
 
       def html
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-          safe_join(
-            [
-              label_element.html,
-              supplemental_content.html,
-              hint_element.html,
-              error_element.html,
-              @builder.collection_select(
-                @attribute_name,
-                @collection,
-                @value_method,
-                @text_method,
-                @options,
-                build_html_options
-              )
-            ]
-          )
+          safe_join([label_element, supplemental_content, hint_element, error_element, select])
         end
       end
 
     private
 
-      def build_html_options
+      def select
+        @builder.collection_select(@attribute_name, @collection, @value_method, @text_method, @options, **select_options)
+      end
+
+      def select_options
         @html_options.deep_merge(
           id: field_id(link_errors: true),
           class: select_classes,
@@ -53,9 +40,15 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def select_classes
-        %w(select).prefix(brand).tap do |classes|
-          classes.push(%(#{brand}-select--error)) if has_errors?
-        end
+        [%(#{brand}-select), select_error_class, select_custom_classes].flatten.compact
+      end
+
+      def select_error_class
+        %(#{brand}-select--error) if has_errors?
+      end
+
+      def select_custom_classes
+        @html_options.dig(:class)
       end
     end
   end

data/lib/govuk_design_system_formbuilder/elements/submit.rb

@@ -3,7 +3,7 @@ module GOVUKDesignSystemFormBuilder
     class Submit < Base
       using PrefixableArray
 
-      def initialize(builder, text, warning:, secondary:, classes:, prevent_double_click:, validate:, &block)
+      def initialize(builder, text, warning:, secondary:, classes:, prevent_double_click:, validate:, disabled:, &block)
         fail ArgumentError, 'buttons can be warning or secondary' if warning && secondary
 
         @builder              = builder
@@ -13,29 +13,38 @@ module GOVUKDesignSystemFormBuilder
         @secondary            = secondary
         @classes              = classes
         @validate             = validate
+        @disabled             = disabled
         @block_content        = capture { block.call } if block_given?
       end
 
       def html
-        safe_join(
-          [
-            @builder.submit(
-              @text,
-              class: %w(button).prefix(brand).push(
-                warning_class,
-                secondary_class,
-                @classes,
-                padding_class(@block_content.present?)
-              ).compact,
-              **extra_args
-            ),
-            @block_content
-          ]
-        )
+        safe_join([submit, @block_content])
       end
 
     private
 
+      def submit
+        @builder.submit(@text, class: submit_classes, **submit_options)
+      end
+
+      def submit_classes
+        %w(button)
+          .prefix(brand)
+          .push(warning_class, secondary_class, disabled_class, padding_class, @classes)
+          .compact
+      end
+
+      def submit_options
+        {
+          formnovalidate: !@validate,
+          disabled: @disabled,
+          data: {
+            module: %(#{brand}-button),
+            'prevent-double-click': @prevent_double_click
+          }.select { |_k, v| v.present? }
+        }
+      end
+
       def warning_class
         %(#{brand}-button--warning) if @warning
       end
@@ -44,17 +53,12 @@ module GOVUKDesignSystemFormBuilder
         %(#{brand}-button--secondary) if @secondary
       end
 
-      def padding_class(content_present)
-        %(#{brand}-!-margin-right-1) if content_present
+      def padding_class
+        %(#{brand}-!-margin-right-1) if @block_content
       end
 
-      def extra_args
-        {
-          formnovalidate: !@validate,
-          data: {
-            module: %(#{brand}-button), 'prevent-double-click' => @prevent_double_click
-          }.select { |_k, v| v.present? }
-        }
+      def disabled_class
+        %(#{brand}-button--disabled) if @disabled
       end
     end
   end

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -8,55 +8,53 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Label
       include Traits::Supplemental
 
-      def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, rows:, max_words:, max_chars:, threshold:, **extra_args, &block)
+      def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, rows:, max_words:, max_chars:, threshold:, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @label      = label
-        @caption    = caption
-        @hint_text  = hint_text
-        @extra_args = extra_args
-        @max_words  = max_words
-        @max_chars  = max_chars
-        @threshold  = threshold
-        @rows       = rows
+        @label           = label
+        @caption         = caption
+        @hint_text       = hint_text
+        @max_words       = max_words
+        @max_chars       = max_chars
+        @threshold       = threshold
+        @rows            = rows
+        @html_attributes = kwargs
       end
 
       def html
-        Containers::CharacterCount.new(@builder, max_words: @max_words, max_chars: @max_chars, threshold: @threshold).html do
+        Containers::CharacterCount.new(@builder, **character_count_options).html do
           Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-            safe_join(
-              [
-                [
-                  label_element,
-                  supplemental_content,
-                  hint_element,
-                  error_element
-                ].map(&:html),
-                @builder.text_area(
-                  @attribute_name,
-                  id: field_id(link_errors: true),
-                  class: govuk_textarea_classes,
-                  aria: {
-                    describedby: described_by(hint_id, error_id, supplemental_id, limit_description_id)
-                  },
-                  **@extra_args.merge(rows: @rows)
-                ),
-                limit_description
-              ].flatten.compact
-            )
+            safe_join([label_element, supplemental_content, hint_element, error_element, text_area, limit_description])
           end
         end
       end
 
     private
 
-      def govuk_textarea_classes
+      def character_count_options
+        { max_words: @max_words, max_chars: @max_chars, threshold: @threshold }
+      end
+
+      def text_area
+        @builder.text_area(@attribute_name, **text_area_options, **@html_attributes)
+      end
+
+      def text_area_classes
         %w(textarea).prefix(brand).tap do |classes|
           classes.push(%(#{brand}-textarea--error)) if has_errors?
           classes.push(%(#{brand}-js-character-count)) if limit?
         end
       end
 
+      def text_area_options
+        {
+          id: field_id(link_errors: true),
+          class: text_area_classes,
+          rows: @rows,
+          aria: { describedby: described_by(hint_id, error_id, supplemental_id, limit_description_id) },
+        }
+      end
+
       # Provides an id for use by the textual description of character and word limits.
       #
       # @note In order for the GOV.UK Frontend JavaScript to pick up this associated field
@@ -66,9 +64,17 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def limit?
+        limit_quantity.present?
+      end
+
+      def limit_quantity
         @max_words || @max_chars
       end
 
+      def limit_type
+        @max_words.present? ? 'words' : 'characters'
+      end
+
       def limit_description
         return nil unless limit?
 
@@ -81,14 +87,6 @@ module GOVUKDesignSystemFormBuilder
         %w(hint character-count__message).prefix(brand)
       end
 
-      def limit_quantity
-        @max_words || @max_chars
-      end
-
-      def limit_type
-        @max_words.present? ? 'words' : 'characters'
-      end
-
       def limit_description_id
         return nil unless limit?
 

data/lib/govuk_design_system_formbuilder/traits/caption.rb

@@ -4,12 +4,11 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def caption_element
-        @caption_element ||= Elements::Caption.new(
-          @builder,
-          @object_name,
-          @attribute_name,
-          **{ text: nil }.merge({ text: caption_text, size: caption_size }.compact)
-        )
+        @caption_element ||= Elements::Caption.new(@builder, @object_name, @attribute_name, **caption_options)
+      end
+
+      def caption_options
+        { text: nil }.merge({ text: caption_text, size: caption_size }.compact)
       end
 
       def caption_text

data/lib/govuk_design_system_formbuilder/traits/input.rb

@@ -1,45 +1,36 @@
 module GOVUKDesignSystemFormBuilder
   module Traits
     module Input
-      def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, width:, **extra_args, &block)
+      def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, width:, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @width          = width
-        @extra_args     = extra_args
-        @label          = label
-        @caption        = caption
-        @hint_text      = hint_text
+        @width           = width
+        @label           = label
+        @caption         = caption
+        @hint_text       = hint_text
+        @html_attributes = kwargs
       end
 
       def html
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-          safe_join(
-            [
-              label_element.html,
-              supplemental_content.html,
-              hint_element.html,
-              error_element.html,
-              @builder.send(
-                builder_method,
-                @attribute_name,
-                id: field_id(link_errors: true),
-                class: input_classes,
-                aria: {
-                  describedby: described_by(
-                    hint_id,
-                    error_id,
-                    supplemental_id
-                  )
-                },
-                **@extra_args
-              )
-            ]
-          )
+          safe_join([label_element, supplemental_content, hint_element, error_element, input])
         end
       end
 
     private
 
+      def input
+        @builder.send(builder_method, @attribute_name, **input_options, **@html_attributes)
+      end
+
+      def input_options
+        {
+          id: field_id(link_errors: true),
+          class: input_classes,
+          aria: { describedby: described_by(hint_id, error_id, supplemental_id) }
+        }
+      end
+
       def input_classes
         [%(#{brand}-input)].push(width_classes, error_classes).compact
       end