nfg_ui 0.15.2 → 5.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f11c4d96da560e024244be9e9e2bc6f3911d2fd86a062a134f61247345db7090
-  data.tar.gz: fea4f47ca1ac73f95f30d7dbb3acc4b2ec63396ab6ffda5564595ae60d7750f6
+  metadata.gz: 44a92bdd16747ddbe83d9bc5bf872094e7344d6205391b356d8c5e01cc2209cb
+  data.tar.gz: 2dc7bdf3bfcad4046d0ea6162d36d3b1e6a3a023e83f0813f88d6e393ca16da6
 SHA512:
-  metadata.gz: f9223e4c167e4cc79338e6ca89b451e010a3a11d85c4383a1e89007bf64cd5c114afa25b07827a43f1bc177f5f4dc2a3ba363fcb17f51e96e14a92f0af793fb5
-  data.tar.gz: 18ed8464b5415a2cf2dfd2e5aef97a4528a7d73da2592bdc4fe5b8ba359eab4335997f1e72bf30661b1a3e49a18d3439cc595e76707528720e4d017b84b351b7
+  metadata.gz: a2557d3579278fd434faa9d0c1e246f95d3fc4ba4eaf7d320b1c9f7e284f4eb74800147e6c06ad9946ae70969db4d3f52d17b4539ae320c92cc533257158428b
+  data.tar.gz: beca0a9fcebd58ab9cf36bbe2d4f6f598a3a7d5698092b0a90e6554ab4b632cf0f1cccf1314220b0f1f52f83832dd20d65050272cacc3eebbd9de3a77698cfb7

data/lib/nfg_ui/bootstrap/components/dropdown_item.rb

@@ -10,7 +10,16 @@ module NfgUi
         include Bootstrap::Utilities::Activatable
         include Bootstrap::Utilities::Disableable
         include Bootstrap::Utilities::Tooltipable
-        include Bootstrap::Utilities::Remotable
+
+        # We do not want to overwrite button_to's interpretation
+        # of `remote`. Conditionally include Remotable
+        # when not using as: :button_to
+        def initialize(*)
+          super
+          if as != :button_to
+            extend Bootstrap::Utilities::Remotable
+          end
+        end
 
         def component_family
           :dropdown

data/lib/nfg_ui/components/elements/dropdown_item.rb

@@ -12,7 +12,6 @@ module NfgUi
         include NfgUi::Components::Utilities::Describable
         include NfgUi::Components::Utilities::DisableWithable
         include NfgUi::Components::Utilities::Iconable
-        include NfgUi::Components::Utilities::Methodable
         include NfgUi::Components::Utilities::Renderable
         include NfgUi::Components::Utilities::Traitable
 
@@ -22,24 +21,34 @@ module NfgUi
         include NfgUi::Components::Traits::Disable
         include NfgUi::Components::Traits::Theme
 
+        # We do not want to overwrite button_to's interpretation
+        # of `method`. Conditionally include Methodable
+        # when not using as: :button_to
+        def initialize(*)
+          super
+          if as != :button_to
+            extend NfgUi::Components::Utilities::Methodable
+          end
+        end
+
         def render
           if tooltip && disabled
             content_tag(:span, disabled_component_tooltip_wrapper_html_options) do
               content_tag(as, html_options.except(:href)) do
-                if icon
-                  NfgUi::Components::Foundations::Icon.new({ traits: ["#{icon} fw"], text: (block_given? ? yield : body), class: 'text-center' }, view_context).render
-                else
-                  (block_given? ? yield : body)
-                end
+                yield_icon_or_body
               end
             end
+          elsif as == :button_to
+            # Manually pass in url_for args for routing
+            # example: = ui.nfg :dropdown_item, as: :button_to, button_url: some_action_path(@object)
+            url_for_option = options.delete(:button_url)
+
+            view_context.button_to(url_for_option, html_options) do
+              yield_icon_or_body
+            end
           else
             super do
-              if icon
-                NfgUi::Components::Foundations::Icon.new({ traits: ["#{icon} fw"], text: (block_given? ? yield : body), class: 'text-center' }, view_context).render
-              else
-                (block_given? ? yield : body)
-              end
+              yield_icon_or_body
             end
           end
         end
@@ -52,6 +61,14 @@ module NfgUi
 
         private
 
+        def yield_icon_or_body
+          if icon
+            NfgUi::Components::Foundations::Icon.new({ traits: ["#{icon} fw"], text: (block_given? ? yield : body), class: 'text-center' }, view_context).render
+          else
+            (block_given? ? yield : body)
+          end
+        end
+
         def base_element
           as
         end

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 = '0.15.2'
+  VERSION = '5.15.4'
 end

metadata

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