govuk_publishing_components 21.50.0 → 21.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 159d020ba82914af6816875f569ef650b3bde9b0a3573048c576cdd2e3b0d864
-  data.tar.gz: 777fcff7c030364ae8018fee71e746c24ab1b60aaa4a08bc7a1665ffe704086e
+  metadata.gz: 9b75297c083a34e5136622cab23b3e1b393318cf789a15ba9c5deca7d96a4115
+  data.tar.gz: 6cf830ee77d6f2126b007ed24a55e905d42884b80cac984d29bd900b1d1dbb3f
 SHA512:
-  metadata.gz: cf14fda6410001b1c39da5fc1e878ad6865cf0ba4d13110b1af3ea0c9bf2745ff949ab7ade06cf12449e34a3855108d655e92b5b32ce42e5dd78b2a5f94a0692
-  data.tar.gz: 7e8af37602ddc795cba2d4f5c2c81888169bd9a0919ec9c5c16db2c1fd298aa6a0a62b331ce5579ae6afee9069af07c793a2d58a473b853dc0325b55c3a4caa4
+  metadata.gz: 365054c463d00d090f45861e6ce505a99c97b39e477759d94e1595254024c68bebaa02c329ec50b2635712d8a4fb7e1de34b17439473ee2136a0993a51fcdf97
+  data.tar.gz: f4a3fc8fc08f9e3e10840bcb8ef0bde1c94da69ef388ee6b5cf2be405ce4424bd35315a300c3e640af310a76e3c666c6ad2213bcfe9eaa47a084c9a1e314f6bf

data/app/assets/javascripts/govuk_publishing_components/all_components.js

@@ -1,6 +1,4 @@
 // = require_tree ./lib
 // = require_tree ./components
-// = require govuk/all.js
 
-// Initialise all GOVUKFrontend components
-window.GOVUKFrontend.initAll()
+window.GOVUKFrontend.initAll = function () {}

data/app/assets/javascripts/govuk_publishing_components/components/accordion.js

@@ -1,2 +1,5 @@
 // This component relies on JavaScript from GOV.UK Frontend
 // = require govuk/components/accordion/accordion.js
+window.GOVUK = window.GOVUK || {}
+window.GOVUK.Modules = window.GOVUK.Modules || {}
+window.GOVUK.Modules.Accordion = window.GOVUKFrontend

data/app/assets/javascripts/govuk_publishing_components/components/button.js

@@ -0,0 +1,5 @@
+// This component relies on JavaScript from GOV.UK Frontend
+// = require govuk/components/button/button.js
+window.GOVUK = window.GOVUK || {}
+window.GOVUK.Modules = window.GOVUK.Modules || {}
+window.GOVUK.Modules.Button = window.GOVUKFrontend

data/app/assets/javascripts/govuk_publishing_components/components/character-count.js

@@ -1,2 +1,5 @@
 // This component relies on JavaScript from GOV.UK Frontend
 // = require govuk/components/character-count/character-count.js
+window.GOVUK = window.GOVUK || {}
+window.GOVUK.Modules = window.GOVUK.Modules || {}
+window.GOVUK.Modules.CharacterCount = window.GOVUKFrontend

data/app/assets/javascripts/govuk_publishing_components/components/checkboxes.js

@@ -1,7 +1,8 @@
 /* eslint-env jquery */
 // = require govuk/components/checkboxes/checkboxes.js
 window.GOVUK = window.GOVUK || {}
-window.GOVUK.Modules = window.GOVUK.Modules || {};
+window.GOVUK.Modules = window.GOVUK.Modules || {}
+window.GOVUK.Modules.Checkboxes = window.GOVUKFrontend;
 
 (function (Modules) {
   'use strict'

data/app/assets/javascripts/govuk_publishing_components/components/error-summary.js

@@ -1,2 +1,5 @@
 // This component relies on JavaScript from GOV.UK Frontend
 // = require govuk/components/error-summary/error-summary.js
+window.GOVUK = window.GOVUK || {}
+window.GOVUK.Modules = window.GOVUK.Modules || {}
+window.GOVUK.Modules.ErrorSummary = window.GOVUKFrontend

data/app/assets/javascripts/govuk_publishing_components/components/header.js

@@ -0,0 +1,5 @@
+// This component relies on JavaScript from GOV.UK Frontend
+// = require govuk/components/header/header.js
+window.GOVUK = window.GOVUK || {}
+window.GOVUK.Modules = window.GOVUK.Modules || {}
+window.GOVUK.Modules.Header = window.GOVUKFrontend

data/app/assets/javascripts/govuk_publishing_components/components/radio.js

@@ -1,2 +1,5 @@
 // This component relies on JavaScript from GOV.UK Frontend
 // = require govuk/components/radios/radios.js
+window.GOVUK = window.GOVUK || {}
+window.GOVUK.Modules = window.GOVUK.Modules || {}
+window.GOVUK.Modules.Radios = window.GOVUKFrontend

data/app/assets/javascripts/govuk_publishing_components/components/tabs.js

@@ -0,0 +1,5 @@
+// This component relies on JavaScript from GOV.UK Frontend
+// = require govuk/components/tabs/tabs.js
+window.GOVUK = window.GOVUK || {}
+window.GOVUK.Modules = window.GOVUK.Modules || {}
+window.GOVUK.Modules.Tabs = window.GOVUKFrontend

data/app/assets/javascripts/govuk_publishing_components/lib.js

@@ -0,0 +1 @@
+// = require_tree ./lib

data/app/assets/javascripts/govuk_publishing_components/modules.js

@@ -28,13 +28,25 @@
       for (var i = 0, l = modules.length; i < l; i++) {
         var module
         var element = $(modules[i])
-        var type = camelCaseAndCapitalise(element.data('module'))
+        var moduleName = camelCaseAndCapitalise(element.data('module'))
         var started = element.data('module-started')
+        var frontendModuleName = moduleName.replace('Govuk', '')
 
-        if (typeof GOVUK.Modules[type] === 'function' && !started) {
-          module = new GOVUK.Modules[type]()
+        if ( // GOV.UK Publishing & Legacy Modules
+          typeof GOVUK.Modules[moduleName] === 'function' &&
+          !GOVUK.Modules[moduleName].prototype.init &&
+          !started
+        ) {
+          module = new GOVUK.Modules[moduleName]()
           module.start(element)
           element.data('module-started', true)
+        } else if ( // GOV.UK Frontend Modules
+          typeof GOVUK.Modules[frontendModuleName] === 'function' &&
+          GOVUK.Modules[frontendModuleName].prototype.init &&
+          !started
+        ) {
+          module = new GOVUK.Modules[frontendModuleName](element[0]).init()
+          element.data('module-started', true)
         }
       }
 

data/app/assets/stylesheets/component_guide/application.scss

@@ -1,12 +1,5 @@
 // This file contains the styles for the Component Guide.
 
-@import "govuk_publishing_components/components/helpers/govuk-frontend-settings";
-@import "govuk_publishing_components/components/helpers/markdown-typography";
-@import "govuk/settings/all";
-@import "govuk/tools/all";
-@import "govuk/helpers/all";
-@import "govuk/core/all";
-
 @import "govuk_publishing_components/all_components";
 
 $gem-guide-border-width: 1px;

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

@@ -1,20 +1,11 @@
 // This is the file that the application needs to include in order to use
 // the components.
 
-// Include all of the GOV.UK Frontend styles. This includes fonts, and individual components.
+@import "govuk_publishing_components/govuk_frontend_support";
+@import "govuk_publishing_components/component_support";
 
-@import "components/helpers/govuk-frontend-settings";
-
-// Include common imports used by many components
-@import "govuk/all";
-
-@import "components/helpers/variables";
-@import "components/helpers/brand-colours";
-@import "components/mixins/govuk-template-link-focus-override";
-@import "components/mixins/media-down";
-@import "components/mixins/margins";
-@import "components/mixins/clearfix";
-@import "components/mixins/css3";
+// Include all govuk frontend components
+@import "govuk/components/all";
 
 // components
 @import "components/accordion";

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

@@ -20,6 +20,11 @@
   }
 }
 
+.gem-c-action-link__contents-wrapper {
+  display: table-cell;
+  vertical-align: middle;
+}
+
 .gem-c-action-link__link-wrapper {
   @include govuk-font(19, $weight: bold, $line-height: 1.3);
   display: table-cell;
@@ -89,7 +94,7 @@
     background-image: image-url("govuk_publishing_components/action-link-arrow--simple.svg");
     // sass-lint:enable no-duplicate-properties
     background-size: 25px auto;
-    background-position: 0 0;
+    background-position: 0 2px;
   }
 
   .gem-c-action-link__link {
@@ -112,7 +117,7 @@
     background-image: image-url("govuk_publishing_components/action-link-arrow--dark.svg");
     // sass-lint:enable no-duplicate-properties
     background-size: 25px auto;
-    background-position: 0 0;
+    background-position: 0 2px;
   }
 
   .gem-c-action-link__link {

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

@@ -31,22 +31,31 @@
   }
 }
 
