vanilla_nested 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3da0c7f05ceb96d7a699e1368e2fa022647da44a63dfba213771e860b47e4566
-  data.tar.gz: 0a878fad581e593f8dcabd480b85bb8b6b261ddff693bbf8cddf42dc08afc2e1
+  metadata.gz: 0d47f68290b80623181ca454d3c30088e5c8178f6b7846b01affdbf07ec51e94
+  data.tar.gz: 20a430b78106da4df2220667b05b9ef0e14172768750b4e198b6642cf1689470
 SHA512:
-  metadata.gz: 9dd3796185bf8649b10b8be74dfa7008cdcf947afa34b9c2b133a330fafad07970afaab67944373c92612bcaadace2e916166497914480351acea238d69744b1
-  data.tar.gz: 64c6350136c876344a678e1b324a61429a94f7d20f895c69cd4a0f6e2132550182ca3b818d7a3f12e5d5a70dca65fcf5fecb26c304d17171530eadfebece079a
+  metadata.gz: 94bc333d6a5ba8949068ff25a77f76eb4073bd0fe91bffea4cae5fa9865edbaaa274ed98618b5c532898073673e7709bbb6dc9abadfe84c29259eace7bf16f05
+  data.tar.gz: 979c5c4f836a8dc4685723a3226864f8d0b8a11c5df08ed4a78a228afa7f1199e907adac3f45c8c99d8671937c4bd5fe8052a10f2f717cf462c14fc5a2ce6ccb

data/app/assets/javascripts/vanilla_nested.js

@@ -4,11 +4,15 @@
   window.addVanillaNestedFields = function(event) {
     event.preventDefault();
 
-    const element = event.target;
+    let element = event.target;
+    if (!element.classList.contains('vanilla-nested-add'))
+      element = element.closest('.vanilla-nested-add')
+
     const data = element.dataset;
     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'):
@@ -21,15 +25,18 @@
         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');
     if (removeLink)
-      removeLink.addEventListener('click', removeVanillaNestedFields);
+      removeLink.addEventListener('click', removeVanillaNestedFields, true);
 
     // 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)
     }
@@ -40,7 +47,10 @@
   window.removeVanillaNestedFields = function(event) {
     event.preventDefault();
 
-    const element = event.target;
+    let element = event.target;
+    if (!element.classList.contains('vanilla-nested-remove'))
+      element = element.closest('.vanilla-nested-remove')
+
     const data = element.dataset;
     let wrapper = element.parentElement;
     if (sel = data.fieldsWrapperSelector) wrapper = element.closest(sel);
@@ -59,7 +69,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
@@ -121,13 +137,24 @@
     return undo;
   }
 
-  document.addEventListener('DOMContentLoaded', function(){
+  function initVanillaNested() {
     document.querySelectorAll('.vanilla-nested-add').forEach(el => {
-      el.addEventListener('click', addVanillaNestedFields);
+      el.addEventListener('click', addVanillaNestedFields, true);
     })
 
     document.querySelectorAll('.vanilla-nested-remove').forEach(el => {
-      el.addEventListener('click', removeVanillaNestedFields);
+      el.addEventListener('click', removeVanillaNestedFields, true);
     })
+  }
+
+  document.addEventListener('DOMContentLoaded', function(){
+    initVanillaNested();
+  })
+
+  // Don't run turbolinks 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();
   })
 })()

data/lib/vanilla_nested/view_helpers.rb

@@ -4,13 +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)
+    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
 
@@ -34,8 +37,16 @@ module VanillaNested
       nested_options = form.object.class.nested_attributes_options[association.to_sym]
       data['limit'] = nested_options[:limit] if nested_options[:limit]
 
-      link_to '#', class: classes, data: data do
-        link_text || "Add #{association_class.model_name}"
+      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
 
@@ -44,9 +55,13 @@ module VanillaNested
     # @param fields_wrapper_selector [String] selector for the wrapper of the fields, must be an ancestor
     # @param undo_link_timeout [Integer] time until undo timeouts
     # @param undo_link_text [String] text to show as "undo"
-    # @param undo_link_classes [String] space separated list of classes
+    # @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: '')
+    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,
@@ -54,9 +69,23 @@ module VanillaNested
         'undo-link-classes': undo_link_classes
       }
 
+      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 link_to(link_text, '#', class: 'vanilla-nested-remove', data: data)
+        concat(
+          content_tag(tag, attributes) do
+            if block_given?
+              yield link_content
+            else
+              link_text.html_safe
+            end
+          end
+        )
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vanilla_nested
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Ariel Juodziukynas <arieljuod@gmail.com>
@@ -21,7 +21,7 @@ files:
 - lib/vanilla_nested/view_helpers.rb
 homepage: https://github.com/arielj/vanilla-nested
 licenses:
-- GPL-3.0
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Dynamic nested forms using vanilla javascript