brick 1.0.153 → 1.0.154

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc98614593bc4e4931a445801f4f7764c15e6032daf2765f8d78a47f61b7b3a7
-  data.tar.gz: 5b3ae1d718df14101c153b335a66578a5b02771714dedd7ebda1022cadebe482
+  metadata.gz: 647f34b463dc92515c7eb04331726a808b5ea69dd2bbd6ef99c9d6c769868565
+  data.tar.gz: 22ae7fa65845e65a7848f5cfff0fbb52a864b0161783c3f7d28cfb82ba1f88e5
 SHA512:
-  metadata.gz: 15852e3d59a95d5ac8614d98a44a70796c5494610447505abe61dcd02010c3701dc9ba48da951e4639e4fa14694cfee4c7455c2a0bd63fc613738886ca908b26
-  data.tar.gz: bd5cc34b7c004461af1737dbcb4b746889bd7f4da7d5242c3f341793ed4675c33a50bc61108a6f1e24037585298361f8f4f6ac699a25a72c4ec860f1c272e0ba
+  metadata.gz: 84034f48010bd159804a19cb865a9cad04ba5efe89bb1e807a7031393d9a64a33d9ca9802f991565f4d73753df087d200099052dde59e4127c6b94370456ec09
+  data.tar.gz: 57b3cca20e566ef0d4ac72a45f24b025feea45421417b23cbe7cb683877ac228463f5f348f931a6024b9cdf750dde6aa6c49293e1ae1a596a70a0d8f3c128d6c

data/lib/brick/config.rb

@@ -230,6 +230,14 @@ module Brick
       @mutex.synchronize { @json_columns = cols }
     end
 
+    def sidescroll
+      @mutex.synchronize { @sidescroll ||= {} }
+    end
+
+    def sidescroll=(scroll)
+      @mutex.synchronize { @sidescroll = scroll }
+    end
+
     def model_descrips
       @mutex.synchronize { @model_descrips ||= {} }
     end

data/lib/brick/frameworks/rails/engine.rb

@@ -864,6 +864,10 @@ tr th {
   color: #fff;
   text-align: left;
 }
+.col-sticky {
+  position: sticky;
+  left: 0;
+}
 #headerTop tr th {
   position: relative;
 }
@@ -902,6 +906,10 @@ tr td.highlight {
   background-color: #B0B0FF;
 }
 
+table tr .col-sticky {
+  background-color: #28B898;
+}
+
 .show-field {
   background-color: #004998;
 }
