bug #5710 Fix new item insertion selector, see #5368 (quentint)

This PR was squashed before being merged into the 4.x branch. Discussion ---------- Fix new item insertion selector, see #5368 This selector fix allows collections' new items to be injected at their correct place in the DOM. It does not take into account the `isArrayCollection` case as I do not know how to reproduce it. Also, recompiling the admin assets might be necessary (this is a draft PR). Commits ------- ef50c04 Fix new item insertion selector, see #5368
EasyCorp · Apr 24, 2023 · 2cb5e2f · 2cb5e2f
2 parents be698e9 + ef50c04
commit 2cb5e2f
Show file tree

Hide file tree

Showing 6 changed files with 291 additions and 288 deletions.
diff --git a/assets/js/field-collection.js b/assets/js/field-collection.js
@@ -48,7 +48,7 @@ const EaCollectionProperty = {
                 .replace(nameRegexp, numItems);
 
             collection.dataset.numItems = numItems;
-            const newItemInsertionSelector = isArrayCollection ? '.ea-form-collection-items' : '.ea-form-collection-items .accordion > .form-widget-compound';
+            const newItemInsertionSelector = isArrayCollection ? '.ea-form-collection-items' : '.ea-form-collection-items .accordion > .form-widget-compound [data-empty-collection]';
             const collectionItemsWrapper = collection.querySelector(newItemInsertionSelector);
 
             collectionItemsWrapper.insertAdjacentHTML('beforeend', newItemHtml);

diff --git a/src/Resources/public/app.a444d0a8.css b/src/Resources/public/app.a444d0a8.css
diff --git a/src/Resources/public/app.a444d0a8.rtl.css b/src/Resources/public/app.a444d0a8.rtl.css
diff --git a/src/Resources/public/entrypoints.json b/src/Resources/public/entrypoints.json
@@ -40,7 +40,7 @@
     },
     "field-collection": {
       "js": [
-        "/field-collection.c6a8940b.js"
+        "/field-collection.a88a5924.js"
       ]
     },
     "field-file-upload": {

diff --git a/...urces/public/field-collection.c6a8940b.js → ...urces/public/field-collection.a88a5924.js b/...urces/public/field-collection.c6a8940b.js → ...urces/public/field-collection.a88a5924.js