effective_bootstrap 0.9.38 → 0.9.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b22f36af611b8928951e32da7674994739220cf189d8b1486359e58507a66bff
-  data.tar.gz: 884b64100e7d832a0ba995f6b0e14b1ac12e147e560b0a583cb40ea52dd57f69
+  metadata.gz: ac9e0d6013b991db010ef717fe181ea041d2d9e756e0bb477d9ff7544248b718
+  data.tar.gz: f212aea0848dd0d7d50b0186b798ce9cb52d8c5e17bba7f4cfd63b69cc716861
 SHA512:
-  metadata.gz: 4ffe5bbd7785815688f74a8e0c3304438dff1d12f3213c20220e664f40c0d4f71fc37e06f09de4beb15994cc63ff2dd766c79a666b58353ce52b4919f57f7c2e
-  data.tar.gz: 28330b3adfa44c418270d85ace2339960d2664eb5d44fa56158a0ff23aea940648567a3422b7a6f81d5466a13bcab6a2549580bfc1ad53dd24135b4e9633a963
+  metadata.gz: a87134d9311b1837d06e9e37857c03930a52cb0c211a2bd1dd05276ecd7eca76d57615e71cea80b271b9f11a7469647ff4915f790330f19ddd8a2c185a0604c6
+  data.tar.gz: 35fca4a527a44b58237cc6e71ab8846aa4da76d0f1c7e82078d272323bfb90be12ca16c4f27574603b118a90f5831753fb0e010bc7e5586626c982cf8be33901

data/app/assets/javascripts/effective_has_many/initialize.js.coffee

@@ -36,8 +36,27 @@ $(document).on 'click', '[data-effective-form-has-many-add]', (event) ->
   template = atob($obj.data('effective-form-has-many-template')).replace(/HASMANYINDEX/g, uid)
 
   $fields = $(template).hide().fadeIn('fast')
-  EffectiveBootstrap.initialize($fields)
   $obj.closest('.has-many-links').before($fields)
+  EffectiveBootstrap.initialize($fields)
+
+  assignPositions($hasMany)
+  true
+
+$(document).on 'click', '[data-effective-form-has-many-insert]', (event) ->
+  event.preventDefault()
+
+  $obj = $(event.currentTarget)
+  $hasMany = $obj.closest('.form-has-many')
+  return unless $hasMany.length > 0
+
+  $add = $hasMany.children('.has-many-links').find('[data-effective-form-has-many-template]')
+
+  uid = (new Date).valueOf()
+  template = atob($add.data('effective-form-has-many-template')).replace(/HASMANYINDEX/g, uid)
+
+  $fields = $(template).hide().fadeIn('fast')
+  $obj.closest('.has-many-fields').before($fields)
+  EffectiveBootstrap.initialize($fields)
 
   assignPositions($hasMany)
   true

data/app/assets/stylesheets/effective_has_many/input.scss

@@ -3,12 +3,16 @@
   .has-many-move { display: none; }
   .has-many-remove-disabled { opacity: 0; cursor: default !important; }
 
+  .has-many-actions { margin-bottom: 0.75rem; }
   .has-many-remove { margin-top: 1rem; }
   .has-many-move { margin-top: 1.5rem; }
 }
 
 .form-has-many.reordering {
+  .has-many-actions { display: none; }
   .has-many-move { display: inline-block; cursor: grab; }
+
+  .form-has-many { display: none; }
 }
 
 .form-has-many.tight {

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

@@ -51,6 +51,20 @@ module Effective
         end
       end
 
+      # insert: false
+      def insert
+        return @insert unless @insert.nil?
+
+        @insert ||= begin
+          insert = options[:input].delete(:insert)
+          insert.nil? ? false : insert
+        end
+      end
+
+      def insert?
+        !!insert
+      end
+
       # errors: true
       def errors?
         return @errors unless @errors.nil?
@@ -62,7 +76,7 @@ module Effective
       end
 
       # remove: true
-      def remove?
+      def remove
         return @remove unless @remove.nil?
 
         @remove ||= begin
@@ -77,6 +91,10 @@ module Effective
         end
       end
 
+      def remove?
+        !!remove
+      end
+
       def can_remove_method
         return @can_remove_method unless @can_remove_method.nil?
         @can_remove_method = (options[:input].delete(:can_remove_method) || false)
@@ -114,6 +132,7 @@ module Effective
       def render_resource(resource, block)
         remove = BLANK
         reorder = BLANK
+        insert = BLANK
         can_remove = (can_remove_method.blank? || !!resource.send(can_remove_method))
 
         content = @builder.fields_for(name, resource) do |form|
@@ -129,7 +148,11 @@ module Effective
           remove += (can_remove || resource.new_record?) ? link_to_remove(resource) : disabled_link_to_remove(resource)
         end
 
-        content_tag(:div, render_fields(content, (remove + reorder)), class: 'has-many-fields')
+        if insert?
+          insert = render_insert() if add? && reorder?
+        end
+
+        content_tag(:div, insert + render_fields(content, remove + reorder), class: 'has-many-fields')
       end
 
       def render_fields(content, remove)
@@ -141,12 +164,25 @@ module Effective
             content_tag(:div, remove, class: 'col-auto')
           end
         when :cards
-          raise('unsupported')
+          content_tag(:div, class: 'form-row mb-3') do
+            (reorder? ? content_tag(:div, has_many_move, class: 'col-auto') : BLANK) +
+            content_tag(:div, content, class: 'col mr-auto') do
+              content_tag(:div, class: 'card') do
+                content_tag(:div, class: 'card-body') do
+                  content_tag(:div, remove, class: 'float-right') + content
+                end
+              end
+            end
+          end
         else
           content + remove
         end
       end
 
+      def render_insert()
+        content_tag(:div, link_to_insert(), class: 'has-many-actions')
+      end
+
       def render_template(block)
         resource = build_resource()
         index = collection.length
@@ -176,6 +212,27 @@ module Effective
         )
       end
 
+      # f.has_many :things, insert: { label: (icon('plus-circle') + 'Insert Article') }
+      # f.has_many :things, insert: (icon('plus-circle') + 'Insert Article')
+      def link_to_insert
+        tag = (insert[:tag] if insert.kind_of?(Hash))
+        title = (insert[:title] || insert[:label] if insert.kind_of?(Hash))
+        html_class = (insert[:class] if insert.kind_of?(Hash))
+
+        label = (insert[:label] if insert.kind_of?(Hash))
+        label = insert if insert.kind_of?(String)
+
+        content_tag(
+          (tag || :button),
+          (label || (icon('plus-circle') + 'Insert Another')),
+          class: 'has-many-insert ' + (html_class || 'btn btn-secondary'),
+          title: (title || 'Insert Another'),
+          data: {
+            'effective-form-has-many-insert': true,
+          }
+        )
+      end
+
       def link_to_reorder(block)
         content_tag(
           :button,
@@ -189,11 +246,18 @@ module Effective
       end
 
       def link_to_remove(resource)
+        tag = (remove[:tag] if remove.kind_of?(Hash))
+        title = (remove[:title] || remove[:label] if remove.kind_of?(Hash))
+        html_class = (remove[:class] if remove.kind_of?(Hash))
+
+        label = (remove[:label] if remove.kind_of?(Hash))
+        label = remove if remove.kind_of?(String)
+
         content_tag(
-          :button,
-          icon('trash-2'),
-          class: 'has-many-remove btn btn-danger',
-          title: 'Remove',
+          (tag || :button),
+          (label || icon('trash-2')),
+          class: 'has-many-remove ' + (html_class || 'btn btn-danger'),
+          title: (title || 'Remove'),
           data: {
             'confirm': "Remove #{resource}?",
             'effective-form-has-many-remove': true,

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.38'.freeze
+  VERSION = '0.9.39'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.38
+  version: 0.9.39
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails