df-ae-forms-package 1.0.69 → 1.0.71

package/dist/index.esm.js

@@ -176,9 +176,21 @@ class ConditionalLogicService {
                 if (found)
                     return found;
             }
-            if (comp.name === 'table' && comp.cells) {
-                for (const row of comp.cells) {
-                    for (const cell of row) {
+            if (comp.name === 'table' && comp.cells && Array.isArray(comp.cells)) {
+                for (const rowOrCell of comp.cells) {
+                    // Handle 2D array structure (standard: cells[row][col])
+                    if (Array.isArray(rowOrCell)) {
+                        for (const cell of rowOrCell) {
+                            if (cell.components) {
+                                const found = this.findComponent(cell.components, componentId);
+                                if (found)
+                                    return found;
+                            }
+                        }
+                    }
+                    // Handle 1D array structure (flat: cells[i]) - robust fallback
+                    else if (typeof rowOrCell === 'object' && rowOrCell !== null) {
+                        const cell = rowOrCell;
                         if (cell.components) {
                             const found = this.findComponent(cell.components, componentId);
                             if (found)
@@ -220,9 +232,18 @@ class ConditionalLogicService {
                     traverse(item.children);
                 if (item.templateComponents)
                     traverse(item.templateComponents);
-                if (item.cells) {
-                    for (const row of item.cells) {
-                        for (const cell of row) {
+                if (item.cells && Array.isArray(item.cells)) {
+                    for (const rowOrCell of item.cells) {
+                        // Handle 2D array structure (standard)
+                        if (Array.isArray(rowOrCell)) {
+                            for (const cell of rowOrCell) {
+                                if (cell.components)
+                                    traverse(cell.components);
+                            }
+                        }
+                        // Handle 1D array structure (flat)
+                        else if (typeof rowOrCell === 'object' && rowOrCell !== null) {
+                            const cell = rowOrCell;
                             if (cell.components)
                                 traverse(cell.components);
                         }
@@ -5997,17 +6018,35 @@ 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)) {
-                component.cells.forEach((row, _rowIndex) => {
-                    if (Array.isArray(row)) {
-                        row.forEach((cell, _cellIndex) => {
+                component.cells.forEach((rowOrCell, _rowIndex) => {
+                    // Handle 2D array (standard)
+                    if (Array.isArray(rowOrCell)) {
+                        rowOrCell.forEach((cell, _cellIndex) => {
                             if (cell && cell.components && Array.isArray(cell.components)) {
                                 initializeComponentValues(cell.components, values);
                             }
                         });
                     }
+                    // Handle 1D array (flat)
+                    else if (typeof rowOrCell === 'object' && rowOrCell !== null) {
+                        const cell = rowOrCell;
+                        if (cell && cell.components && Array.isArray(cell.components)) {
+                            initializeComponentValues(cell.components, values);
+                        }
+                    }
                 });
             }
             // Handle nested components in datagrid entries
@@ -6068,11 +6107,23 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
                 // Recurse
                 if (comp.children)
                     extractNotesAndAttachments(comp.children);
-                if (comp.cells)
-                    comp.cells.forEach((row) => row.forEach((cell) => {
-                        if (cell.components)
-                            extractNotesAndAttachments(cell.components);
-                    }));
+                if (comp.cells && Array.isArray(comp.cells)) {
+                    comp.cells.forEach((rowOrCell) => {
+                        // Handle 2D array
+                        if (Array.isArray(rowOrCell)) {
+                            rowOrCell.forEach((cell) => {
+                                if (cell.components)
+                                    extractNotesAndAttachments(cell.components);
+                            });
+                        }
+                        // Handle 1D array
+                        else if (typeof rowOrCell === 'object' && rowOrCell !== null) {
+                            const cell = rowOrCell;
+                            if (cell.components)
+                                extractNotesAndAttachments(cell.components);
+                        }
+                    });
+                }
                 if (comp.entries)
                     comp.entries.forEach((entry) => {
                         if (entry.components)
@@ -6109,9 +6160,10 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
                     validatedComponent.children = getValidatedComponents(validatedComponent.children);
                 }
                 if (validatedComponent.cells && Array.isArray(validatedComponent.cells)) {
-                    validatedComponent.cells = validatedComponent.cells.map((row) => {
-                        if (Array.isArray(row)) {
-                            return row.map((cell) => {
+                    validatedComponent.cells = validatedComponent.cells.map((rowOrCell) => {
+                        // Handle 2D array
+                        if (Array.isArray(rowOrCell)) {
+                            return rowOrCell.map((cell) => {
                                 if (cell && cell.components && Array.isArray(cell.components)) {
                                     return {
                                         ...cell,
@@ -6121,7 +6173,18 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
                                 return cell;
                             });
                         }
-                        return row;
+                        // Handle 1D array
+                        else if (typeof rowOrCell === 'object' && rowOrCell !== null) {
+                            const cell = rowOrCell;
+                            if (cell && cell.components && Array.isArray(cell.components)) {
+                                return {
+                                    ...cell,
+                                    components: getValidatedComponents(cell.components)
+                                };
+                            }
+                            return cell;
+                        }
+                        return rowOrCell;
                     });
                 }
                 if (validatedComponent.entries && Array.isArray(validatedComponent.entries)) {
@@ -6169,8 +6232,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(() => {