From b1f291ab96d19dd18496aca86a2edbd63a0cec8f Mon Sep 17 00:00:00 2001
From: Travis Tidwell <travis@form.io>
Date: Tue, 15 Jul 2025 10:55:34 -0500
Subject: [PATCH] FIO-10408: Fixed issues with the nested field validations.

---
 src/process/process.ts                       |  8 ----
 src/process/processOne.ts                    |  8 ----
 src/utils/formUtil/eachComponentData.ts      | 42 ++++++++++++--------
 src/utils/formUtil/eachComponentDataAsync.ts | 42 ++++++++++++--------
 4 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/src/process/process.ts b/src/process/process.ts
index cab0e157..8f48c250 100644
--- a/src/process/process.ts
+++ b/src/process/process.ts
@@ -34,10 +34,6 @@ export async function process<ProcessScope>(
     components,
     data,
     async (component, compData, row, path, components, index, parent) => {
-      // Skip processing if row is null or undefined
-      if (!row) {
-        return;
-      }
       await processOne<ProcessScope>({
         ...context,
         data: compData,
@@ -74,10 +70,6 @@ export function processSync<ProcessScope>(context: ProcessContext<ProcessScope>)
     components,
     data,
     (component, compData, row, path, components, index, parent) => {
-      // Skip processing if row is null or undefined
-      if (!row) {
-        return;
-      }
       processOneSync<ProcessScope>({
         ...context,
         data: compData,
diff --git a/src/process/processOne.ts b/src/process/processOne.ts
index e0d24af8..64d9c581 100644
--- a/src/process/processOne.ts
+++ b/src/process/processOne.ts
@@ -33,10 +33,6 @@ export async function processOne<ProcessorScope>(context: ProcessorsContext<Proc
   // If the component has ephemeral state, then we need to reset it in case this is e.g. a data grid,
   // in which each row needs to be validated independently
   resetEphermalState(component);
-
-  if (!context.row) {
-    return;
-  }
   context.processor = ProcessorType.Custom;
   for (const processor of processors) {
     if (processor?.process) {
@@ -69,10 +65,6 @@ export function processOneSync<ProcessorScope>(context: ProcessorsContext<Proces
 
   // If the component has ephemeral state, then we need to reset the ephemeral state in case this is e.g. a data grid, in which each row needs to be validated independently
   resetEphermalState(component);
-
-  if (!context.row) {
-    return;
-  }
   context.processor = ProcessorType.Custom;
   for (const processor of processors) {
     if (processor?.processSync) {
diff --git a/src/utils/formUtil/eachComponentData.ts b/src/utils/formUtil/eachComponentData.ts
index 36b9a438..602d9dcb 100644
--- a/src/utils/formUtil/eachComponentData.ts
+++ b/src/utils/formUtil/eachComponentData.ts
@@ -37,30 +37,40 @@ export const eachComponentData = (
       if (fn(component, data, row, compPath, componentComponents, index, compParent) === true) {
         return true;
       }
+      const modelType = getModelType(component);
       if (isComponentNestedDataType(component)) {
-        const value = get(data, compPath, data) as DataObject;
-        if (Array.isArray(value)) {
-          for (let i = 0; i < value.length; i++) {
-            const nestedComponentPath =
-              getModelType(component) === 'nestedDataArray'
-                ? `${compPath}[${i}].data`
-                : `${compPath}[${i}]`;
+        const value = get(data, compPath) as DataObject;
+        if (modelType === 'nestedArray' || modelType === 'nestedDataArray') {
+          if (Array.isArray(value) && value.length) {
+            for (let i = 0; i < value.length; i++) {
+              const nestedComponentPath =
+                modelType === 'nestedDataArray' ? `${compPath}[${i}].data` : `${compPath}[${i}]`;
+              eachComponentData(
+                component.components,
+                data,
+                fn,
+                nestedComponentPath,
+                i,
+                component,
+                includeAll,
+              );
+            }
+            return true;
+          } else if (includeAll) {
             eachComponentData(
               component.components,
               data,
               fn,
-              nestedComponentPath,
-              i,
+              modelType === 'nestedDataArray' ? `${compPath}[0].data` : `${compPath}[0]`,
+              0,
               component,
               includeAll,
             );
+          } else {
+            // This is an empty nested array, so we do not need to process the children.
+            return true;
           }
-          return true;
-        } else if (isEmpty(row) && !includeAll) {
-          // Tree components may submit empty objects; since we've already evaluated the parent tree/layout component, we won't worry about constituent elements
-          return true;
-        }
-        if (getModelType(component) === 'dataObject') {
+        } else if (modelType === 'dataObject') {
           const nestedFormValue: any = get(data, component.path);
           const noReferenceAttached = nestedFormValue?._id
             ? isEmpty(nestedFormValue.data) && !has(nestedFormValue, 'form')
@@ -97,7 +107,7 @@ export const eachComponentData = (
           );
         }
         return true;
-      } else if (getModelType(component) === 'none') {
+      } else if (modelType === 'none') {
         const info = componentInfo(component);
         if (info.hasColumns) {
           const columnsComponent = component as HasColumns;
diff --git a/src/utils/formUtil/eachComponentDataAsync.ts b/src/utils/formUtil/eachComponentDataAsync.ts
index 312844ac..0d85163b 100644
--- a/src/utils/formUtil/eachComponentDataAsync.ts
+++ b/src/utils/formUtil/eachComponentDataAsync.ts
@@ -40,30 +40,40 @@ export const eachComponentDataAsync = async (
       ) {
         return true;
       }
+      const modelType = getModelType(component);
       if (isComponentNestedDataType(component)) {
-        const value = get(data, compPath, data);
-        if (Array.isArray(value)) {
-          for (let i = 0; i < value.length; i++) {
-            const nestedComponentPath =
-              getModelType(component) === 'nestedDataArray'
-                ? `${compPath}[${i}].data`
-                : `${compPath}[${i}]`;
+        const value = get(data, compPath);
+        if (modelType === 'nestedArray' || modelType === 'nestedDataArray') {
+          if (Array.isArray(value) && value.length) {
+            for (let i = 0; i < value.length; i++) {
+              const nestedComponentPath =
+                modelType === 'nestedDataArray' ? `${compPath}[${i}].data` : `${compPath}[${i}]`;
+              await eachComponentDataAsync(
+                component.components,
+                data,
+                fn,
+                nestedComponentPath,
+                i,
+                component,
+                includeAll,
+              );
+            }
+            return true;
+          } else if (includeAll) {
             await eachComponentDataAsync(
               component.components,
               data,
               fn,
-              nestedComponentPath,
-              i,
+              modelType === 'nestedDataArray' ? `${compPath}[0].data` : `${compPath}[0]`,
+              0,
               component,
               includeAll,
             );
+          } else {
+            // This is an empty nested array, so we do not need to process the children.
+            return true;
           }
-          return true;
-        } else if (isEmpty(row) && !includeAll) {
-          // Tree components may submit empty objects; since we've already evaluated the parent tree/layout component, we won't worry about constituent elements
-          return true;
-        }
-        if (getModelType(component) === 'dataObject') {
+        } else if (modelType === 'dataObject') {
           const nestedFormValue: any = get(data, component.path);
           const noReferenceAttached = nestedFormValue?._id
             ? isEmpty(nestedFormValue.data) && !has(nestedFormValue, 'form')
@@ -100,7 +110,7 @@ export const eachComponentDataAsync = async (
           );
         }
         return true;
-      } else if (getModelType(component) === 'none') {
+      } else if (modelType === 'none') {
         const info = componentInfo(component);
         if (info.hasColumns) {
           const columnsComponent = component as HasColumns;