@@ -916,6 +924,12 @@ table.shadow > tbody > tr {
 table tbody tr:nth-of-type(even) {
   background-color: #f3f3f3;
 }
+table tbody tr:nth-of-type(even) .col-sticky {
+  background-color: #fff;
+}
+table tbody tr:nth-of-type(odd) .col-sticky {
+  background-color: #f3f3f3;
+}
 
 table.shadow > tbody > tr:last-of-type {
   border-bottom: 2px solid #009879;
@@ -1080,18 +1094,30 @@ function setHeaderSizes() {
   // %%% Grab the TRs from headerTop, clear it out, do this stuff, add them back
   headerTop.innerHTML = \"\"; // %%% Would love to not have to clear it out like this every time!  (Currently doing this to support resize events.)
   var isEmpty = headerTop.childElementCount === 0;
+  var numFixed = parseInt(grid.getAttribute(\"x-num-frozen\")) || 0;
+  var fixedColLefts = [0];
+
   // Set up proper sizings of sticky column header
   var node;
   for (var j = 0; j < #{table_name}HtColumns.length; ++j) {
     var row = #{table_name}HtColumns[j];
     var tr = isEmpty ? document.createElement(\"TR\") : headerTop.childNodes[j];
     tr.innerHTML = row.innerHTML.trim();
+    var curLeft = 0.0;
     // Match up widths from the original column headers
     for (var i = 0; i < row.childNodes.length; ++i) {
       node = row.childNodes[i];
       if (node.nodeType === 1) {
         var th = tr.childNodes[i];
         th.style.minWidth = th.style.maxWidth = getComputedStyle(node).width;
+        // Add \"left: __px\" style to the fixed-width column THs
+        if (i <= numFixed) {
+          th.style.position = \"sticky\";
+          th.style.backgroundColor = \"#008061\";
+          th.style.zIndex = \"1\";
+          th.style.left = curLeft + \"px\";
+          fixedColLefts.push(curLeft += node.clientWidth);
+        }
         if (#{pk&.present? ? 'i > 0' : 'true'}) {
           // Add <span> at the end
           var span = document.createElement(\"SPAN\");
@@ -1108,6 +1134,12 @@ function setHeaderSizes() {
     headerCols = tr.childNodes;
     if (isEmpty) headerTop.appendChild(tr);
   }
+  // Add \"left: __px\" style to all fixed-width column TDs
+  [...grid.children[1].children].forEach(function (row) {
+    for (var j = 1; j <= numFixed; ++j) {
+      row.children[j].style.left = fixedColLefts[j] + 'px';
+    }
+  });
   grid.style.marginTop = \"-\" + getComputedStyle(headerTop).height;
   // console.log(\"end\");
 }

data/lib/brick/frameworks/rails/form_tags.rb

@@ -24,8 +24,11 @@ module Brick::Rails::FormTags
       end
     end
 
+    nfc = Brick.config.sidescroll.fetch(relation.table_name, nil)&.fetch(:num_frozen_columns, nil) ||
+          Brick.config.sidescroll.fetch(:num_frozen_columns, nil) ||
+          0
     out = "<table id=\"headerTop\"></table>
-<table id=\"#{relation.table_name.split('.').last}\" class=\"shadow\">
+<table id=\"#{relation.table_name.split('.').last}\" class=\"shadow\"#{ " x-num-frozen=\"#{nfc}\"" if nfc.positive? }>
   <thead><tr>"
     pk = (klass = relation.klass).primary_key || []
     pk = [pk] unless pk.is_a?(Array)
@@ -95,12 +98,13 @@ module Brick::Rails::FormTags
     #     (After restarting the server it worked fine again.)
     relation.each do |obj|
       out << "<tr>\n"
-      out << "<td>#{link_to('⇛', send("#{klass._brick_index(:singular)}_path".to_sym,
+      out << "<td class=\"col-sticky\">#{link_to('⇛', send("#{klass._brick_index(:singular)}_path".to_sym,
                                       pk.map { |pk_part| obj.send(pk_part.to_sym) }), { class: 'big-arrow' })}</td>\n" if pk.present?
-      sequence.each do |col_name|
+      sequence.each_with_index do |col_name, idx|
         val = obj.attributes[col_name]
         bt = bts[col_name]
         out << '<td'
+        (classes ||= []) << 'col-sticky' if idx < nfc
         (classes ||= []) << 'dimmed' unless cols.key?(col_name) || (cust_col = cust_cols[col_name]) ||
                                             (col_name.is_a?(Symbol) && bts.key?(col_name)) # HOT
         (classes ||= []) << 'right' if val.is_a?(Numeric) && !bt

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 153
+    TINY = 154
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/brick.rb

@@ -501,6 +501,11 @@ module Brick
       Brick.config.json_columns = cols
     end
 
+    # @api public
+    def sidescroll=(scroll)
+      Brick.config.sidescroll = scroll
+    end
+
     # DSL templates for individual models to provide prettier descriptions of objects
     # @api public
     def model_descrips=(descrips)

data/lib/generators/brick/install_generator.rb

@@ -35,7 +35,7 @@ module Brick
           end
         end
         possible_additional_references = relations.each_with_object(Hash.new { |h, k| h[k] = [] }) do |relation, s|
-          this_tnp = tnps&.keys.find { |tnp| relation.first.start_with?(tnp) }
+          this_tnp = tnps&.keys&.find { |tnp| relation.first.start_with?(tnp) }
           model_filename = "app/models/#{ActiveSupport::Inflector.singularize(relation.first)}.rb"
           relation.last[:cols].each do |col, type|
             col_down = col.downcase
@@ -244,6 +244,14 @@ if ActiveRecord::Base.respond_to?(:brick_select) && !::Brick.initializer_loaded
   # Brick.column_sequence = { 'users' =>   { include: ['email', 'profile.firstname', 'profile.lastname'] },
   #                           'profile' => { exclude: ['birthdate'] } }
 
+  # # When rendering the grid on index pages, a default number of columns to keep as \"sticky\" so that they remain
+  # # at the left of the grid while scrolling.  By default this is 0 extra columns -- only the link to that
+  # # object's show / edit page is sticky.  And this would add one extra column in the mix:
+  # Brick.sidescroll = { num_frozen_columns: 1 }
+  # # As well if you would like to customise this for specific resources, that is possible:
+  # Brick.sidescroll = { num_frozen_columns: 0,
+  #                      'products' => { num_frozen_columns: 2 } }
+
   # # EXTRA FOREIGN KEYS AND OTHER HAS_MANY SETTINGS
 
   # # Additional table references which are used to create has_many / belongs_to associations inside auto-created

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.153
+  version: 1.0.154
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-24 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord