govuk_publishing_components 63.1.2 → 63.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69822fdce4a621596d707d34006154c108e1f98fceec83c42f2fb79e5a06c53a
-  data.tar.gz: 763173cb626bcde1135818f5d43998e2d8fab60e6e91b48ccfc4439d7a62361f
+  metadata.gz: 165109e571c6ba5445e74e15f2be52f24c787509790ad41a4ea88664e9efdb65
+  data.tar.gz: be9e4eafdc824e8cc3ae4e3ad5829f33a85a4df2e6ad3ac86a0c89fd52a2a084
 SHA512:
-  metadata.gz: ef764e6e4ae2bd257effc2830983fb388605ef4f1d4b0a2410b43835f67753cabbf6885fd7b65a0af14d7e22c64eb2703122f71e42fbceaf1ea8dadea120607d
-  data.tar.gz: 36d11809f4b629784cdafef3ebab1702c142657854adb31ccedc7443621fb1ad67c29c214540f7c7baa4c6351c1d09fd80b225e6583607b7e3dbc7a0493b9d78
+  metadata.gz: a4b8872ec44bbe165d2962f38157b1919f3c6433e13c14a714738bfe001b46cab9ea75d0a6d4e7f8c4fd42f98e8e2a4a3c174ff39e6f8dc1fcdcd2d987613eca
+  data.tar.gz: 2a6335737c699d6a6c5d397a1149e1e8f30e02dae6ba84f11f49edb41bc69743f26b98d22cde3e227447f4dafc00ac90e754384d307a9041586730fcbf720d9c

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-page-views.js

@@ -59,6 +59,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
             emergency_banner: document.querySelector('[data-ga4-emergency-banner]') ? 'true' : undefined,
             phase_banner: this.getElementAttribute('data-ga4-phase-banner') || undefined,
             devolved_nations_banner: this.getElementAttribute('data-ga4-devolved-nations-banner') || undefined,
+            app_promo_banner: this.getBannerPresence('[data-ga4-app-promo-banner]'),
             cookie_banner: this.getBannerPresence('[data-ga4-cookie-banner]'),
             intervention: this.getBannerPresence('[data-ga4-intervention-banner]'),
             global_bar: this.getBannerPresence('[data-ga4-global-banner]'),
@@ -172,8 +173,8 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       return this.PIIRemover.stripPIIWithOverride(document.title, false, true)
     },
 
