govuk_publishing_components 61.2.0 → 61.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2658bb0ee7be3c63ed5194070eb599671a47ae86d573bf934c47711e6788308
-  data.tar.gz: f7ddb17de0757400f0122135454f2e06c4eaee29fd7e97f0315429247474353f
+  metadata.gz: 6a87851becee1d2a17743023f74057913c96f5a6b1f7b59e05f7209149e28a9b
+  data.tar.gz: 0263a75ae09eb9fa63677a03b146e6668ec4da01b9c989256864cd4db6663aef
 SHA512:
-  metadata.gz: 499bf3b8e4f5f2fb14bb1f7bc3753af05a554271f9741875a525262a6235e75297df8e92532aa893cd4f8c9501cc4b81bd197fd96a3dfcc5cf3a8381e17b2382
-  data.tar.gz: f09b42020e2e8912c60f59518378e82c50f5fd56321fc41eafb1f21504059fec77296f9961e7255cb0817dc1fac60407e5f619613e79629bb5ad5c7cde5346e3
+  metadata.gz: 18a4f902404fc7757833b25044bbeddb6b5730845d2f1ed4232be223b49ca4939874a8f26036fc26c37dfe193f13cc1821307b3b2ba518c39d487f7e32dc708b
+  data.tar.gz: d15b3f54fd67cdd8bc0677a6040e594ade6c7455756709a8c6d933e7231d97a543e7c4884764c271b3a501e0467c271c564d814e3226ae1defc327c96ee6aefc

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

@@ -26,7 +26,6 @@
 @import "components/contextual-guidance";
 @import "components/contextual-sidebar";
 @import "components/cookie-banner";
-@import "components/copy-to-clipboard";
 @import "components/cross-service-header";
 @import "components/date-input";
 @import "components/details";

data/app/controllers/govuk_publishing_components/component_guide_controller.rb

@@ -35,6 +35,21 @@ module GovukPublishingComponents
     def preview
       @component_examples = []
       @component_doc = component_docs.get(params[:component])
+
+      @all_components = true if params[:all_components] == "true"
+      @all_gem_component_docs = []
+      @all_app_component_docs = []
+      if @all_components
+        @component_gem_path = Gem.loaded_specs["govuk_publishing_components"].full_gem_path
+
+        # Remove components without CSS, and the current component. The current component is excluded as the view will handle rendering its CSS.
+        @all_gem_component_docs = gem_component_docs.all.reject { |component| !component_has_sass_file(component.id.gsub("_", "-")) || component.id == @component_doc.id }
+        @all_app_component_docs = component_docs.all.reject { |component| !app_component_has_sass_file(component.id.gsub("_", "-")) || component.id == @component_doc.id }
+
+        @current_component_id = @component_doc.id.gsub("_", "-")
+        @render_component_first = params[:render_component_first] == "true" unless !component_has_sass_file(@current_component_id) && !app_component_has_sass_file(@current_component_id)
+      end
+
       @preview = true
 
       if params[:example].present?
@@ -42,6 +57,9 @@ module GovukPublishingComponents
       else
         @component_examples = @component_doc.examples
       end
+
+      @percy = true if params[:percy] == "true"
+      @preview_title = preview_title(@component_doc, @component_examples, @all_components, @render_component_first, @percy)
     end
 
     def components_in_use_sass
@@ -136,6 +154,10 @@ module GovukPublishingComponents
       extra_components.flatten.uniq.sort
     end
 
+    def app_component_has_sass_file(component)
+      Pathname.new(Rails.root + "app/assets/stylesheets/components/_#{component}.scss").exist?
+    end
+
     def component_has_sass_file(component)
       Pathname.new(@component_gem_path + "/app/assets/stylesheets/govuk_publishing_components/components/_#{component}.scss").exist?
     end
@@ -168,5 +190,27 @@ module GovukPublishingComponents
         h[:url] = component_doc_path(component_doc.id) if component_example
       end
     end
+
+    def preview_title(component, component_examples, all_components, render_component_first, percy)
+      title = [component.name]
+
+      if component_examples.length == 1 && !percy
+        title[0] << ": #{component_examples.first.name} preview"
+      end
+
+      if all_components
+        title << "+ every component's CSS file"
+
+        title << if render_component_first
+                   "- component rendering first"
+                 else
+                   "- component rendering last"
+                 end
+      end
+
+      title << "- #{GovukPublishingComponents::Config.component_guide_title}" unless percy
+
+      title.join(" ")
+    end
   end
 end

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

