ccs-frontend_helpers 0.1.2 → 0.3.0

data/lib/ccs/components/govuk/field/inputs/date_input.rb

@@ -10,43 +10,22 @@ module CCS
           #
           # This is used for generating the date input component from the
           # {https://design-system.service.gov.uk/components/date-input GDS - Components -  Date Input}
-          #
-          # @!attribute [r] date_input_items
-          #   @return [Array<DateInput::Item>] An array of the initialised date input items
 
           class DateInput < Inputs
-            private
-
-            attr_reader :date_input_items
-
-            public
-
             # @param (see CCS::Components::GovUK::Field::Inputs#initialize)
             # @param date_items [Array<Hash>] an array of options for the date items.
             #                                 See {Components::GovUK::Field::Inputs::DateInput::Item#initialize Item#initialize} for details of the items in the array.
             #
             # @option (see CCS::Components::GovUK::Field::Inputs#initialize)
 
-            def initialize(attribute:, date_items: default_date_items, **options)
-              (options[:fieldset][:attributes] ||= {})[:role] = 'group'
+            def initialize(attribute:, date_items: nil, **options)
+              (options[:fieldset][:attributes] ||= {})[:role] = 'group' if options[:fieldset]
 
               super(attribute: attribute, **options)
 
-              # date_items ||= default_date_items
-
-              @date_input_items = date_items.map { |date_input_item| Item.new(attribute: attribute, error_message: @error_message, model: @options[:model], form: @options[:form], context: @context, **date_input_item) }
-            end
-
-            # Generates the HTML for the GOV.UK date input component
-            #
-            # @return [ActiveSupport::SafeBuffer]
+              date_items = default_date_items if date_items.blank?
 
-            def render
-              super() do
-                tag.div(**options[:attributes]) do
-                  date_input_items.each { |date_input_item| concat(date_input_item.render) }
-                end
-              end
+              @input_items = date_items.map { |date_input_item| Item.new(attribute: attribute, error_message: @error_message, model: @options[:model], form: @options[:form], context: @context, **date_input_item) }
             end
 
             # The default attributes for the date input

data/lib/ccs/components/govuk/field/inputs/item/checkbox.rb

@@ -17,23 +17,11 @@ module CCS
               # @option (see CCS::Components::GovUK::Field::Items::Item#initialize))
 
               def initialize(attribute:, label:, **options)
-                super(attribute: attribute, **options)
+                super(attribute: attribute, item_class: 'govuk-checkboxes__item', **options)
 
                 label[:classes] = "govuk-checkboxes__label #{label[:classes]}".rstrip
               end
 
-              # Generates the HTML to wrap arround a checkbox input
-              #
-              # @yield the checkbox item input HTML
-              #
-              # @return [ActiveSupport::SafeBuffer]
-
-              def render(&block)
-                tag.div(class: 'govuk-checkboxes__item') do
-                  super(&block)
-                end
-              end
-
               # The default attributes for the checkbox
 
               DEFAULT_ATTRIBUTES = { class: 'govuk-checkboxes__input' }.freeze

data/lib/ccs/components/govuk/field/inputs/item/radio.rb

@@ -17,23 +17,11 @@ module CCS
               # @option (see CCS::Components::GovUK::Field::Items::Item#initialize))
 
               def initialize(attribute:, label:, **options)
-                super(attribute: attribute, **options)
+                super(attribute: attribute, item_class: 'govuk-radios__item', **options)
 
                 label[:classes] = "govuk-radios__label #{label[:classes]}".rstrip
               end
 
-              # Generates the HTML to wrap arround a radio input
-              #
-              # @yield the radio item input HTML
-              #
-              # @return [ActiveSupport::SafeBuffer]
-
-              def render(&block)
-                tag.div(class: 'govuk-radios__item') do
-                  super(&block)
-                end
-              end
-
               # The default attributes for the radio
 
               DEFAULT_ATTRIBUTES = { class: 'govuk-radios__input' }.freeze

data/lib/ccs/components/govuk/field/inputs/item.rb

@@ -19,6 +19,8 @@ module CCS
           #   @return [String,Symbol] The attribute of the item
           # @!attribute [r] value
           #   @return [String] The value of the item
+          # @!attribute [r] item_class
+          #   @return [String] The CSS class for the item
           # @!attribute [r] label
           #   @return [Label] The initialised item label
           # @!attribute [r] hint
@@ -27,13 +29,19 @@ module CCS
           #   @return [ActiveSupport::SafeBuffer] The conditional HTML
 
           class Item < Base
+            include ActionView::Context
+            include ActionView::Helpers
+
             private
 
-            attr_reader :attribute, :value, :label, :hint, :conditional_content
+            attr_reader :attribute, :value, :item_class, :label, :hint, :conditional_content
 
             public
 
+            # rubocop:disable  Metrics/ParameterLists
+
             # @param attribute [String,Symbol] the attribute of the item
+            # @param item_class [String] the CSS class for the item
             # @param value [String] the value of the item
             # @param hint [Hash] options for an item hint see {CCS::Components::GovUK::Hint#initialize Hint#initialize} for more details.
             #                    If no hint is given then no hint will be rendered
