crown_marketplace_utils 0.1.0.beta.3 → 0.1.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bded690841ee7e1cbd50580542cbebe6ec6f1522dfa1ee4ef3da56028ada558
-  data.tar.gz: 6cddd1647d22f33db11fc6120bd2f789b908d686b0c16e5d344a7ccbf188b3c7
+  metadata.gz: efd7605edd0d81a5dc2a899b1196c235a2f2265898f979855cd3e2b995e7c6c2
+  data.tar.gz: 1bef91763ce32d1c96e3e98494f2ea544142dfdf1eecb7141d40ebbd16fe2227
 SHA512:
-  metadata.gz: 051dee5a663d6355aba6d171307b7ea9965413e15c7926efa164c4ff651b9f25fa8946c66cbaa2f0be4491facfbb8dbbf366363d33d348deb8eaa5ae431aa8db
-  data.tar.gz: 7d201bfd9d0a383bf3e5bf71402f428f6eda75bd88d17c669a1f1d0649ad5029d2400ed5626b26b9bf3ffffdadbf3ddeba9b6a65fdb8c09edc26cc0683952b5e
+  metadata.gz: cd54c38fddaf0e2e012eb3440476de012cee407787407a35e8eea925e20b30a81bb37416e33a66e4218f1752e3203a6a61dc2df31d24b91e6acde7718ce35bf3
+  data.tar.gz: 21de5f82595c05403b6b4c81cdef316cb4a84610604e5de45aaf69df13b17733567e7ccce0298fbb675c79dee297786e5c3fbedb5ee8cef516256951ac3c3d17

data/.rubocop.yml

@@ -114,7 +114,7 @@ RSpec/NestedGroups:
 
 RSpec/ExampleLength:
     Exclude:
-        - 'spec/crown_marketplace_utils/gov_uk_helper/**/*'
+        - 'spec/crown_marketplace_utils/helpers/gov_uk_helper/**/*'
 
 Rails/DynamicFindBy:
   Whitelist:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    crown_marketplace_utils (0.1.0.beta.3)
+    crown_marketplace_utils (0.1.0.beta.5)
       actionview (>= 6.0)
 
 GEM
