vanilla_nested 1.2.5 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b6d8ed9c309bf72014920bec0254c922804f9077967492047139cb3aabc54f3
-  data.tar.gz: 890d67164554668f8054724329cb9bfe56884e73ab44a864ef3b8283c011cae9
+  metadata.gz: 7164d9ce14876a0445fc8d3b30d14c18e5caca9771313e0f53034266d99363af
+  data.tar.gz: f49863e8b1d520de26f2ea5088753f89d228ce63a90f46fa0410655b5fe6c1f7
 SHA512:
-  metadata.gz: c6df5288710235fce651f21a7d03aff41c9d7d529bbb1f0626677bdfe3bf8f670b1277fde0b942c8978a7240de1ecd0586f96d218e6c63f4a27eb63325539964
-  data.tar.gz: f2b7ec1060c226133354d30cb0643620bf12251657771357429f21a3069c76390085715eeb7fcc381ae4ca016ec0d6a632f0573eb1ec5f7df7bac6f1fa835296
+  metadata.gz: 1ccd4bdf78c71155a3fde6bb26c250244b382868c3a74fb395463c76d55f8b7c7f318ef1b586d93ce191c8fc86fea0239ef8e301c257fe5753003cd3de04d85f
+  data.tar.gz: 9d3d0c45b8d9e7bcd8e456b8d4a7beacc05f97a46b677079add599b2741d03f48e25e3d826be600499ede979a6af414e9ed42af474e6b023c1d772579c20ba5e

data/app/assets/javascripts/vanilla_nested.js

@@ -12,6 +12,7 @@
     const container = document.querySelector(data.containerSelector);
     const newHtml = data.html.replace(/_idx_placeholder_/g, Date.now());
 
+    // insert and store reference
     let inserted;
     switch (data.methodForInsert) {
       case ('append'):
@@ -24,6 +25,9 @@
         break;
     }
 
+    // add a class to show it was added dynamically
+    inserted.classList.add('added-by-vanilla-nested');
+
     _dispatchEvent(container, 'vanilla-nested:fields-added', element, {added: inserted})
 
     let removeLink = inserted.querySelector('.vanilla-nested-remove');
@@ -32,7 +36,7 @@
 
     // dispatch an event if we reached the limit configured on the model
     if (data.limit) {
-      let nestedElements = container.children.length;
+      let nestedElements = container.querySelectorAll('[name$="[_destroy]"][value="0"]').length;
       if (nestedElements >= data.limit)
         _dispatchEvent(container, 'vanilla-nested:fields-limit-reached', element)
     }
@@ -49,7 +53,8 @@
 
     const data = element.dataset;
     let wrapper = element.parentElement;
-    if (sel = data.fieldsWrapperSelector) wrapper = element.closest(sel);
+    const sel = data.fieldsWrapperSelector;
+    if (sel) wrapper = element.closest(sel);
 
     if (data.undoTimeout) {
       hideFieldsWithUndo(wrapper, element);
@@ -65,7 +70,13 @@
   // Hides an element, mainly the wrapper of a group of fields
   // "wrapper" is the wrapper of the link to remove fields
   function hideWrapper(wrapper) {
-    wrapper.style.display = 'none';
+    if (wrapper.classList.contains('added-by-vanilla-nested')) {
+      wrapper.remove();
+    } else {
+      const destroyInput = wrapper.querySelector('[name$="[_destroy]"');
+      wrapper.innerHTML = '';
+      wrapper.insertAdjacentElement('afterbegin', destroyInput);
+    }
   }
 
   // Unhides the children given a fields wrapper
@@ -119,7 +130,8 @@
     const undo = document.createElement('A');
 
     undo.classList.add('vanilla-nested-undo');
-    if (classes = data.undoLinkClasses)
+    const classes = data.undoLinkClasses;
+    if (classes)
       undo.classList.add(...classes.split(' '));
 
     undo.innerText = data.undoText;
@@ -141,10 +153,14 @@
     initVanillaNested();
   })
 
-  // Don't run turbolinks event callback for first load, we already do it with DOMContentLoaded
+  // Don't run turbolinks/turbo event callback for first load, we already do it with DOMContentLoaded
   const notEmpty = (obj) => Object.keys(obj).length;
 
   document.addEventListener('turbolinks:load', function(e){
     if (notEmpty(e.data.timing)) initVanillaNested();
   })
+
+  document.addEventListener('turbo:load', function(e){
+    if (notEmpty(e.detail.timing)) initVanillaNested();
+  })
 })()

data/lib/vanilla_nested/view_helpers.rb

