govuk_publishing_components 23.7.0 → 23.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a97fad3ed17572d72aa4904dec96a13f48732b2c740f017dd8ac3a8c9ef9d93
-  data.tar.gz: 429048afab20b2b89b342024d4681ccccfb4c7706d1e09051cfdf6c47af1066d
+  metadata.gz: 59c2da5bb82e22d5f69cd19ec1815c5730386dc14fea2ba845e5db185b7d6e58
+  data.tar.gz: a501b486477fc328dc912105f0c97f56a6701bb0af5ae40920dbd803f5b989d1
 SHA512:
-  metadata.gz: f51d92a980b602c69168a506866f2a496c4ea85558de991083ba09a3c7c054a50486dd8169bcb74f61ffa279066bbbf0e6d2a367c6d457f1f89ede11fff78423
-  data.tar.gz: d32c3132330f198be910b85ca88fdbf96c061a5fb5e2520eedd741ff03ea1af0072823e45d654ade08a84ae8a9ac9aedfbea80bc1a41156dda99d987a6fbd638
+  metadata.gz: f11647e0aab3acc33a200d52198462955ba7fdbd8a2770ef43456175b8bb442ce30f065710b501a4e437c761a2492b67e98ee18cf2fff5bd6f41446a2abb6670
+  data.tar.gz: 52f80f2f5c35ef50852d3a36dd77409fe15982f7a9ddadf6e93eeabcff4618353765b11145d2416758ebd27b76fe330db84263aa97a0106679af48d99ea02c51

data/README.md

@@ -22,6 +22,7 @@ Components should be added to this gem if they are required in more than one app
 - [Run the component guide](/docs/run-component-guide.md)
 - [Move a component from an application to the gem](/docs/moving-components-upstream-into-this-gem.md)
 - [Publish/release a new version of the gem](/docs/publishing-to-rubygems.md)
+- [Keep this gem in sync with the Design System](/docs/upgrade-govuk-frontend.md)
 
 ## Architecture / structure
 
