nfg_ui 0.15.2 → 5.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f11c4d96da560e024244be9e9e2bc6f3911d2fd86a062a134f61247345db7090
-  data.tar.gz: fea4f47ca1ac73f95f30d7dbb3acc4b2ec63396ab6ffda5564595ae60d7750f6
+  metadata.gz: bc2e41b096acf0984f462d1c7b2058dbf4f7c14d183ced10061b70cad2c263fb
+  data.tar.gz: 044aba97d396b80d60ab7dde7b6ed598f5f70c1c4c46366ac2db3a1ed9e27b81
 SHA512:
-  metadata.gz: f9223e4c167e4cc79338e6ca89b451e010a3a11d85c4383a1e89007bf64cd5c114afa25b07827a43f1bc177f5f4dc2a3ba363fcb17f51e96e14a92f0af793fb5
-  data.tar.gz: 18ed8464b5415a2cf2dfd2e5aef97a4528a7d73da2592bdc4fe5b8ba359eab4335997f1e72bf30661b1a3e49a18d3439cc595e76707528720e4d017b84b351b7
+  metadata.gz: 172b725c9ee35587851e1883b2f06c349c8cf6c438db6afe2c5b450dbd434f1bf3de610e6f64fd18e737c286beb0abe775f7a4522cc5259f4d15486c0035a93d
+  data.tar.gz: a687c3edd6dd070bf6e4d511050019d4c302ab334e40da37d20c58cd9c6bdc3333cabd7991145491247ab81a28a90b036d88d19537f88def6e2bd2c920137d53

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NfgUi
-  VERSION = '0.15.2'
+  VERSION = '5.15.3'
 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.3
 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-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap