bullet_train-themes-light 1.6.38 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc56ad0f914c9e52197eadc60d362b517b257a8e3a0ac35644e557cd0976f8c
-  data.tar.gz: 65725c988f6b48a1481d198d32d55216a52247b8d46b5b440be49497a174959d
+  metadata.gz: a8cd8c8f227d8831226248a63618f7be2355217c9852e3ddf0f3df08fe24c97b
+  data.tar.gz: 927fcc1d0f8abbcc09eb45c88b6a81dd9e4a53f8ff34e631dce196d4da62ec38
 SHA512:
-  metadata.gz: 25cf2ddec2df492cb151026d87536d2615b385e2701c86fa6a455ed9412623941c15b95011e684822cc716ddba28a99f629ece00fb28a8c88749db59a3fd2ee9
-  data.tar.gz: a2be75172cd98040fbc709558ebffd9757176277ed8dac57d5f2664fb4097a640785373358d8e376fef6dcb6d065d7d37f5214abff86c284ecf95a6d589c4b7c
+  metadata.gz: dd0f8c0b42a6a1012dcbff75b743033ad9fb4015f40d6d0d227c34b313790169a124d428ef2c5bfdf8bda000f460e7f56ca9b560bd97176da2fc3f73d8662ac1
+  data.tar.gz: d4ea72eb5d580348d2cd3dd7924fb3d1766c376e98b40aaaf3b5511993d2142acb914c685cb8823b1e82285e0522c5b72baa2aeec67848f1a5cac2a2982f0c69

data/app/helpers/{light_theme_helper.rb → theme_helper.rb}

@@ -1,4 +1,4 @@
-module LightThemeHelper
+module ThemeHelper
   # override in app/helpers/application_helper.rb
   def current_theme
     :light

data/app/views/showcase/previews/field_partials/_buttons.html.erb

@@ -4,7 +4,7 @@
   <% end %>
 
   <% showcase.sample "Multiple Buttons" do %>
-    <%= render "shared/fields/buttons", form: form, method: :multiple_button_values, multiple: true %>
+    <%= render "shared/fields/buttons", form: form, method: :multiple_button_values, options: {multiple: true} %>
   <% end %>
 
   <% showcase.sample "Boolean Button" do %>

data/app/views/showcase/previews/field_partials/_options.html.erb

@@ -4,7 +4,7 @@
   <% end %>
 
   <% showcase.sample "Multiple Option" do %>
-    <%= render 'shared/fields/options', form: form, method: :multiple_option_values, multiple: true, show_select_all_top: true %>
+    <%= render 'shared/fields/options', form: form, method: :multiple_option_values, options: {multiple: true}, show_select_all_top: true %>
   <% end %>
 <% end %>
 

data/app/views/themes/light/fields/_field.html.erb

@@ -1,3 +1,17 @@
+<%
+# This is the main partial which all of our other field partials
+# invoke in `bullet_train-themes/app/views/base/fields/`.
+# `options`, `html_options` and `other_options`
+# each serve their own specific purpose, so please read the
+# Field Partial documentation to get more familiar with how these work.
+# https://bullettrain.co/docs/field-partials
+#
+# Even though not all form helpers are invoked in this partial,
+# all instances of `options` must be passed here because
+# We add the `for` attribute for labels with `options[:id]`,
+# and this isn't always as simple as `form.field_id(method)`.
+%>
+
 <%
 %i[label field error help after_help].each do |key|
   if (content = content_for(key).presence)
@@ -11,12 +25,18 @@ end
 form ||= current_fields_form
 # returns a struct with `label`, `placeholder`, and `help` methods.
 labels = labels_for(form, method)
+
+# Initialize options.
 options ||= {}
+other_options ||= {}
+
 options[:id] ||= form.field_id(method)
-# options[:disabled] ||= !field_editable?(form.object, method) if user_signed_in?
 options[:placeholder] ||= labels.placeholder if labels.placeholder
 
-other_options ||= {}
+# TODO: Why is this commented out, and where is `field_editable?`?
+# Delete this and finish https://github.com/bullet-train-co/bullet_train-core/pull/587.
+# options[:disabled] ||= !field_editable?(form.object, method) if user_signed_in?
+
 other_options[:help] = [other_options[:help], labels.help].compact.join(" ")
 
 if !other_options.key?(:required)
@@ -30,6 +50,8 @@ end
 errors = [method, method.to_s.delete_suffix("_id").to_sym].uniq.map { |attribute| form.object.errors.full_messages_for(attribute) }.flatten
 has_errors = errors.any? || partial.error? || other_options[:error].present?
 
+# TODO: Partials which invoke form helpers inline aren't using
+# these classes, although we have the `has_errors` conditional with some style below.
 options[:class] = "#{options[:class]} block w-full rounded-md shadow-sm font-light dark:bg-slate-800 dark:text-slate-300"
 options[:class] += " text-base md:text-sm" # default to 16px on mobile to prevent zooming
 
@@ -38,7 +60,6 @@ options[:class] += if has_errors
 else
   " focus:ring-primary-500 focus:border-primary-500 border-slate-300 dark:border-slate-900"
 end
-
 %>
 
 <div class="<%= 'required' if other_options[:required] %>">
@@ -54,8 +75,12 @@ end
     <% end %>
   <% end %>
 
+  <%# Here, we prioritize yielding the partial's field markup if it already exists. %>
+  <%# `form.send` below calls the original Rails Form helpers, such as %>
+  <%# `form.text_field(method, options)`. Refer to the form helpers for more details: %>
+  <%# https://github.com/rails/rails/blob/main/actionview/lib/action_view/helpers/form_helper.rb %>
   <div class="mt-1.5">
-    <% # the actual field. %>
+    <% # The actual field. %>
     <% if partial.field? %>
       <%= partial.field %>
     <% else %>
@@ -85,7 +110,7 @@ end
   <% end %>
 
   <% if other_options[:icon] %>
-  <div class="pre-icon os-icon <%= other_options[:icon] %>"></div>
+    <div class="pre-icon os-icon <%= other_options[:icon] %>"></div>
   <% end %>
 
 </div>

data/lib/bullet_train/themes/light/version.rb

@@ -1,7 +1,7 @@
 module BulletTrain
   module Themes
     module Light
-      VERSION = "1.6.38"
+      VERSION = "1.7.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-themes-light
 version: !ruby/object:Gem::Version
-  version: 1.6.38
+  version: 1.7.0
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -146,7 +146,7 @@ files:
 - app/assets/stylesheets/tailwindcss/base.css
 - app/assets/stylesheets/tailwindcss/components.css
 - app/assets/stylesheets/tailwindcss/utilities.css
-- app/helpers/light_theme_helper.rb
+- app/helpers/theme_helper.rb
 - app/javascript/application.light.js
 - app/views/showcase/engine/_head.html.erb
 - app/views/showcase/previews/field_partials/_about_field_partials.erb