@dmitryvim/form-builder 0.2.16 → 0.2.17

package/dist/cjs/index.cjs

@@ -3927,10 +3927,7 @@ function renderMultipleContainerElement(element, ctx, wrapper, _pathKey) {
           rem.addEventListener("mouseleave", () => {
             rem.style.backgroundColor = "transparent";
           });
-          rem.onclick = () => {
-            item.remove();
-            updateAddButton();
-          };
+          rem.onclick = () => handleRemoveItem(item);
           item.style.position = "relative";
           item.appendChild(rem);
         }
@@ -3952,6 +3949,10 @@ function renderMultipleContainerElement(element, ctx, wrapper, _pathKey) {
     }
     countDisplay.textContent = `${currentCount}/${max === Infinity ? "\u221E" : max}`;
   };
+  const handleRemoveItem = (item) => {
+    item.remove();
+    updateAddButton();
+  };
   if (pre && Array.isArray(pre)) {
     pre.forEach((prefillObj, idx) => {
       var _a2;
@@ -3996,10 +3997,7 @@ function renderMultipleContainerElement(element, ctx, wrapper, _pathKey) {
         rem.addEventListener("mouseleave", () => {
           rem.style.backgroundColor = "transparent";
         });
-        rem.onclick = () => {
-          item.remove();
-          updateAddButton();
-        };
+        rem.onclick = () => handleRemoveItem(item);
         item.style.position = "relative";
         item.appendChild(rem);
       }
@@ -4050,8 +4048,7 @@ function renderMultipleContainerElement(element, ctx, wrapper, _pathKey) {
       });
       rem.onclick = () => {
         if (countItems() > min) {
-          item.remove();
-          updateAddButton();
+          handleRemoveItem(item);
         }
       };
       item.style.position = "relative";
@@ -4110,15 +4107,16 @@ function validateContainerElement(element, key, context) {
       "[data-container-item]"
     );
     const containerWrappers = Array.from(allContainerWrappers).filter((el) => {
-      const attr = el.getAttribute("data-container-item");
-      return attr == null ? void 0 : attr.startsWith(`${key}[`);
+      const attr = el.getAttribute("data-container-item") || "";
+      if (!attr.startsWith(`${key}[`)) return false;
+      const suffix = attr.slice(key.length);
+      return /^\[\d+\]$/.test(suffix);
     });
-    const itemCount = containerWrappers.length;
-    for (let i = 0; i < itemCount; i++) {
+    containerWrappers.forEach((itemContainer) => {
       const itemData = {};
-      const itemContainer = scopeRoot.querySelector(
-        `[data-container-item="${key}[${i}]"]`
-      ) || scopeRoot;
+      const containerAttr = itemContainer.getAttribute("data-container-item") || "";
+      const indexMatch = containerAttr.match(/\[(\d+)\]$/);
+      const domIndex = indexMatch ? parseInt(indexMatch[1], 10) : 0;
       element.elements.forEach((child) => {
         var _a;
         if (child.enableIf) {
@@ -4136,7 +4134,7 @@ function validateContainerElement(element, key, context) {
             }
           } catch (error) {
             console.error(
-              `Error evaluating enableIf for field "${child.key}" in container "${key}[${i}]":`,
+              `Error evaluating enableIf for field "${child.key}" in container "${key}[${domIndex}]":`,
               error
             );
           }
@@ -4144,7 +4142,7 @@ function validateContainerElement(element, key, context) {
         if (child.hidden || child.type === "hidden") {
           itemData[child.key] = child.default !== void 0 ? child.default : null;
         } else {
-          const childKey = `${key}[${i}].${child.key}`;
+          const childKey = `${key}[${domIndex}].${child.key}`;
           itemData[child.key] = validateElement(
             { ...child, key: childKey },
             { path },
@@ -4153,7 +4151,7 @@ function validateContainerElement(element, key, context) {
         }
       });
       items.push(itemData);
-    }
+    });
     validateContainerCount(key, items, element);
     return { value: items, errors };
   } else {
@@ -5811,8 +5809,18 @@ var FormBuilderInstance = class {
         if ((element.type === "container" || element.type === "group") && "elements" in element && element.elements) {
           const containerData = formData == null ? void 0 : formData[element.key];
           if (Array.isArray(containerData)) {
-            containerData.forEach((_, index) => {
-              checkElements(element.elements, `${fullPath}[${index}]`);
+            const containerItems = this.state.formRoot.querySelectorAll(
+              `[data-container-item]`
+            );
+            const directItems = Array.from(containerItems).filter((el) => {
+              const attr = el.getAttribute("data-container-item") || "";
+              if (!attr.startsWith(`${fullPath}[`)) return false;
+              const suffix = attr.slice(fullPath.length);
+              return /^\[\d+\]$/.test(suffix);
+            });
+            directItems.forEach((el) => {
+              const attr = el.getAttribute("data-container-item") || "";
+              checkElements(element.elements, attr);
             });
           } else {
             checkElements(element.elements, fullPath);