vanilla_nested 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b6d8ed9c309bf72014920bec0254c922804f9077967492047139cb3aabc54f3
-  data.tar.gz: 890d67164554668f8054724329cb9bfe56884e73ab44a864ef3b8283c011cae9
+  metadata.gz: ca0695302433ce2ff7b48e7673894ca698034f0cfffe9eeb822eb1e47b78943b
+  data.tar.gz: 9db10e3cba8445ab747f8c360403518e8bcfb4c296b1dc7aaab0bdbc629ed980
 SHA512:
-  metadata.gz: c6df5288710235fce651f21a7d03aff41c9d7d529bbb1f0626677bdfe3bf8f670b1277fde0b942c8978a7240de1ecd0586f96d218e6c63f4a27eb63325539964
-  data.tar.gz: f2b7ec1060c226133354d30cb0643620bf12251657771357429f21a3069c76390085715eeb7fcc381ae4ca016ec0d6a632f0573eb1ec5f7df7bac6f1fa835296
+  metadata.gz: 55c3480096e5d17f8a2a0c14ae3f1c976e3b081177a6ff51b3d8c4da3dbfd1d5af2caa720ff6c6c546c51a379a0adbc385d0f16d798532e0377bd26d3a1486f2
+  data.tar.gz: 4f64f3dcad06add84d899ac23415ca18489b1f2fe22c8ea57862aae7278c24eb82e056327cf7877fb7c5406ec42e57f2b83c9b49408200a626eef7c41b33a56e

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)
     }
@@ -65,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

data/lib/vanilla_nested/view_helpers.rb

@@ -4,14 +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, &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', &link_content)
       association_class = form.object.class.reflections[association.to_s].klass
       object = association_class.new
 
@@ -35,11 +36,12 @@ 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
+      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
 
@@ -50,9 +52,10 @@ 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
     # @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', &link_content)
       data = {
         'fields-wrapper-selector': fields_wrapper_selector,
         'undo-timeout': undo_link_timeout,
@@ -65,10 +68,12 @@ module VanillaNested
       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, class: classes, data: data) do
+            if block_given?
+              yield link_content
+            else
+              link_text.html_safe
+            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.3.0
 platform: ruby
 authors:
 - Ariel Juodziukynas <arieljuod@gmail.com>