govuk_design_system_formbuilder 1.1.11 → 1.2.1

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

@@ -6,7 +6,7 @@ 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:, inline:, small:, bold_labels:, classes:, &block)
+        def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, hint_method:, hint_text:, legend:, caption:, inline:, small:, bold_labels:, classes:, &block)
           super(builder, object_name, attribute_name, &block)
 
           @collection    = collection
@@ -16,6 +16,7 @@ module GOVUKDesignSystemFormBuilder
           @inline        = inline
           @small         = small
           @legend        = legend
+          @caption       = caption
           @hint_text     = hint_text
           @classes       = classes
           @bold_labels   = hint_method.present? || bold_labels
@@ -23,38 +24,39 @@ module GOVUKDesignSystemFormBuilder
 
         def html
           Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-            Containers::Fieldset.new(@builder, @object_name, @attribute_name, legend: @legend, described_by: [error_id, hint_id, supplemental_id]).html do
-              safe_join(
-                [
-                  supplemental_content.html,
-                  hint_element.html,
-                  error_element.html,
-                  Containers::Radios.new(@builder, inline: @inline, small: @small, classes: @classes).html do
-                    safe_join(build_collection)
-                  end
-                ]
-              )
+            Containers::Fieldset.new(@builder, @object_name, @attribute_name, legend: @legend, caption: @caption, described_by: [error_id, hint_id, supplemental_id]).html do
+              safe_join([supplemental_content, hint_element, error_element, radios])
             end
           end
         end
 
       private
 
-        def build_collection
+        def radios
+          Containers::Radios.new(@builder, inline: @inline, small: @small, classes: @classes).html do
+            safe_join(collection)
+          end
+        end
+
+        def collection
           @collection.map.with_index do |item, i|
-            Elements::Radios::CollectionRadioButton.new(
-              @builder,
-              @object_name,
-              @attribute_name,
-              item,
-              value_method: @value_method,
-              text_method: @text_method,
-              hint_method: @hint_method,
-              link_errors: has_errors? && i.zero?,
-              bold_labels: @bold_labels
-            ).html
+            Elements::Radios::CollectionRadioButton.new(@builder, @object_name, @attribute_name, item, **collection_options(i)).html
           end
         end
+
+        def collection_options(index)
+          {
+            value_method: @value_method,
+            text_method: @text_method,
+            hint_method: @hint_method,
+            link_errors: link_errors?(index),
+            bold_labels: @bold_labels
+          }
+        end
+
+        def link_errors?(index)
+          has_errors? && index.zero?
+        end
       end
     end
   end

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

@@ -2,6 +2,8 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Radios
       class CollectionRadioButton < Base
+        using PrefixableArray
+
         include Traits::Hint
         include Traits::CollectionItem
 
@@ -21,25 +23,25 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def html
-          content_tag('div', class: 'govuk-radios__item') do
-            safe_join(
-              [
-                @builder.radio_button(
-                  @attribute_name,
-                  @value,
-                  id: field_id(link_errors: @link_errors),
-                  aria: { describedby: hint_id },
-                  class: %w(govuk-radios__input)
-                ),
-                label_element.html,
-                hint_element.html
-              ]
-            )
+          content_tag('div', class: %(#{brand}-radios__item)) do
+            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

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

@@ -2,6 +2,9 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Radios
       class FieldsetRadioButton < Base
+        using PrefixableArray
+
+        include Traits::Label
         include Traits::Hint
         include Traits::Conditional
 
@@ -20,26 +23,19 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def html
-          safe_join(
-            [
-              content_tag('div', class: 'govuk-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, **@label, link_errors: @link_errors)
+          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, radio: true, value: @value, link_errors: @link_errors, **label_options)
         end
 
         def hint_element
@@ -47,18 +43,20 @@ 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(govuk-radios__input)
-          )
+            class: %w(radios__input).prefix(brand)
+          }
         end
 
         def conditional_classes
-          %w(govuk-radios__conditional govuk-radios__conditional--hidden)
+          %w(radios__conditional radios__conditional--hidden).prefix(brand)
         end
       end
     end

data/lib/govuk_design_system_formbuilder/elements/select.rb

@@ -1,12 +1,14 @@
 module GOVUKDesignSystemFormBuilder
   module Elements
     class Select < Base
+      using PrefixableArray
+
       include Traits::Error
       include Traits::Label
       include Traits::Hint
       include Traits::Supplemental
 
-      def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, options: {}, html_options: {}, hint_text:, label:, &block)
+      def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, options: {}, html_options: {}, hint_text:, label:, caption:, &block)
         super(builder, object_name, attribute_name, &block)
 
         @collection    = collection