+.gem-c-input__prefix,
 .gem-c-input__suffix {
   @include govuk-font($size: 19);
 
   background-color: govuk-colour("light-grey", $legacy: "grey-3");
   border: $govuk-border-width-form-element solid $govuk-input-border-colour;
-  border-left: 0;
   box-sizing: border-box;
   cursor: default; // emphasise non-editable status of prefixes and suffixes
   display: inline-block;
-  flex: 0 0 0;
-  padding: govuk-spacing(1);
   white-space: nowrap;
   width: auto;
+  text-align: center;
   height: 40px;
+  padding: govuk-spacing(1);
+  min-width: 40px;
   @if $govuk-typography-use-rem {
-    height: govuk-px-to-rem(40px);
+    min-width: govuk-px-to-rem(40px);
   }
   margin-top: 0;
 }
+
+.gem-c-input__prefix {
+  border-right: 0;
+}
+
+.gem-c-input__suffix {
+  border-left: 0;
+}

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

@@ -10,7 +10,7 @@
     margin-left: 0;
     padding: .75em 0 .75em 2.5em;
 
-    @for $i from 1 through 14 {
+    @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-repeat: no-repeat;

data/app/assets/stylesheets/govuk_publishing_components/components/helpers/_brand-colours.scss

@@ -1,6 +1,3 @@
-@import "govuk/settings/colours-organisations";
-@import "govuk/helpers/colour";
-
 @mixin organisation-brand-colour {
   @each $organisation in map-keys($govuk-colours-organisations) {
     .brand--#{$organisation} {

data/app/controllers/govuk_publishing_components/component_guide_controller.rb

@@ -10,6 +10,7 @@ module GovukPublishingComponents
       @components_in_use_docs = components_in_use_docs.used_in_this_app
       @components_in_use_sass = components_in_use_sass(false)
       @components_in_use_print_sass = components_in_use_sass(true)
+      @components_in_use_js = components_in_use_js
     end
 
     def show
@@ -62,6 +63,25 @@ module GovukPublishingComponents
       }.compact.uniq.sort.join("\n").squeeze("\n").prepend(additional_files)
     end
 
+    def components_in_use_js
+      additional_files = "//= require govuk_publishing_components/lib\n"
+
+      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|
+        "//= require govuk_publishing_components/components/#{component.gsub('_', '-')}" if component_has_js_file(component.gsub("_", "-"))
+      }.compact.uniq.sort.join("\n").squeeze("\n").prepend(additional_files)
+    end
+
   private
 
     def component_docs
@@ -95,6 +115,10 @@ module GovukPublishingComponents
       Pathname.new(@component_gem_path + "/app/assets/stylesheets/govuk_publishing_components/components/#{print_path}_#{component}.scss").exist?
     end
 
+    def component_has_js_file(component)
+      Pathname.new(@component_gem_path + "/app/assets/javascripts/govuk_publishing_components/components/#{component}.js").exist?
+    end
+
     def components_within_component(component)
       data = File.read(@component_gem_path + "/app/views/govuk_publishing_components/components/_#{component}.html.erb")
       match = data.scan(/(govuk_publishing_components\/components\/[a-z_-]+)/)

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

@@ -20,7 +20,7 @@
   <h2 class="component-doc-h2">Gem components used by this app (<%= @components_in_use_docs.length %>)</h2>
 
   <%= render "govuk_publishing_components/components/details", {
-    title: "Suggested Sass for this application"
+    title: "Suggested imports for this application"
   } do %>
     <%= render "govuk_publishing_components/components/textarea", {
       label: {
@@ -36,6 +36,13 @@
       name: "print-sass",
       value: @components_in_use_print_sass
     } %>
+    <%= render "govuk_publishing_components/components/textarea", {
+      label: {
+        text: "Add this to your application's main js file, before your other local imports."
+      },
+      name: "main-js",
+      value: @components_in_use_js
+    } %>
   <% end %>
 <pre>
 

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

@@ -24,16 +24,24 @@
 %>
 <% if href.present? && text.present? %>
   <div class="<%= css_classes.join(' ') %>">
-    <span class="gem-c-action-link__link-wrapper">
-      <%= link_to  href, :class => link_classes, :data => data do %>
-        <%= text %>
-        <%= content_tag(:span, nowrap_text, class: "gem-c-action-link__nowrap-text") if nowrap_text %>
+    <% contents = capture do %>
+      <span class="gem-c-action-link__link-wrapper">
+        <%= link_to  href, :class => link_classes, :data => data do %>
+          <%= text %>
+          <%= content_tag(:span, nowrap_text, class: "gem-c-action-link__nowrap-text") if nowrap_text %>
+        <% end %>
+      </span>
+      <% if subtext %>
+        <span class="gem-c-action-link__subtext-wrapper">
+          <%= content_tag(:span, subtext, class: "gem-c-action-link__subtext") %>
+        </span>
       <% end %>
-    </span>
+    <% end %>
+
     <% if subtext %>
-      <span class="gem-c-action-link__subtext-wrapper">
-        <%= content_tag(:span, subtext, class: "gem-c-action-link__subtext") %>
-      </span>
+      <%= content_tag(:span, contents, class: "gem-c-action-link__contents-wrapper") %>
+    <% else %>
+      <%= contents %>
     <% end %>
   </div>
 <% end %>

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

@@ -1,47 +1,16 @@
-<% navigation = GovukPublishingComponents::Presenters::ContextualNavigation.new(content_item, request) %>
 <% prioritise_taxon_breadcrumbs ||= false %>
+<% breadcrumb_selector = GovukPublishingComponents::Presenters::BreadcrumbSelector.call(content_item, request, prioritise_taxon_breadcrumbs) %>
 <% inverse ||= false %>
 <% collapse_on_mobile ||= true unless local_assigns[:collapse_on_mobile].eql?(false) %>
 
 <div class='gem-c-contextual-breadcrumbs'>
-
-  <% if navigation.priority_taxon %>
-    <%= render 'govuk_publishing_components/components/step_by_step_nav_header',
-      {
-        title: navigation.priority_taxon['title'],
-        path: navigation.priority_taxon['base_path']
-      }
-    %>
-  <% elsif navigation.content_tagged_to_current_step_by_step? %>
-    <%# Rendering step by step nav breadcrumbs because there's 1 step by step %>
+  <% if breadcrumb_selector[:step_by_step] %>
     <%= render 'govuk_publishing_components/components/step_by_step_nav_header',
-      navigation.step_nav_helper.header %>
-  <% elsif navigation.content_tagged_to_a_finder? %>
-    <%# Rendering finder breadcrumbs because the page is tagged to a finder %>
-    <%= render 'govuk_publishing_components/components/breadcrumbs', breadcrumbs: navigation.breadcrumbs, inverse: inverse, collapse_on_mobile: collapse_on_mobile %>
-  <% elsif navigation.content_is_tagged_to_a_live_taxon? && prioritise_taxon_breadcrumbs %>
-    <%# Rendering taxonomy breadcrumbs because the page is tagged to live taxons
-          and we want to prioritise them over all other breadcrumbs %>
+               breadcrumb_selector[:breadcrumbs] %>
+  <% elsif breadcrumb_selector[:breadcrumbs] %>
     <%= render 'govuk_publishing_components/components/breadcrumbs',
-               breadcrumbs: navigation.taxon_breadcrumbs[:breadcrumbs],
+               breadcrumbs: breadcrumb_selector[:breadcrumbs],
                inverse: inverse,
                collapse_on_mobile: collapse_on_mobile %>
-  <% elsif navigation.content_tagged_to_mainstream_browse_pages? %>
-    <%# Rendering parent-based breadcrumbs because the page is tagged to mainstream browse %>
-    <%= render 'govuk_publishing_components/components/breadcrumbs', breadcrumbs: navigation.breadcrumbs, inverse: inverse, collapse_on_mobile: collapse_on_mobile %>
-  <% elsif navigation.content_has_curated_related_items? %>
-    <%# Rendering parent-based breadcrumbs because the page has curated related links %>
-    <%= render 'govuk_publishing_components/components/breadcrumbs', breadcrumbs: navigation.breadcrumbs, inverse: inverse, collapse_on_mobile: collapse_on_mobile %>
-  <% elsif navigation.content_is_tagged_to_a_live_taxon? && !navigation.content_is_a_specialist_document? %>
-    <%# Rendering taxonomy breadcrumbs because the page is tagged to live taxons %>
-    <%= render 'govuk_publishing_components/components/breadcrumbs',
-      breadcrumbs: navigation.taxon_breadcrumbs[:breadcrumbs],
-      inverse: inverse,
-      collapse_on_mobile: collapse_on_mobile %>
-  <% elsif navigation.breadcrumbs.any? %>
-    <%# Rendering parent-based breadcrumbs because no browse, no related links, no live taxons %>
-    <%= render 'govuk_publishing_components/components/breadcrumbs', breadcrumbs: navigation.breadcrumbs, inverse: inverse, collapse_on_mobile: collapse_on_mobile %>
-  <% else %>
-    <%# Not rendering any breadcrumbs because there aren't any %>
   <% end %>
 </div>

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

@@ -22,6 +22,7 @@
   error_id = "error-#{SecureRandom.hex(4)}"
   search_icon ||= nil
   heading_size = false unless ['s', 'm', 'l', 'xl'].include?(heading_size)
+  prefix ||= nil
   suffix ||= nil
 
   css_classes = %w(gem-c-input govuk-input)
@@ -92,7 +93,17 @@
     }
   %>
 
-  <% if suffix %>
+  <% if prefix && suffix %>
+    <%= tag.div class: "gem-c-input__wrapper" do %>
+      <%= tag.span prefix, class: "gem-c-input__prefix", aria: { hidden: true } %>
+      <%= input_tag %>
+      <%= tag.span suffix, class: "gem-c-input__suffix", aria: { hidden: true } %>
+    <% end %>
+  <% elsif prefix %>
+    <%= tag.div class: "gem-c-input__wrapper" do %>
+      <%= tag.span prefix, class: "gem-c-input__prefix", aria: { hidden: true } %><%= input_tag %>
+    <% end %>
+  <% elsif suffix %> 
     <%= tag.div class: "gem-c-input__wrapper" do %>
       <%= input_tag %><%= tag.span suffix, class: "gem-c-input__suffix", aria: { hidden: true } %>
     <% end %>

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

@@ -140,6 +140,15 @@ examples:
       name: "lead-times"
       width: 10
       suffix: "days"
+  with_prefix_and_suffix:
+    description: To help users understand how the input should look like. Often used for units of measurement.
+    data:
+      label:
+        text: "Cost per item, in pounds"
+      name: "Cost-per-item"
+      width: 10
+      prefix: "£"
+      suffix: "per item"
   with_suffix_and_error:
     description: To help users understand how the input should look like. Often used for units of measurement.
     data:

data/lib/govuk_publishing_components.rb

@@ -6,6 +6,7 @@ require "govuk_publishing_components/engine"
 require "govuk_publishing_components/presenters/shared_helper"
 require "govuk_publishing_components/presenters/attachment"
 require "govuk_publishing_components/presenters/breadcrumbs"
+require "govuk_publishing_components/presenters/breadcrumb_selector"
 require "govuk_publishing_components/presenters/button_helper"
 require "govuk_publishing_components/presenters/contextual_navigation"
 require "govuk_publishing_components/presenters/related_navigation_helper"

data/lib/govuk_publishing_components/presenters/breadcrumb_selector.rb

@@ -0,0 +1,105 @@
+module GovukPublishingComponents
+  module Presenters
+    class BreadcrumbSelector
+      def self.call(*args)
+        new(*args).output
+      end
+
+      attr_reader :content_item, :request, :prioritise_taxon_breadcrumbs
+
+      def initialize(content_item, request, prioritise_taxon_breadcrumbs)
+        @content_item = content_item
+        @request = request
+        @prioritise_taxon_breadcrumbs = prioritise_taxon_breadcrumbs
+      end
+
+      def content_item_navigation
+        @content_item_navigation ||= ContextualNavigation.new(content_item, request)
+      end
+
+      def parent_item_navigation
+        @parent_item_navigation ||= ContextualNavigation.new(parent_item, request)
+      end
+
+      def parent_item
+        @parent_item ||= Services.content_store.content_item(content_item_navigation.parent_api_path)
+      rescue GdsApi::ContentStore::ItemNotFound
+        # Do nothing
+      end
+
+      def parent_item_options
+        @parent_item_options ||= options(parent_item_navigation)
+      end
+
+      def content_item_options
+        @content_item_options ||= options(content_item_navigation)
+      end
+
+      def parent_breadcrumbs
+        breadcrumbs = [parent_item_options[:breadcrumbs]].flatten # to ensure breadcrumbs always an array
+        breadcrumbs.last[:is_page_parent] = false
+        breadcrumbs << {
+          title: parent_item["title"],
+          url: parent_item["base_path"],
+          is_page_parent: true,
+        }
+      end
+
+      def output
+        return content_item_options unless content_item_navigation.html_document_with_parent?
+        return parent_item_options if parent_item_navigation.priority_breadcrumbs
+
+        {
+          step_by_step: parent_item_options[:step_by_step],
+          breadcrumbs: parent_breadcrumbs,
+        }
+      end
+
+      def options(navigation)
+        if navigation.priority_breadcrumbs
+          {
+            step_by_step: true,
+            breadcrumbs: navigation.priority_breadcrumbs,
+          }
+        elsif navigation.content_tagged_to_current_step_by_step?
+          {
+            step_by_step: true,
+            breadcrumbs: navigation.step_nav_helper.header,
+          }
+        elsif navigation.content_tagged_to_a_finder?
+          {
+            step_by_step: false,
+            breadcrumbs: navigation.breadcrumbs,
+          }
+        elsif navigation.content_is_tagged_to_a_live_taxon? && prioritise_taxon_breadcrumbs
+          {
+            step_by_step: false,
+            breadcrumbs: navigation.taxon_breadcrumbs,
+          }
+        elsif navigation.content_tagged_to_mainstream_browse_pages?
+          {
+            step_by_step: false,
+            breadcrumbs: navigation.breadcrumbs,
+          }
+        elsif navigation.content_has_curated_related_items?
+          {
+            step_by_step: false,
+            breadcrumbs: navigation.breadcrumbs,
+          }
+        elsif navigation.use_taxon_breadcrumbs?
+          {
+            step_by_step: false,
+            breadcrumbs: navigation.taxon_breadcrumbs,
+          }
+        elsif navigation.breadcrumbs.any?
+          {
+            step_by_step: false,
+            breadcrumbs: navigation.breadcrumbs,
+          }
+        else
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -11,7 +11,7 @@ module GovukPublishingComponents
 
       # Returns the highest priority taxon that has a content_id matching those in PRIORITY_TAXONS
       def self.call(content_item)
-        new(content_item).taxon
+        new(content_item).breadcrumbs
       end
 
       attr_reader :content_item
@@ -24,19 +24,29 @@ module GovukPublishingComponents
         @taxon ||= priority_taxons.min_by { |t| PRIORITY_TAXONS.values.index(t["content_id"]) }
       end
 
+      def breadcrumbs
+        taxon && { title: taxon["title"], path: taxon["base_path"] }
+      end
+
     private
 
       def priority_taxons
-        taxons = content_item.dig("links", "taxons")&.map do |taxon|
-          taxon.dig("links", "parent_taxons")&.select do |parent_taxon|
-            PRIORITY_TAXONS.values.include?(parent_taxon["content_id"])
-          end
+        return [] unless content_item["links"].is_a?(Hash)
+
+        taxons = content_item.dig("links", "taxons")
+        taxon_tree(taxons).select do |taxon|
+          priority_taxon?(taxon)
         end
-        return [] unless taxons
+      end
+
+      def taxon_tree(taxons)
+        return [] if taxons.blank?
+
+        taxons + taxons.flat_map { |taxon| taxon_tree(taxon.dig("links", "parent_taxons")) }
+      end
 
-        taxons.flatten!
-        taxons.compact!
-        taxons
+      def priority_taxon?(taxon)
+        PRIORITY_TAXONS.values.include?(taxon["content_id"])
       end
     end
   end

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons.rb

@@ -21,9 +21,7 @@ module GovukPublishingComponents
           is_page_parent: ordered_parents.empty?,
         }
 
