govuk_publishing_components 21.26.0 → 21.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85bfabc41347e3eabf194ea1267d038be37fb4a7d1f2275a114768760400fdbb
-  data.tar.gz: 94857248756288979fa76c7d836de06a412572d3162b56999b554bf5c48f6d6f
+  metadata.gz: cc5af29219bd4b9bc7b8ae363465464bc9be5b18379be56fb5749e1cc7770b5e
+  data.tar.gz: ad31407f577d64d7e5bf86692444d4ed50f548dfb077a20bc07c67ab2b8b915c
 SHA512:
-  metadata.gz: '05045873de72f2d7ee83c5e3ff3409f4617914f012a8dddd7156d5babccc0ad6e7eccc765e89303f301e8721eadee9730e0ebfe66189d3965566f03547ae5405'
-  data.tar.gz: 51a1441882dce26a073c3f18e431346f4ad628487213c19c9d6110398125338f5abc387675e05a93411713e1a6aed8f665bd5dc2a450efd290b31fa5fa3aa5c4
+  metadata.gz: 650dd808ba0219ef1e49ba8c466efa63e3875d2fdc6022117ab758c7eaeb5e79ed39f71eb39a14ac7235272ade539a577d4ef6e639325c237db799fbd136aacf
+  data.tar.gz: 7192ab37e652830ccd24beac87b31249c0490bc98b81f3d16bdfaa8f070284a71d4c01dc14b23cc5fa47cc73ccb0a2b83abf951307710d9e84db40d74fb6fa93

data/app/controllers/govuk_publishing_components/component_guide_controller.rb

@@ -44,7 +44,18 @@ module GovukPublishingComponents
       additional_files = "@import 'govuk_publishing_components/govuk_frontend_support';\n"
       additional_files << "@import 'govuk_publishing_components/component_support';\n" unless print_styles
 
-      components_in_use.map { |component|
+      components = components_in_use
+      extra_components = []
+
+      components.each do |component|
+        components_in_component = components_within_component(component)
+        extra_components << components_in_component
+      end
+
+      components << extra_components.compact
+      components = components.flatten.uniq.sort
+
+      components.map { |component|
         "@import 'govuk_publishing_components/components/#{print_path}_#{component.gsub('_', '-')}';" if component_has_sass_file(component.gsub('_', '-'), print_styles)
       }.join("\n").squeeze("\n").prepend(additional_files)
     end
@@ -80,6 +91,12 @@ module GovukPublishingComponents
       Pathname.new(__dir__ + "/../../assets/stylesheets/govuk_publishing_components/components/#{print_path}_#{component}.scss").exist?
     end
 
+    def components_within_component(component)
+      data = File.read(Pathname.new(__dir__ + "/../../views/govuk_publishing_components/components/_#{component}.html.erb"))
+      match = data.scan(/(govuk_publishing_components\/components\/[a-z_-]+)/)
+      match.flatten.uniq.map(&:to_s).sort.map { |m| m.gsub('govuk_publishing_components/components/', '') }
+    end
+
     def index_breadcrumb
       {
         title: GovukPublishingComponents::Config.component_guide_title,

data/app/views/govuk_publishing_components/component_guide/index.html.erb

@@ -24,14 +24,14 @@
   } do %>
     <%= render "govuk_publishing_components/components/textarea", {
       label: {
-        text: "Add this to your application's main scss file"
+        text: "Add this to your application's main scss file, before your other local imports."
       },
       name: "main-sass",
       value: @components_in_use_sass
     } %>
     <%= render "govuk_publishing_components/components/textarea", {
       label: {
-        text: "Add this to your application's print scss file"
+        text: "Add this to your application's print scss file, before your other local imports."
       },
       name: "print-sass",
       value: @components_in_use_print_sass

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

@@ -24,6 +24,16 @@
 
     <ul class="gem-c-share-links__list">
       <% links.each do |link| %>
+        <% link_text = capture do %>
+          <span class="govuk-visually-hidden">
+            <% if link[:hidden_text] %>
+              <%= link[:hidden_text] %>
+            <% else %>
+              Share on
+            <% end %>
+          </span>
+          <%= link[:text] %>
+        <% end %>
         <li class="gem-c-share-links__list-item">
           <%
             if track_as_sharing
@@ -78,7 +88,7 @@
                 <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="9 9 32 32"><path fill="currentColor" d="M9 9h32v32H9V9z"/><path fill="#FFF" d="M12.84 14.12v19.2h5.76l5.76 5.76v-5.76h12.8v-19.2H12.84zm3.2 8.32H28.2V25H16.04v-2.56zm16 7.68h-16v-2.56h16v2.56zm1.92-10.24H16.04v-2.56h17.92v2.56z"/></svg>
 
               <% end %>
-            </span><%= link[:text] %><% end %>
+            </span><%= link_text %><% end %>
         </li>
       <% end %>
     </ul>

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

@@ -65,6 +65,20 @@ examples:
           icon: 'facebook'
         }
       ]
+  with_custom_visually_hidden_text:
+    description: |
+      Use this option to specify a visually hidden text for screenreaders to prepend to the link text.
+
+      If omitted, the default text used will be 'Share on'.
+    data:
+      links: [
+        {
+          href: 'share',
+          text: 'Facebook',
+          hidden_text: 'Download from',
+          icon: 'facebook'
+        }
+      ]
   with_branding:
     description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) can be added to the component as shown.
     data:

data/app/views/layouts/govuk_publishing_components/application.html.erb

@@ -16,8 +16,8 @@
     <%= csrf_meta_tags %>
     <%= favicon_link_tag "govuk_publishing_components/favicon-production.png" %>
 
-    <%= stylesheet_link_tag "component_guide/application", media: "screen" %>
     <%= stylesheet_link_tag "#{GovukPublishingComponents::Config.application_stylesheet}" %>
+    <%= stylesheet_link_tag "component_guide/application", media: "screen" %>
 
     <% if GovukPublishingComponents::Config.application_print_stylesheet %>
       <%= stylesheet_link_tag "#{GovukPublishingComponents::Config.application_print_stylesheet}", media: "print" %>

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '21.26.0'.freeze
+  VERSION = '21.26.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 21.26.0
+  version: 21.26.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters