Fix empty collection first item index

EasyCorp · Mar 14, 2024 · 248aca4 · 248aca4 · YuriiZhura · May 2, 2024
1 parent 4127bf2
commit 248aca4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/assets/js/field-collection.js b/assets/js/field-collection.js
@@ -44,10 +44,10 @@ const EaCollectionProperty = {
             const nameRegexp = new RegExp(formTypeNamePlaceholder, 'g');
 
             let newItemHtml = collection.dataset.prototype
-                .replace(labelRegexp, ++numItems)
+                .replace(labelRegexp, numItems)
                 .replace(nameRegexp, numItems);
 
-            collection.dataset.numItems = numItems;
+            collection.dataset.numItems = ++numItems;
             const newItemInsertionSelector = isArrayCollection ? '.ea-form-collection-items' : '.ea-form-collection-items .accordion > .form-widget-compound [data-empty-collection]';
             const collectionItemsWrapper = collection.querySelector(newItemInsertionSelector);
 

diff --git a/src/Resources/views/crud/form_theme.html.twig b/src/Resources/views/crud/form_theme.html.twig
@@ -137,7 +137,7 @@
         'data-entry-is-complex': form.vars.ea_vars.field and form.vars.ea_vars.field.customOptions.get('entryIsComplex') ? 'true' : 'false',
         'data-allow-add': allow_add ? 'true' : 'false',
         'data-allow-delete': allow_delete ? 'true' : 'false',
-        'data-num-items': form.children is empty ? 0 : max(form.children|keys),
+        'data-num-items': form.children is empty ? 0 : max(form.children|keys) + 1,
         'data-form-type-name-placeholder': prototype is defined ? prototype.vars.name : '',
     }) %}