-    // window.httpStatusCode is set in the source of the error page in static
-    // https://github.com/alphagov/static/blob/1c734451f2dd6fc0c7e80beccbdcbfa5aaffd0e4/app/views/root/_error_page.html.erb#L41-L43
+    // window.httpStatusCode is set in the source of the error page
+    // https://github.com/alphagov/frontend/blob/1d92fe5f0ada726d1c95dae645e1dc2195d9d3fe/app/views/static_error_pages/_error_page.html.erb#L26
     getStatusCode: function () {
       if (window.httpStatusCode) {
         return window.httpStatusCode.toString()

data/app/assets/javascripts/govuk_publishing_components/components/app-promo-banner.js

@@ -0,0 +1,134 @@
+window.GOVUK = window.GOVUK || {}
+window.GOVUK.Modules = window.GOVUK.Modules || {};
+
+(function (Modules) {
+  class AppPromoBanner {
+    constructor ($module) {
+      this.$module = $module
+      /** @type {HTMLButtonElement | null} */
+      this.$closeButton = this.$module.querySelector('.js-close-app-promo-banner')
+      this.APP_PROMO_BANNER_COOKIE = 'app_promo_banner'
+    }
+
+    /**
+     * Initialise the app promo banner
+     *
+     */
+    init () {
+      // Only display the banner on Android devices
+      if (!this.isAndroidDevice()) return
+
+      // Do not display the app promo banner if the cookie banner is visible
+      if (this.isCookieBannerVisible()) return
+
+      // Do not display the banner if it was previously closed
+      const cookieContents = this.getAppPromoBannerCookieContent()
+      if (cookieContents && cookieContents.closed === true) return
+
+      // Do not display the banner if the close button is not found
+      if (!this.$closeButton) return
+
+      this.$closeButton.addEventListener('click', (event) => this.handleClick(event))
+      this.showBanner()
+    }
+
+    /**
+     * Checks if the current device is an Android device
+     *
+     * @returns Boolean
+     */
+    isAndroidDevice () {
+      return (/Android/i.test(navigator.userAgent))
+    }
+
+    /**
+     * Checks if the user has accepted cookies and the cookie
+     * category the app promo banner is in
+     *
+     * @returns Boolean
+     */
+    isCookiesAndCategoryPermitted () {
+      const cookieConsent = window.GOVUK.getConsentCookie()
+      const cookieCategory = window.GOVUK.getCookieCategory(this.APP_PROMO_BANNER_COOKIE)
+      return (cookieConsent && cookieConsent[cookieCategory])
+    }
+
+    /**
+     * Checks if the cookie banner is visible
+     *
+     * @returns Boolean - Cookie banner visible
+     */
+    isCookieBannerVisible () {
+      /** @type {HTMLDivElement | null} */
+      const cookieBanner = document.querySelector('#global-cookie-message')
+      return cookieBanner && !cookieBanner.hidden
+    }
+
+    /**
+     * Sets the cookie for the app promo banner, including if the
+     * the banner should be in the closed state
+     *
+     * @param {Boolean} isAppBannerClosed
+     */
+    setAppBannerCookie (isAppBannerClosed) {
+      // Do not set the cookie if cookies and category are not permitted
+      if (!this.isCookiesAndCategoryPermitted) return
+
+      /** @type {AppBannerCookie} */
+      const appBannerCookie = { closed: isAppBannerClosed }
+
+      // This approach will simply set/overwrite the cookie with new values
+      const appBannerCookieValue = JSON.stringify(appBannerCookie)
+      window.GOVUK.setCookie(this.APP_PROMO_BANNER_COOKIE, appBannerCookieValue, { days: 84 })
+    }
+
+    /**
+     * Return the user's cookie settings for the app promo banner,
+     * or null if the cookie is not present
+     *
+     * @returns {AppBannerCookie | null} App promo banner settings
+     */
+    getAppPromoBannerCookieContent () {
+      const appBannerCookie = window.GOVUK.getCookie(this.APP_PROMO_BANNER_COOKIE)
+      return appBannerCookie ? JSON.parse(appBannerCookie) : null
+    }
+
+    /**
+     * Handle the click of the close banner button
+     *
+     * @param {MouseEvent} event - Click event
+     */
+    handleClick (event) {
+      event.preventDefault()
+      this.hideBanner()
+    }
+
+    /**
+     * Shows the app promo banner
+     *
+     */
+    showBanner () {
+      this.$module.hidden = false
+      this.$module.classList.add('gem-c-app-promo-banner--visible')
+    }
+
+    /**
+     * Hides the app promo banner and sets a cookie to store
+     * the closed state as true
+     *
+     */
+    hideBanner () {
+      this.setAppBannerCookie(true)
+      this.$module.hidden = true
+      this.$module.classList.remove('gem-c-app-promo-banner--visible')
+    }
+  }
+
+  Modules.AppPromoBanner = AppPromoBanner
+})(window.GOVUK.Modules)
+
+/**
+ * @typedef {object} AppBannerCookie
+ * @property {boolean} [closed] - Banner closed state
+ * @property {number} [version] - Banner version number
+ */

data/app/assets/javascripts/govuk_publishing_components/lib/cookie-functions.js

@@ -21,6 +21,7 @@
     licensing_session: 'essential',
     govuk_contact_referrer: 'essential',
     multivariatetest_cohort_coronavirus_extremely_vulnerable_rate_limit: 'essential',
+    app_promo_banner: 'settings',
     dgu_beta_banner_dismissed: 'settings',
     global_banner_seen: 'settings',
     user_nation: 'settings',

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

@@ -11,6 +11,7 @@
 @import "components/accordion";
 @import "components/action-link";
 @import "components/add-another";
+@import "components/app-promo-banner";
 @import "components/attachment";
 @import "components/attachment-link";
 @import "components/back-link";

data/app/assets/stylesheets/govuk_publishing_components/components/_app-promo-banner.scss

@@ -0,0 +1,64 @@
+@import "govuk_publishing_components/individual_component_support";
+
+.gem-c-app-promo-banner {
+  display: none;
+  padding: govuk-spacing(5) 0;
+  border-top: 4px solid $govuk-brand-colour;
+  background-color: $govuk-rebrand-template-background-colour;
+  @include govuk-text-colour;
+}
+
+.gem-c-app-promo-banner--visible {
+  display: block;
+}
+
+.gem-c-app-promo-banner__container {
+  display: flex;
+  gap: govuk-spacing(3);
+  align-items: center;
+}
+
+.gem-c-app-promo-banner__icon {
+  flex: 0 1 64px;
+  min-width: 60px;
+  height: auto;
+}
+
+.gem-c-app-promo-banner__content {
+  flex: 1 1 auto;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  row-gap: govuk-spacing(1);
+  column-gap: govuk-spacing(3);
+
+  // Ensures the view link appears beneath the text content
+  // on larger screen sizes
+  @include govuk-media-query($from: tablet) {
+    flex-direction: column;
+    align-items: start;
+  }
+}
+
+.gem-c-app-promo-banner__text {
+  text-wrap-style: balance;
+}
+
+.gem-c-app-promo-banner__close-button {
+  border: 0;
+  padding: 0;
+  color: govuk-tint(govuk-colour("black"), 25%);
+  background: none;
+  flex: 0 0 24px;
+  height: 24px;
+
+  &:hover {
+    cursor: pointer;
+    box-shadow: 0 4px govuk-colour("black");
+  }
+
+  &:focus {
+    @include govuk-focused-text;
+  }
+}

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

@@ -248,16 +248,3 @@ $feedback-prompt-border-top-colour: $govuk-blue-tint-50;
     color: $govuk-focus-text-colour;
   }
 }
