tramway 2.2.3 → 2.2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 073b1293c7f3778243b4402bd9db528eea16b9897145f5ac7a50bb0751607dfd
-  data.tar.gz: 980e71accc0572795aaa87764af580f50d883fa504b4b148fd5224826941c110
+  metadata.gz: 8fdcc19f72d21a32a847cbe65521d96122451e79661d56a04b91b9e24834684c
+  data.tar.gz: 0e24422cc70884ec8b30be9dbd1ab874d0696e0e332908032bd128318df1c0bd
 SHA512:
-  metadata.gz: 4819641881ea15d5ef0211470aab28fad0c758ac2f733bab1c8b2a319ae0b4794973df321a45d0bc054c273c9d567db1c86325a9b2739e40a818b101106c9b3a
-  data.tar.gz: 331ddb0387c6ee4339e1988a69c79cb9851d5f33f2ccd519036dec9d88c5b8d7fcd3744418e881550c915f568a6efb8fe352c4e80d0a08eb79b3833469221662
+  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{ type: :submit, name: :commit, 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 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/app/components/tailwinds/form/builder.rb

@@ -5,6 +5,7 @@ require 'tramway/utils/field'
 module Tailwinds
   module Form
     # Provides Tailwind-styled forms
+    # rubocop:disable Metrics/ClassLength
     class Builder < Tramway::Views::FormBuilder
       include Tramway::Utils::Field
 
@@ -92,7 +93,14 @@ module Tailwinds
       def submit(action, **options, &)
         sanitized_options = sanitize_options(options)
 
-        render(Tailwinds::ButtonComponent.new(text: action, size: form_size, type: :submit, **sanitized_options), &)
+        render(
+          Tailwinds::ButtonComponent.new(
+            text: action,
+            size: form_size,
+            options: sanitized_options.merge(name: :commit, type: :submit)
+          ),
+          &
+        )
       end
 
       private
@@ -140,5 +148,6 @@ module Tailwinds
         end
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/tramway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tramway
-  VERSION = '2.2.3'
+  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
+  version: 2.2.3.2
 platform: ruby
 authors:
 - kalashnikovisme