@@ -48,15 +56,18 @@ module CCS
             # @option conditional [ActiveSupport::SafeBuffer] content the HTML content
             # @option conditional [Hash] attributes[:id] the id of the conditional section
 
-            def initialize(attribute:, value:, hint: nil, conditional: nil, **options)
+            def initialize(attribute:, value:, item_class:, hint: nil, conditional: nil, **options)
               super(**options)
 
               initialise_item_hint(attribute, value, hint) if hint
-              initialize_item_conditional(attribute, value, conditional) if conditional
+              initialize_item_conditional(attribute, value, conditional) if conditional && conditional[:content]
               @attribute = attribute
               @value = value
+              @item_class = item_class
             end
 
+            # rubocop:enable  Metrics/ParameterLists
+
             # Generates the HTML to wrap arround a input
             #
             # @yield the item input HTML
@@ -64,10 +75,14 @@ module CCS
             # @return [ActiveSupport::SafeBuffer]
 
             def render
-              concat(yield)
-              concat(label.render)
-              concat(hint.render) if hint
-              concat(conditional_content) if conditional_content
+              capture do
+                concat(tag.div(class: @item_class) do
+                  concat(yield)
+                  concat(label.render)
+                  concat(hint.render) if hint
+                end)
+                concat(conditional_content) if conditional_content
+              end
             end
 
             private
@@ -82,8 +97,7 @@ module CCS
               hint[:attributes] ||= {}
               hint[:classes] = "govuk-#{self.class::ITEM_TYPE}__hint #{hint[:classes]}".rstrip
               hint[:attributes][:id] ||= "#{attribute}_#{value}-item-hint"
-
-              (@options[:attributes][:aria] ||= {})[:describedby] = hint[:attributes][:id]
+              (@options[:attributes][:aria] ||= {})[:describedby] = [@options.dig(:attributes, :aria, :describedby), hint[:attributes][:id]].compact.join(' ')
 
               @hint = Hint.new(context: @context, **hint)
             end
@@ -97,7 +111,7 @@ module CCS
             def initialize_item_conditional(attribute, value, conditional)
               conditional[:attributes] ||= {}
               conditional[:attributes][:class] = "govuk-#{self.class::ITEM_TYPE}__conditional #{"govuk-#{self.class::ITEM_TYPE}__conditional--hidden" unless @options[:checked]}".rstrip
-              conditional[:attributes][:id] ||= sanitize_to_id("#{attribute}_#{value}_conditional")
+              conditional[:attributes][:id] ||= sanitize_to_id("conditional-#{attribute}_#{value}")
 
               (@options[:attributes][:data] ||= {})[:'aria-controls'] = conditional[:attributes][:id]
 

data/lib/ccs/components/govuk/field/inputs/radios.rb

@@ -12,18 +12,15 @@ module CCS
           #
           # This is used for generating the radios component from the
           # {https://design-system.service.gov.uk/components/radios GDS - Components - Radios}
-          #
-          # @!attribute [r] radio_items
-          #   @return [Array<Item::Divider|Item::Radio|Item::Radio>] An array of the initialised radio items
 
           class Radios < Inputs
             private
 
-            attr_reader :radio_items
+            attr_reader :input_items
 
             public
 
-            # rubocop:disable Metrics/CyclomaticComplexity
+            # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
             # @param (see CCS::Components::GovUK::Field::Inputs#initialize)
             # @param radio_items [Array<Hash>] an array of options for the radios.
@@ -34,29 +31,16 @@ module CCS
             def initialize(attribute:, radio_items:, **options)
               super(attribute: attribute, **options)
 
-              if @options[:model] || @options[:form]
-                value = (@options[:model] || @options[:form].object).send(attribute)
-                radio_items.each { |radio_item| radio_item[:checked] = value == radio_item[:value] }
-              end
+              @options[:value] = (@options[:model] || @options[:form].object).send(attribute) if @options[:model] || @options[:form]
+
+              radio_items.each { |radio_item| radio_item[:checked] = @options[:value] == radio_item[:value] } if @options[:value]
 
               radio_item_class = @options[:form] ? Item::Radio::Form : Inputs::Item::Radio::Tag
 
-              @radio_items = radio_items.map { |radio_item| radio_item[:divider] ? Item::Divider.new(divider: radio_item[:divider], type: 'radios') : radio_item_class.new(attribute: attribute, form: @options[:form], context: @context, **radio_item) }
+              @input_items = radio_items.map { |radio_item| radio_item[:divider] ? Item::Divider.new(divider: radio_item[:divider], type: 'radios') : radio_item_class.new(attribute: attribute, form: @options[:form], context: @context, **radio_item) }
             end
 
-            # rubocop:enable Metrics/CyclomaticComplexity
-
-            # Generates the HTML for the GOV.UK Radios component
-            #
-            # @return [ActiveSupport::SafeBuffer]
-
-            def render
-              super() do
-                tag.div(**options[:attributes]) do
-                  radio_items.each { |radio_item| concat(radio_item.render) }
-                end
-              end
-            end
+            # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
             # The default attributes for the radios
 

