govuk_publishing_components 16.1.0 → 16.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1c43a8de608bcadb260cb50450159ed9a1afb2629bf108bc3d21897cea0531e
-  data.tar.gz: 9a1bf967473efb25ee611861a94d8084a430d095ca3fb39f27008863b2481da8
+  metadata.gz: c8194e57a52a4ba7a9d41fb80f0dd76903f299fac60f35e2b45fa8d2803c51d5
+  data.tar.gz: 130f165b192cbc3a54d1c87d0cabd5ab0b17f2e6c1907fb43735c028f9bf387d
 SHA512:
-  metadata.gz: bd69d01ebf621bc839d7ff47c1eaa47c7ea721d47971958cb9172d9be7e604d5633301fede44e60f6f9b9bfb0d95da24b023d756effbc3e2a18071af3e7e81e0
-  data.tar.gz: 6e8add99822a200e2f2652c6735bc44e211e302e6fd1b28ebf2926f6c7c0e0a2b14f072c6304a3e5a6d12b8ec073058953eea2d3b9dcf632c716b3410b9d6d93
+  metadata.gz: 2de1d21a69fb4a855c07d06e241abdc570c182933c84c3af06889e8978742d74f9bbae3596ff9fb6382239b9f2b9ae433186f23ea2df267d479359e9ac776a84
+  data.tar.gz: bd1673a83c3b7acfd8d95d1d6922c2ace5336fe7d31adefb6b9401caef5a43321632a3b48221bdd6dc0db0ba3069172512a1a011919bdf936c4cbec2ce052a9c

data/app/assets/stylesheets/govuk_publishing_components/components/_textarea.scss

@@ -1 +1,5 @@
 @import "govuk-frontend/components/textarea/textarea";
+
+.gem-c-textarea .govuk-textarea {
+  margin-bottom: 0;
+}

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

@@ -1,5 +1,5 @@
 <%
-  heading_helper = GovukPublishingComponents::Presenters::AccordionHelper.new(local_assigns)
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
   id ||= "default-id-#{SecureRandom.hex(4)}"
   items ||= []
@@ -31,7 +31,7 @@
         <div class="govuk-accordion__section-header">
           <%=
             content_tag(
-              heading_helper.heading_tag,
+              shared_helper.get_heading_level,
               content_tag('span', item[:heading][:text], class: "govuk-accordion__section-button", id: "#{id}-heading-#{index}", data: item[:data_attributes]),
               class: 'govuk-accordion__section-heading'
             )

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

@@ -1,10 +1,10 @@
 <%
   text ||= t('components.back_link.back')
+  data_attributes ||= nil
 %>
-<%= link_to text,
+<%= link_to(
+  text,
   href,
-  class: %w(
-    gem-c-back-link
-    govuk-back-link
-  )
- %>
+  class: %w(gem-c-back-link govuk-back-link),
+  data: data_attributes
+) %>

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

@@ -1,6 +1,13 @@
-<% data_attributes ||= nil %>
-<% open ||= nil %>
-<%= tag.details class: "gem-c-details govuk-details", data: data_attributes, open: open do %>
+<%
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
+
+  data_attributes ||= nil
+  open ||= nil
+  margin_bottom ||= 3
+  css_classes = %w(gem-c-details govuk-details)
+  css_classes << (shared_helper.get_margin_bottom)
+%>
+<%= tag.details class: css_classes, data: data_attributes, open: open do %>
   <summary class="govuk-details__summary">
     <span class="govuk-details__summary-text">
       <%= title %>

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