-        {
-          breadcrumbs: ordered_parents.reverse,
-        }
+        ordered_parents.reverse
       end
 
     private

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -16,32 +16,41 @@ module GovukPublishingComponents
         content_item["document_type"] == "simple_smart_answer"
       end
 
+      def html_document_with_parent?
+        (content_item["document_type"] == "html_publication") && parent_api_path
+      end
+
+      def parent_api_path
+        parent = content_item.dig("links", "parent")&.first
+        parent["base_path"] if parent
+      end
+
       def taxon_breadcrumbs
         @taxon_breadcrumbs ||= ContentBreadcrumbsBasedOnTaxons.new(content_item).breadcrumbs
       end
 
-      def priority_taxon
-        @priority_taxon ||= ContentBreadcrumbsBasedOnPriority.call(content_item)
+      def priority_breadcrumbs
+        @priority_breadcrumbs ||= ContentBreadcrumbsBasedOnPriority.call(content_item)
       end
 
       def breadcrumbs
-        if content_tagged_to_a_finder?
-          parent_finder = content_item.dig("links", "finder", 0)
-          return [] unless parent_finder
-
-          [
-            {
-              title: "Home",
-              url: "/",
-            },
-            {
-              title: parent_finder["title"],
-              url: parent_finder["base_path"],
-            },
-          ]
-        else
-          ContentBreadcrumbsBasedOnParent.new(content_item).breadcrumbs[:breadcrumbs]
-        end
+        return breadcrumbs_based_on_parent unless content_tagged_to_a_finder?
+        return [] unless parent_finder
+
+        [
+          {
+            title: "Home",
+            url: "/",
+          },
+          {
+            title: parent_finder["title"],
+            url: parent_finder["base_path"],
+          },
+        ]
+      end
+
+      def use_taxon_breadcrumbs?
+        content_is_tagged_to_a_live_taxon? && !content_is_a_specialist_document?
       end
 
       def content_tagged_to_a_finder?
@@ -64,6 +73,10 @@ module GovukPublishingComponents
         content_item["schema_name"] == "specialist_document"
       end
 
+      def content_is_a_html_publication?
+        content_item["document_type"] == "html_publication"
+      end
+
       def tagged_to_brexit?
         taxons = content_item.dig("links", "taxons").to_a
         brexit_taxon = "d6c2de5d-ef90-45d1-82d4-5f2438369eea"
@@ -106,9 +119,17 @@ module GovukPublishingComponents
         step_nav_helper.show_also_part_of_step_nav?
       end
 
+      def breadcrumbs_based_on_parent
+        ContentBreadcrumbsBasedOnParent.new(content_item).breadcrumbs[:breadcrumbs]
+      end
+
       def step_nav_helper
         @step_nav_helper ||= PageWithStepByStepNavigation.new(content_item, request_path, query_parameters)
       end
+
+      def parent_finder
+        @parent_finder ||= content_item.dig("links", "finder", 0)
+      end
     end
   end
 end

data/lib/govuk_publishing_components/presenters/machine_readable/faq_page_schema.rb

@@ -58,29 +58,10 @@ module GovukPublishingComponents
         question = page.title
 
         doc.xpath("html/body").children.each_with_object({}) do |element, q_and_as|
-          _q_and_as, question = recursive_question_and_answers(element, question, q_and_as)
-        end
-      end
-
-      def recursive_question_and_answers(element, question, q_and_as)
-        if is_a_question?(element)
-          question = element.text
-          q_and_as[question] = { anchor: element["id"] }
-        else
-          q_and_as = add_answer_to_question(q_and_as, element, question)
-          element.children.each do |child_element|
-            if child_element.element?
-              q_and_as, question = recursive_question_and_answers(child_element, question, q_and_as)
-            end
-          end
-        end
-
-        [q_and_as, question]
-      end
-
-      def add_answer_to_question(q_and_as, element, question)
-        if no_questions_in_subtree?(element)
-          if question_hash_is_unset?(q_and_as, question)
+          if question_element?(element)
+            question = element.text
+            q_and_as[question] = { anchor: element["id"] }
+          elsif question_hash_is_unset?(q_and_as, question)
             q_and_as[question] = { answer: element.to_s }
           elsif answer_is_unset?(q_and_as, question)
             q_and_as[question][:answer] = element.to_s
