infotable 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61eaa702c985b223c91d6da00bf84515ba067ad2a7d8dd3b6fde0c5e9eac7603
-  data.tar.gz: edda1595d51b8ae913cecd87315a01ebf2f8788df68578ff3b45086b04c942d6
+  metadata.gz: f00cd7591b4bc03f8f7443771dc1be2abc2e022602a2a2b14a61090d6eea76aa
+  data.tar.gz: 1c48ace8adb272674a1b0138b7aa1744dfe5154695b87ea5e1773cc918d912fc
 SHA512:
-  metadata.gz: 7e612ced33027a865095124cad1c1f2798abaab7238cb4c073da90625a7adbfa1068f5ca216e2e753766085ad5e43b6d1723255773ebc9e10dc3acfa63150634
-  data.tar.gz: 73c8657018df5e58536b75b27e5624ef4868c5a2fb29f72d87a7a258a8cb813c51184188d1b2b6bc9de576cf94605eab850cee545bf76e71eaf53198b0fe2a32
+  metadata.gz: 9ed45ecaf4c41b844dd6a7df34e35bcecefe593fa146fbe352ec9c6e4b20501f7661464a383f6a6ae386190e13d6a4cb395765c6ea4450f1d2637f442256c148
+  data.tar.gz: 79fae3ddc36f3c98c826eb18fcb9856f810e5d8fd2681eb9244ba3577efa7a397b384eb8bb170c791cd1668c5c5f5e444f546553d55cffb0cd099813555366bd

data/app/assets/javascripts/infotable/controllers/table_controller.js

@@ -848,11 +848,20 @@ export default class extends Controller {
     const cells = table.querySelectorAll(`th[data-column-name="${escaped}"], td[data-column-name="${escaped}"]`)
 
     cells.forEach(cell => {
-      if (cell.dataset.defaultWidth === undefined) cell.dataset.defaultWidth = cell.style.width
-      const value = width === null ? cell.dataset.defaultWidth : `${width}px`
-      cell.style.width = value
-      cell.style.maxWidth = value
-      cell.style.minWidth = width === null ? "" : value
+      // Remember how the server rendered the cell (action columns have width/min-width but no max-width)
+      if (cell.dataset.defaultWidth === undefined) {
+        cell.dataset.defaultWidth = cell.style.width
+        cell.dataset.defaultMaxWidth = cell.style.maxWidth
+        cell.dataset.defaultMinWidth = cell.style.minWidth
+      }
+
+      if (width === null) {
+        cell.style.width = cell.dataset.defaultWidth
+        cell.style.maxWidth = cell.dataset.defaultMaxWidth
+        cell.style.minWidth = cell.dataset.defaultMinWidth
+      } else {
+        cell.style.width = cell.style.maxWidth = cell.style.minWidth = `${width}px`
+      }
     })
   }
 

data/app/helpers/infotable/tables_helper.rb

@@ -28,6 +28,17 @@ module Infotable
       render partial: "infotable/tables/table", locals: locals
     end
 
+    # Inline width style for a header/body cell. Data columns are clipped to their width (ellipsis);
+    # action columns hold buttons, so their width is only a minimum and the column grows to fit all
+    # of them (a clipped "Delete" button is worse than a wider column).
+    def infotable_cell_width_style(column, ellipsis: false)
+      if %w[action actions].include?(column[:type].to_s)
+        "width: 1%; min-width: #{column[:width]}; white-space: nowrap;"
+      else
+        "width: #{column[:width]}; max-width: #{column[:width]}; overflow: hidden;#{' text-overflow: ellipsis;' if ellipsis}"
+      end
+    end
+
     # Format cell value based on column definition
     def format_cell_value(record, column, table_class = nil)
       value = (table_class || Infotable::Base).cell_value(record, column)

data/app/views/infotable/tables/_table_rows.html.erb

@@ -29,7 +29,7 @@
     <% table_class.columns.each do |column| %>
       <td data-column-name="<%= column[:name] %>"
           data-default-visible="<%= column[:visible] %>"
-          style="width: <%= column[:width] %>; max-width: <%= column[:width] %>; overflow: hidden; text-overflow: ellipsis;"
+          style="<%= infotable_cell_width_style(column, ellipsis: true) %>"
           class="<%= cell_padding %> whitespace-nowrap <%= text_size %> text-gray-700 dark:text-gray-300">
         <%= format_cell_value(record, column, table_class) %>
       </td>

data/app/views/infotable/tables/show.html.erb

@@ -34,7 +34,7 @@
                     data-column-name="<%= column[:name] %>"
                     data-default-visible="<%= column[:visible] %>"
                     <%= tag.attributes(data: { default_pinned: column[:pinned] }) if column[:pinned] %>
-                    style="width: <%= column[:width] %>; max-width: <%= column[:width] %>; overflow: hidden;"
+                    style="<%= infotable_cell_width_style(column) %>"
                     class="<%= header_padding %> text-left text-xs font-semibold text-gray-900 dark:text-gray-100 tracking-wider select-none bg-gray-50 dark:bg-gray-800 sticky top-0 z-20">
                   <% if column[:sortable] %>
                     <% sort_index = current_sorts.index { |name, _| name == column[:name].to_s } %>

data/lib/infotable/version.rb

@@ -1,3 +1,3 @@
 module Infotable
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infotable
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Jakub Cieślar