df-ae-forms-package 1.0.68 → 1.0.70

package/dist/index.esm.js

@@ -5997,6 +5997,16 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
                         values[component.id] = '';
                     }
                 }
+                // CRITICAL: Also store by label and _id so conditional logic can find values.
+                // condition.when stores the component LABEL (set in ConditionalLogicComponent.tsx line 163).
+                // getComponentValue() checks formValues[label] first, so we must populate it here
+                // to ensure show/hide logic evaluates correctly on initial load (before any user interaction).
+                if (component.basic?.label) {
+                    values[component.basic.label] = values[component.id];
+                }
+                if (component._id) {
+                    values[component._id] = values[component.id];
+                }
             }
             // Handle nested components in table cells
             if (component.cells && Array.isArray(component.cells)) {
@@ -6169,8 +6179,10 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
         // Initialize notes and attachments state
         setComponentNotes(prev => ({ ...initialNotes, ...prev }));
         setComponentAttachments(prev => ({ ...initialAttachments, ...prev }));
-        // Evaluate initial conditional logic
-        evaluateConditionalLogic();
+        // Evaluate initial conditional logic with the freshly computed initialValues.
+        // We pass initialValues explicitly because setFormValues is async and formValues
+        // in the closure is still the old state at this point.
+        evaluateConditionalLogic(initialValues, validatedFormComponents);
     }, [initialFormData, formComponents]);
     // Synchronize component visibility whenever form values or components change
     useEffect(() => {
@@ -6393,8 +6405,6 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
                 validateField(change.id);
             }, 150);
         }
-        // Re-evaluate immediately to ensure responsive UI
-        evaluateConditionalLogic(newFormValues, updatedComponents);
     }, [formComponents, formValues, validationErrors, onFormDataChange, evaluateConditionalLogic]);
     // Recursive function to find a component by ID in nested structures
     const findComponentById = useCallback((components, fieldId) => {