-
-// static.css on GOV.UK overwrites the component styles using input[type="text"]
-// so we need to apply  govuk-input styles using a stronger selector
-.gem-c-feedback .gem-c-input[type="text"] {
-  margin: 0;
-  padding: govuk-spacing(1);
-  border: $govuk-border-width-form-element solid $govuk-input-border-colour;
-  @include govuk-font($size: 19);
-
-  &:focus {
-    outline: $govuk-focus-width solid $govuk-focus-colour;
-  }
-}

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

@@ -14,17 +14,3 @@ $search-icon-size: 40px;
   height: govuk-px-to-rem($search-icon-size);
   background: url("govuk_publishing_components/icon-search.svg") no-repeat -3px center;
 }
-
-// this overrides styles from static that break the look of the component
-// unfortunately we then need to override the override for the search icon variant
-// TODO: remove these styles once static is made less aggressive
-.gem-c-input.govuk-input {
-  margin: 0;
-  min-width: 0;
-  padding: govuk-spacing(1);
-  box-sizing: border-box;
-
-  &.gem-c-input--with-search-icon {
-    padding-left: govuk-spacing(6);
-  }
-}

data/app/assets/stylesheets/govuk_publishing_components/components/_summary-list.scss

@@ -2,21 +2,11 @@
 @import "govuk/components/summary-list/summary-list";
 
 .gem-c-summary-list {
-  border-bottom: 1px solid $govuk-border-colour;
-
+  margin-bottom: govuk-spacing(6);
   @include govuk-font(19);
-  @include govuk-responsive-margin(6, "top");
-
-  &:nth-of-type(1) {
-    margin-top: govuk-spacing(0);
-  }
-
-  &:nth-last-of-type(1) {
-    border-bottom: 0;
-  }
 
   .govuk-summary-list {
-    clear: both;
+    margin-bottom: 0;
   }
 }
 

data/app/controllers/govuk_publishing_components/applications_page_controller.rb

@@ -4,7 +4,7 @@ module GovukPublishingComponents
       applications = [
         {
           type: "public-facing",
-          apps: %w[collections email-alert-frontend feedback finder-frontend frontend government-frontend smart-answers static].sort,
+          apps: %w[collections email-alert-frontend feedback finder-frontend frontend government-frontend smart-answers].sort,
         },
         {
           type: "publishing",
@@ -39,7 +39,6 @@ module GovukPublishingComponents
             source: app.source,
             gem_version: app.gem_version,
             gem_version_status: app.gem_version == GovukPublishingComponents::VERSION ? "green" : "red",
-            slimmer_version: app.slimmer_version,
             sass_version: app.sass_version,
           }
         end

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -20,7 +20,6 @@ module GovukPublishingComponents
         govuk-developer-docs
         local-links-manager
         manuals-publisher
-        maslow
         places-manager
         publisher
         release
@@ -31,7 +30,6 @@ module GovukPublishingComponents
         signon
         smart-answers
         specialist-publisher
-        static
         support
         transition
         travel-advice-publisher

data/app/models/govuk_publishing_components/applications_page.rb

@@ -16,10 +16,6 @@ module GovukPublishingComponents
       parse_file(@gemfilelock, /govuk_publishing_components \(([^)>=~ ]+)\)/)
     end
 
-    def slimmer_version
-      parse_file(@gemfilelock, /slimmer \(([^)>=~ ]+)\)/)
-    end
-
     def sass_version
       parse_file(@gemfilelock, /sass-embedded \(([^)>=~ ]+)\)/)
     end

data/app/models/govuk_publishing_components/audit_comparer.rb

@@ -4,15 +4,6 @@ module GovukPublishingComponents
 
     def initialize(gem_data, results)
       if gem_data[:gem_found]
-        @applications_using_static = %w[
-          collections
-          finder-frontend
-          government-frontend
-          service-manual-frontend
-          smart-answers
-        ]
-
-        @static_data = find_static(results)
         @gem_data = gem_data
         @applications_data = sort_results(results)
         @gem_data[:components_by_application] = get_components_by_application || []
@@ -23,23 +14,6 @@ module GovukPublishingComponents
 
   private
 
-    # find static to check for global includes, reduce false warnings
-    def find_static(results)
-      results.each do |result|
-        if result[:name] == "static" && result[:application_found] == true
-          return clean_static(result)
-        end
-      end
-
-      false
-    end
-
-    # turn static data into an object so locations can be easily referenced
-    # should give object of form { "template" => [], "stylesheet" => [] }
-    def clean_static(data)
-      Hash[data[:components_found].map { |d| [d[:location], d[:components]] }]
-    end
-
     def prettify_key(key)
       key.to_s.gsub("_", " ").capitalize
     end
@@ -50,20 +24,19 @@ module GovukPublishingComponents
       results.each do |result|
         if result[:application_found]
           @current_uses_individual_asset_model = result[:uses_individual_asset_model]
-          application_uses_static = @applications_using_static.include?(result[:name])
           templates = result[:components_found].find { |c| c[:location] == "template" }
           stylesheets = result[:components_found].find { |c| c[:location] == "stylesheet" }
           javascripts = result[:components_found].find { |c| c[:location] == "javascript" }
           ruby = result[:components_found].find { |c| c[:location] == "ruby" }
 
           templates[:components] = include_any_components_within_components(templates[:components])
+          ruby[:components] = include_any_components_within_components(ruby[:components])
 
           warnings = []
           warnings << warn_about_missing_components(result[:components_found])
           warnings << warn_about_missing_assets(result[:components_found])
           warnings << warn_about_style_overrides(result[:gem_style_references])
           warnings << warn_about_jquery_references(result[:jquery_references])
-          warnings << check_for_assets_already_in_static(result[:components_found]) if @static_data && application_uses_static
           warnings = warnings.flatten
 
           summary = [
@@ -89,7 +62,6 @@ module GovukPublishingComponents
             name: result[:name],
             dir: result[:dir],
             application_found: result[:application_found],
-            uses_static: application_uses_static,
             summary:,
             warnings:,
             warning_count: warnings.length,
@@ -155,12 +127,10 @@ module GovukPublishingComponents
               asset_in_gem = false
             end
 
-            check_static = @static_data && second_location != "code"
-            asset_in_static = asset_already_in_static(second_location, component) if check_static
             suppress_warning = @current_uses_individual_asset_model && second_location == "stylesheet"
-            raise_warning = asset_in_gem && !asset_in_static && !suppress_warning
+            raise_warning = asset_in_gem && !suppress_warning
 
-            # this raises a warning if the asset exists and isn't included either in the application or static
+            # this raises a warning if the asset exists and isn't included in the application
             warnings << create_warning(component, "Included in #{first_location} but not #{second_location}") if raise_warning
           end
         end
@@ -169,27 +139,6 @@ module GovukPublishingComponents
       warnings
     end
 
-    def asset_already_in_static(location, component)
-      return true if @static_data[location].include?(component)
-
-      false
-    end
-
-    def check_for_assets_already_in_static(locations)
-      warnings = []
-
-      locations.each do |location|
-        next if %w[template ruby].include?(location[:location])
-
-        location[:components].each do |component|
-          raise_warning = asset_already_in_static(location[:location], component)
-          warnings << create_warning(component, "Included in #{location[:location]} but already included in static") if raise_warning
-        end
-      end
-
-      warnings
-    end
-
     def warn_about_missing_assets(components)
       warnings = []
 

data/app/views/govuk_publishing_components/applications_page/_table-content.html.erb

@@ -21,13 +21,6 @@
         } %>
       <% end %>
     </td>
-    <td class="govuk-table__cell">
-      <% if app[:slimmer_version] %>
-        <%= render "govuk_publishing_components/components/tag", {
-          text: app[:slimmer_version],
-        } %>
-      <% end %>
-    </td>
     <td class="govuk-table__cell">
       <% if app[:sass_version] %>
         <%= render "govuk_publishing_components/components/tag", {

data/app/views/govuk_publishing_components/applications_page/show.html.erb

@@ -24,7 +24,6 @@
         <th scope="col" class="govuk-table__header sticky-table-header">Type</th>
         <th scope="col" class="govuk-table__header sticky-table-header">Source</th>
         <th scope="col" class="govuk-table__header sticky-table-header">Gem version</th>
-        <th scope="col" class="govuk-table__header sticky-table-header">Slimmer version</th>
         <th scope="col" class="govuk-table__header sticky-table-header">Sass version</th>
       </tr>
     </thead>

data/app/views/govuk_publishing_components/audit/_applications.html.erb

@@ -43,12 +43,6 @@
             } %>
           <% end %>
 
-          <% if application[:uses_static] %>
-            <%= render "govuk_publishing_components/components/warning_text", {
-              text: raw("This application uses <a href=\"https://github.com/alphagov/static\" class=\"govuk-link\">static</a>, which can contain assets for components used in more than one application. Warnings for missing component assets in this application that are already included in static have been suppressed."),
-            } %>
-          <% end %>
-
           <% application[:warnings].each do |warning| %>
             <p class="govuk-body">
               <strong class="govuk-tag">Warn</strong>
@@ -66,6 +60,8 @@
           heading_level: 3,
         } %>
 
+        <p class="govuk-body">Note that this information includes components within components - the application may not directly reference them.</p>
+
         <% items = [] %>
         <% application[:summary].each do |item| %>
           <% content = capture do %>

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

@@ -0,0 +1,72 @@
+<%
+  add_gem_component_stylesheet("app_promo_banner")
+
+  disable_ga4 ||= false
+
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_class("gem-c-app-promo-banner")
+  component_helper.add_role("region")
+  component_helper.add_aria_attribute({ label: t("components.app_promo_banner.aria_label")})
+  component_helper.set_hidden("hidden")
+  component_helper.add_data_attribute({ module: "app-promo-banner", nosnippet: "" })
+  component_helper.add_data_attribute({ ga4_app_promo_banner: "" }) unless disable_ga4 # Added to the parent element for the GA4 pageview object to use
+
+  ga4_event_attributes = {
+    event_name: "select_content",
+    type: "app promo banner",
+    action: "closed",
+    section: t("components.app_promo_banner.title_text"),
+    text: t("components.app_promo_banner.close"),
+  }.to_json unless disable_ga4
+
+  ga4_link_attributes = {
+    event_name: "navigation",
+    type: "app promo banner",
+    index_link: 1,
+    index_total: 1,
+  }.to_json unless disable_ga4
+%>
+
+<%= tag.div(**component_helper.all_attributes) do %>
+  <%= tag.div(class: "govuk-width-container") do %>
+    <%= tag.div(class: "gem-c-app-promo-banner__container") do %>
+      <%= content_tag(:button, {
+        class: "gem-c-app-promo-banner__close-button js-close-app-promo-banner",
+        aria: {
+          label: t("components.app_promo_banner.close"),
+        },
+        data: {
+          module: disable_ga4 ? nil : "ga4-event-tracker",
+          ga4_event: ga4_event_attributes,
+        },
+      }) do %>
+        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" focusable="false">
+          <circle cx="12" cy="12" r="11.5" stroke="currentColor" />
+          <path stroke="currentColor" stroke-linecap="round" stroke-width="1.5" d="m7 7 10 10m0-10L7 17" />
+        </svg>
+      <% end %>
+      <%= image_tag((asset_path "govuk_publishing_components/app-promo-banner/govuk-app-icon.png"),
+        alt: "",
+        class: "gem-c-app-promo-banner__icon",
+        width: "64",
+        height: "64",
+      ) %>
+      <%= tag.div(class: "gem-c-app-promo-banner__content") do %>
+        <%= tag.div(class: "gem-c-app-promo-banner__text") do %>
+          <%= tag.h2 t("components.app_promo_banner.title_text"), class: "govuk-heading-s govuk-!-margin-bottom-0" %>
+          <%= tag.p t("components.app_promo_banner.body_text"), class: "govuk-body-s govuk-!-margin-bottom-0" %>
+        <% end %>
+        <%= link_to("https://play.google.com/store/apps/details?id=uk.gov.govuk&hl=en_GB",
+          class: "govuk-link govuk-body govuk-!-margin-bottom-0",
+          data: {
+            module: disable_ga4 ? nil : "ga4-link-tracker",
+            ga4_link: ga4_link_attributes,
+          },
+          ) do %>
+          <%= t("components.app_promo_banner.view") %>
+          <%= tag.span("on Google Play", class: "govuk-visually-hidden") %>
+        <% end %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -1,9 +1,7 @@
 <%
   add_gem_component_stylesheet("layout-for-public")
 
-  for_static ||= false
   emergency_banner ||= nil
-  full_width ||= false
   global_banner ||= nil
   html_lang ||= "en"
   homepage ||= false
@@ -17,6 +15,7 @@
   omit_header ||= false
   product_name ||= nil
   service_name ||= nil
+  show_app_promo_banner ||= false
   show_cross_service_header ||= false
   draft_watermark ||= false
   title ||= "GOV.UK - The best place to find government services and information"
@@ -76,6 +75,9 @@
       <%= render "govuk_publishing_components/components/skip_link", {
         href: "#content",
       } %>
+      <% if show_app_promo_banner %>
+        <%= render "govuk_publishing_components/components/app_promo_banner" %>
+      <% end %>
     <% end %>
     <% unless omit_header %>
       <% if show_cross_service_header %>
@@ -105,18 +107,10 @@
         omit_account_phase_banner: omit_account_phase_banner,
         omit_account_navigation: omit_account_navigation,
         account_nav_location: account_nav_location,
-        for_static: for_static,
       } do %>
         <%= yield :before_content %>
         <%= yield %>
       <% end %>
-    <% elsif for_static %>
-      <div id="wrapper" class="<%= "govuk-width-container" unless full_width %>">
-        <%= yield :before_content %>
-        <main class="govuk-main-wrapper" id="content">
-          <%= yield %>
-        </main>
-      </div>
     <% else %>
       <%= yield %>
     <% end %>

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

@@ -5,6 +5,7 @@
   title ||= nil
   summary_card_actions ||= []
   rows ||=[]
+  block ||= yield
 
   component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
   component_helper.add_class("gem-c-summary-card")
@@ -26,8 +27,8 @@
         <% end %>
       <% end %>
 
-      <% if rows.present? %>
-        <%= tag.div class: "govuk-summary-card__content" do %>
+      <%= tag.div class: "govuk-summary-card__content" do %>
+        <% if rows.any? %>
           <%= tag.dl class: "govuk-summary-list" do %>
             <% rows.each do |row| %>
               <%
@@ -62,6 +63,7 @@
             <% end %>
           <% end %>
         <% end %>
+        <%= tag.div block, class: "gem-c-summary__block" if block.present? %>
       <% end %>
     <% end %>
   <% end %>

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

@@ -136,6 +136,6 @@
       <% end %>
     <% end %>
 
-    <%= tag.div block, class: "gem-c-summary__block" if block %>
-    <% end %>
+    <%= tag.div block, class: "gem-c-summary__block" if block.length > 0 %>
+  <% end %>
 <% end %>