@@ -39,13 +40,13 @@ There are 2 types of helper classes in this app:
 GOV.UK Publishing Components also makes [GOV.UK Design System](https://design-system.service.gov.uk/) styles and components available to GOV.UK's frontend applications. This gem consumes [GOV.UK Frontend](https://github.com/alphagov/govuk-frontend) via [Yarn](https://classic.yarnpkg.com/).
 
 ## Browser and assistive technology support
+
 GOV.UK Publishing Components shares the same standards in terms of browser and assistive technology support with [GOV.UK Frontend](https://github.com/alphagov/govuk-frontend#browser-and-assistive-technology-support).
 
 ## Documentation
 
 [See the rubydoc.info documentation](http://www.rubydoc.info/gems/govuk_publishing_components)
 
-
 ## Working locally
 
 ### Install dependencies

data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/magna-charta.js

@@ -215,8 +215,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       return !isNaN(parseFloat(val))
     },
     stripValue: function (val) {
-      var re = new RegExp('\\,|£|%|[a-z]', 'gi')
-      return val.replace(re, '')
+      return val.replace(/,|£|%|[a-z]/gi, '')
     },
     returnMax: function (values) {
       var max = 0

data/app/assets/stylesheets/govuk_publishing_components/component_support.scss

@@ -9,6 +9,7 @@
 @import "govuk_publishing_components/components/helpers/variables";
 @import "govuk_publishing_components/components/helpers/brand-colours";
 @import "govuk_publishing_components/components/helpers/link";
+@import "govuk_publishing_components/components/helpers/px-to-em";
 @import "govuk_publishing_components/components/mixins/govuk-template-link-focus-override";
 @import "govuk_publishing_components/components/mixins/media-down";
 @import "govuk_publishing_components/components/mixins/margins";

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

@@ -39,7 +39,7 @@ $large-input-size: 50px;
   padding: 6px;
   margin: 0;
   width: 100%;
-  height: $input-size;
+  height: em(34, 16);
   border: $govuk-border-width-form-element solid $govuk-input-border-colour;
   background: govuk-colour("white");
   border-radius: 0; //otherwise iphones apply an automatic border radius

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_charts.scss

@@ -152,7 +152,7 @@
         }
 
         .mc-value-overflow {
-          text-indent: -99999px !important;
+          text-indent: -99999px !important; // stylelint-disable-line declaration-no-important
         }
 
         // Bar labels
@@ -178,7 +178,7 @@
 
       .mc-stacked-total {
         padding: $bar-padding 0;
-        background-color: transparent !important;
+        background-color: transparent !important; // stylelint-disable-line declaration-no-important
         color: govuk-colour("black");
         display: inline-block;
         text-indent: 5px;

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_steps.scss

@@ -12,10 +12,10 @@
 
     @for $i from 1 through 30 {
       &:nth-child(#{$i}) {
-        background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='250' height='250'%3E%3Ccircle cx='125' cy='125' r='100' fill='black' /%3E%3Ctext x='50%25' y='50%25' text-anchor='middle' alignment-baseline='middle' font-family='sans-serif' font-size='100px' fill='white'%3E#{$i}%3C/text%3E%3C/svg%3E");
+        background-image: url("data:image/svg+xml, %3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 250 250' preserveAspectRatio='xMinYMin meet'%3E%3Cg%3E%3Ccircle r='50%25' cx='50%25' cy='50%25' class='circle-back'%3E%3C/circle%3E%3Ctext x='50%25' y='50%25' text-anchor='middle' dy='0.3em' font-family='nta,arial,sans-serif' font-size='8rem' fill='%23ffffff'%3E#{$i}%3C/text%3E%3C/g%3E%3C/svg%3E ");
         background-repeat: no-repeat;
-        background-position: left 10px;
-        background-size: 35px 35px;
+        background-position: .2em .7em;
+        background-size: 1.4em 1.4em;
       }
     }
   }

data/app/assets/stylesheets/govuk_publishing_components/components/mixins/_govuk-template-link-focus-override.scss

@@ -9,6 +9,6 @@
   &:link:focus,
   &:visited:focus {
     @include govuk-focused-text;
-    color: govuk-colour("black") !important;
+    color: govuk-colour("black") !important; // stylelint-disable-line declaration-no-important
   }
 }

data/app/assets/stylesheets/govuk_publishing_components/components/print/_accordion.scss

@@ -6,12 +6,12 @@
 
 // Open all of the accordion sections.
 .govuk-accordion__section-content {
-  display: block !important;
+  display: block !important; // stylelint-disable-line declaration-no-important
 }
 
 // Change the colour from the blue link colour to black.
 .govuk-accordion__section-button {
-  color: govuk-colour("black") !important;
+  color: govuk-colour("black") !important; // stylelint-disable-line declaration-no-important
 }
 
 // Change the summary subheading size.
@@ -27,5 +27,5 @@
 // Hide the unusable "Open all" button and the "+" icons.
 .govuk-accordion__open-all,
 .govuk-accordion__icon {
-  display: none !important;
+  display: none !important; // stylelint-disable-line declaration-no-important
 }

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

@@ -1,4 +1,5 @@
 <% navigation = GovukPublishingComponents::Presenters::ContextualNavigation.new(content_item, request) %>
+<% shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns) %>
 
 <div class="gem-c-contextual-sidebar">
   <% if navigation.show_brexit_cta? && navigation.step_by_step_count.zero? %>
@@ -9,12 +10,14 @@
       url: t("components.related_navigation.transition.link_path"),
       text: t("components.related_navigation.transition.link_text"),
       data_attributes: {
+        "module": "track-click",
         "track-category": "relatedLinkClicked",
         "track-action": "1.0 Transition",
         "track-label": t("components.related_navigation.transition.link_path"),
-        "track-options": "{'dimension29':'#{t("components.related_navigation.transition.link_text")}'}"
+        "track-dimension": t("components.related_navigation.transition.link_text"),
+        "track-dimension-index": "29",
       },
