nfg_ui 0.15.1 → 5.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b354ba900a6e46b2eda8601e69b7de3f58e05656328c7e28892bf892fbc8dc2
-  data.tar.gz: f02ffac702d1686da3d6552e950a40cbb5b83c8e42aec255fb137ce74c6ef0be
+  metadata.gz: bc2e41b096acf0984f462d1c7b2058dbf4f7c14d183ced10061b70cad2c263fb
+  data.tar.gz: 044aba97d396b80d60ab7dde7b6ed598f5f70c1c4c46366ac2db3a1ed9e27b81
 SHA512:
-  metadata.gz: ad68314c9bdb5faf2afda14487120d9f4927b50bc1d1944b22acaa9b8b3d669141b831119a327003543b6880abd2359205937c70b0a97026ef07a355ccddb959
-  data.tar.gz: '0972a216ccd1eacb2d43386cc0a574d94a6de43c2037711eb1228adf384c0891302efa40c11a782899d8e7d82713de1b70aa6a1d669d43f0d7c4bc12bb7aef4c'
+  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.1'
+  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.1
+  version: 5.15.3
 platform: ruby
 authors:
 - Jonathan Roehm
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap