vanilla_nested 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dffbc6a9079eef6fa23eb04580cd0744a9563bb48435d86e539c53500184fc6
-  data.tar.gz: 922f56a43170f687d0aba466384841474fe0198d88f45e6a4a2ad203787ebbc9
+  metadata.gz: ca0695302433ce2ff7b48e7673894ca698034f0cfffe9eeb822eb1e47b78943b
+  data.tar.gz: 9db10e3cba8445ab747f8c360403518e8bcfb4c296b1dc7aaab0bdbc629ed980
 SHA512:
-  metadata.gz: 7b5d7b4821aed2cfc669fdf75e512b7611324879824bd85a8a0b8e7c3589d5f917148d6f724c010c14fb4c5659630e510a4a61c4d08c55e25fd888c2aa7fc62d
-  data.tar.gz: ff26be147b8e052a170389456c900da3a21a9369739c271bb7da9ebab4043b98edfae5807dcc0e6cdb5363f3567b5a93148f9ecdd91bc31636c857510a2e918d
+  metadata.gz: 55c3480096e5d17f8a2a0c14ae3f1c976e3b081177a6ff51b3d8c4da3dbfd1d5af2caa720ff6c6c546c51a379a0adbc385d0f16d798532e0377bd26d3a1486f2
+  data.tar.gz: 4f64f3dcad06add84d899ac23415ca18489b1f2fe22c8ea57862aae7278c24eb82e056327cf7877fb7c5406ec42e57f2b83c9b49408200a626eef7c41b33a56e

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,11 +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, 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)
     }
@@ -36,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);
@@ -55,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
@@ -116,4 +136,25 @@
 
     return undo;
   }
+
+  function initVanillaNested() {
+    document.querySelectorAll('.vanilla-nested-add').forEach(el => {
+      el.addEventListener('click', addVanillaNestedFields, true);
+    })
+
+    document.querySelectorAll('.vanilla-nested-remove').forEach(el => {
+      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,15 @@ 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
     # @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', &link_content)
       association_class = form.object.class.reflections[association.to_s].klass
       object = association_class.new
 
@@ -34,8 +36,12 @@ 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, onclick: 'addVanillaNestedFields(event)', data: data do
-        link_text || "Add #{association_class.model_name}"
+      content_tag(tag, class: classes, data: data) do
+        if block_given?
+          yield link_content
+        else
+          link_text || "Add #{association_class.model_name}"
+        end
       end
     end
 
@@ -44,9 +50,12 @@ 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
     # @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', &link_content)
       data = {
         'fields-wrapper-selector': fields_wrapper_selector,
         'undo-timeout': undo_link_timeout,
@@ -54,9 +63,19 @@ module VanillaNested
         'undo-link-classes': undo_link_classes
       }
 
+      classes = "vanilla-nested-remove #{link_classes}"
+
       capture do
         concat form.hidden_field(:_destroy, value: 0)
-        concat link_to(link_text, '#', class: 'vanilla-nested-remove', onclick: 'removeVanillaNestedFields(event)', data: data)
+        concat(
+          content_tag(tag, class: classes, data: data) 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.0
+  version: 1.3.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