@open-mercato/ui 0.6.2-develop.3381.1.8461b312a9 → 0.6.2-develop.3400.2.d948268f50

package/dist/backend/CrudForm.js

@@ -102,6 +102,10 @@ const CRUDFORM_EXTENDED_EVENTS_ENABLED = parseBooleanWithDefault(
   process.env.NEXT_PUBLIC_OM_CRUDFORM_EXTENDED_EVENTS_ENABLED,
   true
 );
+function evaluateFieldVisibility(visibleWhen, values) {
+  if (!visibleWhen) return true;
+  return values[visibleWhen.field] === visibleWhen.equals;
+}
 function isFormControlTarget(target) {
   if (!target || typeof target.tagName !== "string") return false;
   const el = target;
@@ -750,7 +754,7 @@ function CrudForm({
     setIsInDialog(Boolean(root.closest("[data-dialog-content]")));
   }, []);
   const dialogFooterClass = isInDialog ? "sticky bottom-0 left-0 right-0 z-20 -mx-6 px-6 bg-card border-t border-border/70 py-2 sm:-mx-6 sm:px-6" : "";
-  const dialogFormPadding = isInDialog ? "pb-4" : "";
+  const dialogFormPadding = isInDialog ? "pb-20" : "";
   const buildCustomFieldsManageHref = React.useCallback(
     (targetEntityId) => {
       if (!targetEntityId) return null;
@@ -1168,6 +1172,16 @@ function CrudForm({
       record: recordValues
     };
   }, [values]);
+  const hiddenBaseFieldIds = React.useMemo(() => {
+    const hidden = /* @__PURE__ */ new Set();
+    const recordValues = values;
+    for (const field of fields) {
+      if (!evaluateFieldVisibility(field.visibleWhen, recordValues)) {
+        hidden.add(field.id);
+      }
+    }
+    return hidden;
+  }, [fields, values]);
   const hiddenInjectedFieldIds = React.useMemo(() => {
     const hidden = /* @__PURE__ */ new Set();
     for (const definition of injectedFieldDefinitions) {
@@ -1226,7 +1240,7 @@ function CrudForm({
     if (formReadOnly) return;
     const field = fieldById.get(fieldId);
     if (!field || field.disabled) return;
-    if (hiddenInjectedFieldIds.has(fieldId)) return;
+    if (hiddenBaseFieldIds.has(fieldId) || hiddenInjectedFieldIds.has(fieldId)) return;
     const nextValues = sourceValues ?? valuesRef.current;
     const nextFieldErrors = {};
     const requiredMessage = t("ui.forms.errors.required");
@@ -1303,6 +1317,7 @@ function CrudForm({
     customEntity,
     fieldById,
     formReadOnly,
+    hiddenBaseFieldIds,
     hiddenInjectedFieldIds,
     injectedFieldIdSet,
     mapDefsForValidation,
@@ -1781,7 +1796,7 @@ function CrudForm({
       for (const field of allFields) {
         if (!field.required) continue;
         if (field.disabled) continue;
-        if (hiddenInjectedFieldIds.has(field.id)) continue;
+        if (hiddenBaseFieldIds.has(field.id) || hiddenInjectedFieldIds.has(field.id)) continue;
         const v = values[field.id];
         const isArray = Array.isArray(v);
         const isString = typeof v === "string";
@@ -2610,6 +2625,7 @@ function CrudForm({
                   }
                 ) : null,
                 /* @__PURE__ */ jsx("div", { className: grid, children: allFields.map((f) => {
+                  if (hiddenBaseFieldIds.has(f.id) || hiddenInjectedFieldIds.has(f.id)) return null;
                   const layout = f.layout ?? "full";
                   const wrapperClassName = usesResponsiveLayout ? resolveLayoutClass(layout) : void 0;
                   return /* @__PURE__ */ jsx(