@@ -1,4 +1,20 @@
-<% content_for :application_stylesheet do %>
+<% content_for :application_stylesheet do
+  if @all_components
+    # If rendering the component CSS first, do it explicitly here. If not, the component partial render will handle the CSS import.
+    if @render_component_first
+      if @component_doc.source == "application"
+        add_app_component_stylesheet(@current_component_id)
+      else
+        add_gem_component_stylesheet(@current_component_id)
+      end
+    end
+    @all_gem_component_docs.each do |component|
+      add_gem_component_stylesheet(component.id.gsub("_", "-"))
+    end
+    @all_app_component_docs.each do |component|
+      add_app_component_stylesheet(component.id.gsub("_", "-"))
+    end
+  end %>
   <% if @component_doc.source == "application" && application_stylesheet_in_use? %>
     <%= render "application_stylesheet" %>
   <% end %>

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

@@ -26,15 +26,7 @@
 <html lang="en" class="<%= "govuk-template" unless @preview %> govuk-template--rebranded">
   <head>
     <meta charset="utf-8">
-    <title>
-      <% if @preview %>
-        <%= @component_doc.name %><% if @component_examples.length == 1 %>:
-          <%= @component_examples.first.name %>
-        <% end %>
-        preview -
-      <% end %>
-      <%= yield :title %><% if content_for(:title) %> - <% end %><%= GovukPublishingComponents::Config.component_guide_title %>
-    </title>
+    <title><% if @preview %><%= @preview_title %><% else %><%= yield :title %><% if content_for(:title) %> - <% end %><%= GovukPublishingComponents::Config.component_guide_title %><% end %></title>
     <meta name="robots" content="noindex,nofollow,noimageindex">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <%= csrf_meta_tags %>

data/lib/govuk_publishing_components/config.rb

@@ -37,12 +37,10 @@ module GovukPublishingComponents
 
     def self.all_stylesheets
       stylesheets = Dir.glob("#{gem_directory}/app/assets/stylesheets/govuk_publishing_components/components/*.scss")
-      # _copy-to-clipboard.css is removed due to being an empty stylesheet
-      included_files = stylesheets.reject { |path| path.include?("copy-to-clipboard") }
 
       application_stylesheet_hash = { "#{gem_directory}/app/assets/stylesheets/component_guide/application.scss" => "component_guide/application.css" }
 
-      included_files.each_with_object(application_stylesheet_hash) do |path, hsh|
+      stylesheets.each_with_object(application_stylesheet_hash) do |path, hsh|
         hsh[path] = "govuk_publishing_components/components/#{File.basename(path, '.*')}.css"
       end
     end

data/lib/govuk_publishing_components/presenters/component_wrapper_helper.rb

@@ -183,7 +183,7 @@ module GovukPublishingComponents
       def check_lang_is_valid(lang)
         return if lang.blank?
 
-        langs = %w[ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh zh-Hans zh-Hant cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl gd gv ka de el kl gn gu ht ha he hz hi ho hu is io ig id in ia ie iu ik ga it ja jv kl kn kr ks kk km ki rw rn ky kv kg ko ku kj lo la lv li ln lt lu lg lb gv mk mg ms ml mt mi mr mh mo mn na nv ng nd ne no nb nn ii oc oj cu or om os pi ps fa pl pt pa qu rm ro ru se sm sg sa sr sh st tn sn ii sd si ss sk sl so nr es su sw ss sv tl ty tg ta tt te th bo ti to ts tr tk tw ug uk ur uz ve vi vo wa cy wo fy xh yi ji yo za zu]
+        langs = %w[ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh zh-Hans zh-Hant zh-tw cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl gd gv ka de el kl gn gu ht ha he hz hi ho hu is io ig id in ia ie iu ik ga it ja jv kl kn kr ks kk km ki rw rn ky kv kg ko ku kj lo la lv li ln lt lu lg lb gv mk mg ms ml mt mi mr mh mo mn na nv ng nd ne no nb nn ii oc oj cu or om os pi ps fa pl pt pa pa-pk qu rm ro ru se sm sg sa sr sh st tn sn ii sd si ss sk sl so nr es su sw ss sv tl ty tg ta tt te th bo ti to ts tr tk tw ug uk ur uz ve vi vo wa cy wo fy xh yi ji yo za zu]
         unless langs.include? lang
           raise(ArgumentError, "lang attribute (#{lang}) is not recognised")
         end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "61.2.0".freeze
+  VERSION = "61.3.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 61.2.0
+  version: 61.3.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -561,7 +561,6 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/_contextual-guidance.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_contextual-sidebar.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss
-- app/assets/stylesheets/govuk_publishing_components/components/_copy-to-clipboard.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_cross-service-header.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_date-input.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_details.scss

data/app/assets/stylesheets/govuk_publishing_components/components/_copy-to-clipboard.scss

@@ -1 +0,0 @@
-// No styles, this component just uses subcomponents