-      lang: I18n.locale,
+      lang: shared_helper.t_locale("components.related_navigation.transition.title"),
     } %>
   <% end %>
 

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

@@ -1,4 +1,5 @@
 <% related_nav_helper = GovukPublishingComponents::Presenters::RelatedNavigationHelper.new(local_assigns) %>
+<% shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns) %>
 
 <% if related_nav_helper.related_navigation? %>
   <% random = SecureRandom.hex(4) %>
@@ -8,7 +9,7 @@
       <h2 id="related-nav-related_items-<%= random %>"
           class="gem-c-related-navigation__main-heading"
           data-track-count="sidebarRelatedItemSection"
-          <%= related_nav_helper.t_lang(
+          <%= shared_helper.t_lang(
               "components.related_#{local_assigns[:context]}_navigation.related_content",
               default: 'components.related_navigation.related_content'
             )
@@ -28,6 +29,7 @@
 
       <%= render 'govuk_publishing_components/components/related_navigation/section',
         related_nav_helper: related_nav_helper,
+        shared_helper: shared_helper,
         section_title: section_title,
         links: links,
         section_index: section_index,

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

@@ -7,10 +7,11 @@
   text ||= nil
   url ||= nil
   data_attributes ||= {}
-  lang ||= 'en'
+  lang ||= "en"
+  direction ||= "ltr"
   css_classes = %w(gem-c-transition-countdown)
-  css_classes << 'gem-c-transition-countdown--cta' if url
-  css_classes << 'govuk-link' if url
+  css_classes << "gem-c-transition-countdown--cta" if url
+  css_classes << "govuk-link" if url
 %>
 
 <% countdown = capture do %>
@@ -24,11 +25,11 @@
 <% end %>
 
 <% if url %>
-  <%= link_to url, class: css_classes, data: data_attributes, lang: lang do %>
+  <%= link_to url, class: css_classes, data: data_attributes, lang: lang, dir: direction do %>
     <%= countdown %>
   <% end %>
 <% else %>
-  <%= tag.div class: css_classes, lang: lang do %>
+  <%= tag.div class: css_classes, lang: lang, dir: direction do %>
     <%= countdown %>
   <% end %>
 <% end %>

data/app/views/govuk_publishing_components/components/docs/subscription-links.yml

@@ -1,5 +1,5 @@
 name: Subscription links
-description: Links to ‘Get email alerts’ and ‘Subscribe to feed’
+description: Links to ‘Get emails’ and ‘Subscribe to feed’
 body: |
   <strong>NOTE: This component includes a h2 heading by default but can be suppressed by using `hide_heading` option (see below)<strong>
 accessibility_criteria: |

data/app/views/govuk_publishing_components/components/related_navigation/_section.html.erb

@@ -28,7 +28,7 @@
           link[:path],
           class: related_nav_helper.section_css_class("gem-c-related-navigation__section-link", section_title, link, (index >= section_link_limit)),
           rel: link[:rel],
-          lang: related_nav_helper.t_locale_check(link[:locale]),
+          lang: shared_helper.t_locale_check(link[:locale]),
           data: {
             track_category: 'relatedLinkClicked',
             track_action: "#{section_index}.#{index} #{related_nav_helper.construct_section_heading(section_title) || t('components.related_navigation.related_content')}",

data/config/locales/en.yml

@@ -92,7 +92,7 @@ en:
     step_by_step_nav_related:
       part_of: "Part of"
     subscription_links:
-      email_signup_link_text: "Get email alerts"
+      email_signup_link_text: "Get emails"
       feed_link_text: "Subscribe to feed"
       subscriptions: "Subscriptions"
     summary_list:

data/lib/govuk_publishing_components/presenters/related_navigation_helper.rb

@@ -97,48 +97,8 @@ module GovukPublishingComponents
         related_navigation.flat_map(&:last).any?
       end
 
-      def t_locale(content, options = {})
-        # Check if the content string has a translation
-        content_translation_available = translation_present?(content)
-
-        # True, return locale
-        this_locale = I18n.locale if content_translation_available
-        # If false, return default locale
-        this_locale = I18n.default_locale unless content_translation_available
-
-        # Check if default string passed in
-        if options[:default].present?
-          # Check if the default string has a translation
-          default_translation_available = translation_present?(options[:default])
-          # If true, return locale
-          this_locale = I18n.locale if default_translation_available
-          # If false, return default_locale
-          this_locale = I18n.default_locale unless default_translation_available
-        end
-
-        this_locale
-      end
-
-      def t_lang(content, options = {})
-        locale = t_locale(content, options)
-        "lang=#{locale}" unless locale.eql?(I18n.locale)
-      end
-
-      def t_locale_check(locale)
-        locale.presence unless locale.to_s.eql?(I18n.locale.to_s)
-      end
-
     private
 
-      def translation_present?(content)
-        default_string = "This is a string to act as a default for the `I18n.translate` method. Comparing the result reveals if there is a translation in the i18n files."
-        I18n.translate(
-          content,
-          default: default_string,
-          fallback: false,
-        ) != default_string
-      end
-
       def related_items
         related_quick_links = content_item_details_for("quick_links")
 

data/lib/govuk_publishing_components/presenters/shared_helper.rb

@@ -30,6 +30,48 @@ module GovukPublishingComponents
 
         "span"
       end
+
+      def t_locale(content, options = {})
+        # Check if the content string has a translation
+        content_translation_available = translation_present?(content)
+
+        # True, return locale
+        this_locale = I18n.locale if content_translation_available
+        # If false, return default locale
+        this_locale = I18n.default_locale unless content_translation_available
+
+        # Check if default string passed in
+        if options[:default].present?
+          # Check if the default string has a translation
+          default_translation_available = translation_present?(options[:default])
+          # If true, return locale
+          this_locale = I18n.locale if default_translation_available
+          # If false, return default_locale
+          this_locale = I18n.default_locale unless default_translation_available
+        end
+
+        this_locale
+      end
+
+      def t_lang(content, options = {})
+        locale = t_locale(content, options)
+        "lang=#{locale}" unless locale.eql?(I18n.locale)
+      end
+
+      def t_locale_check(locale)
+        locale.presence unless locale.to_s.eql?(I18n.locale.to_s)
+      end
+
+    private
+
+      def translation_present?(content)
+        default_string = "This is a string to act as a default for the `I18n.translate` method. Comparing the result reveals if there is a translation in the i18n files."
+        I18n.translate(
+          content,
+          default: default_string,
+          fallback: false,
+        ) != default_string
+      end
     end
   end
 end

data/lib/govuk_publishing_components/presenters/subscription_links_helper.rb

@@ -14,13 +14,13 @@ module GovukPublishingComponents
       def email_signup_link_text
         return @local_assigns[:email_signup_link_text] if @local_assigns[:email_signup_link_text]
 
-        I18n.t("govuk_component.subscription_links.email_signup_link_text", default: "Get email alerts")
+        I18n.t("components.subscription_links.email_signup_link_text")
       end
 
       def feed_link_text
         return @local_assigns[:feed_link_text] if @local_assigns[:feed_link_text]
 
-        I18n.t("govuk_component.subscription_links.feed_link_text", default: "Subscribe to feed")
+        I18n.t("components.subscription_links.feed_link_text")
       end
 
       def component_data_is_valid?

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "23.7.0".freeze
+  VERSION = "23.7.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 23.7.0
+  version: 23.7.5
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config