tramway 2.2.3.1 → 2.2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3404f527f0941b117509108d7827d36cdf2c2d80037bdd41d6316ad040c2b95
-  data.tar.gz: 5a2896ae1e85140de75fa5c8b7aabc50475adf6ce31edeee66cfb1dd2d9cb034
+  metadata.gz: 8fdcc19f72d21a32a847cbe65521d96122451e79661d56a04b91b9e24834684c
+  data.tar.gz: 0e24422cc70884ec8b30be9dbd1ab874d0696e0e332908032bd128318df1c0bd
 SHA512:
-  metadata.gz: 11325a08313cf4eea578d73e5471b38339837f2f28b5af7e72a01d1eac6b72a493b12058135b8bd2f024608626ff9d84643c5d4d173c8b7fd561e41da2bd358c
-  data.tar.gz: bbd34d3d7fe3f8a7b306a7d79b0c8a328968180a270db57b2c89c490d5a115b68ee534ea75be48c39d60da13b45402288a6a6ea6b72f0db57d7c17a6d293d88a
+  metadata.gz: 5baf5d3877644edc9bb9671aaf4c9fc70579a126f6dabe15af50eb7c0dbb324d17dc9bb08370b389d42190cd79952879ca36495caa9940cdb8ebd8681826d99d
+  data.tar.gz: b5e7db58d85f0cb419cab1c249d8478b1faed9698e0b7d34c395486976abf8ef6dcd4cd81a3ce33cbbbbe8461c029c788324751234c473d7ab2d9f0bb9fb5447

data/app/components/tailwinds/button_component.html.haml

@@ -1,20 +1,27 @@
 - if text.present?
-  - case @tag
-  - when :a
-    = link_to text, path, class: classes, **render_options
-  - when :button
-    %button{ class: classes, **render_options }
-      = text
-  - when :form
+  - if stop_cell_propagation?
     = helpers.button_to text, path, method:, form: form_options, class: classes, **render_options
+  - else
+    - case @tag
+    - when :a
+      = link_to text, path, class: classes, **render_options
+    - when :button
+      %button{ class: classes, **render_options }
+        = text
+    - when :form
+      = helpers.button_to text, path, method:, form: form_options, class: classes, **render_options
 - else
-  - case @tag
-  - when :a
-    = link_to path, class: classes, **render_options do
-      = content
-  - when :button
-    %button{ class: classes, **render_options }
-      = content
-  - when :form
+  - if stop_cell_propagation?
     = helpers.button_to path, method:, class: classes, form: form_options, **render_options do
       = content
+  - else
+    - case @tag
+    - when :a
+      = link_to path, class: classes, **render_options do
+        = content
+    - when :button
+      %button{ class: classes, **render_options }
+        = content
+    - when :form
+      = helpers.button_to path, method:, class: classes, form: form_options, **render_options do
+        = content

data/app/components/tailwinds/button_component.rb

@@ -10,19 +10,20 @@ module Tailwinds
     option :type, optional: true
     option :size, default: -> { :medium }
     option :method, optional: true, default: -> { :get }
-    option :tag, optional: true, default: -> { false }
+    option :tag, optional: true, default: -> {}
     option :options, optional: true, default: -> { {} }
     option :form_options, optional: true, default: -> { {} }
 
     def before_render
       return if tag.present?
-      return @tag = :button if options[:type] == :submit
 
-      URI.parse(path)
-
-      return @tag = :a if method.to_s.downcase == 'get'
-
-      @tag = :form
+      @tag = if tag_button?
+               :button
+             elsif tag_a?
+               :a
+             else
+               :form
+             end
     end
 
     def size_classes
@@ -94,5 +95,18 @@ module Tailwinds
         'cursor-not-allowed'
       end
     end
+
+    def tag_button?
+      options[:type] == :submit
+    end
+
+    def tag_a?
+      return true unless path.is_a?(String)
+      return false unless method.to_s.downcase == 'get'
+
+      uri = URI.parse(path)
+
+      uri.query.nil? || (uri.query && !uri.query.empty?) # rubocop:disable Rails/Present
+    end
   end
 end

data/lib/tramway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tramway
-  VERSION = '2.2.3.1'
+  VERSION = '2.2.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway
 version: !ruby/object:Gem::Version
-  version: 2.2.3.1
+  version: 2.2.3.2
 platform: ruby
 authors:
 - kalashnikovisme