nfg_ui 0.12.6 → 0.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bbafc30ea4243b1b4053b0ea9556031985f5d9f13a0800542a45d8a92c6a854
-  data.tar.gz: ea57532fe3f800a39722870962424ae6c11868d333c39292703c4df18266f8b0
+  metadata.gz: a35bf8e810bef7ab9c4ac1dca95a6ca9e236b5f4606ef6c63614fa941fd510c8
+  data.tar.gz: 1d007a905113a5bbb89a4dd3fc486639d72b0be1a4c466f07b7f3a70cbb1e37e
 SHA512:
-  metadata.gz: b9642aa6a7d9b14a2523bd3ced6b4a8cfa2cb905fd614f3484ba748447fec2e1f96c3dbdffe42f0baf4e9f042b45ce49cdd455b6bba56c32cbda13383465aefd
-  data.tar.gz: 65e30453eb0709ca978786c273751ad6116e823f1f5eae35439b0b832ce26f117afd010081baaf9ba8800dd0ca5d1c37e5be7736b508bad1556a854a5f17a80d
+  metadata.gz: f7a91b7232e34eb6f7a2b68eb1d7c279858d1e62b4a95ac811f3c45922690790eefa993fb5a0c82f9d2be4dc496aea796b0cac99946b1bc5def7764502bb52d0
+  data.tar.gz: d4e2fc74dcd4244490bc2455a4f30b1a9fd04e73d91373865b87e3ae431563614e2841f83491979a999e5be0d0f668c3e1b47b02454bb210b4d560d1c357c864

data/lib/nfg_ui/components/patterns/tile.rb

@@ -16,6 +16,14 @@ module NfgUi
           options.fetch(:heading, nil)
         end
 
+        def button
+          options.fetch(:button, nil)
+        end
+
+        def href
+          options.fetch(:href, nil)
+        end
+
         def component_family
           :tile
         end
@@ -28,7 +36,7 @@ module NfgUi
           super do
             if render_in_body
               if title.present?
-                concat(NfgUi::Components::Patterns::TileHeader.new({ title: title, icon: icon, collapsible: collapsible, collapse: ("#collapse_#{id}" if collapsible) }, view_context).render)
+                concat(NfgUi::Components::Patterns::TileHeader.new({ title: title, subtitle: subtitle, button: button, href: href, icon: icon, collapsible: collapsible, collapsed: collapsed, collapse: ("#collapse_#{id}" if collapsible) }, view_context).render)
               end
               if collapsible
                 concat(NfgUi::Components::Patterns::Collapse.new({ id: "collapse_#{id}", collapsed: collapsed }, view_context).render {
@@ -47,10 +55,14 @@ module NfgUi
           end
         end
 
+        def subtitle
+          options.fetch(:subtitle, nil)
+        end
+
         private
 
         def non_html_attribute_options
-          super.push(:heading, :render_in_body)
+          super.push(:heading, :render_in_body, :subtitle, :button, :href)
         end
       end
     end

data/lib/nfg_ui/components/patterns/tile_header.rb

@@ -14,23 +14,57 @@ module NfgUi
           :tile
         end
 
+        def button
+          options.fetch(:button, nil)
+        end
+
+        def href
+          options.fetch(:href, nil)
+        end
+
+        def subtitle
+          options.fetch(:subtitle, nil)
+        end
+
         def render
           super do
-            if collapsible && title
-              concat(NfgUi::Components::Elements::Button.new({ traits: [:link, :block], collapse: collapse, class: 'no-link-color p-0 m-0', data: { collapse_icon: collapse_icon, collapsed_icon: collapsed_icon } }, view_context).render {
-                content_tag(:div, class: 'row align-items-center') do
-                  concat(content_tag(:div, class: 'col-10 text-left') {
-                    NfgUi::Components::Foundations::Typeface.new({ heading: title, icon: icon, class: 'h4' }, view_context).render
-                  })
-                  concat(content_tag(:div, class: 'col-2 text-right') {
-                    NfgUi::Components::Foundations::Icon.new({ traits: ["#{contextual_collapsible_icon} fw"], tooltip: 'Show / hide additional information' }, view_context).render
-                  })
+            if title
+              concat(content_tag(:div, class: 'row') do
+                concat(content_tag(:div, class: "col") do
+                  content_tag(:div, class: 'row') do
+                    concat(content_tag(:div, class: 'col-12 col-md') do
+                      concat(NfgUi::Components::Foundations::Typeface.new({ heading: title, icon: icon, class: 'h4' }, view_context).render)
+                      if subtitle
+                        concat(NfgUi::Components::Foundations::Typeface.new({ body: subtitle, traits: [:muted], class: 'mt-1 mb-0' }, view_context).render)
+                      end
+                    end)
+
+                    if button
+                      concat(content_tag(:div, class: 'col-12 col-md-auto mt-md-0 mt-2') do
+                        NfgUi::Components::Elements::Button.new({theme: :secondary, href: href, body: button}, view_context).render
+
+                      end)
+                    end
+                  end
+                end)
+
+                if collapsible
+                  concat(content_tag(:div, class: 'col-auto pl-0') do
+                    NfgUi::Components::Elements::Button.new({ traits: [:link], collapse: collapse, data: { collapse_icon: collapse_icon, collapsed_icon: collapsed_icon } }, view_context).render do
+
+                      # The button cannot host a data-toggle for tooltip
+                      # and a data-toggle for collapse
+
+                      # In order to accomodate the tooltip, we have to
+                      # render the icon manually without using the button's
+                      # options so that we're applying the tooltip on the
+                      # icon and not the button.
+                      NfgUi::Components::Foundations::Icon.new({ traits: ["#{contextual_collapsible_icon} fw"], tooltip: 'Show / hide additional information' }, view_context).render
+                    end
+                  end)
                 end
-              })
-            elsif title
-              concat(NfgUi::Components::Foundations::Typeface.new({ heading: title, icon: icon, class: 'h4' }, view_context).render)
+              end)
             end
-
             concat((block_given? ? yield : body))
           end
         end
@@ -49,6 +83,10 @@ module NfgUi
         def collapsed_icon
           'caret-down'
         end
+
+        def non_html_attribute_options
+          super.push(:subtitle, :button, :href)
+        end
       end
     end
   end

data/lib/nfg_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NfgUi
-  VERSION = '0.12.6'
+  VERSION = '0.12.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nfg_ui
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.12.7
 platform: ruby
 authors:
 - Jonathan Roehm
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap