effective_bootstrap 1.19.1 → 1.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9afa1d831fb565c99c1b891fb5acc4251e24eb54ee807c34ebd168d68eebe3b8
-  data.tar.gz: 42465eed1461c1786fb5971e9472f4633c51c4e386b26de4f8cb77efd9ca5ff0
+  metadata.gz: 300f02e7b6b2330abf3c481bc1f25fba946452a2645e8b8563de189260edcdfa
+  data.tar.gz: 54bf157e0565aeb433d5c8ba7bf192823f4bc6fcedeed665ff6533fa5addc935
 SHA512:
-  metadata.gz: bd94d428c56c7833df84aae205225e569db9862151ec662af732e243d9de150bd4ed36e5cba688080ac7509d5b58366f6e5637efea7b546da47aae7a9b8f1055
-  data.tar.gz: 2152082c0558c7035b65955c13ea1d8e4fe4845c40a036c9b908f9c46922a6cc1d98e5cc19d6fa6865bcedf4993d88c7a1f83e4940acb685da12a75a743a31f2
+  metadata.gz: c4a22fed5a95d87fc8a83c49e612d065d1ce72b11149afe117cc08ddfce2e050904c5644a43ad513245c93bcfecbe4f5e8089db8c2f171c4e13de0583b35e8bb
+  data.tar.gz: cb7f2aa5c848d3dadbd6413d6a4232db808a272d2faf77671bd169b324387d00143826ac82a7bc744e1a8160abd5edc7e7370d6e8bb27593220607bbf036841b

data/app/assets/javascripts/effective_select_or_text/initialize.js

@@ -16,6 +16,12 @@ $(document).on('click', '[data-effective-select-or-text]', function(event) {
   $visible_input = $visible.find('input,textarea,select').first()
   $hidden_input = $hidden.find('input,textarea,select').first()
 
+  if ($visible.find('select').length > 0) {
+    $obj.removeClass('select-enabled').addClass('text-enabled')
+  } else {
+    $obj.removeClass('text-enabled').addClass('select-enabled')
+  }
+
   required = $visible_input.prop('required') || $hidden_input.prop('required')
 
   $hidden_input.prop('required', required)

data/app/models/effective/form_input.rb

@@ -367,7 +367,7 @@ module Effective
       if readonly?
         options[:input][:readonly] = 'readonly'
 
-        unless options[:input][:class].to_s.include?('form-control-plaintext')
+        if options[:input][:class].to_s.include?('form-control-plaintext') == false && options[:input][:plaintext] != false
           options[:input][:class] = (options[:input][:class] || '').sub('form-control', 'form-control-plaintext')
         end
       end

data/app/models/effective/form_inputs/select_or_text.rb

@@ -15,11 +15,19 @@ module Effective
         @name_text = options.delete(:name_text) || raise('Please include a text method name')
         @select_collection = options.delete(:collection) || raise('Please include a collection')
 
-        @select_options = { placeholder: 'Please choose, or...', required: false }
-          .merge(options[:select] || options.presence || {})
+        @shared_options = (options[:input_html] || {})
 
-        @text_options = { placeholder: 'Enter freeform', required: false }
-          .merge(options[:text] || options[:text_field] || options.presence || {})
+        @select_options = { 
+          placeholder: '', 
+          hint: "Can't find your #{(options[:name] || name).to_s.chomp('_id')}? <a class='effective-select-or-text-switch' title='Switch to enter freeform' data-effective-select-or-text='true' href='#'>Click here</a> to add one",
+          required: false,
+        }.merge(options[:select] || options.presence || {}).merge(@shared_options)
+
+        @text_options = { 
+          placeholder: '', 
+          hint: "Looking for an existing #{(options[:name] || name).to_s.chomp('_id')}? <a class='effective-select-or-text-switch' title='Switch to search for existing' data-effective-select-or-text='true' href='#'>Click here</a> to search",
+          required: false 
+        }.merge(options[:text] || options[:text_field] || options.presence || {}).merge(@shared_options)
 
         @email_field = options.fetch(:email, name_text.to_s.include?('email'))
 
@@ -27,15 +35,16 @@ module Effective
       end
 
       def to_html(&block)
-        content_tag(:div, class: 'effective-select-or-text') do
+        wrapper_class = ['effective-select-or-text', (select? ? 'select-enabled' : 'text-enabled'), options.dig(:wrapper, :class)].compact.join(' ')
+
+        content_tag(:div, (options[:wrapper] || {}).merge(class: wrapper_class)) do
           if select?
             @builder.send(email_field? ? :email_field : :text_field, name_text, text_options) +
             @builder.select(name, select_collection, select_options)
           else
             @builder.select(name, select_collection, select_options) +
             @builder.send(email_field? ? :email_field : :text_field, name_text, text_options)
-          end +
-          link_to(icon('rotate-ccw'), '#', class: 'effective-select-or-text-switch', title: 'Switch between choice and freeform', 'data-effective-select-or-text': true)
+          end
         end
       end
 

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.19.1'.freeze
+  VERSION = '1.19.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.19.1
+  version: 1.19.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails