govuk_publishing_components 21.23.1 → 21.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 528cf797ecd8f1a2d4603964f6c30cab2363d8766f9aea9788a1d7291babb91a
-  data.tar.gz: 6c1677759f22c12e8fd9627d3a29e36a06b3905295c38d6b86c90a0bf89e2db1
+  metadata.gz: 852f3e158e84b94b02db8e065964955db1e252c11fb8e90db04284e56a998a12
+  data.tar.gz: 187b7946e006dd1b84b0e949736d32f286be107d2ee182766abbac45a75fc623
 SHA512:
-  metadata.gz: 51bb0f8fd36671cb908211d47b80763123d9394858086802f18291c63891c831389e87ffc7661ce929c9f2bc3376ca146eb0ac375271abeea45d83833ac3727b
-  data.tar.gz: ac3d69fcaee7f858de8558816a4090384e693135d505c6016d375b37729a68a5df62593ef28dc1e19adf48b8a285d41fa89af505b32a405f36d023a14795595c
+  metadata.gz: f83735ddd15083e567d8ff030fc0bf9fe933b929fa265bc7c76637a880000d4f1ac24a5c724728e64be55f5cca61debc9134bc132bb2a2542ec375e533c71170
+  data.tar.gz: 8e1af044ebd75237948275b713ba1276e54b09a1303adc8f6ac48f88414e50b2ed59a8d9ff77825f21d06a0b1a0d5ce641d46cc18b249c6c704ac8a86f5e9c27

data/app/assets/stylesheets/govuk_publishing_components/components/_back-link.scss

@@ -1 +1,38 @@
 @import "govuk/components/back-link/back-link";
+
+.govuk-back-link {
+  &[href] {
+    text-decoration: underline;
+    border-bottom: 1px solid transparent;
+
+    &:focus {
+      text-decoration: none;
+    }
+  }
+
+  &:before {
+    content: "";
+    display: block;
+    position: absolute;
+    top: 0;
+    bottom: 1px;
+    left: 3px;
+    width: 7px;
+    height: 7px;
+    -webkit-transform: rotate(225deg);
+    -ms-transform: rotate(225deg);
+    transform: rotate(225deg);
+    border: solid;
+    border-width: 1px 1px 0 0;
+    clip-path: inherit;
+  }
+}
+
+.govuk-back-link::after {
+  content: "";
+  position: absolute;
+  top: -14px;
+  right: 0;
+  left: 0;
+  bottom: -14px;
+}

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

@@ -2,7 +2,7 @@
   breadcrumbs ||= []
   inverse ||= false
   invert_class = inverse ? "gem-c-breadcrumbs--inverse" : ""
-  breadcrumb_presenter = GovukPublishingComponents::Presenters::Breadcrumbs.new(breadcrumbs, request.path)
+  breadcrumb_presenter = GovukPublishingComponents::Presenters::Breadcrumbs.new(breadcrumbs)
 %>
 
 <script type="application/ld+json">

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

@@ -4,6 +4,7 @@
 
   label ||= nil
   heading ||= nil
+  heading_caption ||= nil
   small ||= false
   inline ||= false
   is_page_heading ||= false
@@ -39,6 +40,7 @@
     <% if heading.present? %>
       <% if is_page_heading %>
         <%= tag.legend class: "govuk-fieldset__legend govuk-fieldset__legend--xl gem-c-title" do %>
+          <%= tag.span(heading_caption, class: "govuk-caption-xl") if heading_caption.present? %>
           <%= tag.h1 heading, class: "gem-c-title__text" %>
         <% end %>
       <% else %>

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

@@ -6,7 +6,7 @@
     { title: "Home", url: "/" },
     { title: title, url: path }
   ]
-  breadcrumb_presenter = GovukPublishingComponents::Presenters::Breadcrumbs.new(breadcrumbs, request.path)
+  breadcrumb_presenter = GovukPublishingComponents::Presenters::Breadcrumbs.new(breadcrumbs)
 %>
 <% if title %>
   <script type="application/ld+json">

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

@@ -3,6 +3,8 @@ description: "Navigational breadcrumbs, showing page hierarchy"
 body: |
   Accepts an array of breadcrumb objects. Each crumb must have a title and a URL.
   Links have tracking data but links to the homepage (any link with a url of "/") will be tracked separately as `homeLinkClicked`
+
+  Note: Only the first and last (or parent) item in the breadcrumb will be displayed when the page width is less than the "tablet" govuk-breakpoint.
 shared_accessibility_criteria:
   - link
 accessibility_criteria:
@@ -28,7 +30,6 @@ examples:
       - title: 'Sub-section'
         url: '/section/sub-section'
         title: 'Education of disadvantaged children'
-        is_current_page: true
       inverse: true
     context:
       dark_background: true
@@ -67,26 +68,8 @@ examples:
         url: '/browse/abroad'
       - title: 'Travel abroad'
         url: '/browse/abroad/travel-abroad'
-  last_breadcrumb_is_current_page:
-    data:
-      breadcrumbs:
-      - title: 'Home'
-        url: '/'
-      - title: 'Passports, travel and living abroad'
-        url: '/browse/abroad'
-      - title: 'Travel abroad'
-  highlight_current_page:
-    description: This is currently used on pages tagged to the taxonomy, such as [on this page](https://www.gov.uk/guidance/pupil-premium-information-for-schools-and-alternative-provision-settings).
-    data:
-      breadcrumbs:
-      - title: 'Home'
-        url: '/'
-      - title: 'Education, training and skills'
-        url: '/education'
-      - title: 'Education of disadvantaged children'
-        is_current_page: true
-  collapse_on_mobile:
-    description: This is currently used within on pages tagged to the taxonomy, such as [on this page](https://www.gov.uk/guidance/pupil-premium-information-for-schools-and-alternative-provision-settings).
+  long_taxon_on_mobile:
+    description: This is an example of a breadcrumb (specifically for mobile) with long taxons on the the parent item and a greater touch target area
     data:
       collapse_on_mobile: true
       breadcrumbs:
@@ -94,5 +77,5 @@ examples:
         url: '/'
       - title: 'Education, training and skills'
         url: '/education'
-        is_page_parent: true
-      - title: 'Education of disadvantaged children'
+      - title: 'Education of disadvantaged children appended with some extra long content to make this a very very very very long taxon'
+        url: '/education'

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

@@ -106,6 +106,23 @@ examples:
           value: "green"
         - label: "Blue"
           value: "blue"
+  with_page_header_and_caption:
+    description: |
+      If a caption text is provided with a page heading, it will be displayed above the heading.
+      A caption can only be used with a page heading. If a heading is not provided the caption will not render.
+      The pattern is used across GOV.UK to show a high-level section that this page question falls into.
+    data:
+      name: "favourite_skittle"
+      heading: "Choose your favourite skittles"
+      heading_caption: "Question 3 of 9"
+      is_page_heading: true
+      items:
+        - label: "Red"
+          value: "red"
+        - label: "Green"
+          value: "green"
+        - label: "Blue"
+          value: "blue"
   without_hint_text:
     description: Hint text can be removed entirely with this option. Note that this option can be combined with the visually_hide_heading option.
     data:

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

@@ -108,6 +108,21 @@ examples:
         text: "Yes"
       - value: "no"
         text: "No"
+  with_page_header_and_caption:
+    description: |
+      If a caption text is provided with a page heading, it will be displayed above the heading.
+      A caption can only be used with a page heading. If a heading is not provided the caption will not render.
+      The pattern is used across GOV.UK to show a high-level section that this page question falls into.
+    data:
+      name: "radio-group-heading"
+      heading: "Is it snowing?"
+      heading_caption: "Question 3 of 9"
+      is_page_heading: true
+      items:
+        - value: "yes"
+          text: "Yes"
+        - value: "no"
+          text: "No"
   with_page_heading_and_hint:
     data:
       name: "radio-group-heading"
@@ -179,7 +194,6 @@ examples:
         text: "Green"
       - value: "blue"
         text: "Blue"
-
   with_hint_text_on_radios:
     data:
       name: "radio-group-hint-text"

data/lib/govuk_publishing_components/presenters/breadcrumbs.rb

@@ -1,9 +1,8 @@
 module GovukPublishingComponents
   module Presenters
     class Breadcrumbs
-      def initialize(breadcrumbs, request_path)
+      def initialize(breadcrumbs)
         @breadcrumbs = breadcrumbs
-        @request_path = request_path
       end
 
       def structured_data
@@ -16,12 +15,12 @@ module GovukPublishingComponents
 
     private
 
-      attr_reader :breadcrumbs, :request_path
+      attr_reader :breadcrumbs
 
       def item_list_element
         breadcrumbs.each_with_index.map { |crumb, index| Breadcrumb.new(crumb, index) }.
           select(&:is_link?).
-          map { |breadcrumb| breadcrumb.item_list_element(@request_path) }
+          map(&:item_list_element)
       end
     end
 
@@ -34,24 +33,24 @@ module GovukPublishingComponents
         @index = index + 1
       end
 
-      def item_list_element(request_path)
+      def item_list_element
         {
           "@type" => "ListItem",
           "position" => index,
-          "item" => list_item_item(request_path)
+          "item" => list_item_item
         }
       end
 
       def is_link?
-        crumb[:url].present? || crumb[:is_current_page]
+        crumb[:url].present?
       end
 
       def path
-        crumb[:is_current_page] ? '#content' : crumb[:url]
+        crumb[:url]
       end
 
       def aria_current
-        crumb[:is_current_page] ? 'page' : 'false'
+        'false'
       end
 
       def tracking_data(breadcrumbs_length)
@@ -81,8 +80,8 @@ module GovukPublishingComponents
 
       attr_reader :crumb, :index
 
-      def list_item_item(request_path)
-        path = crumb[:is_current_page] ? request_path : crumb[:url]
+      def list_item_item
+        path = crumb[:url]
         item = { "name" => crumb[:title] }
         item["@id"] = Plek.new.website_root + path if path
         item

data/lib/govuk_publishing_components/presenters/checkboxes_helper.rb

@@ -4,7 +4,8 @@ module GovukPublishingComponents
       include ActionView::Helpers
       include ActionView::Context
 
-      attr_reader :items, :name, :css_classes, :list_classes, :error, :has_conditional, :has_nested, :id, :hint_text, :description, :heading_size
+      attr_reader :items, :name, :css_classes, :list_classes, :error, :has_conditional,
+                  :has_nested, :id, :hint_text, :description, :heading_size, :heading_caption
 
       def initialize(options)
         @items = options[:items] || []
@@ -24,6 +25,7 @@ module GovukPublishingComponents
         @heading = options[:heading] || nil
         @heading_size = options[:heading_size]
         @heading_size = 'm' unless %w(s m l xl).include?(@heading_size)
+        @heading_caption = options[:heading_caption] || nil
         @is_page_heading = options[:is_page_heading]
         @description = options[:description] || nil
         @no_hint_text = options[:no_hint_text]
@@ -54,7 +56,8 @@ module GovukPublishingComponents
             :legend,
             class: "govuk-fieldset__legend govuk-fieldset__legend--xl gem-c-title"
           ) do
-            content_tag(:h1, @heading, class: "gem-c-title__text")
+            concat content_tag(:span, heading_caption, class: "govuk-caption-xl") if heading_caption.present?
+            concat content_tag(:h1, @heading, class: "gem-c-title__text")
           end
         else
           classes = %w(govuk-fieldset__legend)

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '21.23.1'.freeze
+  VERSION = '21.24.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 21.23.1
+  version: 21.24.0
 platform: ruby
 authors:
 - GOV.UK Dev