From 31bb391013f9a3b48921d5454ecd50303a90f9b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20V=C5=A1iansk=C3=BD?= <richard.vsiansky@sap.com>
Date: Mon, 6 Nov 2023 15:16:49 +0100
Subject: [PATCH] fix(renderer): pass field property to when in sequence and
 not

---
 .../src/parse-condition/parse-condition.js    |  4 +-
 .../form-renderer/parse-condition.test.js     | 40 +++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/packages/react-form-renderer/src/parse-condition/parse-condition.js b/packages/react-form-renderer/src/parse-condition/parse-condition.js
index e8e907aca..b834cc675 100644
--- a/packages/react-form-renderer/src/parse-condition/parse-condition.js
+++ b/packages/react-form-renderer/src/parse-condition/parse-condition.js
@@ -71,7 +71,7 @@ export const parseCondition = (condition, values, field) => {
   if (condition.sequence) {
     return condition.sequence.reduce(
       (acc, curr) => {
-        const result = parseCondition(curr, values);
+        const result = parseCondition(curr, values, field);
 
         return {
           sets: [...acc.sets, ...(result.set ? [result.set] : [])],
@@ -90,7 +90,7 @@ export const parseCondition = (condition, values, field) => {
   }
 
   if (condition.not) {
-    return !parseCondition(condition.not, values).result ? positiveResult : negativeResult;
+    return !parseCondition(condition.not, values, field).result ? positiveResult : negativeResult;
   }
 
   const finalWhen = typeof condition.when === 'function' ? condition.when(field) : condition.when;
diff --git a/packages/react-form-renderer/src/tests/form-renderer/parse-condition.test.js b/packages/react-form-renderer/src/tests/form-renderer/parse-condition.test.js
index a625d18c0..ae5230ff6 100644
--- a/packages/react-form-renderer/src/tests/form-renderer/parse-condition.test.js
+++ b/packages/react-form-renderer/src/tests/form-renderer/parse-condition.test.js
@@ -542,6 +542,46 @@ describe('parseCondition', () => {
       expect(whenSpyX).toHaveBeenCalledWith(field);
       expect(whenSpyY).toHaveBeenCalledWith(field);
     });
+
+    it('when is function in sequence', () => {
+      const whenSpy = jest.fn().mockImplementation(() => 'x');
+
+      condition = {
+        sequence: [
+          {
+            when: whenSpy,
+            is: 'yes',
+          },
+        ],
+      };
+
+      values = {
+        x: 'yes',
+      };
+
+      expect(parseCondition(condition, values, field)).toEqual({ ...positiveResult, sets: [] });
+      expect(whenSpy).toHaveBeenCalledWith(field);
+    });
+
+    it('when is function in not', () => {
+      const whenSpy = jest.fn().mockImplementation(() => 'x');
+
+      condition = {
+        not: [
+          {
+            when: whenSpy,
+            is: 'yes',
+          },
+        ],
+      };
+
+      values = {
+        x: 'yes',
+      };
+
+      expect(parseCondition(condition, values, field)).toEqual(negativeResult);
+      expect(whenSpy).toHaveBeenCalledWith(field);
+    });
   });
 
   it('simple condition - custom function', () => {