@@ -4,14 +4,16 @@ module VanillaNested
   module ViewHelpers
     # @param form [FormBuild] builder on a "form_for" block
     # @param association [Symbol] name of the association
-    # @param container_selector [String] selector of the element to inser the fields
+    # @param container_selector [String] selector of the element to insert the fields
     # @param link_text [String, nil] text to use for the link tag
     # @param link_classes [String] space separated classes for the link tag
     # @param insert_method [:append, :prepend] tells javascript if the new fields should be appended or prepended to the container
     # @param partial_form_variable [String, Symbol] name of the variable that represents the form builder inside the fields partial
+    # @param tag [String] HTML tag to use for the html generated, defaults to and `a` tag
     # @param link_content [Block] block of code for the link content
+    # @param tag_attributes [Hash<attribute, value>] hash with attribute,value pairs for the html tag
     # @return [String] link tag
-    def link_to_add_nested(form, association, container_selector, link_text: nil, link_classes: '', insert_method: :append, partial: nil, partial_form_variable: :form, &link_content)
+    def link_to_add_nested(form, association, container_selector, link_text: nil, link_classes: '', insert_method: :append, partial: nil, partial_form_variable: :form, tag: 'a', tag_attributes: {}, &link_content)
       association_class = form.object.class.reflections[association.to_s].klass
       object = association_class.new
 
@@ -35,11 +37,16 @@ module VanillaNested
       nested_options = form.object.class.nested_attributes_options[association.to_sym]
       data['limit'] = nested_options[:limit] if nested_options[:limit]
 
-      if block_given?
-        link_to '#', class: classes, data: data, &link_content
-      else
-        text = link_text || "Add #{association_class.model_name}"
-        link_to text, '#', class: classes, data: data
+      attributes = tag_attributes
+      attributes[:class] = "#{attributes.fetch(:class, '')} #{classes}"
+      attributes[:data] = attributes.fetch(:data, {}).merge(data)
+
+      content_tag(tag, attributes) do
+        if block_given?
+          yield link_content
+        else
+          link_text || "Add #{association_class.model_name}"
+        end
       end
     end
 
@@ -50,9 +57,11 @@ module VanillaNested
     # @param undo_link_text [String] text to show as "undo"
     # @param undo_link_classes [String] space separated list of classes for the "undo" link
     # @param ulink_classes [String] space separated list of classes for the "x" link
+    # @param tag [String] HTML tag to use for the html generated, defaults to and `a` tag
     # @param link_content [Block] block of code for the link content
+    # @param tag_attributes [Hash<attribute, value>] hash with attribute,value pairs for the html tag
     # @return [String] hidden field and link tag
-    def link_to_remove_nested(form, link_text: 'X', fields_wrapper_selector: nil, undo_link_timeout: nil, undo_link_text: 'Undo', undo_link_classes: '', link_classes: '', &link_content)
+    def link_to_remove_nested(form, link_text: 'X', fields_wrapper_selector: nil, undo_link_timeout: nil, undo_link_text: 'Undo', undo_link_classes: '', link_classes: '', tag: 'a', tag_attributes: {}, &link_content)
       data = {
         'fields-wrapper-selector': fields_wrapper_selector,
         'undo-timeout': undo_link_timeout,
@@ -62,13 +71,19 @@ module VanillaNested
 
       classes = "vanilla-nested-remove #{link_classes}"
 
+      attributes = tag_attributes
+      attributes[:class] = "#{attributes.fetch(:class, '')} #{classes}"
+      attributes[:data] = attributes.fetch(:data, {}).merge(data)
+
       capture do
         concat form.hidden_field(:_destroy, value: 0)
         concat(
-          if block_given?
-            link_to('#', class: classes, data: data, &link_content)
-          else
-            link_to(link_text.html_safe, '#', class: classes, data: data)
+          content_tag(tag, attributes) do
+            if block_given?
+              yield link_content
+            else
+              link_text.html_safe
+            end
           end
         )
       end

data/lib/vanilla_nested.rb

@@ -9,5 +9,11 @@ module VanillaNested
         ActionView::Base.send :include, VanillaNested::ViewHelpers
       end
     end
+
+    initializer "vanilla_nested.assets" do
+      if Rails.application.config.respond_to?(:assets)
+        Rails.application.config.assets.precompile += %w( vanilla_nested.js )
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vanilla_nested
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.6.0
 platform: ruby
 authors:
 - Ariel Juodziukynas <arieljuod@gmail.com>
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Dynamic nested forms using vanilla javascript