data/lib/ccs/components/govuk/field/inputs.rb

@@ -14,11 +14,13 @@ module CCS
         #
         # @!attribute [r] fieldset
         #   @return [Fieldset] The initialised fieldset
+        # @!attribute [r] input_items
+        #   @return [Array<Item>] An array of the initialised items
 
         class Inputs < Field
           private
 
-          attr_reader :fieldset
+          attr_reader :fieldset, :input_items
 
           public
 
@@ -27,9 +29,11 @@ module CCS
           #
           # @option (see CCS::Components::GovUK::Field#initialize)
 
-          def initialize(attribute:, fieldset:, **options)
+          def initialize(attribute:, fieldset: nil, **options)
             super(attribute: attribute, **options)
 
+            return unless fieldset
+
             set_described_by(fieldset, @attribute, @error_message, options[:hint])
 
             @fieldset = Fieldset.new(context: @context, **fieldset)
@@ -41,15 +45,35 @@ module CCS
           #
           # @return [ActiveSupport::SafeBuffer]
 
-          def render
+          def render(&block)
             super() do |display_error_message|
-              fieldset.render do
-                concat(hint.render) if hint
-                concat(display_error_message)
-                concat(yield)
+              if fieldset
+                fieldset.render do
+                  field_inner_html(display_error_message, &block)
+                end
+              else
+                field_inner_html(display_error_message, &block)
               end
             end
           end
+
+          private
+
+          # Generates the HTML structure for the field component
+          #
+          # @yield (see CCS::Components::GovUK::Field#render)
+          #
+          # @return [ActiveSupport::SafeBuffer]
+
+          def field_inner_html(display_error_message)
+            concat(hint.render) if hint
+            concat(display_error_message)
+            concat(tag.div(**options[:attributes]) do
+              concat(before_input) if before_input
+              input_items.each { |input_item| concat(input_item.render) }
+              concat(after_input) if after_input
+            end)
+          end
         end
       end
     end

data/lib/ccs/components/govuk/field.rb

@@ -18,14 +18,20 @@ module CCS
       #   @return [FormGroup] The initialised form group
       # @!attribute [r] hint
       #   @return [Hint] The initialised hint
+      # @!attribute [r] before_input
+      #   @return [String] Text or HTML to go before the input
+      # @!attribute [r] after_input
+      #   @return [String] Text or HTML to go after the input
 
       class Field < Base
         private
 
-        attr_reader :attribute, :error_message, :form_group, :hint
+        attr_reader :attribute, :error_message, :form_group, :hint, :before_input, :after_input
 
         public
 
+        # rubocop:disable Metrics/ParameterLists
+
         # @param attribute [String, Symbol] the attribute of the field
         # @param hint [Hash] attributes for the hint, see {CCS::Components::GovUK::Hint#initialize Hint#initialize} for more details.
         #                    If no hint is given then no hint will be rendered
@@ -39,7 +45,7 @@ module CCS
         # @option options [String] :classes additional CSS classes for the field HTML
         # @option options [Hash] :attributes ({}) any additional attributes that will added as part of the HTML
 
-        def initialize(attribute:, form_group: nil, hint: nil, **options)
+        def initialize(attribute:, form_group: nil, hint: nil, before_input: nil, after_input: nil, **options)
           super(**options)
 
           (hint[:attributes] ||= {})[:id] = "#{attribute}-hint" if hint && !hint.dig(:attributes, :id)
@@ -49,8 +55,12 @@ module CCS
 
           @form_group = FormGroup.new(attribute: attribute, error_message: @error_message, context: @context, **(form_group || {}))
           @hint = Hint.new(context: @context, **hint) if hint
+          @before_input = before_input
+          @after_input = after_input
         end
 
+        # rubocop:enable Metrics/ParameterLists
+
         # Generates the HTML to wrap arround a GDS form input component
         #
         # @yield the field HTML

data/lib/ccs/components/govuk/fieldset.rb

@@ -41,7 +41,7 @@ module CCS
         def render
           tag.fieldset(**options[:attributes]) do
             concat(legend.render) if legend
-            yield
+            yield if block_given?
           end
         end
 

data/lib/ccs/components/govuk/footer/meta.rb

@@ -44,7 +44,7 @@ module CCS
           def render
             capture do
               concat(tag.h2(visually_hidden_title, class: 'govuk-visually-hidden'))
-              if meta_links
+              if meta_links.present?
                 concat(tag.ul(class: 'govuk-footer__inline-list') do
                   meta_links.each { |meta_link| concat(meta_link.render) }
                 end)

data/lib/ccs/components/govuk/footer.rb

@@ -37,7 +37,6 @@ module CCS
         def initialize(navigation: nil, meta: nil, **options)
           super(**options)
 
-          @options[:attributes][:role] = 'contentinfo'
           @options[:copyright] ||= '© Crown copyright'
 
           @navigation = navigation&.map { |navigation_item| Navigation.new(context: @context, **navigation_item) }
@@ -53,7 +52,7 @@ module CCS
         def render
           tag.footer(**options[:attributes]) do
             tag.div(class: "govuk-width-container #{options[:container_classes]}".rstrip) do
-              if navigation
+              if navigation.present?
                 concat(tag.div(class: 'govuk-footer__navigation') do
                   navigation.each { |navigation_item| concat(navigation_item.render) }
                 end)

data/lib/ccs/components/govuk/header/navigation.rb

@@ -44,7 +44,9 @@ module CCS
           def initialize(navigation:, context:, menu_button: nil)
             menu_button ||= {}
             menu_button[:text] ||= 'Menu'
-            menu_button[:label] ||= 'Show or hide menu'
+
+            menu_button[:aria] = { controls: 'navigation' }
+            menu_button[:aria][:label] = menu_button[:label] if menu_button[:label]
 
             @menu_button = menu_button
             @navigation_links = navigation[:items].map { |navigation_link| Link.new(context: context, **navigation_link) }
@@ -58,7 +60,7 @@ module CCS
 
           def render
             tag.nav(aria: { label: navigation_label }, class: navigation_classes) do
-              concat(button_tag(menu_button[:text], type: :button, class: 'govuk-header__menu-button govuk-js-header-toggle', aria: { controls: 'navigation', label: menu_button[:label] }, hidden: true))
+              concat(button_tag(menu_button[:text], type: :button, class: 'govuk-header__menu-button govuk-js-header-toggle', aria: menu_button[:aria], hidden: true))
               concat(tag.ul(id: 'navigation', class: 'govuk-header__navigation-list') do
                 navigation_links.each { |navigation_link| concat(navigation_link.render) }
               end)

data/lib/ccs/components/govuk/header.rb

@@ -35,16 +35,17 @@ module CCS
         # @option options [String] :container_classes classes for the container
         # @option options [String] :homepage_url URL of the homepage. Defaults to +/+
         # @option options [String] :product_name product name, used when the product name follows on directly from ‘GOV.UK
+        # @option options [Boolean] :use_tudor_crown flag to use the new tudor crown for the GOV.UK Logo
         # @option options [Hash] :attributes additional attributes that will added as part of the header HTML
 
         def initialize(navigation: nil, menu_button: nil, service: nil, **options)
           super(**options)
 
-          @options[:attributes][:role] = 'banner'
           @options[:container_classes] ||= 'govuk-width-container'
           @options[:homepage_url] ||= '/'
+          @options[:use_tudor_crown] = true if @options[:use_tudor_crown].nil?
 
-          @navigation = Navigation.new(navigation: navigation, menu_button: menu_button, context: @context) if navigation
+          @navigation = Navigation.new(navigation: navigation, menu_button: menu_button, context: @context) if navigation && navigation[:items].present?
           @service = service
         end
 
@@ -79,12 +80,7 @@ module CCS
         def header_logo
           tag.div(class: 'govuk-header__logo') do
             link_to(options[:homepage_url], class: 'govuk-header__link govuk-header__link--homepage') do
-              concat(tag.span(class: 'govuk-header__logotype') do
-                concat(tag.svg(class: 'govuk-header__logotype-crown', xmlns: 'http://www.w3.org/2000/svg', height: '30', width: '36', aria: { hidden: 'true' }, focusable: 'false', viewBox: '0 0 132 97') do
-                  tag.path(fill: 'currentColor', 'fill-rule': 'evenodd', d: 'M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z')
-                end)
-                concat(tag.span('GOV.UK', class: 'govuk-header__logotype-text'))
-              end)
+              concat(options[:use_tudor_crown] ? tudor_crown : st_edwards_crown)
               concat(tag.span(options[:product_name], class: 'govuk-header__product-name')) if options[:product_name]
             end
           end
@@ -101,6 +97,28 @@ module CCS
             tag.span(service[:name], class: 'govuk-header__service-name')
           end
         end
