design_system 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b229cbfe82c0d8b0b7d9c88dfeec1b5993a5524ad04fa4b6f5baaa7507d269
-  data.tar.gz: 2b33b73ffabdd0381e2842f3d3f645476563698fec7b912e0d4e67a65d35dfd9
+  metadata.gz: cb797f5d8de4db2fa7a4b83c6d451a2b24b3cbb0abf6268e5ab5fa6c689c6622
+  data.tar.gz: 261263af1a12f6ca8de4fd08344922e302550d4f955b67e302111df125a03f7f
 SHA512:
-  metadata.gz: 7da95f367410b3780f36f11a6de15d028b82b1a410b4ce83aa63cc58ccd3a5dd965c6bae1b3eb0ade6308c8dfa2dfce577afa569bef90f01f04d455e262b45a9
-  data.tar.gz: 0c70a3bafd6638771780d1d098beff10eec4f63bfa8983a8cde25964c0a7940e6ca48f2255491d0f37d3de5d6380b9514be95adfe465c5e1e3a005192f7c9edd
+  metadata.gz: 015b3c2907397ff7c1f25efd042ef04e6859c774e84e71030e76e32391f67de6ef58832286101231cc89e77283850e4af0fa10eca42b102ee3e219bc76696ac5
+  data.tar.gz: 58c317d53b129d0b3e5185979b4fe05fd00e41a1a05df2bf0595ec5d88830e7a78b6ead981af6f1f9af308e29ae05ef9fdb8f02eac0e295a41fcb4be67417bfb

data/app/components/design_system/generic/summary_card_component.html.erb

@@ -1,6 +1,6 @@
 <div class="<%= brand %>-card">
   <div class="<%= brand %>-card__heading-container">
-    <%= ds_heading(title, class: "#{brand}-card__heading #{brand}-heading-m") %>
+    <%= ds_heading(title, class: "#{brand}-card__heading #{brand}-heading-m", level: heading_level) %>
     <% if actions.any? %>
       <ul class="<%= brand %>-card__actions">
         <% actions.each do |action| %>

data/app/components/design_system/generic/summary_card_component.rb

@@ -10,13 +10,14 @@ module DesignSystem
     class SummaryCardComponent < DesignSystem::BaseComponent
       include DesignSystemHelper
 
-      def initialize(title:, actions: [])
+      def initialize(title:, actions: [], heading_level: 2)
         super()
         @title = title
         @actions = Array(actions)
+        @heading_level = heading_level
       end
 
-      attr_reader :title, :actions
+      attr_reader :title, :actions, :heading_level
 
       def render_action(action)
         link_to(action[:href] || '#', class: "#{brand}-link") do

data/app/components/design_system/govuk/summary_card_component.html.erb

@@ -1,6 +1,6 @@
 <div class="<%= brand %>-summary-card">
   <div class="<%= brand %>-summary-card__title-wrapper">
-    <%= ds_heading(title, class: "#{brand}-summary-card__title") %>
+    <%= ds_heading(title, class: "#{brand}-summary-card__title", level: heading_level) %>
     <% if actions.any? %>
       <ul class="<%= brand %>-summary-card__actions">
         <% actions.each do |action| %>

data/app/helpers/design_system_helper.rb

@@ -117,8 +117,8 @@ module DesignSystemHelper
     render DesignSystem::Registry.component(brand, :panel).new(title:, body:)
   end
 
-  def ds_summary_card(title:, actions: [], &block)
-    component = DesignSystem::Registry.component(brand, :summary_card).new(title:, actions:)
+  def ds_summary_card(title:, actions: [], heading_level: 2, &block)
+    component = DesignSystem::Registry.component(brand, :summary_card).new(title:, actions:, heading_level:)
     render(component) { block ? capture(&block) : nil }
   end
 

data/lib/design_system/govuk/builders/pagination_renderer.rb

@@ -21,8 +21,29 @@ module DesignSystem
           end
         end
 
+        def to_html
+          previous_page_item, *page_items, next_page_item = pagination.map do |item|
+            item.is_a?(Integer) ? page_number(item) : send(item)
+          end
+
+          html_fragments = [
+            previous_page_item,
+            tag(:ul, page_items.join, class: 'govuk-pagination__list'),
+            next_page_item
+          ]
+
+          html_container(html_fragments.join)
+        end
+
         private
 
+        # GOV.UK renders the gap between page numbers as a list item with the
+        # ellipses modifier, not will_paginate's default bare <span class="gap">,
+        # which would be an invalid child of <ul class="govuk-pagination__list">.
+        def gap
+          tag(:li, '&ctdot;', class: 'govuk-pagination__item govuk-pagination__item--ellipses')
+        end
+
         def link_with_prev_title(_text, target, aria_label)
           tag(:a,
               govuk_icon('previous') + tag(:span,
@@ -47,12 +68,12 @@ module DesignSystem
           if page == current_page
             tag(:li,
                 tag(:a, page, class: 'govuk-link govuk-pagination__link', href: '#',
-                              aria: { label: "Page #{page}", current: 'page' }),
+                              'aria-label': "Page #{page}", 'aria-current': 'page'),
                 class: 'govuk-pagination__item govuk-pagination__item--current')
           else
             tag(:li,
                 tag(:a, page, class: 'govuk-link govuk-pagination__link', href: url(page),
-                              aria: { label: "Page #{page}" }),
+                              'aria-label': "Page #{page}"),
                 class: 'govuk-pagination__item')
           end
         end

data/lib/design_system/version.rb

@@ -1,3 +1,3 @@
 module DesignSystem
-  VERSION = '0.16.0'.freeze
+  VERSION = '0.17.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: design_system
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Filis Liu
@@ -524,7 +524,7 @@ files:
 - lib/tasks/design_system_tasks.rake
 - lib/tasks/govuk.rake
 - lib/tasks/nhsuk.rake
-- public/design_system/static/design_system-0.16.0/design_system.js
+- public/design_system/static/design_system-0.17.0/design_system.js
 - public/design_system/static/govuk-frontend-5.11.1/fonts/bold-affa96571d-v2.woff
 - public/design_system/static/govuk-frontend-5.11.1/fonts/bold-b542beb274-v2.woff2
 - public/design_system/static/govuk-frontend-5.11.1/fonts/light-94a07e06a1-v2.woff2