@@ -88,11 +69,6 @@ module GovukPublishingComponents
             q_and_as[question][:answer] << element.to_s
           end
         end
-        q_and_as
-      end
-
-      def no_questions_in_subtree?(element)
-        element.search(QUESTION_TAG).none?
       end
 
       def question_hash_is_unset?(q_and_as, question)
@@ -106,7 +82,7 @@ module GovukPublishingComponents
       # we use H2 tags as the "question" and the html between them as the "answer"
       QUESTION_TAG = "h2".freeze
 
-      def is_a_question?(element)
+      def question_element?(element)
         element.name == QUESTION_TAG
       end
 

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "21.50.0".freeze
+  VERSION = "21.53.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 21.50.0
+  version: 21.53.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters
@@ -408,6 +408,7 @@ files:
 - app/assets/javascripts/component_guide/visual-regression.js
 - app/assets/javascripts/govuk_publishing_components/all_components.js
 - app/assets/javascripts/govuk_publishing_components/components/accordion.js
+- app/assets/javascripts/govuk_publishing_components/components/button.js
 - app/assets/javascripts/govuk_publishing_components/components/character-count.js
 - app/assets/javascripts/govuk_publishing_components/components/checkboxes.js
 - app/assets/javascripts/govuk_publishing_components/components/contextual-guidance.js
@@ -417,11 +418,14 @@ files:
 - app/assets/javascripts/govuk_publishing_components/components/error-summary.js
 - app/assets/javascripts/govuk_publishing_components/components/feedback.js
 - app/assets/javascripts/govuk_publishing_components/components/govspeak.js
+- app/assets/javascripts/govuk_publishing_components/components/header.js
 - app/assets/javascripts/govuk_publishing_components/components/initial-focus.js
 - app/assets/javascripts/govuk_publishing_components/components/modal-dialogue.js
 - app/assets/javascripts/govuk_publishing_components/components/radio.js
 - app/assets/javascripts/govuk_publishing_components/components/step-by-step-nav.js
+- app/assets/javascripts/govuk_publishing_components/components/tabs.js
 - app/assets/javascripts/govuk_publishing_components/dependencies.js
+- app/assets/javascripts/govuk_publishing_components/lib.js
 - app/assets/javascripts/govuk_publishing_components/lib/cookie-functions.js
 - app/assets/javascripts/govuk_publishing_components/lib/current-location.js
 - app/assets/javascripts/govuk_publishing_components/lib/govspeak/barchart-enhancement.js
@@ -744,6 +748,7 @@ files:
 - lib/govuk_publishing_components/engine.rb
 - lib/govuk_publishing_components/minitest/component_guide_test.rb
 - lib/govuk_publishing_components/presenters/attachment.rb
+- lib/govuk_publishing_components/presenters/breadcrumb_selector.rb
 - lib/govuk_publishing_components/presenters/breadcrumbs.rb
 - lib/govuk_publishing_components/presenters/button_helper.rb
 - lib/govuk_publishing_components/presenters/checkboxes_helper.rb