+
+        # Generates the GOV.UK log with St. Edwards Crown
+        #
+        # @return [ActiveSupport::SafeBuffer]
+
+        def st_edwards_crown
+          tag.svg(class: 'govuk-header__logotype', xmlns: 'http://www.w3.org/2000/svg', height: '30', width: '152', aria: { label: 'GOV.UK' }, focusable: 'false', viewBox: '0 0 152 30', role: 'img') do
+            concat(tag.title('GOV.UK'))
+            concat(tag.path(d: 'M6.7 12.2c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1-.4 1 0 2.1 1 2.5m-4.3 2.5c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1-.5 1 0 2.1 1 2.5m-1.3 4.8c1 .4 2.1-.1 2.5-1 .4-1-.1-2.1-1-2.5-1-.4-2.1.1-2.5 1-.4 1 0 2.1 1 2.5m10.4-5.8c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1s0 2.1 1 2.5m17.4-1.5c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1 .5 1 0 2.1-1 2.5m4.3 2.5c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1 .5 1 0 2.1-1 2.5m1.3 4.8c-1 .4-2.1-.1-2.5-1-.4-1 .1-2.1 1-2.5 1-.4 2.1.1 2.5 1 .4 1 0 2.1-1 2.5m-10.4-5.8c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1s0 2.1-1 2.5m-5.3-4.9 2.4 1.3V6.5l-2.4.8c-.1-.1-.1-.2-.2-.2s1-3 1-3h-3.4l1 3c-.1.1-.2.1-.2.2-.1.1-2.4-.7-2.4-.7v3.5L17 8.8c-.1.1 0 .2.1.3l-1.4 4.2c-.1.2-.1.4-.1.7 0 1.1.8 2.1 1.9 2.2h.6C19.2 16 20 15.1 20 14c0-.2 0-.4-.1-.7l-1.4-4.2c.2-.1.3-.2.3-.3m-1 20.3c4.6 0 8.9.3 12.8.9 1.1-4.6 2.4-7.2 3.8-9.1l-2.6-.9c.3 1.3.3 1.9 0 2.8-.4-.4-.8-1.2-1.1-2.4l-1.2 4.2c.8-.5 1.4-.9 2-.9-1.2 2.6-2.7 3.2-3.6 3-1.2-.2-1.7-1.3-1.5-2.2.3-1.3 1.6-1.6 2.2-.1 1.2-2.4-.8-3.1-2.1-2.4 1.9-1.9 2.2-3.6.6-5.7-2.2 1.7-2.2 3.3-1.2 5.6-1.3-1.5-3.3-.7-2.5 1.7.9-1.4 2.1-.5 2 .8-.2 1.2-1.7 2.1-3.7 2-2.8-.2-3-2.2-3-3.7.7-.1 1.9.5 3 2l.4-4.4c-1.1 1.2-2.2 1.4-3.3 1.4.4-1.2 2.1-3.1 2.1-3.1h-5.5s1.8 2 2.1 3.1c-1.1 0-2.2-.3-3.3-1.4l.4 4.4c1.1-1.5 2.3-2.1 3-2-.1 1.6-.2 3.5-3 3.7-1.9.2-3.5-.8-3.7-2-.2-1.3 1-2.2 1.9-.8.7-2.4-1.3-3.1-2.6-1.7 1-2.3 1-4-1.2-5.6-1.6 2.1-1.3 3.8.6 5.7-1.3-.7-3.2 0-2.1 2.4.6-1.5 1.9-1.1 2.2.1.2.9-.4 1.9-1.5 2.2-1 .2-2.5-.5-3.7-3 .7 0 1.3.4 2 .9L5 20.4c-.3 1.2-.7 1.9-1.2 2.4-.3-.8-.2-1.5 0-2.8l-2.6.9C2.7 22.8 4 25.4 5.1 30c3.8-.5 8.2-.9 12.7-.9m30.5-11.5c0 .9.1 1.7.3 2.5.2.8.6 1.5 1 2.2.5.6 1 1.1 1.7 1.5.7.4 1.5.6 2.5.6.9 0 1.7-.1 2.3-.4s1.1-.7 1.5-1.1c.4-.4.6-.9.8-1.5.1-.5.2-1 .2-1.5v-.2h-5.3v-3.2h9.4V28H59v-2.5c-.3.4-.6.8-1 1.1-.4.3-.8.6-1.3.9-.5.2-1 .4-1.6.6s-1.2.2-1.8.2c-1.5 0-2.9-.3-4-.8-1.2-.6-2.2-1.3-3-2.3-.8-1-1.4-2.1-1.8-3.4-.3-1.4-.5-2.8-.5-4.3s.2-2.9.7-4.2c.5-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.6 2.6-.8 4.1-.8 1 0 1.9.1 2.8.3.9.2 1.7.6 2.4 1s1.4.9 1.9 1.5c.6.6 1 1.3 1.4 2l-3.7 2.1c-.2-.4-.5-.9-.8-1.2-.3-.4-.6-.7-1-1-.4-.3-.8-.5-1.3-.7-.5-.2-1.1-.2-1.7-.2-1 0-1.8.2-2.5.6-.7.4-1.3.9-1.7 1.5-.5.6-.8 1.4-1 2.2-.3.8-.4 1.9-.4 2.7zm36.4-4.3c-.4-1.3-1.1-2.4-2-3.4-.9-1-1.9-1.7-3.1-2.3-1.2-.6-2.6-.8-4.2-.8s-2.9.3-4.2.8c-1.1.6-2.2 1.4-3 2.3-.9 1-1.5 2.1-2 3.4-.4 1.3-.7 2.7-.7 4.2s.2 2.9.7 4.2c.4 1.3 1.1 2.4 2 3.4.9 1 1.9 1.7 3.1 2.3 1.2.6 2.6.8 4.2.8 1.5 0 2.9-.3 4.2-.8 1.2-.6 2.3-1.3 3.1-2.3.9-1 1.5-2.1 2-3.4.4-1.3.7-2.7.7-4.2-.1-1.5-.3-2.9-.8-4.2zM81 17.6c0 1-.1 1.9-.4 2.7-.2.8-.6 1.6-1.1 2.2-.5.6-1.1 1.1-1.7 1.4-.7.3-1.5.5-2.4.5-.9 0-1.7-.2-2.4-.5s-1.3-.8-1.7-1.4c-.5-.6-.8-1.3-1.1-2.2-.2-.8-.4-1.7-.4-2.7v-.1c0-1 .1-1.9.4-2.7.2-.8.6-1.6 1.1-2.2.5-.6 1.1-1.1 1.7-1.4.7-.3 1.5-.5 2.4-.5.9 0 1.7.2 2.4.5s1.3.8 1.7 1.4c.5.6.8 1.3 1.1 2.2.2.8.4 1.7.4 2.7v.1zM92.9 28 87 7h4.7l4 15.7h.1l4-15.7h4.7l-5.9 21h-5.7zm28.8-3.6c.6 0 1.2-.1 1.7-.3.5-.2 1-.4 1.4-.8.4-.4.7-.8.9-1.4.2-.6.3-1.2.3-2v-13h4.1v13.6c0 1.2-.2 2.2-.6 3.1s-1 1.7-1.8 2.4c-.7.7-1.6 1.2-2.7 1.5-1 .4-2.2.5-3.4.5-1.2 0-2.4-.2-3.4-.5-1-.4-1.9-.9-2.7-1.5-.8-.7-1.3-1.5-1.8-2.4-.4-.9-.6-2-.6-3.1V6.9h4.2v13c0 .8.1 1.4.3 2 .2.6.5 1 .9 1.4.4.4.8.6 1.4.8.6.2 1.1.3 1.8.3zm13-17.4h4.2v9.1l7.4-9.1h5.2l-7.2 8.4L152 28h-4.9l-5.5-9.4-2.7 3V28h-4.2V7zm-27.6 16.1c-1.5 0-2.7 1.2-2.7 2.7s1.2 2.7 2.7 2.7 2.7-1.2 2.7-2.7-1.2-2.7-2.7-2.7z'))
+          end
+        end
+
+        # Generates the GOV.UK logo with a Tudor Crown
+        #
+        # @return [ActiveSupport::SafeBuffer]
+
+        def tudor_crown
+          tag.svg(class: 'govuk-header__logotype', xmlns: 'http://www.w3.org/2000/svg', height: '30', width: '148', aria: { label: 'GOV.UK' }, focusable: 'false', viewBox: '0 0 148 30', role: 'img') do
+            concat(tag.title('GOV.UK'))
+            concat(tag.path(d: 'M22.6 10.4c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m-5.9 6.7c-.9.4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m10.8-3.7c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s0 2-1 2.4m3.3 4.8c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4M17 4.7l2.3 1.2V2.5l-2.3.7-.2-.2.9-3h-3.4l.9 3-.2.2c-.1.1-2.3-.7-2.3-.7v3.4L15 4.7c.1.1.1.2.2.2l-1.3 4c-.1.2-.1.4-.1.6 0 1.1.8 2 1.9 2.2h.7c1-.2 1.9-1.1 1.9-2.1 0-.2 0-.4-.1-.6l-1.3-4c-.1-.2 0-.2.1-.3m-7.6 5.7c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m-5 3c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s.1 2 1 2.4m-3.2 4.8c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m14.8 11c4.4 0 8.6.3 12.3.8 1.1-4.5 2.4-7 3.7-8.8l-2.5-.9c.2 1.3.3 1.9 0 2.7-.4-.4-.8-1.1-1.1-2.3l-1.2 4c.7-.5 1.3-.8 2-.9-1.1 2.5-2.6 3.1-3.5 3-1.1-.2-1.7-1.2-1.5-2.1.3-1.2 1.5-1.5 2.1-.1 1.1-2.3-.8-3-2-2.3 1.9-1.9 2.1-3.5.6-5.6-2.1 1.6-2.1 3.2-1.2 5.5-1.2-1.4-3.2-.6-2.5 1.6.9-1.4 2.1-.5 1.9.8-.2 1.1-1.7 2.1-3.5 1.9-2.7-.2-2.9-2.1-2.9-3.6.7-.1 1.9.5 2.9 1.9l.4-4.3c-1.1 1.1-2.1 1.4-3.2 1.4.4-1.2 2.1-3 2.1-3h-5.4s1.7 1.9 2.1 3c-1.1 0-2.1-.2-3.2-1.4l.4 4.3c1-1.4 2.2-2 2.9-1.9-.1 1.5-.2 3.4-2.9 3.6-1.9.2-3.4-.8-3.5-1.9-.2-1.3 1-2.2 1.9-.8.7-2.3-1.2-3-2.5-1.6.9-2.2.9-3.9-1.2-5.5-1.5 2-1.3 3.7.6 5.6-1.2-.7-3.1 0-2 2.3.6-1.4 1.8-1.1 2.1.1.2.9-.3 1.9-1.5 2.1-.9.2-2.4-.5-3.5-3 .6 0 1.2.3 2 .9l-1.2-4c-.3 1.1-.7 1.9-1.1 2.3-.3-.8-.2-1.4 0-2.7l-2.9.9C1.3 23 2.6 25.5 3.7 30c3.7-.5 7.9-.8 12.3-.8m28.3-11.6c0 .9.1 1.7.3 2.5.2.8.6 1.5 1 2.2.5.6 1 1.1 1.7 1.5.7.4 1.5.6 2.5.6.9 0 1.7-.1 2.3-.4s1.1-.7 1.5-1.1c.4-.4.6-.9.8-1.5.1-.5.2-1 .2-1.5v-.2h-5.3v-3.2h9.4V28H55v-2.5c-.3.4-.6.8-1 1.1-.4.3-.8.6-1.3.9-.5.2-1 .4-1.6.6s-1.2.2-1.8.2c-1.5 0-2.9-.3-4-.8-1.2-.6-2.2-1.3-3-2.3-.8-1-1.4-2.1-1.8-3.4-.3-1.4-.5-2.8-.5-4.3s.2-2.9.7-4.2c.5-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.6 2.6-.8 4.1-.8 1 0 1.9.1 2.8.3.9.2 1.7.6 2.4 1s1.4.9 1.9 1.5c.6.6 1 1.3 1.4 2l-3.7 2.1c-.2-.4-.5-.9-.8-1.2-.3-.4-.6-.7-1-1-.4-.3-.8-.5-1.3-.7-.5-.2-1.1-.2-1.7-.2-1 0-1.8.2-2.5.6-.7.4-1.3.9-1.7 1.5-.5.6-.8 1.4-1 2.2-.3.8-.4 1.9-.4 2.7zM71.5 6.8c1.5 0 2.9.3 4.2.8 1.2.6 2.3 1.3 3.1 2.3.9 1 1.5 2.1 2 3.4s.7 2.7.7 4.2-.2 2.9-.7 4.2c-.4 1.3-1.1 2.4-2 3.4-.9 1-1.9 1.7-3.1 2.3-1.2.6-2.6.8-4.2.8s-2.9-.3-4.2-.8c-1.2-.6-2.3-1.3-3.1-2.3-.9-1-1.5-2.1-2-3.4-.4-1.3-.7-2.7-.7-4.2s.2-2.9.7-4.2c.4-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.5 2.6-.8 4.2-.8zm0 17.6c.9 0 1.7-.2 2.4-.5s1.3-.8 1.7-1.4c.5-.6.8-1.3 1.1-2.2.2-.8.4-1.7.4-2.7v-.1c0-1-.1-1.9-.4-2.7-.2-.8-.6-1.6-1.1-2.2-.5-.6-1.1-1.1-1.7-1.4-.7-.3-1.5-.5-2.4-.5s-1.7.2-2.4.5-1.3.8-1.7 1.4c-.5.6-.8 1.3-1.1 2.2-.2.8-.4 1.7-.4 2.7v.1c0 1 .1 1.9.4 2.7.2.8.6 1.6 1.1 2.2.5.6 1.1 1.1 1.7 1.4.6.3 1.4.5 2.4.5zM88.9 28 83 7h4.7l4 15.7h.1l4-15.7h4.7l-5.9 21h-5.7zm28.8-3.6c.6 0 1.2-.1 1.7-.3.5-.2 1-.4 1.4-.8.4-.4.7-.8.9-1.4.2-.6.3-1.2.3-2v-13h4.1v13.6c0 1.2-.2 2.2-.6 3.1s-1 1.7-1.8 2.4c-.7.7-1.6 1.2-2.7 1.5-1 .4-2.2.5-3.4.5-1.2 0-2.4-.2-3.4-.5-1-.4-1.9-.9-2.7-1.5-.8-.7-1.3-1.5-1.8-2.4-.4-.9-.6-2-.6-3.1V6.9h4.2v13c0 .8.1 1.4.3 2 .2.6.5 1 .9 1.4.4.4.8.6 1.4.8.6.2 1.1.3 1.8.3zm13-17.4h4.2v9.1l7.4-9.1h5.2l-7.2 8.4L148 28h-4.9l-5.5-9.4-2.7 3V28h-4.2V7zm-27.6 16.1c-1.5 0-2.7 1.2-2.7 2.7s1.2 2.7 2.7 2.7 2.7-1.2 2.7-2.7-1.2-2.7-2.7-2.7z'))
+          end
+        end
       end
     end
   end

data/lib/ccs/components/govuk/pagination/increment/next.rb

@@ -14,8 +14,8 @@ module CCS
             #
             # @option (see Increment#initialize)
 
-            def initialize(text: 'Next', **options)
-              super(type: :next, text: text, **options)
+            def initialize(text: nil, **options)
+              super(type: :next, text: text, default_text: 'Next', **options)
             end
 
             # Generates the HTML for the next link in the pagination
@@ -26,7 +26,10 @@ module CCS
               tag.div(class: 'govuk-pagination__next') do
                 super() do
                   concat(pagination_icon) if block_is_level
-                  concat(tag.span(text, class: pagination_text_classes))
+                  concat(tag.span(class: pagination_text_classes) do
+                    concat(text)
+                    concat(tag.span(' page', class: 'govuk-visually-hidden')) if text == default_text
+                  end)
                   pagination_icon_label_text
                   concat(pagination_icon) unless block_is_level
                 end

data/lib/ccs/components/govuk/pagination/increment/previous.rb

@@ -14,8 +14,8 @@ module CCS
             #
             # @option (see Increment#initialize)
 
-            def initialize(text: 'Previous', **options)
-              super(type: :prev, text: text, **options)
+            def initialize(text: nil, **options)
+              super(type: :prev, text: text, default_text: 'Previous', **options)
             end
 
             # Generates the HTML for the previous link in the pagination
