govuk_publishing_components 58.1.1 → 59.0.0

data/lib/govuk_publishing_components/presenters/select_helper.rb

@@ -1,23 +1,26 @@
 module GovukPublishingComponents
   module Presenters
     class SelectHelper
-      attr_reader :options, :option_markup, :selected_option, :error_message, :error_id, :hint, :hint_id, :describedby
+      include ActionView::Helpers::FormOptionsHelper
+
+      attr_reader :options, :options_markup, :error_items, :error_id, :hint, :hint_id, :describedby
 
       def initialize(local_assigns)
         @options = local_assigns[:options] || []
-        @error_message = local_assigns[:error_message]
+        @error_items = local_assigns[:error_items] || []
+        @error_items << { text: local_assigns[:error_message] } if local_assigns[:error_message]
         @error_id = local_assigns[:error_id] || nil
         @hint = local_assigns[:hint] || nil
         @hint_id = local_assigns[:hint_id] || nil
         @heading_size = local_assigns[:heading_size]
         @full_width = local_assigns[:full_width] || false
-        @option_markup = get_options
+        @options_markup = options_for_select(get_options, @selected_option)
         @describedby = get_describedby
       end
 
       def css_classes
         classes = %w[govuk-form-group gem-c-select]
-        classes << "govuk-form-group--error" if @error_message
+        classes << "govuk-form-group--error" if @error_items.present?
         classes
       end
 
@@ -66,7 +69,7 @@ module GovukPublishingComponents
       def get_describedby
         describedby = %w[]
 
-        if @error_message || @error_id
+        if @error_items.present? || @error_id
           @error_id ||= "error-#{SecureRandom.hex(4)}"
           describedby << @error_id
         end

data/lib/govuk_publishing_components/presenters/select_with_search_helper.rb

@@ -0,0 +1,92 @@
+##
+# Helper methods for use with the "select-with-search" component.
+# This wraps and extends the Select component's helper methods to add support for option groups.
+##
+module GovukPublishingComponents
+  module Presenters
+    class SelectWithSearchHelper
+      include ActionView::Helpers::FormOptionsHelper
+
+      attr_reader :options, :selected_options, :aria, :options_markup
+
+      delegate :describedby,
+               :hint_id,
+               :hint,
+               :label_classes,
+               :select_classes,
+               :error_items,
+               :error_id,
+               to: :@select_helper
+
+      def initialize(local_assigns)
+        @select_helper = SelectHelper.new(local_assigns.except(:options, :grouped_options))
+        @options = local_assigns[:options]
+        @grouped_options = local_assigns[:grouped_options]
+        @include_blank = local_assigns[:include_blank]
+        @selected_options = []
+        @options_markup = get_options
+        @local_assigns = local_assigns
+      end
+
+      def css_classes
+        classes = @select_helper.css_classes
+        classes << "gem-c-select-with-search"
+        classes
+      end
+
+    private
+
+      def get_options
+        blank_option_if_include_blank +
+          if @grouped_options.present?
+            grouped_and_ungrouped_options_for_select(@grouped_options)
+          elsif @options.present?
+            options_for_select(
+              transform_options(@options),
+              selected_options,
+            )
+          end
+      end
+
+      def grouped_and_ungrouped_options_for_select(unsorted_options)
+        # Filter out the 'single option' options and treat them as simply `<option>`
+        # The remainder should be treated as true 'grouped options', i.e. `<optgroup>`
+        single_options = []
+        grouped_options = []
+        unsorted_options.each_with_index do |(group, options), _index|
+          if group == ""
+            single_options << options
+          else
+            grouped_options << [group, options]
+          end
+        end
+        single_options.flatten!
+
+        options_for_select(transform_options(single_options), selected_options) +
+          grouped_options_for_select(transform_grouped_options(grouped_options), selected_options)
+      end
+
+      def transform_options(options)
+        options.map do |option|
+          @selected_options << option[:value] if option[:selected]
+          [
+            option[:text],
+            option[:value],
+          ]
+        end
+      end
+
+      def transform_grouped_options(grouped_options)
+        grouped_options.map do |(group, options)|
+          [group, transform_options(options)]
+        end
+      end
+
+      def blank_option_if_include_blank
+        return "".html_safe if @include_blank.blank?
+
+        options_for_select([["", ""]])
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/presenters/single_page_notification_button_helper.rb

@@ -64,7 +64,7 @@ module GovukPublishingComponents
       end
 
       def skip_the_gov_uk_account?
-        @skip_account == "true"
+        @skip_account == "true" || @skip_account == true
       end
     end
   end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "58.1.1".freeze
+  VERSION = "59.0.0".freeze
 end

data/lib/govuk_publishing_components.rb

@@ -27,6 +27,7 @@ require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_org
 require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons"
 require "govuk_publishing_components/presenters/checkboxes_helper"
 require "govuk_publishing_components/presenters/select_helper"
+require "govuk_publishing_components/presenters/select_with_search_helper"
 require "govuk_publishing_components/presenters/meta_tags"
 require "govuk_publishing_components/presenters/content_item"
 require "govuk_publishing_components/presenters/translation_nav_helper"

data/node_modules/choices.js/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Josh Johnson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.