Merge branch 'master' of github.com:formio/core into refactor-compone…

…nt-paths
formio · Nov 25, 2024 · dc60547 · dc60547
2 parents 96f9aa9 + 30ac705
commit dc60547
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/process/validation/rules/validateCustom.ts b/src/process/validation/rules/validateCustom.ts
@@ -24,16 +24,17 @@ export const validateCustomSync: RuleFnSync = (context: ValidationContext) => {
       return null;
     }
 
+    const ctx = instance?.evalContext
+      ? instance.evalContext()
+      : evalContext
+        ? evalContext(normalizeContext(context))
+        : normalizeContext(context);
     const evalContextValue = {
-      ...(instance?.evalContext
-        ? instance.evalContext()
-        : evalContext
-          ? evalContext(normalizeContext(context))
-          : normalizeContext(context)),
+      ...ctx,
       component,
       data,
       row,
-      rowIndex: index,
+      rowIndex: typeof index === 'number' ? index : ctx.rowIndex,
       instance,
       valid: true,
       input: value,