@@ -2,8 +2,9 @@
   brand ||= false
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
   heading_helper = GovukPublishingComponents::Presenters::HeadingHelper.new(local_assigns)
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 %>
-<%= content_tag(heading_helper.heading_tag, text,
+<%= content_tag(shared_helper.get_heading_level, text,
     class: "gem-c-heading #{heading_helper.classes} #{brand_helper.brand_class} #{brand_helper.border_color_class}",
     id: heading_helper.id
 ) %>

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

@@ -1,9 +1,9 @@
 <%
   id ||= "hint-#{SecureRandom.hex(4)}"
-  margin_bottom ||= 3
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
   css_classes = %w( gem-c-hint govuk-hint )
-  css_classes << ([*0..9].include?(margin_bottom) ? "govuk-!-margin-bottom-#{margin_bottom}" : "govuk-!-margin-bottom-3")
+  css_classes << (shared_helper.get_margin_bottom)
 %>
 
 <%= tag.span id: id, class: css_classes do %>

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

@@ -2,6 +2,7 @@
   brand ||= false
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
   card_helper = GovukPublishingComponents::Presenters::ImageCardHelper.new(local_assigns)
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 %>
 <% if card_helper.href || card_helper.extra_links.any? %>
   <div class="gem-c-image-card <%= "gem-c-image-card--large" if card_helper.large %> <%= brand_helper.brand_class %>"
@@ -13,7 +14,7 @@
       <%= card_helper.context %>
 
       <% if card_helper.heading_text %>
-        <%= content_tag(card_helper.heading_tag,
+        <%= content_tag(shared_helper.get_heading_level,
           class: "gem-c-image-card__title") do %>
             <% if card_helper.href %>
               <%= link_to card_helper.heading_text, card_helper.href,

data/app/views/govuk_publishing_components/components/_subscription-links.html.erb

@@ -1,11 +1,14 @@
 <%
   brand ||= false
-  margin_bottom ||= 0
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
   sl_helper = GovukPublishingComponents::Presenters::SubscriptionLinksHelper.new(local_assigns)
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
+
+  local_assigns[:margin_bottom] ||= 0
+  local_assigns[:margin_bottom] = 0 if local_assigns[:margin_bottom] > 9
 
   css_classes = %w( gem-c-subscription-links )
-  css_classes << ([*0..9].include?(margin_bottom) ? "govuk-!-margin-bottom-#{margin_bottom}" : "govuk-!-margin-bottom-0")
+  css_classes << (shared_helper.get_margin_bottom) unless local_assigns[:margin_bottom] == 0
   css_classes << brand_helper.brand_class
   data = {"module": "gem-toggle"} if sl_helper.feed_link_box_value
 %>

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

@@ -7,7 +7,8 @@
 
   label ||= nil
   hint ||= nil
-  margin_bottom ||= 3
+  local_assigns[:margin_bottom] ||= 6
+  local_assigns[:margin_bottom] = 6 if local_assigns[:margin_bottom] > 9
   error_message ||= nil
   error_items ||= nil
   character_count ||= nil
@@ -16,12 +17,14 @@
   has_error ||= error_message || error_items&.any?
   error_id = "error-#{SecureRandom.hex(4)}"
 
-  css_classes = %w(gem-c-textarea govuk-textarea)
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
+
+  css_classes = %w(govuk-textarea)
   css_classes << "js-character-count" if character_count
   css_classes << "govuk-textarea--error" if has_error
-  css_classes << ([*0..9].include?(margin_bottom) ? "govuk-!-margin-bottom-#{margin_bottom}" : "govuk-!-margin-bottom-3")
-  form_group_css_classes = %w(govuk-form-group)
+  form_group_css_classes = %w(gem-c-textarea govuk-form-group)
   form_group_css_classes << "govuk-form-group--error" if has_error
+  form_group_css_classes << (shared_helper.get_margin_bottom)
 
   aria_described_by ||= nil
   if hint || has_error

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

@@ -14,3 +14,8 @@ examples:
     data:
       text: 'Back to document list'
       href: '#'
+  with_data_attributes:
+    data:
+      href: '#'
+      data_attributes:
+        tracking: GT-1234

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

@@ -20,6 +20,13 @@ examples:
       label:
         text: "Can you provide more detail?"
       name: "more-detail"
+  with_margin_bottom:
+    description: The component accepts a number for margin bottom from 0 to 9 (0px to 60px) using the [GOV.UK Frontend spacing scale](http://govuk-frontend-review.herokuapp.com/docs/#settings/spacing-variable-govuk-spacing-points). It defaults to a margin bottom of 6 (30px).
+    data:
+      margin_bottom: 9
+      label:
+        text: "Can you provide more detail?"
+      name: "more-detail"
   specific_rows:
     description: Textarea with 10 rows
     data:

data/lib/govuk_publishing_components.rb

@@ -1,6 +1,6 @@
 require "govuk_publishing_components/config"
 require "govuk_publishing_components/engine"
-require "govuk_publishing_components/presenters/accordion_helper"
+require "govuk_publishing_components/presenters/shared_helper"
 require "govuk_publishing_components/presenters/breadcrumbs"
 require "govuk_publishing_components/presenters/button_helper"
 require "govuk_publishing_components/presenters/contextual_navigation"

data/lib/govuk_publishing_components/presenters/heading_helper.rb

@@ -4,8 +4,6 @@ module GovukPublishingComponents
       attr_reader :heading_tag, :id, :classes
 
       def initialize(options)
-        @heading_tag = "h2"
-        @heading_tag = "h#{options[:heading_level]}" if [1, 2, 3, 4, 5, 6].include? options[:heading_level]
         @id = options[:id]
 
         @classes = ""

data/lib/govuk_publishing_components/presenters/image_card_helper.rb

@@ -16,7 +16,6 @@ module GovukPublishingComponents
         @description = local_assigns[:description]
         @large = local_assigns[:large]
         @heading_text = local_assigns[:heading_text]
-        @heading_level = local_assigns[:heading_level] || 2
         @extra_links_no_indent = local_assigns[:extra_links_no_indent]
         @metadata = local_assigns[:metadata]
       end
@@ -59,11 +58,6 @@ module GovukPublishingComponents
         end
       end
 
-      def heading_tag
-        return "h#{@heading_level}" if [1, 2, 3, 4, 5, 6].include? @heading_level
-        return "span" if @heading_level.zero?
-      end
-
       def description
         content_tag(:div, @description, class: "gem-c-image-card__description") if @description
       end

data/lib/govuk_publishing_components/presenters/shared_helper.rb

@@ -0,0 +1,23 @@
+module GovukPublishingComponents
+  module Presenters
+    class SharedHelper
+      attr_reader :options, :margin_bottom, :heading_level
+
+      def initialize(local_assigns)
+        @options = local_assigns
+        @margin_bottom = @options[:margin_bottom] || 3
+        @heading_level = @options[:heading_level] || 2
+      end
+
+      def get_margin_bottom
+        [*0..9].include?(@margin_bottom) ? "govuk-!-margin-bottom-#{margin_bottom}" : "govuk-!-margin-bottom-3"
+      end
+
+      def get_heading_level
+        return [*1..6].include?(@heading_level) ? "h#{@heading_level}" : "h2" unless @heading_level.zero?
+
+        "span"
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '16.1.0'.freeze
+  VERSION = '16.2.0'.freeze
 end

data/node_modules/accessible-autocomplete/package.json

@@ -49,7 +49,7 @@
     "/"
   ],
   "_resolved": "git://github.com/alphagov/accessible-autocomplete.git#0c518b4fa79b9a95b544410858486ed9e6403c84",
-  "_shasum": "81318b920b7ddddd526e2a9a6dc935344ebdd964",
+  "_shasum": "3766842c6201eea1fb4369b0494b7539e51bb988",
   "_shrinkwrap": null,
   "_spec": "accessible-autocomplete@git://github.com/alphagov/accessible-autocomplete.git#add-multiselect-support",
   "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 16.1.0
+  version: 16.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govspeak
@@ -594,7 +594,6 @@ files:
 - lib/govuk_publishing_components/config.rb
 - lib/govuk_publishing_components/engine.rb
 - lib/govuk_publishing_components/minitest/component_guide_test.rb
-- lib/govuk_publishing_components/presenters/accordion_helper.rb
 - lib/govuk_publishing_components/presenters/breadcrumbs.rb
 - lib/govuk_publishing_components/presenters/button_helper.rb
 - lib/govuk_publishing_components/presenters/checkboxes_helper.rb
@@ -622,6 +621,7 @@ files:
 - 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/shared_helper.rb
 - lib/govuk_publishing_components/presenters/step_by_step_nav_helper.rb
 - lib/govuk_publishing_components/presenters/subscription_links_helper.rb
 - lib/govuk_publishing_components/presenters/taxonomy_list_helper.rb

data/lib/govuk_publishing_components/presenters/accordion_helper.rb

@@ -1,12 +0,0 @@
-module GovukPublishingComponents
-  module Presenters
-    class AccordionHelper
-      attr_reader :heading_tag
-
-      def initialize(options)
-        @heading_tag = "h2"
-        @heading_tag = "h#{options[:heading_level]}" if [1, 2, 3, 4, 5, 6].include? options[:heading_level]
-      end
-    end
-  end
-end