df-ae-forms-package 1.0.71 → 1.0.72

package/dist/index.esm.js

@@ -6269,12 +6269,22 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
             }
             // Handle nested components in table cells
             if (component.cells && Array.isArray(component.cells)) {
-                component.cells.forEach((row) => {
-                    row.forEach((cell) => {
+                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;
                         if (cell.components && Array.isArray(cell.components)) {
                             evaluateComponentConditionalLogic(cell.components, visibility, currentFormValues, fullSchema);
                         }
-                    });
+                    }
                 });
             }
             // Handle nested components in datagrid entries
@@ -6309,19 +6319,12 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
     }, [formComponents, formValues]);
     // Check if a component should be visible based on conditional logic
     const shouldShowComponent = useCallback((componentId) => {
-        // 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;
+        // Check the visibility map first
+        if (componentVisibility.hasOwnProperty(componentId)) {
+            return componentVisibility[componentId] === 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;
+        // If not in visibility map, component should be visible by default
+        return true;
     }, [componentVisibility, formComponents]);
     // Handle form value changes and re-evaluate conditional logic
     const onFormValueChange = useCallback((change) => {