nfg_ui 5.15.3 → 5.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc2e41b096acf0984f462d1c7b2058dbf4f7c14d183ced10061b70cad2c263fb
-  data.tar.gz: 044aba97d396b80d60ab7dde7b6ed598f5f70c1c4c46366ac2db3a1ed9e27b81
+  metadata.gz: 44a92bdd16747ddbe83d9bc5bf872094e7344d6205391b356d8c5e01cc2209cb
+  data.tar.gz: 2dc7bdf3bfcad4046d0ea6162d36d3b1e6a3a023e83f0813f88d6e393ca16da6
 SHA512:
-  metadata.gz: 172b725c9ee35587851e1883b2f06c349c8cf6c438db6afe2c5b450dbd434f1bf3de610e6f64fd18e737c286beb0abe775f7a4522cc5259f4d15486c0035a93d
-  data.tar.gz: a687c3edd6dd070bf6e4d511050019d4c302ab334e40da37d20c58cd9c6bdc3333cabd7991145491247ab81a28a90b036d88d19537f88def6e2bd2c920137d53
+  metadata.gz: a2557d3579278fd434faa9d0c1e246f95d3fc4ba4eaf7d320b1c9f7e284f4eb74800147e6c06ad9946ae70969db4d3f52d17b4539ae320c92cc533257158428b
+  data.tar.gz: beca0a9fcebd58ab9cf36bbe2d4f6f598a3a7d5698092b0a90e6554ab4b632cf0f1cccf1314220b0f1f52f83832dd20d65050272cacc3eebbd9de3a77698cfb7

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

@@ -15,16 +15,42 @@ module NfgUi
 
         include NfgUi::Components::Traits::Collapse
 
+        # Because it is common to forget to add the required :id
+        # to the component options when doing a "speed built"
+        # collapse, example:
+        # = ui.nfg :collapse, :collapsed, body: 'Collapse body content', heading: 'My Link'
+        #
+        # Send in a random string that is carried through
+        # from the speed built heading / button AND
+        # to the collapse component.
+        def component_initialize
+          # Only create and supply a random ID this when a :heading is present
+          return unless heading
+          new_id = options[:id].nil? ? random_id : options[:id]
+          options[:id] = new_id
+        end
+
         def render
           capture do
             if heading
-              opts = { collapse: "##{id}", body: heading, icon: 'caret-down', class: 'pl-0 text-left' }
+              icon = options.fetch(:icon, 'caret-down')
+              opts = { collapse: "##{html_options[:id]}", body: heading, icon: icon, class: 'pl-0 text-left' }
               opts.merge!(traits: [:link, :block])
               concat(NfgUi::Components::Elements::Button.new(opts, view_context).render)
             end
             concat(super)
           end
         end
+
+        private
+
+        # Generate a string of random letters
+        # We must insert a random letter before SecureRandom because
+        # if a css ID starts with a number, it seems to break
+        # the collapse JS functionality.
+        def random_id
+          "#{('a'..'z').to_a.sample}-#{SecureRandom.alphanumeric(6)}"
+        end
       end
     end
   end

data/lib/nfg_ui/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nfg_ui
 version: !ruby/object:Gem::Version
-  version: 5.15.3
+  version: 5.15.4
 platform: ruby
 authors:
 - Jonathan Roehm
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap