govuk_publishing_components 46.4.0 → 47.0.0

data/config/locales/zh-tw.yml

@@ -31,14 +31,6 @@ zh-tw:
       type:
         characters: 字元
         words: 字
-    chart:
-      accessibility_heading:
-      accessibility_html:
-      accessibility_link:
-      table_dropdown:
-    chat_entry:
-      description:
-      heading:
     checkboxes:
       or: 或
     contents_list:

data/config/locales/zh.yml

@@ -31,14 +31,6 @@ zh:
       type:
         characters: 字符
         words: 单词
-    chart:
-      accessibility_heading:
-      accessibility_html:
-      accessibility_link:
-      table_dropdown:
-    chat_entry:
-      description:
-      heading:
     checkboxes:
       or: 或
     contents_list:

data/lib/govuk_publishing_components/presenters/heading_helper.rb

@@ -1,17 +1,17 @@
 module GovukPublishingComponents
   module Presenters
     class HeadingHelper
-      attr_reader :heading_tag, :id, :classes
+      attr_reader :heading_tag, :id, :classes, :heading_classes
 
       def initialize(options)
         @id = options[:id]
 
         @classes = ""
-        @classes << heading_size(options[:font_size])
-        @classes << " gem-c-heading--mobile-top-margin" if options[:mobile_top_margin]
         @classes << " gem-c-heading--padding" if options[:padding]
         @classes << " gem-c-heading--border-top-#{options[:border_top]}" if [1, 2, 5].include? options[:border_top]
         @classes << " gem-c-heading--inverse" if options[:inverse]
+
+        @heading_classes = "gem-c-heading__text #{heading_size(options[:font_size])}"
       end
 
     private

data/lib/govuk_publishing_components/presenters/organisation_logo_helper.rb

@@ -4,7 +4,7 @@ module GovukPublishingComponents
       include ActionView::Helpers
       include ActionView::Context
 
-      attr_reader :name, :url, :crest, :image, :logo_image_src, :logo_image_alt
+      attr_reader :name, :url, :crest, :image, :logo_image_src, :logo_image_alt, :hide_underline
 
       def initialize(local_assigns)
         @name = local_assigns[:organisation][:name]
@@ -15,6 +15,7 @@ module GovukPublishingComponents
           @logo_image_src = local_assigns[:organisation][:image][:url] || false
           @logo_image_alt = local_assigns[:organisation][:image][:alt_text] || false
         end
+        @hide_underline = local_assigns[:hide_underline] || false
       end
 
       def logo_content
@@ -28,6 +29,7 @@ module GovukPublishingComponents
       def logo_container_class
         logo_class = "gem-c-organisation-logo__container"
         logo_class = "#{logo_class} gem-c-organisation-logo__link" if url
+        logo_class = "#{logo_class} gem-c-organisation-logo__link-hide-underline" if hide_underline
         logo_class = "#{logo_class} gem-c-organisation-logo__crest gem-c-organisation-logo__crest--#{crest}" if crest
         logo_class
       end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "46.4.0".freeze
+  VERSION = "47.0.0".freeze
 end

data/lib/govuk_publishing_components.rb

@@ -15,7 +15,6 @@ require "govuk_publishing_components/presenters/big_number_helper"
 require "govuk_publishing_components/presenters/breadcrumbs_helper"
 require "govuk_publishing_components/presenters/breadcrumb_selector"
 require "govuk_publishing_components/presenters/button_helper"
-require "govuk_publishing_components/presenters/chart_helper"
 require "govuk_publishing_components/presenters/contextual_navigation"
 require "govuk_publishing_components/presenters/devolved_nations_helper"
 require "govuk_publishing_components/presenters/emergency_banner_helper"

metadata

@@ -1,29 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 46.4.0
+  version: 47.0.0
 platform: ruby
-original_platform: ''
 authors:
 - GOV.UK Dev
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: chartkick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
   requirement: !ruby/object:Gem::Requirement
