Ensure we allow process call to include the parent and parentPaths so…

… any component can be checked independently.
formio · Nov 15, 2024 · f16636e · f16636e
1 parent 0aa0de3
commit f16636e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/src/process/process.ts b/src/process/process.ts
@@ -28,7 +28,7 @@ import { hideChildrenProcessorInfo } from './hideChildren';
 export async function process<ProcessScope>(
   context: ProcessContext<ProcessScope>,
 ): Promise<ProcessScope> {
-  const { instances, components, data, scope, flat, processors } = context;
+  const { instances, components, data, scope, flat, processors, parent, parentPaths } = context;
   await eachComponentDataAsync(
     components,
     data,
@@ -57,6 +57,9 @@ export async function process<ProcessScope>(
         return true;
       }
     },
+    false,
+    parent,
+    parentPaths,
   );
   for (let i = 0; i < processors?.length; i++) {
     const processor = processors[i];
@@ -68,7 +71,7 @@ export async function process<ProcessScope>(
 }
 
 export function processSync<ProcessScope>(context: ProcessContext<ProcessScope>): ProcessScope {
-  const { instances, components, data, scope, flat, processors } = context;
+  const { instances, components, data, scope, flat, processors, parent, parentPaths } = context;
   eachComponentData(
     components,
     data,
@@ -97,6 +100,9 @@ export function processSync<ProcessScope>(context: ProcessContext<ProcessScope>)
         return true;
       }
     },
+    false,
+    parent,
+    parentPaths,
   );
   for (let i = 0; i < processors?.length; i++) {
     const processor = processors[i];

diff --git a/src/types/BaseComponent.ts b/src/types/BaseComponent.ts
@@ -60,7 +60,6 @@ export type BaseComponent = {
   validateOn?: string;
   validateWhenHidden?: boolean;
   modelType?: ReturnType<typeof getModelType>;
-  parentPath?: string;
   validate?: {
     required?: boolean;
     custom?: string;

diff --git a/src/types/process/ProcessContext.ts b/src/types/process/ProcessContext.ts
@@ -5,6 +5,7 @@ import {
   ProcessorContext,
   ProcessType,
   ProcessorInfo,
+  ComponentPaths,
 } from 'types';
 
 export type ComponentInstances = {
@@ -21,6 +22,8 @@ export type BaseProcessContext<ProcessorScope> = {
   form?: any;
   submission?: any;
   flat?: boolean;
+  parent?: Component;
+  parentPaths?: ComponentPaths;
   evalContext?: (context: ProcessorContext<ProcessorScope>) => any;
 };
 

diff --git a/src/utils/formUtil/index.ts b/src/utils/formUtil/index.ts
@@ -377,6 +377,10 @@ export function componentMatches(
     }
   }
 
+  // Get the current model type.
+  const modelType = getModelType(component);
+  const dataModel = modelType !== 'none' && modelType !== 'content';
+
   [
     ComponentPath.path,
     ComponentPath.fullPath,
@@ -387,8 +391,16 @@ export function componentMatches(
   ].forEach((type) => {
     const dataPath = type === ComponentPath.dataPath || type === ComponentPath.localDataPath;
     if (paths[type as ComponentPath] === path) {
-      // Only add a new match if it already doesn't exist OR if the dataIndex is the same (more direct match).
-      if (!matches[type as ComponentPath] || dataPath || dataIndex === paths.dataIndex) {
+      const currentMatch = matches[type as ComponentPath];
+      const currentModelType = currentMatch?.component
+        ? getModelType(currentMatch.component)
+        : 'none';
+      const currentDataModel = currentModelType !== 'none' && currentModelType !== 'content';
+      if (
+        !currentMatch ||
+        (dataPath && dataModel && currentDataModel) || // Replace the current match if this is a dataPath and both are dataModels.
+        (!dataPath && dataIndex === paths.dataIndex) // Replace the current match if this is not a dataPath and the indexes are the same.
+      ) {
         if (dataPath) {
           const dataPaths = {
             dataPath: paths.dataPath || '',