govuk_publishing_components 12.16.0 → 12.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c617ee9f0636b4ff168ddd58e7a9b8eef7f434006057cee0af7bdcf6e43ae8f8
-  data.tar.gz: 78d6bf3676384563725fce4239a3a221d970d943e4effbf8a274716bf487e250
+  metadata.gz: daf83cc27bbb44657c8193582e9f26cfd1e36301a24ba5ed2ba92ac461577905
+  data.tar.gz: 59ac08cf3f8ead780a03d649fcef1ce65cb4b514af1ea557961764b24968accc
 SHA512:
-  metadata.gz: e195aee9e94e5737636c13977e1ecc5a65f05af8d7162b21be96a7958fbfb66603b4d166a2b4123db3c77669a66da57e1008940d46c2627d21ea23a0c38d5532
-  data.tar.gz: a90730ae35728b47466250874f48bfb182fbb9bd27d0c4481e4cb8ff60044726fa5ecd0e4ff9a3e2cea14d4825acc448e94f800413a7c4f18f0a9e669a1cd991
+  metadata.gz: 4d90669dad89315ddadc53669ea3bb668e56661efb7bb2e3ad048fbc1723b65dab49e1b83d1988cc954c2d7b23058470def9c78a4527226467a1527c7dfa834c
+  data.tar.gz: a248d29a9794f949b176059d65e10b48a78a892f39d1d664d0ede520aaeee34be262e46997ae3924a0ff8817fb85602057e34ac2e428d86e334801dc5aa274c8

data/app/views/govuk_publishing_components/components/_select.html.erb

@@ -2,6 +2,8 @@
   options ||= []
   id ||= false
   label ||= false
+
+  select_helper = GovukPublishingComponents::Presenters::SelectHelper.new(options)
 %>
 <% if options.any? && id && label %>
   <div class="govuk-form-group gem-c-select">
@@ -9,9 +11,7 @@
       <%= label %>
     </label>
     <select class="govuk-select" id="<%= id %>" name="<%= id %>">
-      <% options.each do |option| %>
-        <option value="<%= option[:value] %>" <% if option[:selected] %>selected<% end %>><%= option[:text] %></option>
-      <% end %>
+      <%= options_for_select(select_helper.option_markup, select_helper.selected_option) %>
     </select>
   </div>
 <% end %>

data/app/views/govuk_publishing_components/components/docs/select.yml

@@ -22,7 +22,7 @@ examples:
   with_preselect:
     data:
       id: 'dropdown2'
-      label: 'My Dropdown'
+      label: 'Option 2 preselected'
       options:
       - text: 'Option one'
         value: 'option1'
@@ -31,3 +31,25 @@ examples:
         selected: true
       - text: 'Option three'
         value: 'option3'
+  with_data_attributes:
+    description: Data attributes can be added to the option elements of the select. Note that the component will not do anything with them - Javascript will have to be added in the application that uses the component, for example to fire tracking events.
+    data:
+      id: 'dropdown3'
+      label: 'With data attributes'
+      options:
+      - text: 'Option one'
+        value: 'option1'
+        data_attributes:
+          track_category: "hello"
+          something_else: "moo"
+      - text: 'Option two'
+        value: 'option2'
+      - text: 'Option three'
+        value: 'option3'
+        data_attributes:
+          track_category: 'navDocumentCollectionLinkClicked'
+          track_action: 1.1
+          track_label: '/government/publications/parental-responsibility-measures-for-behaviour-and-attendance'
+          track_options:
+            dimension28: 2
+            dimension29: 'School behaviour and attendance: parental responsibility measures'

data/lib/govuk_publishing_components.rb

@@ -9,6 +9,7 @@ require "govuk_publishing_components/presenters/page_with_step_by_step_navigatio
 require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_parent"
 require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons"
 require "govuk_publishing_components/presenters/services"
+require "govuk_publishing_components/presenters/select"
 require "govuk_publishing_components/presenters/meta_tags"
 require "govuk_publishing_components/presenters/taxonomy_navigation"
 require "govuk_publishing_components/presenters/curated_taxonomy_sidebar_links"

data/lib/govuk_publishing_components/presenters/select.rb

@@ -0,0 +1,38 @@
+module GovukPublishingComponents
+  module Presenters
+    class SelectHelper
+      attr_reader :options, :option_markup, :selected_option
+
+      def initialize(options)
+        @options = options
+        @option_markup = get_options
+      end
+
+    private
+
+      def get_options
+        return if options.nil?
+
+        options.map { |option|
+          @selected_option = option[:value] if option[:selected]
+          [
+            option[:text],
+            option[:value],
+            options_data_attribute(option[:data_attributes])
+          ]
+        }
+      end
+
+      def options_data_attribute(attributes)
+        return {} if attributes.nil?
+
+        attrs = {}
+        attributes.each do |key, value|
+          key_name = "data-#{key.to_s.split('_').join('-')}"
+          attrs[key_name] = value.is_a?(Hash) ? value.to_json : value
+        end
+        attrs
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '12.16.0'.freeze
+  VERSION = '12.17.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 12.16.0
+  version: 12.17.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govspeak
@@ -606,6 +606,7 @@ files:
 - lib/govuk_publishing_components/presenters/page_with_step_by_step_navigation.rb
 - lib/govuk_publishing_components/presenters/related_navigation_helper.rb
 - lib/govuk_publishing_components/presenters/schema_org.rb
+- lib/govuk_publishing_components/presenters/select.rb
 - lib/govuk_publishing_components/presenters/services.rb
 - lib/govuk_publishing_components/presenters/step_by_step_nav_helper.rb
 - lib/govuk_publishing_components/presenters/subscription_links_helper.rb