katalyst-govuk-formbuilder 1.28.0 → 1.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '088f97f2c42cd5766eaa77fd9e85f60a2a02ea9b988aa3c6fb4924f107f1ac52'
-  data.tar.gz: bfc23680580b356b1a4eff07a82cc5770c36740a76819e84fd6cd4a9adf3a239
+  metadata.gz: 9d4e88755cce23d5a3cc6744389d5719affe98d3f99da5e7166e1a51237caadb
+  data.tar.gz: 193369a6eaaa537f1b66e229ae8ae9a8cdd817d549683e154777328087c52e25
 SHA512:
-  metadata.gz: a9c4758793c31b396fa8e75620f20ada27970b4da30f885b18acb5d7e62514fa8565bd5cff4965f76f6dddc4baf6ed28e72a102cd23e67e77bf339b947fe7eed
-  data.tar.gz: 371302ba7c537c19bb0ec1ab31610b96f05dd1e999abef60aed649123bc96199b63a42667e54109df2b01475eb644414d2bdca0afa015ef170616667654aebc7
+  metadata.gz: 8f0de20a24e82ff967e0839dbccf2d0e0d94145880ccb6b44df47159a56bb96da0ec55397b5d5ae9b4821afe3f2231dc064a4fa6659b5a12af459f475f402cd0
+  data.tar.gz: 8c576643a92fd031ea13cc9ed5183d31aa09adfe09542ee0613f0fecedc66f50e77a4aed4c3b5773d339498bf88682711a5cb4d38193a6aac126aa49dcd204c0

data/config/ci.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# Run using bin/ci
+
+CI.run do
+  step "Style", "bundle exec rake lint"
+  step "Assets: Build", "bundle exec rake build"
+  step "Tests: RSpec", "bundle exec rake spec"
+  step "Security: Brakeman", "bundle exec rake security"
+end

data/lib/katalyst/govuk/form_builder/engine.rb

@@ -27,8 +27,17 @@ module Katalyst
           end
         end
 
+        # Mix the extension modules into GOVUKDesignSystemFormBuilder once, after the main
+        # autoloader is set up. The modules in app/helpers stay reloadable, but a consuming
+        # app only needs them wired once: re-applying on every reload would accumulate stale
+        # copies in the (non-reloadable) GOVUKDesignSystemFormBuilder ancestor chain.
+        #
+        # When developing this gem, spec/dummy re-applies them via to_prepare so that edits
+        # to the extension modules are picked up on reload.
         initializer "katalyst-govuk-formbuilder.extensions" do
-          GOVUKDesignSystemFormBuilder::Builder.include(FormBuilder::Extensions)
+          config.after_initialize do
+            FormBuilder.inject_extensions!
+          end
         end
 
         initializer "katalyst-govuk-formbuilder.importmap", before: "importmap" do |app|

data/lib/katalyst/govuk/form_builder.rb

@@ -6,6 +6,20 @@ require "active_support/rails"
 module Katalyst
   module GOVUK
     module FormBuilder
+      # Mix our extension modules into the GOVUKDesignSystemFormBuilder classes.
+      #
+      # This is called from an after_initialize block (see Engine) or to_prepare in development (see dummy app)
+      def inject_extensions!
+        GOVUKDesignSystemFormBuilder.include(Config)
+        GOVUKDesignSystemFormBuilder::Builder.include(Builder)
+        GOVUKDesignSystemFormBuilder::Elements::Label.include(Elements::Label)
+        GOVUKDesignSystemFormBuilder::Elements::Legend.include(Elements::Legend)
+        GOVUKDesignSystemFormBuilder::Traits::Label.include(Traits::Label)
+        GOVUKDesignSystemFormBuilder::Containers::Fieldset.include(Containers::FieldsetContext)
+        GOVUKDesignSystemFormBuilder::Containers::CheckBoxesFieldset.include(Containers::FieldsetContext)
+        GOVUKDesignSystemFormBuilder::Containers::RadioButtonsFieldset.include(Containers::FieldsetContext)
+      end
+      module_function :inject_extensions!
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-govuk-formbuilder
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 1.29.1
 platform: ruby
 authors:
 - Katalyst Interactive
@@ -43,23 +43,12 @@ files:
 - app/assets/stylesheets/katalyst/govuk/components/richtextarea/_index.scss
 - app/assets/stylesheets/katalyst/govuk/components/richtextarea/_mixin.scss
 - app/assets/stylesheets/katalyst/govuk/formbuilder.scss
+- config/ci.rb
 - config/importmap.rb
 - lib/katalyst-govuk-formbuilder.rb
 - lib/katalyst/govuk/form_builder.rb
