tramway 3.0.4 → 3.0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f1294b704f5b6bc2779d6eae4168a9c63508af6b485dfe267fa70a1b2ca786e
-  data.tar.gz: 662bf3c75f819a46229a55cce0804b11a70511ade1ecbc08e8aa50a09d246381
+  metadata.gz: cfd16d191c35f49e31f08328da1a8992ab6f1f08182c8b919355d54ff9951074
+  data.tar.gz: d1f8dfe3c21273a746a13750ee89c575cb9c0a065aca4aff0b93010613a381dd
 SHA512:
-  metadata.gz: 90eb4ab0b7d5e871f904d320a42469ea92d35a83ebad3c014b167fe7b5294e7c046c1c0ebc41f64a09693794995e82641d69b3cb9d59d3e5183f5108ace44745
-  data.tar.gz: 53bc0d610787669587ed26f4c6bbadce0c0e476ae34b8f4ea49128ad7e20265080d09abdf3726fea93aea1014a2a935b12077b6049c47fd46c199c044ad6872f
+  metadata.gz: f90c814812cd3714bc1f4492ae243a9278dfd49e0cb4d8796597a548fd0c18d9eceab36e4cae21d28f4807dc036f088efe91f555d8623a7c28066422ee6c0b0d
+  data.tar.gz: b77c7144dd9fa87c805b4427a7d22f43011dba7da7cdc53eb494aeac47a15b6601bb06f076a2195347f0a22d1a62ec0293eba04ca29c472b81caa62f625229ac

data/app/components/tramway/table/content_cells.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Tramway
+  module Table
+    # Helpers for extracting and normalizing visible table content cells from HTML fragments.
+    module ContentCells
+      private
+
+      def visible_cells_from(content)
+        fragment = Nokogiri::HTML.fragment(content)
+        parsed_cells = fragment.xpath(
+          './*[@class and contains(concat(" ", normalize-space(@class), " "), " div-table-cell ")]'
+        )
+
+        parsed_cells.each { |cell| remove_hidden_class!(cell) }
+      end
+
+      def remove_hidden_class!(node)
+        classes = node['class'].to_s.split
+        return if classes.empty?
+
+        node['class'] = classes.reject { |class_name| class_name == 'hidden' }.join(' ')
+      end
+    end
+  end
+end

data/app/components/tramway/table/header_component.html.haml

@@ -1,4 +1,5 @@
-%div{ class: "#{header_row_classes} md:grid-cols-#{columns_count}", aria: { label: "Table Header" }, role: "row" }
+- parsed_cells = headers.any? ? nil : visible_cells_from(content)
+%div{ class: "#{header_row_classes} md:grid-cols-#{columns_count(parsed_cells: parsed_cells)}", aria: { label: "Table Header" }, role: "row" }
   - if headers.any?
     - headers.each do |header|
       .div-table-cell{ class: header_cell_classes }

data/app/components/tramway/table/header_component.rb

@@ -4,11 +4,17 @@ module Tramway
   module Table
     # Component for rendering a header in a table
     class HeaderComponent < Tramway::BaseComponent
+      include ContentCells
+
       option :headers, optional: true, default: -> { [] }
       option :columns, optional: true, default: -> { 3 }
 
-      def columns_count
-        headers.present? ? headers.size : columns
+      def columns_count(content = nil, parsed_cells: nil)
+        return headers.size if headers.present?
+        return parsed_cells.size if parsed_cells
+        return visible_cells_from(content).size if content.present?
+
+        columns
       end
 
       def header_row_classes

data/app/components/tramway/table/row_component.rb

@@ -4,6 +4,8 @@ module Tramway
   module Table
     # Component for rendering a row in a table
     class RowComponent < Tramway::BaseComponent
+      include ContentCells
+
       option :cells, optional: true, default: -> { [] }
       option :href, optional: true
       option :preview, optional: true, default: -> { true }
@@ -58,22 +60,6 @@ module Tramway
 
       private
 
-      def visible_cells_from(content)
-        fragment = Nokogiri::HTML.fragment(content)
-        parsed_cells = fragment.xpath(
-          './*[@class and contains(concat(" ", normalize-space(@class), " "), " div-table-cell ")]'
-        )
-
-        parsed_cells.each { |cell| remove_hidden_class!(cell) }
-      end
-
-      def remove_hidden_class!(node)
-        classes = node['class'].to_s.split
-        return if classes.empty?
-
-        node['class'] = classes.reject { |class_name| class_name == 'hidden' }.join(' ')
-      end
-
       def ensure_view_context_accessor
         return if view_context.respond_to?(:tramway_inside_cell=)
 

data/lib/tramway/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.4.1
 platform: ruby
 authors:
 - kalashnikovisme
@@ -230,6 +230,7 @@ files:
 - app/components/tramway/pagination/prev_page_component.rb
 - app/components/tramway/table/cell_component.html.haml
 - app/components/tramway/table/cell_component.rb
+- app/components/tramway/table/content_cells.rb
 - app/components/tramway/table/header_component.html.haml
 - app/components/tramway/table/header_component.rb
 - app/components/tramway/table/row/preview_component.html.haml