@@ -93,7 +93,7 @@ GEM
       activesupport (>= 5.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
+    json (2.6.3)
     loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -118,7 +118,7 @@ GEM
     nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     public_suffix (5.0.0)
     racc (1.6.0)
@@ -168,7 +168,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.39.0)
+    rubocop (1.40.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -178,7 +178,7 @@ GEM
       rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
+    rubocop-ast (1.24.0)
       parser (>= 3.1.1.0)
     rubocop-rails (2.17.3)
       activesupport (>= 4.2.0)

data/README.md

@@ -48,14 +48,16 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 At the moment this Gem only contains view helpers. It would be good in the future to add other kinds of modules to this gem so that they can be shared and managed in one place.
 
 ### Helpers to create
+- ~~Accordion~~
 - ~~Breadcrumbs~~
 - ~~Button~~
 - ~~Checkboxes~~
 - ~~CharacterCount~~
-- DateInput
+- ~~DateInput~~
 - ~~Details~~
 - ~~ErrorMessage~~
 - ~~Fieldset~~
+- ~~File Upload~~
 - ~~FormGroup~~
 - ~~Header~~
 - ~~Hint~~
@@ -70,11 +72,8 @@ At the moment this Gem only contains view helpers. It would be good in the futur
 - ~~Tag~~
 
 ### CCS Helpers to look at after first release
-- Accordion
 - CCS Panel
 - CCS Header
-- Conditioanl Checkboxes
-- Conditioanl Radios
 
 ## Contributing
 

data/lib/crown_marketplace_utils/helpers/gov_uk_helper/accordion.rb

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+require 'action_view'
+
+module CrownMarketplaceUtils::Helpers
+  module GovUkHelper
+    # = GOV.UK Accordion
+    #
+    # This helper is used for generating the accordion component from the
+    # {https://design-system.service.gov.uk/accordion/back-link GDS - Components - Accordion}
+
+    module Accordion
+      include ActionView::Context
+      include ActionView::Helpers::TagHelper
+      include ActionView::Helpers::TextHelper
+
+      # Generates the HTML for the GOV.UK accordion component
+      #
+      # @param accordion_id [String] used as an id in the HTML for the accordion as a whole,
+      #                              and also as a prefix for the ids of the section contents
+      #                              and the buttons that open them
+      # @param accordion_items [Array<Hash>] an array of accordion items.
+      #                                      See {#govuk_accordion_section} for details of the items in the array.
+      # @param govuk_accordion_options [Hash] options that will be used in customising the HTML
+      #
+      # @option govuk_accordion_options [String] :classes additional CSS classes for the accordion HTML
+      # @option govuk_accordion_options [Integer] :heading_level (2) heading level, from 1 to 6
+      # @option govuk_accordion_options [Hash] :attributes ({ data: { module: 'govuk-accordion' } }) any additional
+      #                                                    attributes that will added as part of the HTML
+      #
+      # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Accordion
+      #                                     which can then be rendered on the page
+
+      def govuk_accordion(accordion_id, accordion_items, **govuk_accordion_options)
+        (govuk_accordion_options[:attributes] ||= {})[:data] ||= {}
+        govuk_accordion_options[:attributes][:class] = "govuk-accordion #{govuk_accordion_options[:classes]}".rstrip
+        govuk_accordion_options[:attributes][:id] = accordion_id
+        govuk_accordion_options[:attributes][:data][:module] = 'govuk-accordion'
+        govuk_accordion_options[:heading_level] ||= 2
+
+        tag.div(**govuk_accordion_options[:attributes]) do
+          capture do
+            accordion_items.each.with_index(1) { |accordion_item, index| concat(govuk_accordion_section(accordion_id, accordion_item, index, govuk_accordion_options[:heading_level])) }
+          end
+        end
+      end
+
+      private
+
+      # Generates the HTML for an accordion section, used by {govuk_accordion}
+      #
+      # @param accordion_id [String] used as an id in the HTML for the accordion
+      # @param index [Integer] the index of the accordion item
+      # @param heading_level [Integer] heading level, from 1 to 6
+      #
+      # @option accordion_item [Boolean] :expanded sets whether the section should be expanded
+      #                                            when the page loads for the first time.
+      # @option accordion_item [String] :heading_level (2) Heading level, from 1 to 6
+      # @option accordion_item [String] :heading the heading text for the accordion
+      # @option accordion_item [String] :summary (nil) optional summary text for the accordion header
+      # @option accordion_item [String, ActiveSupport::SafeBuffer] the content within the accordion section
+      #
+      # @return [ActiveSupport::SafeBuffer] the HTML for an accordion section
+      #                                     which is used in {govuk_accordion}
+
+      def govuk_accordion_section(accordion_id, accordion_item, index, heading_level)
+        tag.div(class: "govuk-accordion__section #{'govuk-accordion__section--expanded' if accordion_item[:expanded]}".rstrip) do
+          capture do
+            concat(govuk_accordion_section_header(accordion_id, accordion_item, index, heading_level))
+            concat(govuk_accordion_section_content(accordion_id, accordion_item, index))
+          end
+        end
+      end
+
+      # Generates the HTML for an accordion section heading, used by {govuk_accordion_section}
+      #
+      # @param (see govuk_accordion_section)
+      #
+      # @option (see govuk_accordion_section)
+      #
+      # @return [ActiveSupport::SafeBuffer] the HTML for an accordion section heading
+      #                                     which is used in {govuk_accordion_section}
+
+      def govuk_accordion_section_header(accordion_id, accordion_item, index, heading_level)
+        tag.div(class: 'govuk-accordion__section-header') do
+          capture do
+            concat(tag.send("h#{heading_level}", class: 'govuk-accordion__section-heading') do
+              tag.span(accordion_item[:heading], class: 'govuk-accordion__section-button', id: "#{accordion_id}-heading-#{index}")
+            end)
+            concat(tag.div(accordion_item[:summary], class: 'govuk-accordion__section-summary govuk-body', id: "#{accordion_id}-summary-#{index}")) if accordion_item[:summary]
+          end
+        end
+      end
+
+      # Generates the HTML for an accordion sections content, used by {govuk_accordion_section}
+      #
+      # @param accordion_id [String] used as an id in the HTML for the accordion
+      # @param index [Integer] the index of the accordion item
+      #
+      # @option (see govuk_accordion_section)
+      #
+      # @return [ActiveSupport::SafeBuffer] the HTML for an accordion sections content
+      #                                     which is used in {govuk_accordion_section}
+
+      def govuk_accordion_section_content(accordion_id, accordion_item, index)
+        tag.div(class: 'govuk-accordion__section-content', id: "#{accordion_id}-content-#{index}", aria: { labelledby: "#{accordion_id}-heading-#{index}" }) do
+          if accordion_item[:content].is_a? ActiveSupport::SafeBuffer
+            accordion_item[:content]
+          else
+            tag.p(accordion_item[:content], class: 'govuk-body')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/crown_marketplace_utils/helpers/gov_uk_helper/back_link.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'action_view'
+
+module CrownMarketplaceUtils::Helpers
+  module GovUkHelper
+    # = GOV.UK Back Link
+    #
+    # This helper is used for generating the back link component from the
+    # {https://design-system.service.gov.uk/components/back-link GDS - Components - Back link}
+
+    module BackLink
+      include ActionView::Helpers::UrlHelper
+
+      # Generates the HTML for the GOV.UK Back link component
+      #
+      # @param text [String] the text for the back link
+      # @param href [String] the href for the back link
+      # @param govuk_back_link_options [Hash] options that will be used in customising the HTML
+      #
+      # @option govuk_back_link_options [String] :classes additional CSS classes for the tag HTML
+      # @option govuk_back_link_options [Hash] :attributes ({}) any additional attributes that will added as part of the HTML
+      #
+      # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Back link
+      #                                     which can then be rendered on the page
+
+      def govuk_back_link(text, href, **govuk_back_link_options)
+        govuk_back_link_options[:class] = "govuk-back-link #{govuk_back_link_options[:classes]}".rstrip
+
+        link_to(text, href, class: govuk_back_link_options[:class], **(govuk_back_link_options[:attributes] || {}))
+      end
+    end
+  end
+end

data/lib/crown_marketplace_utils/{gov_uk_helper → helpers/gov_uk_helper}/breadcrumbs.rb

@@ -2,7 +2,7 @@
 
 require 'action_view'
 
-module CrownMarketplaceUtils
+module CrownMarketplaceUtils::Helpers
   module GovUkHelper
     # = GOV.UK Breadcrumbs
     #
@@ -20,7 +20,7 @@ module CrownMarketplaceUtils
       # @param govuk_breadcrumb_items [Array<Hash>] An array of links for the breadcrumbs list. See {#govuk_breadcrumb_link} for details of the items in the array.
       # @param govuk_breadcrumbs_options [Hash] options that will be used in customising the HTML
       #
-      # @option govuk_breadcrumbs_options [String] :classes additional CSS classes for the breadcrums HTML
+      # @option govuk_breadcrumbs_options [String] :classes additional CSS classes for the breadcrumbs HTML
       # @option govuk_breadcrumbs_options [Boolean] :collapse_on_mobile indicates if it is to colapse breadcrumbs on mobile
       # @option govuk_breadcrumbs_options [Hash] :attributes any additional attributes that will added as part of the HTML
       #

data/lib/crown_marketplace_utils/{gov_uk_helper → helpers/gov_uk_helper}/button.rb

@@ -2,7 +2,7 @@
 
 require 'action_view'
 
-module CrownMarketplaceUtils
+module CrownMarketplaceUtils::Helpers
   module GovUkHelper
     # = GOV.UK Button
     #
@@ -19,38 +19,35 @@ module CrownMarketplaceUtils
       # Generates the HTML for the GOV.UK button component
       #
       # @param text [String] the text that will be shown in the button
-      # @param type [Symbol] the type of button that will be created.
-      #                      - :a will create a anchor tag
-      #                      - :submit will create a input with type submit
-      #                      - all other values will create a button with the type specified
       # @param govuk_button_options [Hash] options that will be used in customising the HTML
       #
       # @option govuk_button_options [String] :classes additional CSS classes for the button HTML
       # @option govuk_button_options [Boolean] :is_start_button indicates if it is a start button
-      # @option govuk_button_options [String] :href the URI that will be used in anchor tag (only used if type is +:a+)
-      # @option govuk_button_options [ActionView::Helpers::FormBuilder] :form the form builder used to create the submit button (only used if type is +:submit+)
+      # @option govuk_button_options [String] :href the URI that will be used in anchor tag
+      # @option govuk_button_options [ActionView::Helpers::FormBuilder] :form the form builder used to create the submit button
       # @option govuk_button_options [Hash] :attributes ({ data: { module: 'govuk-button' } }) any additional attributes that will added as part of the HTML
       #
       # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Button
       #                                     which can then be rendered on the page
 
-      def govuk_button(text, type = :a, **govuk_button_options)
+      def govuk_button(text, **govuk_button_options)
         govuk_button_classes = ['govuk-button']
         govuk_button_classes << govuk_button_options[:classes]
         govuk_button_options[:attributes] ||= {}
         govuk_button_classes << 'govuk-button--disabled' if govuk_button_options[:attributes][:disabled]
+        govuk_button_classes << 'govuk-button--start' if govuk_button_options[:is_start_button]
+
         (govuk_button_options[:attributes][:data] ||= {}).merge!({ module: 'govuk-button' })
 
-        button_method = case type
-                        when :a
+        button_method = if govuk_button_options[:href]
                           :govuk_button_link
-                        when :submit
+                        elsif govuk_button_options[:form]
                           :govuk_button_submit
                         else
                           :govuk_button_button
                         end
 
-        send(button_method, text, type, govuk_button_classes, **govuk_button_options)
+        send(button_method, text, govuk_button_classes, **govuk_button_options)
       end
 
       private
@@ -59,7 +56,6 @@ module CrownMarketplaceUtils
       # It is called by {#govuk_button} which will pass in the parameters, including any defaults.
       #
       # @param text [String] the text that will be shown in the button
-      # @param _type [Symbol] unused as type has already been determined
       # @param classes [String] additional CSS classes for the button HTML
       # @param govuk_button_options [Hash] options that will be used in customising the HTML
       #
@@ -70,7 +66,7 @@ module CrownMarketplaceUtils
       # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Button as an anchor element
       #                                     which can then be rendered on the page
 
-      def govuk_button_link(text, _type, classes, **govuk_button_options)
+      def govuk_button_link(text, classes, **govuk_button_options)
         link_to(govuk_button_options[:href], class: classes, role: :button, draggable: false, **govuk_button_options[:attributes]) do
           concat(text)
           concat(govuk_start_button_icon) if govuk_button_options[:is_start_button]
@@ -81,7 +77,6 @@ module CrownMarketplaceUtils
       # It is called by {#govuk_button} which will pass in the parameters, including any defaults.
       #
       # @param text [String] the text that will be shown in the button
-      # @param type [Symbol] the type of attribute of the button
       # @param classes [String] additional CSS classes for the button HTML
       # @param govuk_button_options [Hash] options that will be used in customising the HTML
       #
@@ -91,8 +86,8 @@ module CrownMarketplaceUtils
       # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Button as a button element
       #                                     which can then be rendered on the page
 
-      def govuk_button_button(text, type, classes, **govuk_button_options)
-        button_tag(class: classes, type: type, **govuk_button_options[:attributes]) do
+      def govuk_button_button(text, classes, **govuk_button_options)
+        button_tag(class: classes, **govuk_button_options[:attributes]) do
           concat(text)
           concat(govuk_start_button_icon) if govuk_button_options[:is_start_button]
         end
@@ -102,7 +97,6 @@ module CrownMarketplaceUtils
       # It is called by {#govuk_button} which will pass in the parameters, including any defaults.
       #
       # @param text [String] the text that will be shown in the input
-      # @param _type [Symbol] unused as type has already been determined
       # @param classes [String] additional CSS classes for the button HTML
       # @param govuk_button_options [Hash] options that will be used in customising the HTML
       #
@@ -112,7 +106,7 @@ module CrownMarketplaceUtils
       # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Button as an input element
       #                                     which can then be rendered on the page
 
-      def govuk_button_submit(text, _type, classes, **govuk_button_options)
+      def govuk_button_submit(text, classes, **govuk_button_options)
         govuk_button_options[:form].submit(text, class: classes, **govuk_button_options[:attributes])
       end
 

data/lib/crown_marketplace_utils/{gov_uk_helper → helpers/gov_uk_helper}/details.rb

@@ -2,7 +2,7 @@
 
 require 'action_view'
 
-module CrownMarketplaceUtils
+module CrownMarketplaceUtils::Helpers
   module GovUkHelper
     # = GOV.UK Details
     #

data/lib/crown_marketplace_utils/{gov_uk_helper → helpers/gov_uk_helper}/error_message.rb

@@ -2,7 +2,7 @@
 
 require 'action_view'
 
-module CrownMarketplaceUtils
+module CrownMarketplaceUtils::Helpers
   module GovUkHelper
     # = GOV.UK Error Message
     #

data/lib/crown_marketplace_utils/{gov_uk_helper → helpers/gov_uk_helper}/field/character_count.rb

@@ -2,7 +2,7 @@
 
 require_relative 'textarea'
 
-module CrownMarketplaceUtils
+module CrownMarketplaceUtils::Helpers
   module GovUkHelper
     module Field
       # = GOV.UK Character count
@@ -19,72 +19,44 @@ module CrownMarketplaceUtils
         # It works by warpping the govuk_textarea in HTML which will trigger the JavaScript to do the character count.
         #
         # @param attribute [String, Symbol] the attribute of the character count text area
-        # @param error_message [String] the error message to be displayed
         # @param govuk_character_count_options [Hash] options that will be used for the parts of the form group, label, hint, textarea and the character count
         #
-        # @option govuk_character_count_options [Hash] :form_group_options see {govuk_field}
+        # @option govuk_character_count_options [String] :error_message (nil) the error message to be displayed
+        # @option govuk_character_count_options [ActiveModel] :model (nil) optional model that can be used to find an error message
+        # @option govuk_character_count_options [ActionView::Helpers::FormBuilder] :form (nil) optional form builder used to create
+        #                                                                                 the textarea tag and find the error message
+        # @option govuk_character_count_options [Hash] :form_group see {govuk_field}
         # @option govuk_character_count_options [Hash] :label see {govuk_field}
         # @option govuk_character_count_options [Hash] :hint see {govuk_field}
-        # @option govuk_character_count_options [Hash] :textarea_options see {govuk_textarea}
-        # @option govuk_character_count_options [Hash] :character_count_options ({}) the options that will be used when rendering the textarea.
-        #                                                                            See {_govuk_character_count} for more details.
+        # @option govuk_character_count_options [Hash] :textarea see {govuk_textarea}
+        # @option govuk_character_count_options [Hash] :character_count ({}) the options that will be used when rendering the textarea.
+        #                                                                    See {_govuk_character_count} for more details.
         #
         # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK chracter count
         #                                     which can then be rendered on the page
 
-        def govuk_character_count(attribute, error_message = nil, **govuk_character_count_options)
-          _govuk_character_count(attribute, **govuk_character_count_options) do |govuk_text_textarea_options|
-            govuk_textarea(attribute, error_message, **govuk_text_textarea_options)
-          end
-        end
-
-        # Generates the HTML for the GOV.UK character count component.
-        # It works by warpping the govuk_textarea in HTML which will trigger the JavaScript to do the character count.
-        #
-        # @param attribute [String, Symbol] the attribute of the character count
-        # @param error_message [String] the error message to be displayed
-        # @param govuk_character_count_options [Hash] options that will be used for the parts of the form group, label, hint and textarea
-        #
-        # @option govuk_character_count_options [Hash] :form_group_options see {govuk_field}
-        # @option govuk_character_count_options [Hash] :label see {govuk_field}
-        # @option govuk_character_count_options [Hash] :hint see {govuk_field}
-        # @option govuk_character_count_options [Hash] :textarea_options see {govuk_textarea}
-        # @option govuk_character_count_options [Hash] :character_count_options ({}) the options that will be used when rendering the textarea.
-        #                                                                            See {_govuk_character_count} for more details.
-        #
-        # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK chracter count
-        #                                     which can then be rendered on the page
-
-        # Generates the HTML for the GOV.UK textarea component using an ActionView::Helpers::FormBuilder.
-        # Unlike {#govuk_textarea}, the method will be able to automatically determine if the error message needs to be shown.
-        #
-        # @param form [ActionView::Helpers::FormBuilder] :form the form builder used to create the character count textarea
-        # @param attribute [String, Symbol] the attribute of the character count text area
-        # @param govuk_character_count_options [Hash] options that will be used for the parts of the form group, label, hint, textarea and the character count
-        #
-        # @option govuk_character_count_options [Hash] :form_group_options see {govuk_field_with_form}
-        # @option govuk_character_count_options [Hash] :label see {govuk_field_with_form}
-        # @option govuk_character_count_options [Hash] :hint see {govuk_field_with_form}
-        # @option govuk_character_count_options [Hash] :textarea_options see {govuk_textarea_with_form}
-        # @option govuk_character_count_options [Hash] :character_count_options ({}) the options that will be used when rendering the textarea.
-        #                                                                            See {_govuk_character_count} for more details.
-        #
-        # @return (see govuk_character_count)
-
-        def govuk_character_count_with_form(form, attribute, **govuk_character_count_options)
-          _govuk_character_count(attribute, **govuk_character_count_options) do |govuk_text_textarea_options|
-            govuk_textarea_with_form(form, attribute, **govuk_text_textarea_options)
+        def govuk_character_count(attribute, **govuk_character_count_options)
+          character_count_attribute = govuk_character_count_options[:form] ? "#{form.object_name}_#{attribute}" : attribute
+
+          _govuk_character_count(character_count_attribute, **govuk_character_count_options) do |govuk_textarea_options|
+            govuk_textarea(
+              attribute,
+              error_message: govuk_character_count_options[:error_message],
+              model: govuk_character_count_options[:model],
+              form: govuk_character_count_options[:form],
+              **govuk_textarea_options
+            )
           end
         end
 
         private
 
-        # Wrapper method used by {govuk_character_count} and {govuk_character_count_with_form} to generate the character count HTML
+        # Wrapper method used by {govuk_character_count} to generate the character count HTML
         #
         # @param attribute [String, Symbol] the attribute of the character count
         # @param govuk_character_count_options [Hash] options that will be used in customising the HTML.
-        #                                             This includes everything described in {govuk_character_count} and {govuk_character_count_with_form}
-        #                                             with the addition of the +:character_count_options+ which are described below
+        #                                             This includes everything described in {govuk_character_count}
+        #                                             with the addition of the +:character_count+ which are described below
         #
         # @option govuk_character_count_options [String] :maxlength (required) - if +maxwords+ is set, this is not required.
         #                                                           The maximum number of characters.
@@ -94,22 +66,22 @@ module CrownMarketplaceUtils
         #                                                          If +maxwords+ is provided, the +maxlength+ option will be ignored.
         # @option govuk_character_count_options [String] :threshold the percentage value of the limit at which point the count message is displayed.
         #                                                           If this attribute is set, the count message will be hidden by default.
-        # @option govuk_text_textarea_options [Hash] :fallback_hint ({}) additional parameters that will be used to create the hint containing the character count text.
+        # @option govuk_textarea_options [Hash] :fallback_hint ({}) additional parameters that will be used to create the hint containing the character count text.
         #                                                                This includes all the options in {govuk_hint} plus +:count_message+.
         #                                                                This will replace the default text for the count message.
         #                                                                If you want the count number to appear, put %<count>s in the string and it will be replaced with the number
         #
-        # @yield the textarea HTML generated by {govuk_character_count} or {govuk_character_count_with_form}
+        # @yield the textarea HTML generated by {govuk_character_count}
         #
-        # @yieldparam govuk_text_textarea_options [Hash] the options used in the textarea called by {govuk_character_count} or {govuk_character_count_with_form}
+        # @yieldparam govuk_textarea_options [Hash] the options used in the textarea called by {govuk_character_count}
         #
-        # @return [ActiveSupport::SafeBuffer] the HTML for the chracter count which wrpas arround {govuk_character_count} or {govuk_character_count_with_form}
+        # @return [ActiveSupport::SafeBuffer] the HTML for the chracter count which wrpas arround {govuk_character_count}
 
         def _govuk_character_count(attribute, **govuk_character_count_options)
-          deep_init_hash(govuk_character_count_options, :textarea_options, :attributes, :aria)
-          govuk_character_count_options[:textarea_options][:attributes][:aria][:describedby] = [govuk_character_count_options.dig(:textarea_options, :attributes, :aria, :describedby), "#{attribute}-hint-info"].compact.join(' ')
+          deep_init_hash(govuk_character_count_options, :textarea, :attributes, :aria)
+          govuk_character_count_options[:textarea][:attributes][:aria][:describedby] = [govuk_character_count_options.dig(:textarea, :attributes, :aria, :describedby), "#{attribute}-info"].compact.join(' ')
 
-          govuk_character_count_options[:textarea_options][:classes] = [govuk_character_count_options[:textarea_options][:classes], 'govuk-js-character-count'].compact
+          govuk_character_count_options[:textarea][:classes] = "#{govuk_character_count_options[:textarea][:classes]} govuk-js-character-count".lstrip
 
           tag.div(class: 'govuk-character-count', **get_character_count_attributes(**govuk_character_count_options)) do
             capture do
@@ -128,24 +100,24 @@ module CrownMarketplaceUtils
         # @return [ActiveSupport::SafeBuffer] the HTML for the fullback hint used in {_govuk_character_count}
 
         def character_count_hint(attribute, **govuk_character_count_options)
-          fallback_hint_length = govuk_character_count_options[:character_count_options][:maxwords] || govuk_character_count_options[:character_count_options][:maxlength]
-          fallback_hint_default = "You can enter up to %<count>s #{govuk_character_count_options[:character_count_options][:maxwords] ? 'words' : 'characters'}"
+          fallback_hint_length = govuk_character_count_options[:character_count][:maxwords] || govuk_character_count_options[:character_count][:maxlength]
+          fallback_hint_default = "You can enter up to %<count>s #{govuk_character_count_options[:character_count][:maxwords] ? 'words' : 'characters'}"
 
-          deep_init_hash(govuk_character_count_options, :character_count_options, :fallback_hint, :attributes)
+          deep_init_hash(govuk_character_count_options, :character_count, :fallback_hint, :attributes)
 
-          fallback_hint_text = format(govuk_character_count_options[:character_count_options][:fallback_hint][:count_message] || fallback_hint_default, count: fallback_hint_length)
+          fallback_hint_text = format(govuk_character_count_options[:character_count][:fallback_hint][:count_message] || fallback_hint_default, count: fallback_hint_length)
 
-          govuk_character_count_options[:character_count_options][:fallback_hint][:classes] = [govuk_character_count_options.dig(:character_count_options, :fallback_hint, :classes), 'govuk-character-count__message']
-          govuk_character_count_options[:character_count_options][:fallback_hint][:attributes].merge!(id: "#{attribute}-hint-info")
+          govuk_character_count_options[:character_count][:fallback_hint][:classes] = "#{govuk_character_count_options.dig(:character_count, :fallback_hint, :classes)} govuk-character-count__message".lstrip
+          govuk_character_count_options[:character_count][:fallback_hint][:attributes].merge!(id: "#{attribute}-info")
 
-          govuk_hint(fallback_hint_text, **govuk_character_count_options[:character_count_options][:fallback_hint])
+          govuk_hint(fallback_hint_text, **govuk_character_count_options[:character_count][:fallback_hint])
         end
 
         # Generates a hash with the character count attributes used in {_govuk_character_count}
         #
         # @param govuk_character_count_options [Hash] options that will be used in customising the HTML.
-        #                                             This includes everything described in {govuk_character_count} and {govuk_character_count_with_form}
-        #                                             with the addition of the +:character_count_options+ which are described below
+        #                                             This includes everything described in {govuk_character_count}
+        #                                             with the addition of the +:character_count+ which are described below
         #
         # @option (see _govuk_character_count)
         #
@@ -155,7 +127,7 @@ module CrownMarketplaceUtils
           govuk_character_count_attributes = { data: { module: 'govuk-character-count' } }
 
           %i[maxlength threshold maxwords].each do |data_attribute|
-            govuk_character_count_attributes[:data][data_attribute] = govuk_character_count_options[:character_count_options][data_attribute].to_s if govuk_character_count_options[:character_count_options][data_attribute]
+            govuk_character_count_attributes[:data][data_attribute] = govuk_character_count_options[:character_count][data_attribute].to_s if govuk_character_count_options[:character_count][data_attribute]
           end
 
           govuk_character_count_attributes