-- lib/katalyst/govuk/form_builder/builder.rb
 - lib/katalyst/govuk/form_builder/config.rb
-- lib/katalyst/govuk/form_builder/containers/fieldset_context.rb
-- lib/katalyst/govuk/form_builder/elements/combobox.rb
-- lib/katalyst/govuk/form_builder/elements/document.rb
-- lib/katalyst/govuk/form_builder/elements/image.rb
-- lib/katalyst/govuk/form_builder/elements/label.rb
-- lib/katalyst/govuk/form_builder/elements/legend.rb
-- lib/katalyst/govuk/form_builder/elements/rich_textarea.rb
 - lib/katalyst/govuk/form_builder/engine.rb
-- lib/katalyst/govuk/form_builder/extensions.rb
-- lib/katalyst/govuk/form_builder/frontend.rb
-- lib/katalyst/govuk/form_builder/traits/file.rb
-- lib/katalyst/govuk/form_builder/traits/label.rb
 - lib/katalyst/govuk/formbuilder.rb
 - node_modules/govuk-frontend/dist/govuk/_base.import.scss
 - node_modules/govuk-frontend/dist/govuk/_base.scss

data/lib/katalyst/govuk/form_builder/builder.rb

@@ -1,336 +0,0 @@
-# frozen_string_literal: true
-
-module Katalyst
-  module GOVUK
-    module FormBuilder
-      module Builder
-        extend ActiveSupport::Concern
-
-        included do
-          # Overwrite GOVUK default to set small to true
-          # @see GOVUKDesignSystemFormBuilder::Builder#govuk_collection_radio_buttons
-          def govuk_collection_radio_buttons(attribute_name, collection, value_method, text_method = nil,
-                                             hint_method = nil, hint: {}, legend: {}, caption: {}, inline: false,
-                                             small: true, bold_labels: nil,
-                                             include_hidden: config.default_collection_radio_buttons_include_hidden,
-                                             form_group: {}, **, &)
-            GOVUKDesignSystemFormBuilder::Elements::Radios::Collection.new(
-              self,
-              object_name,
-              attribute_name,
-              collection,
-              value_method:,
-              text_method:,
-              hint_method:,
-              hint:,
-              legend:,
-              caption:,
-              inline:,
-              small:,
-              bold_labels:,
-              form_group:,
-              include_hidden:,
-              **,
-              &
-            ).html
-          end
-
-          # Overwrite GOVUK default to set small to true
-          # @see GOVUKDesignSystemFormBuilder::Builder#govuk_radio_buttons_fieldset
-          def govuk_radio_buttons_fieldset(attribute_name, hint: {}, legend: {}, caption: {}, inline: false,
-                                           small: true, form_group: {}, **, &)
-            GOVUKDesignSystemFormBuilder::Containers::RadioButtonsFieldset.new(
-              self, object_name, attribute_name,
-              hint:, legend:, caption:, inline:, small:, form_group:,
-              **, &
-            ).html
-          end
-
-          # Overwrite GOVUK default to set small to true
-          # @see GOVUKDesignSystemFormBuilder::Builder#govuk_collection_check_boxes
-          def govuk_collection_check_boxes(attribute_name, collection, value_method, text_method, hint_method = nil,
-                                           hint: {}, legend: {}, caption: {}, small: true, form_group: {},
-                                           include_hidden: config.default_collection_check_boxes_include_hidden,
-                                           **, &)
-            GOVUKDesignSystemFormBuilder::Elements::CheckBoxes::Collection.new(
-              self,
-              object_name,
-              attribute_name,
-              collection,
-              value_method:,
-              text_method:,
-              hint_method:,
-              hint:,
-              legend:,
-              caption:,
-              small:,
-              form_group:,
-              include_hidden:,
-              **,
-              &
-            ).html
-          end
-
-          # Overwrite GOVUK default to set small to true
-          # @see GOVUKDesignSystemFormBuilder::Builder#govuk_check_boxes_fieldset
-          def govuk_check_boxes_fieldset(attribute_name, legend: {}, caption: {}, hint: {}, small: true, form_group: {},
-                                         multiple: true, **, &)
-            GOVUKDesignSystemFormBuilder::Containers::CheckBoxesFieldset.new(
-              self,
-              object_name,
-              attribute_name,
-              hint:,
-              legend:,
-              caption:,
-              small:,
-              form_group:,
-              multiple:,
-              **,
-              &
-            ).html
-          end
-        end
-
-        # Generates a check box within a fieldset to be used as a boolean toggle for a single attribute.
-        # The values are 1 (toggled on), and 0 (toggled off).
-        #
-        # @param attribute_name [Symbol] The name of the attribute
-        # @param small [Boolean] controls whether small check boxes are used instead of regular-sized ones
-        # @param hint [Hash,Proc] The content of the hint. No hint will be added if 'text' is left +nil+. When a +Proc+
-        #                         is supplied the hint will be wrapped in a +div+ instead of a +span+
-        # @option hint text [String] the hint text
-        # @option hint kwargs [Hash] additional arguments are applied as attributes to the hint
-        # @param link_errors [Boolean] controls whether this checkbox should be linked to from {#govuk_error_summary}
-        # @option label text [String] the label text
-        # @option label size [String] the size of the label font, can be +xl+, +l+, +m+, +s+ or nil
-        # @option label tag [Symbol,String] the label's wrapper tag, intended to allow labels to act as page headings
-        # @option label hidden [Boolean] control the visibility of the label. Hidden labels will be read by
-        #                                screenreaders
-        # @option label kwargs [Hash] additional arguments are applied as attributes on the +label+ element
-        # @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
-        #
-        # @example A single check box for terms and conditions
-        #   = f.govuk_check_box_field :terms_agreed,
-        #     link_errors: true,
-        #     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_field(attribute_name, value = 1, unchecked_value = 0,
-                                  small: true, hint: {}, label: {}, link_errors: false, **, &)
-          govuk_check_boxes_fieldset(attribute_name, legend: nil, multiple: false, small:) do
-            fieldset_context.pop # undo push from fieldset extension, labels should be bold unless already nested
-            checkbox = govuk_check_box(attribute_name, value, unchecked_value,
-                                       hint:,
-                                       label:,
-                                       link_errors:,
-                                       multiple:    false,
-                                       exclusive:   false,
-                                       **, &)
-            fieldset_context.push attribute_name # restore push from fieldset
-            checkbox
-          end
-        end
-
-        # Generates a select for an enum defined in the model.
-        # @see GOVUKDesignSystemFormBuilder::Builder#govuk_collection_select
-        def govuk_enum_select(attribute_name, **, &)
-          govuk_collection_select(attribute_name, enum_values(attribute_name),
-                                  :itself, enum_labels_for(attribute_name), **, &)
-        end
-
-        # Generates a checkbox fieldset for an enum defined in the model.
-        #
-        # @api internal
-        # @see GOVUKDesignSystemFormBuilder::Builder#govuk_collection_check_boxes
-        def govuk_enum_check_boxes(attribute_name, **, &)
-          govuk_collection_check_boxes(attribute_name, enum_values(attribute_name),
-                                       :itself, enum_labels_for(attribute_name), **, &)
-        end
-
-        # Generates a radio buttons fieldset for an enum defined in the model.
-        # @see GOVUKDesignSystemFormBuilder::Builder#govuk_collection_radio_buttons
-        def govuk_enum_radio_buttons(attribute_name, **, &)
-          govuk_collection_radio_buttons(attribute_name, enum_values(attribute_name),
-                                         :itself, enum_labels_for(attribute_name), **, &)
-        end
-
-        # Generates a pair of +trix-toolbar+ and +trix-editor+ elements with a label, optional hint.
-        # Requires action-text to be correctly setup in the application
-        #
-        # @param attribute_name [Symbol] The name of the attribute
-        # @param hint [Hash,Proc] The content of the hint. No hint will be added if 'text' is left +nil+. When a +Proc+
-        #                         is supplied the hint will be wrapped in a +div+ instead of a +span+
-        # @option hint text [String] the hint text
-        # @option hint kwargs [Hash] additional arguments are applied as attributes to the hint
-        # @param label [Hash,Proc] configures or sets the associated label content
-        # @option label text [String] the label text
-        # @option label size [String] the size of the label font, can be +xl+, +l+, +m+, +s+ or nil
-        # @option label tag [Symbol,String] the label's wrapper tag, intended to allow labels to act as page headings
-        # @option label hidden [Boolean] control the visibility of the label. Hidden labels will still be read by screen
-        #   readers
-        # @option label kwargs [Hash] additional arguments are applied as attributes on the +label+ element
-        # @param caption [Hash] configures or sets the caption content which is inserted above the label
-        # @option caption text [String] the caption text
-        # @option caption size [String] the size of the caption, can be +xl+, +l+ or +m+. Defaults to +m+
-        # @option caption kwargs [Hash] additional arguments are applied as attributes on the caption +span+ element
-        # @option kwargs [Hash] kwargs additional arguments are applied as attributes to the +trix-editor+ element.
-        #                       This is picked up and handled by the action-text gem
-        # @param form_group [Hash] configures the form group
-        # @option form_group classes [Array,String] sets the form group's classes
-        # @option form_group kwargs [Hash] additional attributes added to the form group
-        # @param & [Block] arbitrary HTML that will be rendered between the hint and the input
-        # @return [ActiveSupport::SafeBuffer] HTML output
-        #
-        # @example A rich text area with injected content
-        #   = f.govuk_rich_text_area :description,
-        #     label: { text: 'Where did the incident take place?' } do
-        #
-        #     p.govuk-inset-text
-        #       | If you don't know exactly leave this section blank
-        #
-        # @example A rich text area with the label supplied as a proc
-        #   = f.govuk_rich_text_area :instructions,
-        #     label: -> { tag.h3("How do you set it up?") }
-        #
-        def govuk_rich_textarea(attribute_name, hint: {}, label: {}, caption: {}, form_group: {}, **, &)
-          Elements::RichTextarea.new(
-            self, object_name, attribute_name,
-            hint:, label:, caption:, form_group:, **, &
-          ).html
-        end
-        alias_method :govuk_rich_text_area, :govuk_rich_textarea
-
-        # Generates a +combobox+ element that uses Hotwire Combobox to generate a combobox selection element.
-        # @see https://hotwirecombobox.com
-        # @see https://github.com/josefarias/hotwire_combobox
-        #
-        # @param attribute_name [Symbol] The name of the attribute
-        # @param options_or_src [Array] The +option+ values or a source path for async combobox
-        # @param options [Hash] Options hash passed through to the +combobox+ helper
-        # @param hint [Hash,Proc] The content of the hint. No hint will be added if 'text' is left +nil+.
-        #   When a +Proc+ is supplied the hint will be wrapped in a +div+ instead of a +span+
-        # @option hint text [String] the hint text
-        # @option hint kwargs [Hash] additional arguments are applied as attributes to the hint
-        # @param label [Hash,Proc] configures or sets the associated label content
-        # @option label text [String] the label text
-        # @option label size [String] the size of the label font, can be +xl+, +l+, +m+, +s+ or nil
-        # @option label tag [Symbol,String] the label's wrapper tag, intended to allow labels to act as page headings
-        # @option label hidden [Boolean] control the visibility of the label.
-        #   Hidden labels will still be read by screenreaders
-        # @option label kwargs [Hash] additional arguments are applied as attributes on the +label+ element
-        # @param form_group [Hash] configures the form group
-        # @option form_group kwargs [Hash] additional attributes added to the form group
-        # @param before_input [String,Proc] the content injected before the input. No content will be added if +nil+
-        # @param after_input [String,Proc] the content injected after the input. No content will be added if +nil+
-        # @param & [Block] build the contents of the select element manually for exact control
-        # @see https://hotwirecombobox.com Hotwire Combobox's +combobox+ (called by govuk_combobox)
-        # @return [ActiveSupport::SafeBuffer] HTML output
-        #
-        # @example A combobox that allows the user to choose from a list of states
-        #
-        #   = f.combobox "state", State.all
-        #
-        # @example A combobox that allows the user to choose from an asynchronous states endpoint
-        #
-        #   = f.combobox "state", states_path
-        #
-        # @example A multi-select combobox that allows the user to choose multiple states
-        #
-        #   = f.combobox "state", State.all, multiselect_chip_src: states_chips_path
-        #
-        def govuk_combobox(attribute_name, options_or_src = [], options: {}, label: {}, hint: {}, form_group: {},
-                           caption: {}, before_input: nil, after_input: nil, **, &)
-          Elements::Combobox.new(
-            self, object_name, attribute_name, options_or_src,
-            options:, label:, hint:, form_group:, caption:, before_input:, after_input:, **, &
-          ).html
-        end
-
-        # Generates a file input element for uploading documents.
-        #
-        # @example A upload field with label as a proc
-        #   = f.govuk_document_field :data, label: -> { tag.h3('Upload your document') }
-        #
-        def govuk_document_field(attribute_name,
-                                 label: {},
-                                 caption: {},
-                                 hint: {},
-                                 form_group: {},
-                                 mime_types: config.document_mime_types,
-                                 **,
-                                 &)
-          Elements::Document.new(
-            self, object_name, attribute_name, label:, caption:, hint:, form_group:, mime_types:, **, &
-          ).html
-        end
-
-        # Generates a file input element with a preview for uploading images.
-        #
-        # @param attribute_name [Symbol] The name of the attribute
-        # @param hint [Hash,Proc] The content of the hint. No hint will be added if 'text' is left +nil+.
-        #   When a +Proc+ is supplied the hint will be wrapped in a +div+ instead of a +span+
-        # @option hint text [String] the hint text
-        # @option hint kwargs [Hash] additional arguments are applied as attributes to the hint
-        # @param label [Hash,Proc] configures or sets the associated label content
-        # @option label text [String] the label text
-        # @option label size [String] the size of the label font, can be +xl+, +l+, +m+, +s+ or nil
-        # @option label tag [Symbol,String] the label's wrapper tag, intended to allow labels to act as page headings
-        # @option label hidden [Boolean] control the visibility of the label. Hidden labels will still be read by screen
-        #   readers
-        # @option label kwargs [Hash] additional arguments are applied as attributes on the +label+ element
-        # @param caption [Hash] configures or sets the caption content which is inserted above the label
-        # @option caption text [String] the caption text
-        # @option caption size [String] the size of the caption, can be +xl+, +l+ or +m+. Defaults to +m+
-        # @option caption kwargs [Hash] additional arguments are applied as attributes on the caption +span+ element
-        # @option kwargs [Hash] kwargs additional arguments are applied as attributes to the +input+ element.
-        # @param form_group [Hash] configures the form group
-        # @option form_group classes [Array,String] sets the form group's classes
-        # @option form_group kwargs [Hash] additional attributes added to the form group
-        # @param & [Block] arbitrary HTML that will be rendered between the hint and the input
-        # @return [ActiveSupport::SafeBuffer] HTML output
-        #
-        # @example An image field with injected content
-        #   = f.govuk_image_field :incident_image,
-        #     label: { text: 'Attach a picture of the incident' } do
-        #
-        #     p.govuk-inset-text
-        #       | If you don't know exactly leave this section blank
-        #
-        # @example A image upload field with label as a proc
-        #   = f.govuk_image_field :image, label: -> { tag.h3('Upload your image') }
-        #
-        def govuk_image_field(attribute_name,
-                              label: {},
-                              caption: {},
-                              hint: {},
-                              form_group: {},
-                              mime_types: config.image_mime_types,
-                              **,
-                              &)
-          Elements::Image.new(
-            self, object_name, attribute_name, label:, caption:, hint:, form_group:, mime_types:, **, &
-          ).html
-        end
-
-        # Keep track of whether we are inside a fieldset
-        # This allows labels to default to bold ("s") normally but use the default otherwise
-        def fieldset_context
-          @fieldset_context ||= []
-        end
-
-        private
-
-        def enum_values(attribute_name)
-          object.class.defined_enums[attribute_name.to_s].keys
-        end
-
-        def enum_labels_for(attribute_name)
-          model = object.class
-          ->(value) { model.human_attribute_name("#{attribute_name}.#{value}") }
-        end
-      end
-    end
-  end
-end

data/lib/katalyst/govuk/form_builder/containers/fieldset_context.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Katalyst
-  module GOVUK
-    module FormBuilder
-      module Containers
-        module FieldsetContext
-          def initialize(builder, object_name = nil, attribute_name = nil, &)
-            builder.fieldset_context << attribute_name
-
-            super
-
-            builder.fieldset_context.pop
-          end
-        end
-      end
-    end
-  end
-end

data/lib/katalyst/govuk/form_builder/elements/combobox.rb

@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-require "govuk_design_system_formbuilder"
-
-module Katalyst
-  module GOVUK
-    module FormBuilder
-      module Elements
-        class Combobox < GOVUKDesignSystemFormBuilder::Base
-          include GOVUKDesignSystemFormBuilder::Traits::Error
-          include GOVUKDesignSystemFormBuilder::Traits::Label
-          include GOVUKDesignSystemFormBuilder::Traits::Hint
-          include GOVUKDesignSystemFormBuilder::Traits::HTMLAttributes
-          include GOVUKDesignSystemFormBuilder::Traits::ContentBeforeAndAfter
-
-          def initialize(builder,
-                         object_name,
-                         attribute_name,
-                         options_or_src,
-                         options:,
-                         form_group:,
-                         label:,
-                         hint:,
-                         caption:,
-                         before_input:,
-                         after_input:,
-                         **kwargs,
-                         &block)
-            # assign the block to a variable rather than passing to super so
-            # we can send it through to #combobox
-            super(builder, object_name, attribute_name)
-            @block           = block
-
-            @form_group      = form_group
-            @hint            = hint
-            @label           = label
-            @caption         = caption
-            @options_or_src  = options_or_src
-            @options         = options
-            @html_attributes = kwargs
-            @before_input    = before_input
-            @after_input     = after_input
-          end
-
-          def html
-            GOVUKDesignSystemFormBuilder::Containers::FormGroup.new(*bound, **@form_group).html do
-              safe_join([
-                          label_element,
-                          hint_element,
-                          error_element,
-                          before_input_content,
-                          combobox,
-                          after_input_content,
-                        ])
-            end
-          end
-
-          private
-
-          def combobox
-            attrs         = attributes(@html_attributes)
-            attrs[:class] = attrs.delete(:class).join(" ") # hotwire_combobox does not support flattening classes
-            @builder.combobox(@attribute_name, @options_or_src, **@options, **attrs, &@block)
-          end
-
-          def options
-            {
-              id:    field_id(link_errors: true),
-              class: classes,
-              aria:  { describedby: combine_references(hint_id, error_id) },
-            }
-          end
-
-          def classes
-            combine_references(%(#{brand}-combobox), error_class)
-          end
-
-          def error_class
-            %(#{brand}-combobox--error) if has_errors?
-          end
-        end
-      end
-    end
-  end
-end

data/lib/katalyst/govuk/form_builder/elements/document.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require "govuk_design_system_formbuilder"
-
-module Katalyst
-  module GOVUK
-    module FormBuilder
-      module Elements
-        class Document < GOVUKDesignSystemFormBuilder::Base
-          include ActionDispatch::Routing::RouteSet::MountedHelpers
-
-          include GOVUKDesignSystemFormBuilder::Traits::Error
-          include GOVUKDesignSystemFormBuilder::Traits::Hint
-          include GOVUKDesignSystemFormBuilder::Traits::Label
-          include GOVUKDesignSystemFormBuilder::Traits::Supplemental
-          include GOVUKDesignSystemFormBuilder::Traits::HTMLAttributes
-          include GOVUKDesignSystemFormBuilder::Traits::HTMLClasses
-
-          include FormBuilder::Traits::File
-
-          def initialize(builder, object_name, attribute_name, hint:, label:, caption:, form_group:, mime_types:,
-                         **kwargs, &)
-            super(builder, object_name, attribute_name, &)
-
-            @mime_types      = mime_types
-            @label           = label
-            @caption         = caption
-            @hint            = hint
-            @html_attributes = kwargs.merge(file_input_options)
-            @form_group      = form_group
-          end
-
-          def html
-            GOVUKDesignSystemFormBuilder::Containers::FormGroup.new(
-              *bound,
-              **default_form_group_options(**@form_group),
-            ).html do
-              safe_join([label_element, preview, hint_element, error_element, file, destroy_element,
-                         supplemental_content])
-            end
-          end
-
-          def preview
-            options          = {}
-            add_option(options, :data, "#{stimulus_controller}_target", "preview")
-            add_option(options, :class, "preview-file")
-            options[:hidden] = "" unless preview?
-
-            tag.div(**options) do
-              filename = @builder.object.send(@attribute_name).filename.to_s
-              tag.p(filename, class: "preview-filename") + destroy_element_trigger
-            end
-          end
-
-          private
-
-          def stimulus_controller
-            "govuk-document-field"
-          end
-
-          def form_group_class
-            "govuk-document-field"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/katalyst/govuk/form_builder/elements/image.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-module Katalyst
-  module GOVUK
-    module FormBuilder
-      module Elements
-        class Image < GOVUKDesignSystemFormBuilder::Base
-          include ActionDispatch::Routing::RouteSet::MountedHelpers
-
-          include GOVUKDesignSystemFormBuilder::Traits::Error
-          include GOVUKDesignSystemFormBuilder::Traits::Hint
-          include GOVUKDesignSystemFormBuilder::Traits::Label
-          include GOVUKDesignSystemFormBuilder::Traits::Supplemental
-          include GOVUKDesignSystemFormBuilder::Traits::HTMLAttributes
-          include GOVUKDesignSystemFormBuilder::Traits::HTMLClasses
-
-          include FormBuilder::Traits::File
-
-          def initialize(builder, object_name, attribute_name, hint:, label:, caption:, form_group:, mime_types:,
-                         **kwargs, &)
-            super(builder, object_name, attribute_name, &)
-
-            @mime_types      = mime_types
-            @label           = label
-            @caption         = caption
-            @hint            = hint
-            @html_attributes = kwargs.merge(file_input_options)
-            @form_group      = form_group
-          end
-
-          def html
-            GOVUKDesignSystemFormBuilder::Containers::FormGroup.new(
-              *bound,
-              **default_form_group_options(**@form_group),
-            ).html do
-              safe_join([label_element, preview, hint_element, error_element, file, destroy_element,
-                         supplemental_content])
-            end
-          end
-
-          def preview
-            options          = {}
-            add_option(options, :data, "#{stimulus_controller}_target", "preview")
-            add_option(options, :class, "preview-image")
-            options[:hidden] = "" unless preview?
-
-            tag.div(**options) do
-              tag.img(src: preview_url, class: "image-thumbnail") + destroy_element_trigger
-            end
-          end
-
-          private
-
-          def stimulus_controller
-            "govuk-image-field"
-          end
-
-          def form_group_class
-            "govuk-image-field"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/katalyst/govuk/form_builder/elements/label.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require "govuk_design_system_formbuilder"
-
-module Katalyst
-  module GOVUK
-    module FormBuilder
-      module Elements
-        # Extend Elements::Label to add support for human_attribute_name as a fallback
-        module Label
-          extend ActiveSupport::Concern
-
-          included do
-            def retrieve_text(option_text, hidden)
-              text = option_text.presence ||
-                localised_text(:label).presence ||
-                human_attribute_name.presence ||
-                @attribute_name.to_s.humanize.capitalize.presence
-
-              if hidden
-                tag.span(text, class: %(#{brand}-visually-hidden))
-              else
-                text
-              end
-            end
-          end
-
-          def human_attribute_name
-            return unless @object_name.present? && @attribute_name.present?
-            return unless @builder.object&.class.respond_to?(:human_attribute_name)
-
-            @builder.object.class.human_attribute_name(@attribute_name)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/katalyst/govuk/form_builder/elements/legend.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require "govuk_design_system_formbuilder"
-
-module Katalyst
-  module GOVUK
-    module FormBuilder
-      module Elements
-        # Extend Elements::Legend to add support for human_attribute_name as a fallback
-        module Legend
-          extend ActiveSupport::Concern
-
-          included do
-            def retrieve_text(supplied_text)
-              supplied_text.presence ||
-                localised_text(:legend).presence ||
-                human_attribute_name.presence ||
-                @attribute_name.to_s.humanize.capitalize.presence
-            end
-          end
-
-          def human_attribute_name
-            return unless @object_name.present? && @attribute_name.present?
-            return unless @builder.object&.class.respond_to?(:human_attribute_name)
-
-            @builder.object.class.human_attribute_name(@attribute_name)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/katalyst/govuk/form_builder/elements/rich_textarea.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-require "govuk_design_system_formbuilder"
-
-module Katalyst
-  module GOVUK
-    module FormBuilder
-      module Elements
-        class RichTextarea < GOVUKDesignSystemFormBuilder::Base
-          using GOVUKDesignSystemFormBuilder::PrefixableArray
-
-          include GOVUKDesignSystemFormBuilder::Traits::Error
-          include GOVUKDesignSystemFormBuilder::Traits::Hint
-          include GOVUKDesignSystemFormBuilder::Traits::Label
-          include GOVUKDesignSystemFormBuilder::Traits::Supplemental
-          include GOVUKDesignSystemFormBuilder::Traits::HTMLAttributes
-          include GOVUKDesignSystemFormBuilder::Traits::HTMLClasses
-
-          def initialize(
-            builder,
-            object_name,
-            attribute_name,
-            hint:,
-            label:,
-            caption:,
-            form_group:,
-            **kwargs,
-            &
-          )
-            super(builder, object_name, attribute_name, &)
-
-            @label           = label
-            @caption         = caption
-            @hint            = hint
-            @form_group      = form_group
-            @html_attributes = kwargs
-          end
-
-          def html
-            GOVUKDesignSystemFormBuilder::Containers::FormGroup.new(*bound, **@form_group).html do
-              safe_join([label_element, supplemental_content, hint_element, error_element, rich_textarea])
-            end
-          end
-
-          private
-
-          def rich_textarea
-            @builder.rich_textarea(@attribute_name, **attributes(@html_attributes))
-          end
-
-          def classes
-            build_classes(%(rich-textarea), %(rich-textarea--error) => has_errors?).prefix(brand)
-          end
-
-          def options
-            {
-              id:    field_id,
-              class: classes,
-              aria:  { describedby: combine_references(hint_id, error_id) },
-            }
-          end
-
-          def label_content
-            super.merge(link_errors: false)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/katalyst/govuk/form_builder/extensions.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require "govuk_design_system_formbuilder"
-
-module Katalyst
-  module GOVUK
-    module FormBuilder
-      module Extensions
-        extend ActiveSupport::Concern
-
-        included do
-          GOVUKDesignSystemFormBuilder.include(Config)
-          GOVUKDesignSystemFormBuilder::Builder.include(Builder)
-          GOVUKDesignSystemFormBuilder::Elements::Label.include(Elements::Label)
-          GOVUKDesignSystemFormBuilder::Elements::Legend.include(Elements::Legend)
-          GOVUKDesignSystemFormBuilder::Traits::Label.include(Traits::Label)
-          GOVUKDesignSystemFormBuilder::Containers::Fieldset.include(Containers::FieldsetContext)
-          GOVUKDesignSystemFormBuilder::Containers::CheckBoxesFieldset.include(Containers::FieldsetContext)
-          GOVUKDesignSystemFormBuilder::Containers::RadioButtonsFieldset.include(Containers::FieldsetContext)
-        end
-      end
-    end
-  end
-end

data/lib/katalyst/govuk/form_builder/frontend.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Katalyst
-  module GOVUK
-    module FormBuilder
-      module Frontend
-        # rubocop:disable Rails/OutputSafety
-        def govuk_formbuilder_init
-          tag.script type: "module", nonce: request.content_security_policy_nonce do
-            <<~JS.html_safe
-              document.body.classList.toggle("js-enabled", true);
-              document.body.classList.toggle("govuk-frontend-supported", ('noModule' in HTMLScriptElement.prototype));
-              import {initAll} from "@katalyst/govuk-formbuilder";
-              initAll();
-            JS
-          end
-        end
-        # rubocop:enable Rails/OutputSafety
-      end
-    end
-  end
-end

data/lib/katalyst/govuk/form_builder/traits/file.rb

@@ -1,104 +0,0 @@
-# frozen_string_literal: true
-
-require "govuk_design_system_formbuilder"
-
-module Katalyst
-  module GOVUK
-    module FormBuilder
-      module Traits
-        module File
-          extend ActiveSupport::Concern
-
-          protected
-
-          def stimulus_controller_actions
-            <<~ACTIONS.gsub(/\s+/, " ").freeze
-              dragover->#{stimulus_controller}#dragover
-              dragenter->#{stimulus_controller}#dragenter
-              dragleave->#{stimulus_controller}#dragleave
-              drop->#{stimulus_controller}#drop
-            ACTIONS
-          end
-
-          def file
-            previous_input = @builder.hidden_field(@attribute_name, id: nil, value: value.signed_id) if attached?
-            file_input     = @builder.file_field(@attribute_name, attributes(@html_attributes))
-
-            safe_join([previous_input, file_input])
-          end
-
-          def destroy_element
-            return if @html_attributes[:optional].blank?
-
-            @builder.fields_for(:"#{@attribute_name}_attachment") do |form|
-              form.hidden_field :_destroy, value: false, data: { "#{stimulus_controller}_target" => "destroy" }
-            end
-          end
-
-          def destroy_element_trigger
-            return if @html_attributes[:optional].blank?
-
-            content_tag(:button, "", class: "file-destroy", data: { action: "#{stimulus_controller}#setDestroy" })
-          end
-
-          def preview_url
-            preview? ? main_app.polymorphic_path(value, only_path: true) : ""
-          end
-
-          def preview?
-            attached?
-          end
-
-          def attached?
-            value&.attached? && value.blob.persisted?
-          end
-
-          def value
-            @builder.object.send(@attribute_name)
-          end
-
-          def file_input_options
-            default_file_input_options = options
-
-            add_option(default_file_input_options, :accept, @mime_types.join(","))
-            add_option(default_file_input_options, :data, :action, "change->#{stimulus_controller}#onUpload")
-
-            default_file_input_options
-          end
-
-          def options
-            {
-              id:    field_id(link_errors: true),
-              class: classes,
-              aria:  { describedby: combine_references(hint_id, error_id) },
-            }
-          end
-
-          using GOVUKDesignSystemFormBuilder::PrefixableArray
-
-          def classes
-            build_classes(%(file-upload), %(file-upload--error) => has_errors?).prefix(brand)
-          end
-
-          def default_form_group_options(**form_group_options)
-            add_option(form_group_options, :class, "govuk-form-group #{form_group_class}")
-            add_option(form_group_options, :data, :controller, stimulus_controller)
-            add_option(form_group_options, :data, :action, stimulus_controller_actions)
-            add_option(form_group_options, :data, :"#{stimulus_controller}_mime_types_value",
-                       @mime_types.to_json)
-
-            form_group_options
-          end
-
-          def add_option(options, key, *path)
-            if path.length > 1
-              add_option(options[key] ||= {}, *path)
-            else
-              options[key] = [options[key], *path].compact.join(" ")
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/katalyst/govuk/form_builder/traits/label.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require "govuk_design_system_formbuilder"
-
-module Katalyst
-  module GOVUK
-    module FormBuilder
-      module Traits
-        # Extend GovukDesignSystemFormBuilder::Traits::Label set the default size to small for non-nested labels.
-        module Label
-          extend ActiveSupport::Concern
-
-          included do
-            private
-
-            def label_content
-              default = @builder.fieldset_context.any? ? {} : { size: "s" }
-
-              case @label
-              when Hash
-                default.merge(@label)
-              when Proc
-                default.merge(content: @label)
-              else
-                fail(ArgumentError, %(label must be a Proc or Hash))
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end