@@ -26,7 +26,10 @@ module CCS
               tag.div(class: 'govuk-pagination__prev') do
                 super() do
                   concat(pagination_icon)
-                  concat(tag.span(text, class: pagination_text_classes))
+                  concat(tag.span(class: pagination_text_classes) do
+                    concat(text)
+                    concat(tag.span(' page', class: 'govuk-visually-hidden')) if text == default_text
+                  end)
                   pagination_icon_label_text
                 end
               end

data/lib/ccs/components/govuk/pagination/increment.rb

@@ -11,6 +11,8 @@ module CCS
         # @!attribute [r] type
         #   @return [Symbol] The type of pagination increment
         # @!attribute [r] text
+        #   @return [String] Default text for the pagination increment
+        # @!attribute [r] default_text
         #   @return [String] Text for the pagination increment
         # @!attribute [r] block_is_level
         #   @return [Boolean] Flag to indicate if previous and next blocks are level
@@ -20,11 +22,14 @@ module CCS
         class Increment < Base
           private
 
-          attr_reader :type, :text, :block_is_level, :label_text
+          attr_reader :type, :default_text, :text, :block_is_level, :label_text
 
           public
 
+          # rubocop:disable Metrics/ParameterLists
+
           # @param type [Symbol] the type of increment, either +:prev+ or +:next+