@@ -479,7 +464,6 @@ files:
 - app/assets/javascripts/govuk_publishing_components/components/add-another.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/chart.js
 - app/assets/javascripts/govuk_publishing_components/components/checkboxes.js
 - app/assets/javascripts/govuk_publishing_components/components/contextual-guidance.js
 - app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js
@@ -540,8 +524,6 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/_button.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_cards.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_character-count.scss
-- app/assets/stylesheets/govuk_publishing_components/components/_chart.scss
-- app/assets/stylesheets/govuk_publishing_components/components/_chat-entry.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_checkboxes.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_contents-list.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_contextual-guidance.scss
@@ -682,8 +664,6 @@ files:
 - app/views/govuk_publishing_components/components/_button.html.erb
 - app/views/govuk_publishing_components/components/_cards.html.erb
 - app/views/govuk_publishing_components/components/_character_count.html.erb
-- app/views/govuk_publishing_components/components/_chart.html.erb
-- app/views/govuk_publishing_components/components/_chat_entry.html.erb
 - app/views/govuk_publishing_components/components/_checkboxes.html.erb
 - app/views/govuk_publishing_components/components/_contents_list.html.erb
 - app/views/govuk_publishing_components/components/_contextual_breadcrumbs.html.erb
@@ -779,8 +759,6 @@ files:
 - app/views/govuk_publishing_components/components/docs/button.yml
 - app/views/govuk_publishing_components/components/docs/cards.yml
 - app/views/govuk_publishing_components/components/docs/character_count.yml
-- app/views/govuk_publishing_components/components/docs/chart.yml
-- app/views/govuk_publishing_components/components/docs/chat_entry.yml
 - app/views/govuk_publishing_components/components/docs/checkboxes.yml
 - app/views/govuk_publishing_components/components/docs/contents_list.yml
 - app/views/govuk_publishing_components/components/docs/contextual_breadcrumbs.yml
@@ -960,7 +938,6 @@ files:
 - lib/govuk_publishing_components/presenters/breadcrumb_selector.rb
 - lib/govuk_publishing_components/presenters/breadcrumbs_helper.rb
 - lib/govuk_publishing_components/presenters/button_helper.rb
-- lib/govuk_publishing_components/presenters/chart_helper.rb
 - lib/govuk_publishing_components/presenters/checkboxes_helper.rb
 - lib/govuk_publishing_components/presenters/component_wrapper_helper.rb
 - lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_ancestors.rb
@@ -1070,16 +1047,6 @@ files:
 - node_modules/axe-core/locales/zh_TW.json
 - node_modules/axe-core/package.json
 - node_modules/axe-core/sri-history.json
-- node_modules/chartkick/LICENSE.txt
-- node_modules/chartkick/README.md
-- node_modules/chartkick/chart.js/chart.esm.js
-- node_modules/chartkick/chart.js/package.json
-- node_modules/chartkick/dist/chartkick.esm.js
-- node_modules/chartkick/dist/chartkick.js
-- node_modules/chartkick/dist/chartkick.min.js
-- node_modules/chartkick/highcharts/highcharts.esm.js
-- node_modules/chartkick/highcharts/package.json
-- node_modules/chartkick/package.json
 - node_modules/govuk-frontend/README.md
 - node_modules/govuk-frontend/dist/govuk-prototype-kit/init.js
 - node_modules/govuk-frontend/dist/govuk-prototype-kit/init.scss
@@ -2027,7 +1994,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.0
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A gem to document components in GOV.UK frontend applications
 test_files: []

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

@@ -1 +0,0 @@
-//= require chartkick

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

@@ -1,57 +0,0 @@
-@import "govuk_publishing_components/individual_component_support";
-
-.gem-c-chart {
-  position: relative;
-
-  // slight hack to hide the table automatically added by the charts JS
-  // not needed as we already output the table manually in the component
-  svg + div:has(table) {
-    display: none;
-  }
-
-  .google-visualization-tooltip {
-    background-color: govuk-colour("black");
-    box-shadow: none;
-    border: 0;
-
-    span {
-      color: govuk-colour("white");
-      @include govuk-font($size: 16, $weight: bold);
-    }
-  }
-}
-
-.gem-c-chart__table-wrapper {
-  overflow: auto;
-}
-
-.gem-c-chart__table {
-  margin-top: govuk-spacing(3);
-
-  .govuk-table {
-    margin: 0;
-  }
-
-  .govuk-table .govuk-table__header {
-    text-align: center;
-  }
-
-  .govuk-table .govuk-table__cell {
-    text-align: center;
-  }
-}
-
-.gem-c-chart .gem-c-chart__a11y-note-link {
-  display: none;
-  margin-bottom: govuk-spacing(2);
-}
-
-.js-enabled {
-  .gem-c-chart .gem-c-chart__a11y-note-link {
-    display: inline;
-  }
-
-  .gem-c-chart .gem-c-chart__a11y-note-link:focus-within {
-    display: inline-block;
-  }
-}

data/app/assets/stylesheets/govuk_publishing_components/components/_chat-entry.scss

@@ -1,39 +0,0 @@
-@import "govuk_publishing_components/individual_component_support";
-
-.gem-c-chat-entry {
-  display: flex;
-  align-items: flex-start;
-  background-color: govuk-tint(govuk-colour("blue"), 90%);
-  padding: govuk-spacing(4);
-}
-
-.gem-c-chat-entry--margin-top-until-tablet {
-  @include govuk-media-query($until: tablet) {
-    margin-top: 35px;
-  }
-}
-
-.gem-c-chat-entry--border-top {
-  border-top: 2px solid govuk-colour("blue");
-  padding-top: govuk-spacing(5);
-}
-
-.gem-c-chat-entry--border-bottom {
-  border-bottom: 2px solid govuk-colour("blue");
-  padding-bottom: govuk-spacing(5);
-}
-
-.gem-c-chat-entry__image {
-  flex-shrink: 0;
-  height: 40px;
-  margin-right: govuk-spacing(3);
-  width: 40px;
-}
-
-.gem-c-chat-entry__heading {
-  margin: 0 0 govuk-spacing(2);
-  font-size: 19px;
-  font-size: govuk-px-to-rem(19);
-  line-height: 1.25;
-  @include govuk-typography-common;
-}

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

@@ -1,146 +0,0 @@
-<%
-  add_gem_component_stylesheet("chart")
-  add_gem_component_stylesheet("table")
-  add_gem_component_stylesheet("details")
-  add_gem_component_stylesheet("heading")
-  add_gem_component_stylesheet("skip-link")
-
-  chart_heading_level ||= 2
-  table_direction ||= "horizontal"
-  rows ||= []
-  keys ||= []
-  chart_overview ||= nil
-  chart_type ||= "line"
-  minimal ||= false
-  hide_heading ||= minimal
-  link ||= false
-  local_assigns[:margin_bottom] ||= 3
-
-  chart_id = "chart-id-#{SecureRandom.hex(4)}"
-  table_id = "table-id-#{SecureRandom.hex(4)}"
-  @external_script ||= OpenStruct.new(loaded: 0)
-  @external_script[:loaded] += 1
-
-  chart_helper = GovukPublishingComponents::Presenters::ChartHelper.new(local_assigns)
-  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
-  component_helper.add_class("gem-c-chart")
-  component_helper.add_class("gem-c-chart--minimal") if minimal
-
-  require "chartkick"
-  Chartkick.options[:html] = '<div id="%{id}"><noscript><p class="govuk-body">Our charts are built using JavaScript but all the data is also available in the table below.</p></noscript></div>'
-
-  if !minimal && !chart_heading
-    raise ArgumentError, "A chart heading must be provided for accessibility purposes."
-  end
-%>
-<% if rows.length > 0 && keys.length > 0 %>
-  <%= javascript_include_tag "https://www.gstatic.com/charts/loader.js" if @external_script[:loaded] == 1 %>
-  <%= tag.div(**component_helper.all_attributes) do %>
-    <% if chart_heading && !hide_heading %>
-      <div class="govuk-grid-row">
-        <div class="govuk-grid-column-two-thirds">
-          <%= render "govuk_publishing_components/components/heading", {
-            text: chart_heading,
-            heading_level: chart_heading_level,
-            margin_bottom: 2,
-          } %>
-        </div>
-      </div>
-    <% end %>
-
-    <% aria_attributes = { hidden: true } if minimal %>
-    <%= content_tag :div, id: chart_id, class: "gem-c-chart__chart", aria: aria_attributes do %>
-      <% unless minimal %>
-        <div class="govuk-visually-hidden">
-          <%= content_tag :div, chart_overview, class: "gem-c-chart__a11y-note-1" if chart_overview %>
-          <%= content_tag :div, t("components.chart.accessibility_html"), class: "gem-c-chart__a11y-note-2" %>
-        </div>
-        <span class="gem-c-chart__a11y-note-link">
-          <%= render "govuk_publishing_components/components/skip_link", {
-            text: t("components.chart.accessibility_link", chart_heading: chart_heading),
-            href: "##{table_id}"
-          } %>
-        </span>
-      <% end %>
-
-      <% if chart_type == "column" %>
-        <%= column_chart(chart_helper.chart_format_data, library: chart_helper.chart_options) %>
-      <% elsif chart_type == "bar" %>
-        <%= bar_chart(chart_helper.chart_format_data, library: chart_helper.chart_options) %>
-      <% else %>
-        <%= line_chart(chart_helper.chart_format_data, library: chart_helper.chart_options) %>
-      <% end %>
-    <% end %>
-
-    <% unless minimal %>
-      <div class="gem-c-chart__table" id="<%= table_id %>">
-        <%= render("govuk_publishing_components/components/details",
-          title: t("components.chart.table_dropdown")
-        ) do %>
-          <div tabindex="0" class="gem-c-chart__table-wrapper">
-            <table class="govuk-table">
-              <caption class="govuk-visually-hidden" id="<%= "data-table-caption-#{SecureRandom.hex(4)}" %>">
-                <%= t("components.chart.accessibility_heading", chart_heading: chart_heading) %>
-              </caption>
-              <% if table_direction == "horizontal" %>
-                <thead class="govuk-table__head">
-                  <tr class="govuk-table__row">
-                    <td class="govuk-table__cell"></td>
-                    <% keys.each do |key| %>
-                      <th class="govuk-table__header" scope="col">
-                        <%= key %>
-                      </th>
-                    <% end %>
-                  </tr>
-                </thead>
-                <tbody class="govuk-table__body">
-                  <% rows.each do |row| %>
-                    <tr class="govuk-table__row">
-                      <th class="govuk-table__header" scope="row"><%= row[:label]  %></th>
-                      <% row[:values].each do |value| %>
-                        <td class="govuk-table__cell govuk-table__cell--numeric">
-                          <%= number_with_delimiter value %>
-                        </td>
-                      <% end %>
-                    </tr>
-                  <% end %>
-                </tbody>
-              <% else %>
-                <thead class="govuk-table__head">
-                  <tr class="govuk-table__row">
-                    <td class="govuk-table__cell"></td>
-                    <% rows.each do |row| %>
-                      <th class="govuk-table__header govuk-table__header--stacked" scope="row">
-                        <%= row[:label] %>
-                      </th>
-                    <% end %>
-                  </tr>
-                </thead>
-                <tbody class="govuk-table__body">
-                  <% keys.each_with_index do |key, index| %>
-                    <tr>
-                      <th class="govuk-table__header" scope="row">
-                        <%= key %>
-                      </th>
-                      <% rows.each do |row| %>
-                        <td class="govuk-table__cell govuk-table__cell--numeric">
-                          <%= number_with_delimiter row[:values][index] %>
-                        </td>
-                      <% end %>
-                    </tr>
-                  <% end %>
-                </tbody>
-              <% end %>
-            </table>
-          </div>
-        <% end %>
-      </div>
-
-      <% if link %>
-        <p class="govuk-body">
-          <%= link_to "Download chart data", link,  class: "govuk-link" %>
-        </p>
-      <% end %>
-    <% end %>
-  <% end %>
-<% end %>

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

@@ -1,55 +0,0 @@
-<%
-  add_gem_component_stylesheet("chat-entry")
-  local_assigns[:margin_bottom] ||= 6
-  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
-  href ||= "/chat"
-  heading_text ||= t("components.chat_entry.heading")
-  description_text ||= t("components.chat_entry.description")
-  border_top ||= false
-  border_bottom ||= false
-  disable_ga4 ||= false
-  margin_top_until_tablet ||= false
-  local_assigns[:margin_bottom] ||= 6
-
-  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
-  component_helper.add_class("gem-c-chat-entry")
-  component_helper.add_class("gem-c-chat-entry--border-top") if border_top
-  component_helper.add_class("gem-c-chat-entry--border-bottom") if border_bottom
-  component_helper.add_class("gem-c-chat-entry--margin-top-until-tablet") if margin_top_until_tablet
-  component_helper.add_data_attribute({ module: "ga4-link-tracker" }) unless disable_ga4
-
-  unless disable_ga4
-    ga4_link_data = {
-      ga4_link: {
-        event_name: "navigation",
-        type: "callout",
-        section: "GOV.UK Chat entry",
-      }.to_json
-    }
-  end
-%>
-
-<%= tag.div(**component_helper.all_attributes) do %>
-  <svg class="gem-c-chat-entry__image" width="52" height="52" viewBox="0 0 52 52" fill="none" xmlns="http://www.w3.org/2000/svg" focusable="false" aria-hidden="true">
-    <path d="M11.5713 39.7452L25.6112 51.9999H1.96875L11.5713 39.7452Z" fill="#1D70B8"/>
-    <path d="M26 52C40.3594 52 52 40.3594 52 26C52 11.6406 40.3594 0 26 0C11.6406 0 0 11.6406 0 26C0 40.3594 11.6406 52 26 52Z" fill="#1D70B8"/>
-    <mask id="mask0_51852_3730" maskUnits="userSpaceOnUse" x="14" y="32" width="24" height="10">
-      <rect x="15.2981" y="33.1165" width="21.4029" height="6.98153" fill="#D9D9D9" stroke="#F499BE" stroke-width="1.89313"/>
-    </mask>
-    <g mask="url(#mask0_51852_3730)">
-      <path d="M20.5707 34.156C21.8883 37.1549 25.3874 38.518 28.3863 37.2004C31.3852 35.8829 32.7482 32.3837 31.4307 29.3848C30.1132 26.3859 26.614 25.0229 23.6151 26.3404C20.6162 27.658 19.2532 31.1571 20.5707 34.156Z" stroke="#F499BE" stroke-width="4.43733"/>
-    </g>
-    <path d="M17.3401 13.3198L24.2778 25.515H10.4023L17.3401 13.3198Z" fill="#FFDD00"/>
-    <circle cx="34.2507" cy="19.4078" r="6.10621" fill="#F47738"/>
-  </svg>
-
-  <div class="gem-c-chat-entry__description">
-    <%= content_tag(shared_helper.get_heading_level, class: "gem-c-chat-entry__heading") do %>
-      <%= link_to heading_text, href, class: "govuk-link", data: ga4_link_data %>
-    <% end %>
-
-    <% if description_text %>
-      <p class="govuk-body govuk-!-margin-bottom-0"><%= description_text %></p>
-    <% end %>
-  </div>
-<% end %>