df-ae-forms-package 1.0.72 → 1.0.74

package/dist/index.js

@@ -178,21 +178,9 @@ class ConditionalLogicService {
                 if (found)
                     return found;
             }
-            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 (comp.name === 'table' && comp.cells) {
+                for (const row of comp.cells) {
+                    for (const cell of row) {
                         if (cell.components) {
                             const found = this.findComponent(cell.components, componentId);
                             if (found)
@@ -234,18 +222,9 @@ class ConditionalLogicService {
                     traverse(item.children);
                 if (item.templateComponents)
                     traverse(item.templateComponents);
-                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 (item.cells) {
+                    for (const row of item.cells) {
+                        for (const cell of row) {
                             if (cell.components)
                                 traverse(cell.components);
                         }
@@ -6020,35 +5999,17 @@ 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((rowOrCell, _rowIndex) => {
-                    // Handle 2D array (standard)
-                    if (Array.isArray(rowOrCell)) {
-                        rowOrCell.forEach((cell, _cellIndex) => {
+                component.cells.forEach((row, _rowIndex) => {
+                    if (Array.isArray(row)) {
+                        row.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
@@ -6109,23 +6070,11 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
                 // Recurse
                 if (comp.children)
                     extractNotesAndAttachments(comp.children);
-                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.cells)
+                    comp.cells.forEach((row) => row.forEach((cell) => {
+                        if (cell.components)
+                            extractNotesAndAttachments(cell.components);
+                    }));
                 if (comp.entries)
                     comp.entries.forEach((entry) => {
                         if (entry.components)
@@ -6162,10 +6111,9 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
                     validatedComponent.children = getValidatedComponents(validatedComponent.children);
                 }
                 if (validatedComponent.cells && Array.isArray(validatedComponent.cells)) {
-                    validatedComponent.cells = validatedComponent.cells.map((rowOrCell) => {
-                        // Handle 2D array
-                        if (Array.isArray(rowOrCell)) {
-                            return rowOrCell.map((cell) => {
+                    validatedComponent.cells = validatedComponent.cells.map((row) => {
+                        if (Array.isArray(row)) {
+                            return row.map((cell) => {
                                 if (cell && cell.components && Array.isArray(cell.components)) {
                                     return {
                                         ...cell,
@@ -6175,18 +6123,7 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
                                 return cell;
                             });
                         }
-                        // 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;
+                        return row;
                     });
                 }
                 if (validatedComponent.entries && Array.isArray(validatedComponent.entries)) {
@@ -6234,10 +6171,8 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
         // Initialize notes and attachments state
         setComponentNotes(prev => ({ ...initialNotes, ...prev }));
         setComponentAttachments(prev => ({ ...initialAttachments, ...prev }));
-        // 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);
+        // Evaluate initial conditional logic
+        evaluateConditionalLogic();
     }, [initialFormData, formComponents]);
     // Synchronize component visibility whenever form values or components change
     React.useEffect(() => {
@@ -6271,22 +6206,12 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
             }
             // Handle nested components in table cells
             if (component.cells && Array.isArray(component.cells)) {
-                component.cells.forEach((rowOrCell) => {
-                    // Handle 2D array (standard)
-                    if (Array.isArray(rowOrCell)) {
-                        rowOrCell.forEach((cell) => {
-                            if (cell.components && Array.isArray(cell.components)) {
-                                evaluateComponentConditionalLogic(cell.components, visibility, currentFormValues, fullSchema);
-                            }
-                        });
-                    }
-                    // Handle 1D array (flat)
-                    else if (typeof rowOrCell === 'object' && rowOrCell !== null) {
-                        const cell = rowOrCell;
+                component.cells.forEach((row) => {
+                    row.forEach((cell) => {
                         if (cell.components && Array.isArray(cell.components)) {
                             evaluateComponentConditionalLogic(cell.components, visibility, currentFormValues, fullSchema);
                         }
-                    }
+                    });
                 });
             }
             // Handle nested components in datagrid entries
@@ -6321,12 +6246,19 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
     }, [formComponents, formValues]);
     // Check if a component should be visible based on conditional logic
     const shouldShowComponent = React.useCallback((componentId) => {
-        // Check the visibility map first
-        if (componentVisibility.hasOwnProperty(componentId)) {
-            return componentVisibility[componentId] === true;
+        // Recursive find to get the component to check its type and alternate ID
+        // We need this because formComponents might only be top-level
+        const component = conditionalLogicService.findComponent(formComponents, componentId);
+        // Table and datagrid components are always visible at the root level (their contents handle logic)
+        if (component && (component.name === 'table' || component.name === 'datagrid')) {
+            return true;
         }
-        // If not in visibility map, component should be visible by default
-        return true;
+        // Default to visible if not explicitly hidden
+        // Check both id and _id for maximum resilience
+        const isVisible = (componentVisibility[componentId] !== false) &&
+            (!component?._id || componentVisibility[component._id] !== false) &&
+            (!component?.id || componentVisibility[component.id] !== false);
+        return isVisible;
     }, [componentVisibility, formComponents]);
     // Handle form value changes and re-evaluate conditional logic
     const onFormValueChange = React.useCallback((change) => {
@@ -6463,6 +6395,8 @@ 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 = React.useCallback((components, fieldId) => {