+          # @param default_text [String] the default text for the pagination increment
           # @param text [String] the text for the pagination increment
           # @param block_is_level [Boolean] when there are no items, this will be true and will add extra classes
           #                                 to the link to make the next and previous pagination links level
@@ -35,18 +40,21 @@ module CCS
           # @option options  [ActionView::Helpers::FormBuilder] :form optional form builder used to create the button
           # @option options [Hash] :attributes any additional attributes that will added as part of the HTML
 
-          def initialize(type:, text:, block_is_level:, label_text: nil, **options)
+          def initialize(type:, default_text:, block_is_level:, text: nil, label_text: nil, **options)
             super(**options)
 
             @options[:attributes][:class] = "govuk-link govuk-pagination__link #{'pagination--button_as_link' if @options[:form]}".rstrip
             @options[:attributes][:rel] = type.to_s
 
             @type = type
-            @text = text
+            @default_text = default_text
+            @text = text || default_text
             @block_is_level = block_is_level
             @label_text = label_text
           end
 
+          # rubocop:enable Metrics/ParameterLists
+
           # Generates the HTML for the pagination increment link/button
           #
           # @yield the HTML for the increment button/link

data/lib/ccs/components/govuk/pagination/item.rb

@@ -24,7 +24,7 @@ module CCS
           # @param current [Boolean] flag to indicate if this item is the current page
           #
           # @option options [String] :classes additional CSS classes for the item HTML
-          # @option options [Symbol] :type the type of item. If the value is +:ellipsis+ then an ellipsis will be rendered
+          # @option options [Boolean] :ellipsis If the value is +true+ then an ellipsis will be rendered
           # @option options [Hash] :attributes any additional attributes that will added as part of the HTML
 
           def initialize(number:, current: false, **options)

data/lib/ccs/components/govuk/pagination.rb

@@ -46,8 +46,7 @@ module CCS
           block_is_level = pagination_items.blank? && (pagination_previous.present? || pagination_next.present?)
 
           @options[:attributes][:class] << ' govuk-pagination--block' if block_is_level
-          @options[:attributes][:role] = 'navigation'
-          (@options[:attributes][:aria] ||= {})[:label] ||= 'results'
+          (@options[:attributes][:aria] ||= {})[:label] ||= 'Pagination'
 
           @pagination_previous = Increment::Previous.new(block_is_level: block_is_level, form: @options[:form], context: @context, **pagination_previous) if pagination_previous
           @pagination_next = Increment::Next.new(block_is_level: block_is_level, form: @options[:form], context: @context, **pagination_next) if pagination_next
@@ -88,7 +87,7 @@ module CCS
 
           pagination_item_class = form ? Item::Form : Item::Tag
 
-          @pagination_items = pagination_items.map { |pagination_item| pagination_item[:type] == :ellipsis ? Item::Ellipsis : pagination_item_class.new(form: form, context: context, **pagination_item) }
+          @pagination_items = pagination_items.map { |pagination_item| pagination_item[:ellipsis] ? Item::Ellipsis : pagination_item_class.new(form: form, context: context, **pagination_item) }
         end
       end
     end