@@ -15,33 +17,23 @@ module GOVUKDesignSystemFormBuilder
         @options       = options
         @html_options  = html_options
         @label         = label
+        @caption       = caption
         @hint_text     = hint_text
       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.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,
@@ -50,8 +42,8 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def select_classes
-        %w(govuk-select).tap do |classes|
-          classes.push('govuk-select--error') if has_errors?
+        %w(select).prefix(brand).tap do |classes|
+          classes.push(%(#{brand}-select--error)) if has_errors?
         end
       end
     end

data/lib/govuk_design_system_formbuilder/elements/submit.rb

@@ -1,7 +1,9 @@
 module GOVUKDesignSystemFormBuilder
   module Elements
     class Submit < Base
-      def initialize(builder, text, warning:, secondary:, classes:, prevent_double_click:, validate:, &block)
+      using PrefixableArray
+
+      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
@@ -11,50 +13,50 @@ 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(govuk-button).push(
-                warning_class,
-                secondary_class,
-                @classes,
-                padding_class(@block_content.present?)
-              ).compact,
-              **extra_args
-            ),
-            @block_content
-          ]
-        )
+        safe_join([submit, @block_content])
       end
 
     private
 
-      def warning_class
-        'govuk-button--warning' if @warning
+      def submit
+        @builder.submit(@text, class: submit_classes, **submit_options)
       end
 
-      def secondary_class
-        'govuk-button--secondary' if @secondary
+      def submit_classes
+        %w(button).prefix(brand).push(warning_class, secondary_class, disabled_class, @classes, padding_class(@block_content.present?))
       end
 
-      def padding_class(content_present)
-        'govuk-!-margin-right-1' if content_present
-      end
-
-      def extra_args
+      def submit_options
         {
           formnovalidate: !@validate,
+          disabled: @disabled,
           data: {
-            module: 'govuk-button',
-            'prevent-double-click' => @prevent_double_click
+            module: %(#{brand}-button),
+            'prevent-double-click': @prevent_double_click
           }.select { |_k, v| v.present? }
         }
       end
+
+      def warning_class
+        %(#{brand}-button--warning) if @warning
+      end
+
+      def secondary_class
+        %(#{brand}-button--secondary) if @secondary
+      end
+
+      def padding_class(content_present)
+        %(#{brand}-!-margin-right-1) if content_present
+      end
+
+      def disabled_class
+        %(#{brand}-button--disabled) if @disabled
+      end
     end
   end
 end

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -1,17 +1,20 @@
 module GOVUKDesignSystemFormBuilder
   module Elements
     class TextArea < Base
+      using PrefixableArray
+
       include Traits::Error
       include Traits::Hint
       include Traits::Label
       include Traits::Supplemental
 
-      def initialize(builder, object_name, attribute_name, hint_text:, label:, 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
+        @attributes = kwargs
         @max_words  = max_words
         @max_chars  = max_chars
         @threshold  = threshold
@@ -21,39 +24,32 @@ module GOVUKDesignSystemFormBuilder
       def html
         Containers::CharacterCount.new(@builder, max_words: @max_words, max_chars: @max_chars, threshold: @threshold).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
-        %w(govuk-textarea).tap do |classes|
-          classes.push('govuk-textarea--error') if has_errors?
-          classes.push('govuk-js-character-count') if limit?
+      def text_area
+        @builder.text_area(@attribute_name, **text_area_options, **@attributes.merge(rows: @rows))
+      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,
+          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
@@ -69,11 +65,15 @@ module GOVUKDesignSystemFormBuilder
       def limit_description
         return nil unless limit?
 
-        content_tag('span', id: limit_id, class: %w(govuk-hint govuk-character-count__message), aria: { live: 'polite' }) do
+        content_tag('span', id: limit_id, class: limit_description_classes, aria: { live: 'polite' }) do
           "You can enter up to #{limit_quantity} #{limit_type}"
         end
       end
 
+      def limit_description_classes
+        %w(hint character-count__message).prefix(brand)
+      end
+
       def limit_quantity
         @max_words || @max_chars
       end