@dmitryvim/form-builder 0.2.15 → 0.2.17

package/dist/esm/index.js

@@ -3691,6 +3691,18 @@ function updateSliderField(element, fieldPath, value, context) {
 }
 
 // src/components/container.ts
+function extractChildDefaults(elements) {
+  const defaults = {};
+  for (const child of elements) {
+    if ("default" in child && child.default !== void 0) {
+      defaults[child.key] = child.default;
+    }
+  }
+  return defaults;
+}
+function mergeWithDefaults(prefill, defaults) {
+  return { ...defaults, ...prefill };
+}
 function extractRootFormData(formRoot) {
   const data = {};
   const inputs = formRoot.querySelectorAll(
@@ -3765,10 +3777,13 @@ function renderSingleContainerElement(element, ctx, wrapper, pathKey) {
       containerWrap.appendChild(hintsElement);
     }
   }
+  const childDefaults = extractChildDefaults(element.elements);
+  const containerPrefill = ctx.prefill?.[element.key] || {};
+  const mergedPrefill = mergeWithDefaults(containerPrefill, childDefaults);
   const subCtx = {
     path: pathJoin(ctx.path, element.key),
-    prefill: ctx.prefill?.[element.key] || {},
-    // Sliced data for value population
+    prefill: mergedPrefill,
+    // Merged prefill with defaults for enableIf evaluation
     formData: ctx.formData ?? ctx.prefill,
     // Complete root data for enableIf evaluation
     state: ctx.state
@@ -3798,6 +3813,7 @@ function renderMultipleContainerElement(element, ctx, wrapper, _pathKey) {
   const min = element.minCount ?? 0;
   const max = element.maxCount ?? Infinity;
   const pre = Array.isArray(ctx.prefill?.[element.key]) ? ctx.prefill[element.key] : null;
+  const childDefaults = extractChildDefaults(element.elements);
   const countItems = () => itemsWrap.querySelectorAll(":scope > .containerItem").length;
   const createAddButton = () => {
     const add = document.createElement("button");
@@ -3824,7 +3840,8 @@ function renderMultipleContainerElement(element, ctx, wrapper, _pathKey) {
         const subCtx = {
           state: ctx.state,
           path: pathJoin(ctx.path, `${element.key}[${idx}]`),
-          prefill: {},
+          prefill: childDefaults,
+          // Defaults for enableIf evaluation
           formData: currentFormData
           // Current root data from DOM for enableIf
         };
@@ -3860,10 +3877,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);
         }
@@ -3885,12 +3899,18 @@ 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) => {
+      const mergedPrefill = mergeWithDefaults(prefillObj || {}, childDefaults);
       const subCtx = {
         state: ctx.state,
         path: pathJoin(ctx.path, `${element.key}[${idx}]`),
-        prefill: prefillObj || {},
+        prefill: mergedPrefill,
+        // Merged prefill with defaults for enableIf
         formData: ctx.formData ?? ctx.prefill
         // Complete root data for enableIf
       };
@@ -3926,10 +3946,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);
       }
@@ -3942,7 +3959,8 @@ function renderMultipleContainerElement(element, ctx, wrapper, _pathKey) {
       const subCtx = {
         state: ctx.state,
         path: pathJoin(ctx.path, `${element.key}[${idx}]`),
-        prefill: {},
+        prefill: childDefaults,
+        // Defaults for enableIf evaluation
         formData: ctx.formData ?? ctx.prefill
         // Complete root data for enableIf
       };
@@ -3979,8 +3997,7 @@ function renderMultipleContainerElement(element, ctx, wrapper, _pathKey) {
       });
       rem.onclick = () => {
         if (countItems() > min) {
-          item.remove();
-          updateAddButton();
+          handleRemoveItem(item);
         }
       };
       item.style.position = "relative";
@@ -4038,15 +4055,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?.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) => {
         if (child.enableIf) {
           try {
@@ -4063,7 +4081,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
             );
           }
@@ -4071,7 +4089,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 },
@@ -4080,7 +4098,7 @@ function validateContainerElement(element, key, context) {
         }
       });
       items.push(itemData);
-    }
+    });
     validateContainerCount(key, items, element);
     return { value: items, errors };
   } else {
@@ -4297,7 +4315,8 @@ function shouldDisableElement(element, ctx) {
   }
   try {
     const rootFormData = ctx.formData ?? ctx.prefill ?? {};
-    const containerData = ctx.path ? getValueByPath(rootFormData, ctx.path) : void 0;
+    const scope = element.enableIf.scope ?? "relative";
+    const containerData = scope === "relative" && ctx.path ? ctx.prefill : void 0;
     const shouldEnable = evaluateEnableCondition(
       element.enableIf,
       rootFormData,
@@ -5730,8 +5749,18 @@ var FormBuilderInstance = class {
         if ((element.type === "container" || element.type === "group") && "elements" in element && element.elements) {
           const containerData = 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);