tramway 2.1.2 → 2.1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59b04db0703fc68b1a6377dc00723c2767ecc3417eb9b8f6cf2b73e522ea3a71
-  data.tar.gz: 20580dcdc78622ce7b20404c0b957bd152b741403c5783d00814ad7412b6f177
+  metadata.gz: 65ec93e5a4973beff68cd58f7c0bd06929d9f9063aab326ec16c974c164b319a
+  data.tar.gz: 19f708dfefa7c8c744cfd6ca6f97f7620a1580160039baf962b72a73b649009b
 SHA512:
-  metadata.gz: d266d0adc904060a2c8d376b48cc88be31c8c3b0d1670d0477bd71f07cba7fdbbcf19712b3639395e63e3a3555b401bdc56c43fb5dc841406c7e0e9d1f097670
-  data.tar.gz: 40ec0e1c9668b429155c1ac725f818ffed2eef2074ee67b41c57ef4b7bded03d654bdcc969d400e5d28dc8c135a2af083c94af9d5e082b76216dad843907b426
+  metadata.gz: 1f5760b7f15c842d445dbf788ef0de27b40a43cdf829ea8dce4f3adc22dd68eafeed9820d0794f60a9f8e06d19dcda99189382aff52860b7543ae16401b94ce7
+  data.tar.gz: 39043e6cca5363ce179ad6322e7766cc3e9eaf521cddf77b047d577dd9d5b797a7166618152d7fc7a0d3b3963b4b1b8feb2a56dbc882c9cbe092f41787430816

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

@@ -1,20 +1,20 @@
 - if text.present?
   - if render_a_tag?
-    = link_to text, path, class: classes, **options.except(:class)
+    = link_to text, path, class: classes, **render_options
   - else
     - if type&.to_sym == :submit
-      %button{ type: :submit, name: :commit, class: classes, **options.except(:class) }
+      %button{ type: :submit, name: :commit, class: classes, **render_options }
         = text
     - else
-      = button_to text, path, method:, form: form_options, class: classes, **options.except(:class)
+      = button_to text, path, method:, form: form_options, class: classes, **render_options
 - else
   - if render_a_tag?
-    = link_to path, class: classes, **options.except(:class) do
+    = link_to path, class: classes, **render_options do
       = content
   - else
     - if type&.to_sym == :submit
-      %button{ type: :submit, name: :commit, class: classes, **options.except(:class) }
+      %button{ type: :submit, name: :commit, class: classes, **render_options }
         = content
     - else
-      = button_to path, method:, class: classes, form: form_options, **options.except(:class) do
+      = button_to path, method:, class: classes, form: form_options, **render_options do
         = content

data/app/components/tailwinds/button_component.rb

@@ -61,8 +61,25 @@ module Tailwinds
       false
     end
 
+    def render_options
+      base_options = options.except(:class)
+      return base_options unless stop_cell_propagation?
+
+      base_options.merge(onclick: merged_onclick(base_options[:onclick]))
+    end
+
     private
 
+    def stop_cell_propagation?
+      view_context.respond_to?(:tramway_inside_cell) && view_context.tramway_inside_cell
+    end
+
+    def merged_onclick(existing_onclick)
+      return 'event.stopPropagation();' if existing_onclick.blank?
+
+      "#{existing_onclick}; event.stopPropagation();"
+    end
+
     def cursor_class
       if !render_a_tag? && !disabled?
         'cursor-pointer'

data/app/components/tailwinds/table/cell_component.rb

@@ -4,6 +4,22 @@ module Tailwinds
   module Table
     # Component for rendering a cell in a table
     class CellComponent < Tramway::BaseComponent
+      def around_render
+        ensure_view_context_accessor
+        previous_flag = view_context.tramway_inside_cell
+        view_context.tramway_inside_cell = true
+        yield
+      ensure
+        view_context.tramway_inside_cell = previous_flag
+      end
+
+      private
+
+      def ensure_view_context_accessor
+        return if view_context.respond_to?(:tramway_inside_cell=)
+
+        view_context.singleton_class.attr_accessor :tramway_inside_cell
+      end
     end
   end
 end

data/lib/tramway/version.rb

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

metadata

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