@dmitryvim/form-builder 0.5.1 → 0.5.2

package/dist/esm/index.js

@@ -300,6 +300,15 @@ function getElementLookupKey(element, state) {
 function pathJoin(base, key) {
   return base ? `${base}.${key}` : key;
 }
+function findDirectContainerRows(scopeRoot, containerPath) {
+  if (!containerPath) return [];
+  const all = scopeRoot.querySelectorAll("[data-container-item]");
+  return Array.from(all).filter((el) => {
+    const attr = el.getAttribute("data-container-item") || "";
+    if (!attr.startsWith(`${containerPath}[`)) return false;
+    return /^\[\d+\]$/.test(attr.slice(containerPath.length));
+  });
+}
 function clear(node) {
   while (node.firstChild) node.removeChild(node.firstChild);
 }
@@ -449,6 +458,19 @@ function ensureThemingHooks(doc) {
   color: var(--fb-error-color);
   background-color: var(--fb-background-hover-color);
 }
+.fb-item-remove:disabled {
+  opacity: 0.35;
+  cursor: not-allowed;
+}
+/* Cards carrying a row-level remove button reserve a right-hand lane for it
+   (24px button + inset + gap) so it never sits on top of the first field's
+   control. A class rather than an inline style, so host CSS can override the
+   gutter without !important; the compound selector keeps it ahead of the
+   card's own p-2 utility regardless of stylesheet order. Its own token, not
+   --fb-slide-card-padding, which is slides-only and always resolves. */
+.containerItem.fb-row-removable {
+  padding-right: var(--fb-row-remove-gutter, 40px);
+}
 /* Prefill-suggestion pills rendered by createPrefillHints. Outline pill at rest,
    soft-fill on hover, solid-fill when selected. All colors flow from the active
    theme \u2014 consumers don't need to ship their own CSS. */
@@ -4856,12 +4878,21 @@ function buildClearAllRow(state, ridCount, onClearAll) {
   return row;
 }
 var gridResizeObservers = /* @__PURE__ */ new WeakMap();
+var gridMeasureFrames = /* @__PURE__ */ new WeakMap();
+function cancelPendingMeasure(container) {
+  const frame = gridMeasureFrames.get(container);
+  if (frame !== void 0) {
+    cancelAnimationFrame(frame);
+    gridMeasureFrames.delete(container);
+  }
+}
 function disposePlaceholdersForUpload(container) {
   const observer = gridResizeObservers.get(container);
   if (observer) {
     observer.disconnect();
     gridResizeObservers.delete(container);
   }
+  cancelPendingMeasure(container);
   container.querySelectorAll(".fb-multi-placeholder").forEach((p) => p.remove());
 }
 function renderResourcePills(opts) {
@@ -4886,6 +4917,7 @@ function renderResourcePills(opts) {
     previousObserver.disconnect();
     gridResizeObservers.delete(container);
   }
+  cancelPendingMeasure(container);
   while (container.firstChild) container.removeChild(container.firstChild);
   const ridList = rids ?? [];
   const effectiveMax = maxCount ?? Infinity;
@@ -4985,7 +5017,7 @@ function renderResourcePills(opts) {
   if (effectiveMax === Infinity || effectiveMax > occupied) {
     grid.appendChild(buildPlaceholderTile());
   }
-  requestAnimationFrame(adjustPlaceholders);
+  gridMeasureFrames.set(container, requestAnimationFrame(adjustPlaceholders));
   if (typeof ResizeObserver !== "undefined") {
     const ro = new ResizeObserver(() => adjustPlaceholders());
     ro.observe(grid);
@@ -6759,17 +6791,13 @@ function mountRemoveButton(item, onRemove, state) {
   `;
   rem.innerHTML = BIN_ICON_SVG;
   rem.onclick = onRemove;
-  const labelRow = item.querySelector("[data-fb-label-row]");
-  if (labelRow) {
-    rem.style.marginLeft = "auto";
-    labelRow.appendChild(rem);
-    return;
-  }
   rem.style.position = "absolute";
-  rem.style.top = "8px";
-  rem.style.right = "8px";
+  rem.style.top = "var(--fb-row-remove-inset, 8px)";
+  rem.style.right = "var(--fb-row-remove-inset, 8px)";
+  rem.style.zIndex = "1";
   item.style.position = "relative";
-  item.appendChild(rem);
+  item.classList.add("fb-row-removable");
+  item.insertBefore(rem, item.firstChild);
 }
 function renderMultipleContainerElement(element, ctx, wrapper, _pathKey) {
   const state = ctx.state;
@@ -6794,24 +6822,29 @@ function renderMultipleContainerElement(element, ctx, wrapper, _pathKey) {
   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 handleAddItem = () => {
-    if (countItems() >= max) return;
-    const idx = countItems();
-    const currentFormData = state.formRoot ? extractRootFormData(state.formRoot) : {};
+  let nextRowIndex = 0;
+  const takeRowIndex = () => nextRowIndex++;
+  const directRows = () => Array.from(itemsWrap.children).filter(
+    (el) => el.classList.contains("containerItem")
+  );
+  const countItems = () => directRows().length;
+  const handleRemoveItem = (item) => {
+    if (countItems() <= min) return;
+    item.remove();
+    updateAddButton();
+  };
+  const createContainerItem = (idx, rowPrefill, formData) => {
     const subCtx = {
-      state: ctx.state,
+      state,
       instance: ctx.instance,
       path: pathJoin(ctx.path, `${element.key}[${idx}]`),
-      prefill: childDefaults,
-      // Defaults for enableIf evaluation
-      formData: currentFormData,
-      // Current root data from DOM for enableIf
+      prefill: mergeWithDefaults(rowPrefill ?? {}, childDefaults),
+      formData,
       inheritedReadonly: childInheritedReadonly
     };
     const item = document.createElement("div");
     item.className = "containerItem border border-gray-300 rounded-lg p-2 bg-white";
-    item.setAttribute("data-container-item", `${element.key}[${idx}]`);
+    item.setAttribute("data-container-item", subCtx.path);
     if (isSlides) {
       item.setAttribute("data-fb-slide-card", "");
     }
@@ -6821,11 +6854,9 @@ function renderMultipleContainerElement(element, ctx, wrapper, _pathKey) {
     );
     element.elements.forEach((child) => {
       if (child.type !== "markdown" && (child.hidden || child.type === "hidden")) {
+        const hiddenValue = rowPrefill?.[child.key] ?? ("default" in child ? child.default : null) ?? null;
         childWrapper.appendChild(
-          createHiddenInput(
-            pathJoin(subCtx.path, child.key),
-            ("default" in child ? child.default : null) ?? null
-          )
+          createHiddenInput(pathJoin(subCtx.path, child.key), hiddenValue)
         );
       } else {
         childWrapper.appendChild(renderElement(child, subCtx));
@@ -6835,6 +6866,17 @@ function renderMultipleContainerElement(element, ctx, wrapper, _pathKey) {
     if (!containerIsReadonly) {
       mountRemoveButton(item, () => handleRemoveItem(item), state);
     }
+    return item;
+  };
+  const handleAddItem = () => {
+    if (countItems() >= max) return;
+    const item = createContainerItem(
+      takeRowIndex(),
+      null,
+      // Current root data read back from the DOM, so enableIf sees what the
+      // user has actually typed rather than the original prefill.
+      state.formRoot ? extractRootFormData(state.formRoot) : {}
+    );
     if (slideAddTile && slideAddTile.parentElement === itemsWrap) {
       itemsWrap.insertBefore(item, slideAddTile);
     } else {
@@ -6847,109 +6889,43 @@ function renderMultipleContainerElement(element, ctx, wrapper, _pathKey) {
   let pillAddUpdate = null;
   const syncSlideTileSize = () => {
     if (!slideAddTile) return;
-    const firstSlide = itemsWrap.querySelector(
-      ":scope > .containerItem"
-    );
+    const firstSlide = directRows()[0];
     if (firstSlide && firstSlide.offsetHeight > 0) {
       slideAddTile.style.minHeight = `${firstSlide.offsetHeight}px`;
     }
   };
+  const syncRemoveButtons = () => {
+    const atFloor = countItems() <= min;
+    directRows().forEach((row) => {
+      const btn = Array.from(row.children).find(
+        (el) => el.classList.contains("fb-item-remove")
+      );
+      if (btn) btn.disabled = atFloor;
+    });
+  };
   const updateAddButton = () => {
     const currentCount = countItems();
     if (slideAddUpdate) slideAddUpdate(currentCount, max);
     if (pillAddUpdate) pillAddUpdate(currentCount, max);
     if (slideAddTile) syncSlideTileSize();
+    syncRemoveButtons();
   };
-  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,
-        instance: ctx.instance,
-        path: pathJoin(ctx.path, `${element.key}[${idx}]`),
-        prefill: mergedPrefill,
-        // Merged prefill with defaults for enableIf
-        formData: ctx.formData ?? ctx.prefill,
-        // Complete root data for enableIf
-        inheritedReadonly: childInheritedReadonly
-      };
-      const item = document.createElement("div");
-      item.className = "containerItem border border-gray-300 rounded-lg p-2 bg-white";
-      item.setAttribute("data-container-item", `${element.key}[${idx}]`);
-      if (isSlides) {
-        item.setAttribute("data-fb-slide-card", "");
-      }
-      const childWrapper = document.createElement("div");
-      childWrapper.className = getChildWrapperClass(
-        isSlides ? void 0 : element.columns
+  if (pre) {
+    pre.forEach((prefillObj) => {
+      itemsWrap.appendChild(
+        createContainerItem(
+          takeRowIndex(),
+          prefillObj ?? {},
+          ctx.formData ?? ctx.prefill
+        )
       );
-      element.elements.forEach((child) => {
-        if (child.type !== "markdown" && (child.hidden || child.type === "hidden")) {
-          const prefillVal = prefillObj?.[child.key] ?? ("default" in child ? child.default : null) ?? null;
-          childWrapper.appendChild(
-            createHiddenInput(pathJoin(subCtx.path, child.key), prefillVal)
-          );
-        } else {
-          childWrapper.appendChild(renderElement(child, subCtx));
-        }
-      });
-      item.appendChild(childWrapper);
-      if (!containerIsReadonly) {
-        mountRemoveButton(item, () => handleRemoveItem(item), ctx.state);
-      }
-      itemsWrap.appendChild(item);
     });
   }
   if (!containerIsReadonly) {
     while (countItems() < min) {
-      const idx = countItems();
-      const subCtx = {
-        state: ctx.state,
-        instance: ctx.instance,
-        path: pathJoin(ctx.path, `${element.key}[${idx}]`),
-        prefill: childDefaults,
-        // Defaults for enableIf evaluation
-        formData: ctx.formData ?? ctx.prefill,
-        // Complete root data for enableIf
-        inheritedReadonly: childInheritedReadonly
-      };
-      const item = document.createElement("div");
-      item.className = "containerItem border border-gray-300 rounded-lg p-2 bg-white";
-      item.setAttribute("data-container-item", `${element.key}[${idx}]`);
-      if (isSlides) {
-        item.setAttribute("data-fb-slide-card", "");
-      }
-      const childWrapper = document.createElement("div");
-      childWrapper.className = getChildWrapperClass(
-        isSlides ? void 0 : element.columns
-      );
-      element.elements.forEach((child) => {
-        if (child.type !== "markdown" && (child.hidden || child.type === "hidden")) {
-          childWrapper.appendChild(
-            createHiddenInput(
-              pathJoin(subCtx.path, child.key),
-              ("default" in child ? child.default : null) ?? null
-            )
-          );
-        } else {
-          childWrapper.appendChild(renderElement(child, subCtx));
-        }
-      });
-      item.appendChild(childWrapper);
-      mountRemoveButton(
-        item,
-        () => {
-          if (countItems() > min) {
-            handleRemoveItem(item);
-          }
-        },
-        ctx.state
+      itemsWrap.appendChild(
+        createContainerItem(takeRowIndex(), null, ctx.formData ?? ctx.prefill)
       );
-      itemsWrap.appendChild(item);
     }
   }
   containerWrap.appendChild(itemsWrap);
@@ -7016,15 +6992,7 @@ function validateContainerElement(element, key, context) {
   };
   if ("multiple" in element && element.multiple) {
     const items = [];
-    const allContainerWrappers = scopeRoot.querySelectorAll(
-      "[data-container-item]"
-    );
-    const containerWrappers = Array.from(allContainerWrappers).filter((el) => {
-      const attr = el.getAttribute("data-container-item") || "";
-      if (!attr.startsWith(`${key}[`)) return false;
-      const suffix = attr.slice(key.length);
-      return /^\[\d+\]$/.test(suffix);
-    });
+    const containerWrappers = findDirectContainerRows(scopeRoot, key);
     containerWrappers.forEach((itemContainer) => {
       const itemData = {};
       const containerAttr = itemContainer.getAttribute("data-container-item") || "";
@@ -7147,9 +7115,7 @@ function updateContainerField(element, fieldPath, value, context) {
         });
       }
     });
-    const existingContainers = scopeRoot.querySelectorAll(
-      `[data-container-item^="${fieldPath}["]`
-    );
+    const existingContainers = findDirectContainerRows(scopeRoot, fieldPath);
     if (value.length !== existingContainers.length) {
       console.warn(
         `updateContainerField: Multiple container field "${fieldPath}" item count mismatch. Consider re-rendering for add/remove.`
@@ -11908,17 +11874,12 @@ var FormBuilderInstance = class {
           }
         }
         if ((element.type === "container" || element.type === "group") && "elements" in element && element.elements) {
-          const containerData = element.key ? formData?.[element.key] : void 0;
+          const containerData = element.key ? getValueByPath(formData, fullPath) : void 0;
           if (Array.isArray(containerData)) {
-            const containerItems = this.state.formRoot.querySelectorAll(
-              `[data-container-item]`
+            const directItems = findDirectContainerRows(
+              this.state.formRoot,
+              fullPath
             );
-            const directItems = fullPath ? 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);