@bigbinary/neeto-form-frontend 1.0.43 → 1.0.45

package/dist/index.js

@@ -1,14 +1,14 @@
 import * as React$2 from 'react';
-import React__default, { useLayoutEffect, useEffect, useMemo as useMemo$1, useContext, useReducer, useRef, useState, createContext, createElement, Fragment, forwardRef, useCallback as useCallback$1, Component } from 'react';
+import React__default, { useLayoutEffect, useEffect, useMemo as useMemo$1, useContext, useReducer, useRef, useState, createContext, createElement, Fragment, forwardRef, useCallback as useCallback$1, Component, memo } from 'react';
 import { useField, useFormikContext, FieldArray, Form as Form$1, Formik, Field, FastField } from 'formik';
 import { noop as noop$5, findBy, removeBy, isPresent, findById } from '@bigbinary/neeto-commons-frontend/pure';
 import PageLoader from 'neetomolecules/PageLoader';
-import { Toastr, Typography, Dropdown as Dropdown$2, Button as Button$1, Label, Alert, Spinner as Spinner$1 } from '@bigbinary/neetoui';
+import { Toastr, Typography, Dropdown as Dropdown$2, Button as Button$1, Label, Alert, Spinner as Spinner$2 } from '@bigbinary/neetoui';
 import { assoc, prop, path, isEmpty, reject, omit, insert, compose as compose$1, trim as trim$1, either, isNil, values as values$1, equals, not, pluck, mergeLeft, times } from 'ramda';
 import ReactDOM, { unstable_batchedUpdates as unstable_batchedUpdates$1, createPortal } from 'react-dom';
-import { Input as Input$2, Email as Email$2, Phone as Phone$2, Up, Down, MenuHorizontal, Delete, Plus, NeetoInvisible, MultipleChoice as MultipleChoice$2, ListDot, Dropdown as Dropdown$3, Rating as Rating$3, Smiley, Checkbox as Checkbox$1, Calendar, Check, Close } from '@bigbinary/neeto-icons';
+import { Input as Input$2, Email as Email$2, Phone as Phone$2, Up, Down, MenuHorizontal, Delete, Plus, NeetoInvisible, MultipleChoice as MultipleChoice$2, ListDot, Dropdown as Dropdown$3, Rating as Rating$4, Smiley, Checkbox as Checkbox$1, Calendar, Check, Close } from '@bigbinary/neeto-icons';
 import axios from 'axios';
-import { Input as Input$3, Textarea as Textarea$1, Checkbox, ActionBlock } from '@bigbinary/neetoui/formik';
+import { Input as Input$3, Textarea as Textarea$2, Checkbox, ActionBlock } from '@bigbinary/neetoui/formik';
 import { withImmutableActions } from '@bigbinary/neeto-commons-frontend/react-utils';
 import { create as create$1 } from 'zustand';
 import classnames from 'classnames';
@@ -83,61 +83,6 @@ function _defineProperty$a(obj, key, value) {
   return obj;
 }
 
-function _arrayWithHoles$7(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-
-function _iterableToArrayLimit$6(arr, i) {
-  var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"];
-  if (null != _i) {
-    var _s,
-      _e,
-      _x,
-      _r,
-      _arr = [],
-      _n = !0,
-      _d = !1;
-    try {
-      if (_x = (_i = _i.call(arr)).next, 0 === i) {
-        if (Object(_i) !== _i) return;
-        _n = !1;
-      } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0);
-    } catch (err) {
-      _d = !0, _e = err;
-    } finally {
-      try {
-        if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return;
-      } finally {
-        if (_d) throw _e;
-      }
-    }
-    return _arr;
-  }
-}
-
-function _arrayLikeToArray$j(arr, len) {
-  if (len == null || len > arr.length) len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
-}
-
-function _unsupportedIterableToArray$j(o, minLen) {
-  if (!o) return;
-  if (typeof o === "string") return _arrayLikeToArray$j(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor) n = o.constructor.name;
-  if (n === "Map" || n === "Set") return Array.from(o);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$j(o, minLen);
-}
-
-function _nonIterableRest$7() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-
-function _slicedToArray$6(arr, i) {
-  return _arrayWithHoles$7(arr) || _iterableToArrayLimit$6(arr, i) || _unsupportedIterableToArray$j(arr, i) || _nonIterableRest$7();
-}
-
 function cov_4tvsihi60() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/common/constants.js";
   var hash = "b92143c6c0f8c73463381382fdfb0de014146400";
@@ -3561,7 +3506,7 @@ function _defineProperty$9(obj, key, value) {
   return obj;
 }
 
-function _arrayWithHoles$6(arr) {
+function _arrayWithHoles$7(arr) {
   if (Array.isArray(arr)) return arr;
 }
 
@@ -3569,27 +3514,27 @@ function _iterableToArray$2(iter) {
   if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
 
-function _arrayLikeToArray$i(arr, len) {
+function _arrayLikeToArray$j(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
   for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
   return arr2;
 }
 
-function _unsupportedIterableToArray$i(o, minLen) {
+function _unsupportedIterableToArray$j(o, minLen) {
   if (!o) return;
-  if (typeof o === "string") return _arrayLikeToArray$i(o, minLen);
+  if (typeof o === "string") return _arrayLikeToArray$j(o, minLen);
   var n = Object.prototype.toString.call(o).slice(8, -1);
   if (n === "Object" && o.constructor) n = o.constructor.name;
   if (n === "Map" || n === "Set") return Array.from(o);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$i(o, minLen);
+  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$j(o, minLen);
 }
 
-function _nonIterableRest$6() {
+function _nonIterableRest$7() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
 function _toArray(arr) {
-  return _arrayWithHoles$6(arr) || _iterableToArray$2(arr) || _unsupportedIterableToArray$i(arr) || _nonIterableRest$6();
+  return _arrayWithHoles$7(arr) || _iterableToArray$2(arr) || _unsupportedIterableToArray$j(arr) || _nonIterableRest$7();
 }
 
 function ownKeys$j(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
@@ -6461,7 +6406,7 @@ var _excluded$n = ["size"],
   _excluded5 = ["size"];
 function cov_3ymiqznmu() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/Common/StarRatingIcons.jsx";
-  var hash = "8f12d88a7478ef37b67b0c8e4445cc39069644bb";
+  var hash = "f4b29b283fd872c4616470d709f8f141dd8337fd";
   var global = new Function("return this")();
   var gcv = "__coverage__";
   var coverageData = {
@@ -6596,6 +6541,56 @@ function cov_3ymiqznmu() {
           line: 137,
           column: 8
         }
+      },
+      "13": {
+        start: {
+          line: 140,
+          column: 21
+        },
+        end: {
+          line: 140,
+          column: 37
+        }
+      },
+      "14": {
+        start: {
+          line: 141,
+          column: 22
+        },
+        end: {
+          line: 141,
+          column: 39
+        }
+      },
+      "15": {
+        start: {
+          line: 142,
+          column: 20
+        },
+        end: {
+          line: 142,
+          column: 35
+        }
+      },
+      "16": {
+        start: {
+          line: 143,
+          column: 22
+        },
+        end: {
+          line: 143,
+          column: 39
+        }
+      },
+      "17": {
+        start: {
+          line: 144,
+          column: 23
+        },
+        end: {
+          line: 144,
+          column: 41
+        }
       }
     },
     fnMap: {
@@ -6855,7 +6850,12 @@ function cov_3ymiqznmu() {
       "9": 0,
       "10": 0,
       "11": 0,
-      "12": 0
+      "12": 0,
+      "13": 0,
+      "14": 0,
+      "15": 0,
+      "16": 0,
+      "17": 0
     },
     f: {
       "0": 0,
@@ -6872,7 +6872,7 @@ function cov_3ymiqznmu() {
       "4": [0]
     },
     _coverageSchema: "1a1c01bbd47fc00a2c39e90264f33305004495a9",
-    hash: "8f12d88a7478ef37b67b0c8e4445cc39069644bb"
+    hash: "f4b29b283fd872c4616470d709f8f141dd8337fd"
   };
   var coverage = global[gcv] || (global[gcv] = {});
   if (!coverage[path] || coverage[path].hash !== hash) {
@@ -7028,6 +7028,11 @@ var Trophy = function Trophy(_ref5) {
     strokeWidth: "1.5"
   }));
 };
+var MemoizedStar = (cov_3ymiqznmu().s[13]++, /*#__PURE__*/React__default.memo(Star));
+var MemoizedHeart = (cov_3ymiqznmu().s[14]++, /*#__PURE__*/React__default.memo(Heart));
+var MemoizedZap = (cov_3ymiqznmu().s[15]++, /*#__PURE__*/React__default.memo(Zap));
+var MemoizedCrown = (cov_3ymiqznmu().s[16]++, /*#__PURE__*/React__default.memo(Crown));
+var MemoizedTrophy = (cov_3ymiqznmu().s[17]++, /*#__PURE__*/React__default.memo(Trophy));
 
 function cov_2qs8napxwn() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/ExternalForm/constants.jsx";
@@ -7218,15 +7223,70 @@ var RATING_OPTIONS = (cov_2qs8napxwn().s[3]++, [{
 }]);
 (cov_2qs8napxwn().s[4]++, /\+\d{11,14}$/);
 var ICONS_MAP = (cov_2qs8napxwn().s[5]++, {
-  star: Star,
-  heart: Heart,
-  crown: Crown,
-  trophy: Trophy,
-  zap: Zap
+  star: MemoizedStar,
+  heart: MemoizedHeart,
+  crown: MemoizedCrown,
+  trophy: MemoizedTrophy,
+  zap: MemoizedZap
 });
 
+function _arrayWithHoles$6(arr) {
+  if (Array.isArray(arr)) return arr;
+}
+
+function _iterableToArrayLimit$6(arr, i) {
+  var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"];
+  if (null != _i) {
+    var _s,
+      _e,
+      _x,
+      _r,
+      _arr = [],
+      _n = !0,
+      _d = !1;
+    try {
+      if (_x = (_i = _i.call(arr)).next, 0 === i) {
+        if (Object(_i) !== _i) return;
+        _n = !1;
+      } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0);
+    } catch (err) {
+      _d = !0, _e = err;
+    } finally {
+      try {
+        if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return;
+      } finally {
+        if (_d) throw _e;
+      }
+    }
+    return _arr;
+  }
+}
+
+function _arrayLikeToArray$i(arr, len) {
+  if (len == null || len > arr.length) len = arr.length;
+  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+  return arr2;
+}
+
+function _unsupportedIterableToArray$i(o, minLen) {
+  if (!o) return;
+  if (typeof o === "string") return _arrayLikeToArray$i(o, minLen);
+  var n = Object.prototype.toString.call(o).slice(8, -1);
+  if (n === "Object" && o.constructor) n = o.constructor.name;
+  if (n === "Map" || n === "Set") return Array.from(o);
+  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$i(o, minLen);
+}
+
+function _nonIterableRest$6() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
+function _slicedToArray$6(arr, i) {
+  return _arrayWithHoles$6(arr) || _iterableToArrayLimit$6(arr, i) || _unsupportedIterableToArray$i(arr, i) || _nonIterableRest$6();
+}
+
 function _arrayWithoutHoles$1(arr) {
-  if (Array.isArray(arr)) return _arrayLikeToArray$j(arr);
+  if (Array.isArray(arr)) return _arrayLikeToArray$i(arr);
 }
 
 function _iterableToArray$1(iter) {
@@ -7238,7 +7298,7 @@ function _nonIterableSpread$1() {
 }
 
 function _toConsumableArray$1(arr) {
-  return _arrayWithoutHoles$1(arr) || _iterableToArray$1(arr) || _unsupportedIterableToArray$j(arr) || _nonIterableSpread$1();
+  return _arrayWithoutHoles$1(arr) || _iterableToArray$1(arr) || _unsupportedIterableToArray$i(arr) || _nonIterableSpread$1();
 }
 
 function cov_xtmrgzejj() {
@@ -24262,7 +24322,7 @@ var TextAreaWithMaxLength = function TextAreaWithMaxLength(_ref) {
   }, [value, maxLength, setValue]);
   var shouldShowMaxLength = (cov_1c261hpheg().s[5]++, (cov_1c261hpheg().b[2][0]++, value) && (cov_1c261hpheg().b[2][1]++, value.length > maxLength - 10));
   cov_1c261hpheg().s[6]++;
-  return /*#__PURE__*/React__default.createElement(Textarea$1, _extends$9({}, props, (cov_1c261hpheg().b[3][0]++, shouldShowMaxLength) && (cov_1c261hpheg().b[3][1]++, {
+  return /*#__PURE__*/React__default.createElement(Textarea$2, _extends$9({}, props, (cov_1c261hpheg().b[3][0]++, shouldShowMaxLength) && (cov_1c261hpheg().b[3][1]++, {
     maxLength: maxLength
   })));
 };
@@ -24649,11 +24709,11 @@ var DROPDOWN_FIELD_MIN_OPTIONS$1 = (cov_5u7jgeqcn().s[1]++, 2);
 (cov_5u7jgeqcn().s[3]++, 40);
 (cov_5u7jgeqcn().s[4]++, 150);
 var STAR_RATING_ICONS_MAP = (cov_5u7jgeqcn().s[5]++, {
-  star: Star,
-  heart: Heart,
-  crown: Crown,
-  trophy: Trophy,
-  zap: Zap
+  star: MemoizedStar,
+  heart: MemoizedHeart,
+  crown: MemoizedCrown,
+  trophy: MemoizedTrophy,
+  zap: MemoizedZap
 });
 
 function cov_2dmleb6ptc() {
@@ -26564,7 +26624,7 @@ var RatingItem = function RatingItem(_ref) {
   }, children);
 };
 cov_2mbawiwhpy().s[2]++;
-var Rating$2 = function Rating(_ref2) {
+var Rating$3 = function Rating(_ref2) {
   var name = _ref2.name,
     isRequired = _ref2.isRequired,
     isLabelDisabled = _ref2.isLabelDisabled;
@@ -27756,7 +27816,7 @@ function cov_h8r08qzr() {
 }
 cov_h8r08qzr();
 cov_h8r08qzr().s[0]++;
-var StarRating$2 = function StarRating(_ref) {
+var StarRating$3 = function StarRating(_ref) {
   var name = _ref.name,
     isRequired = _ref.isRequired,
     isLabelDisabled = _ref.isLabelDisabled;
@@ -28157,9 +28217,9 @@ var Fields = (cov_2qk3dozy47().s[0]++, {
   MultipleChoice: MultipleChoice$1,
   SingleChoice: SingleChoice$1,
   Phone: Phone$1,
-  Rating: Rating$2,
+  Rating: Rating$3,
   Terms: Terms$3,
-  StarRating: StarRating$2,
+  StarRating: StarRating$3,
   AdditionalGuests: AdditionalGuests$1,
   RichText: RichText$1,
   Condition: Condition$3
@@ -28602,9 +28662,9 @@ var _ref$1 = (cov_2j8tlu2ul5().s[0]++, Fields),
   MultipleChoice = _ref$1.MultipleChoice,
   SingleChoice = _ref$1.SingleChoice,
   Phone = _ref$1.Phone,
-  Rating$1 = _ref$1.Rating,
+  Rating$2 = _ref$1.Rating,
   Terms$2 = _ref$1.Terms,
-  StarRating$1 = _ref$1.StarRating,
+  StarRating$2 = _ref$1.StarRating,
   AdditionalGuests = _ref$1.AdditionalGuests,
   RichText = _ref$1.RichText,
   Condition$2 = _ref$1.Condition;
@@ -28730,8 +28790,8 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
   type: "star_rating",
   label: instance.t("fields.rif"),
   isSingular: false,
-  icon: Rating$3,
-  component: StarRating$1,
+  icon: Rating$4,
+  component: StarRating$2,
   defaults: {
     label: "",
     isRequired: true,
@@ -28743,7 +28803,7 @@ var QUESTION_KINDS = (cov_2j8tlu2ul5().s[3]++, [{
   label: instance.t("fields.fbf"),
   isSingular: false,
   icon: Smiley,
-  component: Rating$1,
+  component: Rating$2,
   defaults: {
     label: "",
     isRequired: true,
@@ -31476,10 +31536,10 @@ var List = function List(_ref) {
   })));
 };
 
-var _excluded$f = ["questionKinds", "showAddQuestionDivider", "onValueChange", "showActionBlock", "formId", "setShouldValidate", "isDeletable", "isRequiredField", "submitButtonProps", "cancelButtonProps", "isKindAlreadyActive", "getActiveKindDetails", "kindUniqueOn", "isDisabledFieldLabel"];
+var _excluded$f = ["questionKinds", "showAddQuestionDivider", "onValueChange", "showActionBlock", "formId", "isDeletable", "isRequiredField", "submitButtonProps", "cancelButtonProps", "isKindAlreadyActive", "getActiveKindDetails", "kindUniqueOn", "isDisabledFieldLabel"];
 function cov_2e8k7gwd81() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/BuildForm/Form/index.jsx";
-  var hash = "c885d28816766402f837ebd6b60689340526a7ef";
+  var hash = "75bc0a57ebc0e79094a7a070d3da27cbc5fa1354";
   var global = new Function("return this")();
   var gcv = "__coverage__";
   var coverageData = {
@@ -31491,367 +31551,367 @@ function cov_2e8k7gwd81() {
           column: 13
         },
         end: {
-          line: 224,
+          line: 221,
           column: 1
         }
       },
       "1": {
         start: {
-          line: 43,
+          line: 42,
           column: 16
         },
         end: {
-          line: 43,
+          line: 42,
           column: 32
         }
       },
       "2": {
         start: {
-          line: 44,
+          line: 43,
           column: 46
         },
         end: {
-          line: 44,
+          line: 43,
           column: 58
         }
       },
       "3": {
         start: {
-          line: 45,
+          line: 44,
           column: 24
         },
         end: {
-          line: 45,
+          line: 44,
           column: 42
         }
       },
       "4": {
         start: {
-          line: 46,
+          line: 45,
           column: 56
         },
         end: {
-          line: 46,
+          line: 45,
           column: 70
         }
       },
       "5": {
         start: {
-          line: 56,
+          line: 55,
           column: 6
         },
         end: {
-          line: 56,
+          line: 55,
           column: 19
         }
       },
       "6": {
         start: {
-          line: 58,
+          line: 57,
           column: 22
         },
         end: {
-          line: 58,
+          line: 57,
           column: 60
         }
       },
       "7": {
         start: {
-          line: 60,
+          line: 59,
           column: 2
         },
         end: {
-          line: 82,
+          line: 79,
           column: 5
         }
       },
       "8": {
         start: {
-          line: 61,
+          line: 60,
           column: 4
         },
         end: {
-          line: 70,
+          line: 68,
           column: 7
         }
       },
       "9": {
         start: {
-          line: 84,
+          line: 81,
           column: 24
         },
         end: {
-          line: 84,
+          line: 81,
           column: 30
         }
       },
       "10": {
         start: {
-          line: 86,
+          line: 83,
           column: 2
         },
         end: {
-          line: 88,
+          line: 85,
           column: 18
         }
       },
       "11": {
         start: {
-          line: 87,
+          line: 84,
           column: 4
         },
         end: {
-          line: 87,
+          line: 84,
           column: 31
         }
       },
       "12": {
         start: {
-          line: 90,
+          line: 87,
           column: 33
         },
         end: {
-          line: 94,
+          line: 91,
           column: 4
         }
       },
       "13": {
         start: {
-          line: 97,
+          line: 94,
           column: 4
         },
         end: {
-          line: 99,
+          line: 96,
           column: 58
         }
       },
       "14": {
         start: {
-          line: 99,
+          line: 96,
           column: 31
         },
         end: {
-          line: 99,
+          line: 96,
           column: 57
         }
       },
       "15": {
         start: {
-          line: 101,
+          line: 98,
           column: 31
         },
         end: {
-          line: 105,
+          line: 102,
           column: 3
         }
       },
       "16": {
         start: {
-          line: 102,
+          line: 99,
           column: 27
         },
         end: {
-          line: 102,
+          line: 99,
           column: 51
         }
       },
       "17": {
         start: {
-          line: 103,
+          line: 100,
           column: 4
         },
         end: {
-          line: 103,
+          line: 100,
           column: 43
         }
       },
       "18": {
         start: {
-          line: 104,
+          line: 101,
           column: 4
         },
         end: {
-          line: 104,
+          line: 101,
           column: 49
         }
       },
       "19": {
         start: {
-          line: 107,
+          line: 104,
           column: 20
         },
         end: {
-          line: 137,
+          line: 134,
           column: 4
         }
       },
       "20": {
         start: {
-          line: 107,
+          line: 104,
           column: 46
         },
         end: {
-          line: 137,
+          line: 134,
           column: 3
         }
       },
       "21": {
         start: {
-          line: 116,
+          line: 113,
           column: 6
         },
         end: {
-          line: 116,
+          line: 113,
           column: 62
         }
       },
       "22": {
         start: {
-          line: 118,
+          line: 115,
           column: 27
         },
         end: {
-          line: 122,
+          line: 119,
           column: 7
         }
       },
       "23": {
         start: {
-          line: 124,
+          line: 121,
           column: 6
         },
         end: {
-          line: 130,
+          line: 127,
           column: 8
         }
       },
       "24": {
         start: {
-          line: 126,
+          line: 123,
           column: 47
         },
         end: {
-          line: 129,
+          line: 126,
           column: 9
         }
       },
       "25": {
         start: {
-          line: 133,
+          line: 130,
           column: 6
         },
         end: {
-          line: 133,
+          line: 130,
           column: 69
         }
       },
       "26": {
         start: {
-          line: 135,
+          line: 132,
           column: 6
         },
         end: {
-          line: 135,
+          line: 132,
           column: 36
         }
       },
       "27": {
         start: {
-          line: 139,
+          line: 136,
           column: 2
         },
         end: {
-          line: 223,
+          line: 220,
           column: 4
         }
       },
       "28": {
         start: {
-          line: 150,
+          line: 147,
           column: 23
         },
         end: {
-          line: 150,
+          line: 147,
           column: 51
         }
       },
       "29": {
         start: {
-          line: 152,
+          line: 149,
           column: 32
         },
         end: {
-          line: 155,
+          line: 152,
           column: 11
         }
       },
       "30": {
         start: {
-          line: 156,
+          line: 153,
           column: 10
         },
         end: {
-          line: 156,
+          line: 153,
           column: 59
         }
       },
       "31": {
         start: {
-          line: 157,
+          line: 154,
           column: 10
         },
         end: {
-          line: 157,
+          line: 154,
           column: 39
         }
       },
       "32": {
         start: {
-          line: 164,
+          line: 161,
           column: 14
         },
         end: {
-          line: 194,
+          line: 191,
           column: 17
         }
       },
       "33": {
         start: {
-          line: 167,
+          line: 164,
           column: 20
         },
         end: {
-          line: 172,
+          line: 169,
           column: 22
         }
       },
       "34": {
         start: {
-          line: 191,
+          line: 188,
           column: 38
         },
         end: {
-          line: 191,
+          line: 188,
           column: 65
         }
       },
       "35": {
         start: {
-          line: 203,
+          line: 200,
           column: 38
         },
         end: {
-          line: 206,
+          line: 203,
           column: 17
         }
       },
       "36": {
         start: {
-          line: 207,
+          line: 204,
           column: 16
         },
         end: {
-          line: 207,
+          line: 204,
           column: 65
         }
       }
@@ -31871,740 +31931,740 @@ function cov_2e8k7gwd81() {
         },
         loc: {
           start: {
-            line: 42,
+            line: 41,
             column: 6
           },
           end: {
-            line: 224,
+            line: 221,
             column: 1
           }
         },
-        line: 42
+        line: 41
       },
       "1": {
         name: "(anonymous_1)",
         decl: {
           start: {
-            line: 60,
+            line: 59,
             column: 12
           },
           end: {
-            line: 60,
+            line: 59,
             column: 13
           }
         },
         loc: {
           start: {
-            line: 60,
+            line: 59,
             column: 18
           },
           end: {
-            line: 71,
+            line: 69,
             column: 3
           }
         },
-        line: 60
+        line: 59
       },
       "2": {
         name: "(anonymous_2)",
         decl: {
           start: {
-            line: 86,
+            line: 83,
             column: 12
           },
           end: {
-            line: 86,
+            line: 83,
             column: 13
           }
         },
         loc: {
           start: {
-            line: 86,
+            line: 83,
             column: 18
           },
           end: {
-            line: 88,
+            line: 85,
             column: 3
           }
         },
-        line: 86
+        line: 83
       },
       "3": {
         name: "(anonymous_3)",
         decl: {
           start: {
-            line: 99,
+            line: 96,
             column: 19
           },
           end: {
-            line: 99,
+            line: 96,
             column: 20
           }
         },
         loc: {
           start: {
-            line: 99,
+            line: 96,
             column: 31
           },
           end: {
-            line: 99,
+            line: 96,
             column: 57
           }
         },
-        line: 99
+        line: 96
       },
       "4": {
         name: "(anonymous_4)",
         decl: {
           start: {
-            line: 101,
+            line: 98,
             column: 31
           },
           end: {
-            line: 101,
+            line: 98,
             column: 32
           }
         },
         loc: {
           start: {
-            line: 101,
+            line: 98,
             column: 51
           },
           end: {
-            line: 105,
+            line: 102,
             column: 3
           }
         },
-        line: 101
+        line: 98
       },
       "5": {
         name: "(anonymous_5)",
         decl: {
           start: {
-            line: 107,
+            line: 104,
             column: 20
           },
           end: {
-            line: 107,
+            line: 104,
             column: 21
           }
         },
         loc: {
           start: {
-            line: 107,
+            line: 104,
             column: 46
           },
           end: {
-            line: 137,
+            line: 134,
             column: 3
           }
         },
-        line: 107
+        line: 104
       },
       "6": {
         name: "(anonymous_6)",
         decl: {
           start: {
-            line: 115,
+            line: 112,
             column: 22
           },
           end: {
-            line: 115,
+            line: 112,
             column: 23
           }
         },
         loc: {
           start: {
-            line: 116,
+            line: 113,
             column: 6
           },
           end: {
-            line: 116,
+            line: 113,
             column: 62
           }
         },
-        line: 116
+        line: 113
       },
       "7": {
         name: "(anonymous_7)",
         decl: {
           start: {
-            line: 117,
+            line: 114,
             column: 17
           },
           end: {
-            line: 117,
+            line: 114,
             column: 18
           }
         },
         loc: {
           start: {
-            line: 117,
+            line: 114,
             column: 23
           },
           end: {
-            line: 131,
+            line: 128,
             column: 5
           }
         },
-        line: 117
+        line: 114
       },
       "8": {
         name: "(anonymous_8)",
         decl: {
           start: {
-            line: 126,
+            line: 123,
             column: 25
           },
           end: {
-            line: 126,
+            line: 123,
             column: 26
           }
         },
         loc: {
           start: {
-            line: 126,
+            line: 123,
             column: 47
           },
           end: {
-            line: 129,
+            line: 126,
             column: 9
           }
         },
-        line: 126
+        line: 123
       },
       "9": {
         name: "(anonymous_9)",
         decl: {
           start: {
-            line: 132,
+            line: 129,
             column: 14
           },
           end: {
-            line: 132,
+            line: 129,
             column: 15
           }
         },
         loc: {
           start: {
-            line: 133,
+            line: 130,
             column: 6
           },
           end: {
-            line: 133,
+            line: 130,
             column: 69
           }
         },
-        line: 133
+        line: 130
       },
       "10": {
         name: "(anonymous_10)",
         decl: {
           start: {
-            line: 134,
+            line: 131,
             column: 14
           },
           end: {
-            line: 134,
+            line: 131,
             column: 15
           }
         },
         loc: {
           start: {
-            line: 134,
+            line: 131,
             column: 20
           },
           end: {
-            line: 136,
+            line: 133,
             column: 5
           }
         },
-        line: 134
+        line: 131
       },
       "11": {
         name: "(anonymous_11)",
         decl: {
           start: {
-            line: 150,
+            line: 147,
             column: 17
           },
           end: {
-            line: 150,
+            line: 147,
             column: 18
           }
         },
         loc: {
           start: {
-            line: 150,
+            line: 147,
             column: 23
           },
           end: {
-            line: 150,
+            line: 147,
             column: 51
           }
         },
-        line: 150
+        line: 147
       },
       "12": {
         name: "(anonymous_12)",
         decl: {
           start: {
-            line: 151,
+            line: 148,
             column: 18
           },
           end: {
-            line: 151,
+            line: 148,
             column: 19
           }
         },
         loc: {
           start: {
-            line: 151,
+            line: 148,
             column: 24
           },
           end: {
-            line: 158,
+            line: 155,
             column: 9
           }
         },
-        line: 151
+        line: 148
       },
       "13": {
         name: "(anonymous_13)",
         decl: {
           start: {
-            line: 163,
+            line: 160,
             column: 13
           },
           end: {
-            line: 163,
+            line: 160,
             column: 14
           }
         },
         loc: {
           start: {
-            line: 164,
+            line: 161,
             column: 14
           },
           end: {
-            line: 194,
+            line: 191,
             column: 17
           }
         },
-        line: 164
+        line: 161
       },
       "14": {
         name: "(anonymous_14)",
         decl: {
           start: {
-            line: 166,
+            line: 163,
             column: 29
           },
           end: {
-            line: 166,
+            line: 163,
             column: 30
           }
         },
         loc: {
           start: {
-            line: 167,
+            line: 164,
             column: 20
           },
           end: {
-            line: 172,
+            line: 169,
             column: 22
           }
         },
-        line: 167
+        line: 164
       },
       "15": {
         name: "(anonymous_15)",
         decl: {
           start: {
-            line: 191,
+            line: 188,
             column: 30
           },
           end: {
-            line: 191,
+            line: 188,
             column: 31
           }
         },
         loc: {
           start: {
-            line: 191,
+            line: 188,
             column: 38
           },
           end: {
-            line: 191,
+            line: 188,
             column: 65
           }
         },
-        line: 191
+        line: 188
       },
       "16": {
         name: "(anonymous_16)",
         decl: {
           start: {
-            line: 202,
+            line: 199,
             column: 24
           },
           end: {
-            line: 202,
+            line: 199,
             column: 25
           }
         },
         loc: {
           start: {
-            line: 202,
+            line: 199,
             column: 32
           },
           end: {
-            line: 208,
+            line: 205,
             column: 15
           }
         },
-        line: 202
+        line: 199
       }
     },
     branchMap: {
       "0": {
         loc: {
           start: {
-            line: 97,
+            line: 94,
             column: 4
           },
           end: {
-            line: 99,
+            line: 96,
             column: 58
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 97,
+            line: 94,
             column: 4
           },
           end: {
-            line: 97,
+            line: 94,
             column: 13
           }
         }, {
           start: {
-            line: 98,
+            line: 95,
             column: 4
           },
           end: {
-            line: 98,
+            line: 95,
             column: 20
           }
         }, {
           start: {
-            line: 99,
+            line: 96,
             column: 4
           },
           end: {
-            line: 99,
+            line: 96,
             column: 58
           }
         }],
-        line: 97
+        line: 94
       },
       "1": {
         loc: {
           start: {
-            line: 102,
+            line: 99,
             column: 27
           },
           end: {
-            line: 102,
+            line: 99,
             column: 51
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 102,
+            line: 99,
             column: 27
           },
           end: {
-            line: 102,
+            line: 99,
             column: 45
           }
         }, {
           start: {
-            line: 102,
+            line: 99,
             column: 49
           },
           end: {
-            line: 102,
+            line: 99,
             column: 51
           }
         }],
-        line: 102
+        line: 99
       },
       "2": {
         loc: {
           start: {
-            line: 113,
+            line: 110,
             column: 6
           },
           end: {
-            line: 114,
+            line: 111,
             column: 55
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 113,
+            line: 110,
             column: 6
           },
           end: {
-            line: 113,
+            line: 110,
             column: 44
           }
         }, {
           start: {
-            line: 114,
+            line: 111,
             column: 6
           },
           end: {
-            line: 114,
+            line: 111,
             column: 55
           }
         }],
-        line: 113
+        line: 110
       },
       "3": {
         loc: {
           start: {
-            line: 113,
+            line: 110,
             column: 21
           },
           end: {
-            line: 113,
+            line: 110,
             column: 43
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 113,
+            line: 110,
             column: 21
           },
           end: {
-            line: 113,
+            line: 110,
             column: 32
           }
         }, {
           start: {
-            line: 113,
+            line: 110,
             column: 36
           },
           end: {
-            line: 113,
+            line: 110,
             column: 43
           }
         }],
-        line: 113
+        line: 110
       },
       "4": {
         loc: {
           start: {
-            line: 114,
+            line: 111,
             column: 21
           },
           end: {
-            line: 114,
+            line: 111,
             column: 43
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 114,
+            line: 111,
             column: 21
           },
           end: {
-            line: 114,
+            line: 111,
             column: 32
           }
         }, {
           start: {
-            line: 114,
+            line: 111,
             column: 36
           },
           end: {
-            line: 114,
+            line: 111,
             column: 43
           }
         }],
-        line: 114
+        line: 111
       },
       "5": {
         loc: {
           start: {
-            line: 116,
+            line: 113,
             column: 27
           },
           end: {
-            line: 116,
+            line: 113,
             column: 49
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 116,
+            line: 113,
             column: 27
           },
           end: {
-            line: 116,
+            line: 113,
             column: 38
           }
         }, {
           start: {
-            line: 116,
+            line: 113,
             column: 42
           },
           end: {
-            line: 116,
+            line: 113,
             column: 49
           }
         }],
-        line: 116
+        line: 113
       },
       "6": {
         loc: {
           start: {
-            line: 147,
+            line: 144,
             column: 12
           },
           end: {
-            line: 148,
+            line: 145,
             column: 61
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 147,
+            line: 144,
             column: 12
           },
           end: {
-            line: 147,
+            line: 144,
             column: 72
           }
         }, {
           start: {
-            line: 148,
+            line: 145,
             column: 12
           },
           end: {
-            line: 148,
+            line: 145,
             column: 61
           }
         }],
-        line: 147
+        line: 144
       },
       "7": {
         loc: {
           start: {
-            line: 161,
+            line: 158,
             column: 9
           },
           end: {
-            line: 211,
+            line: 208,
             column: 9
           }
         },
         type: "cond-expr",
         locations: [{
           start: {
-            line: 162,
+            line: 159,
             column: 10
           },
           end: {
-            line: 196,
+            line: 193,
             column: 23
           }
         }, {
           start: {
-            line: 198,
+            line: 195,
             column: 10
           },
           end: {
-            line: 210,
+            line: 207,
             column: 29
           }
         }],
-        line: 161
+        line: 158
       },
       "8": {
         loc: {
           start: {
-            line: 212,
+            line: 209,
             column: 9
           },
           end: {
-            line: 220,
+            line: 217,
             column: 9
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 212,
+            line: 209,
             column: 9
           },
           end: {
-            line: 212,
+            line: 209,
             column: 24
           }
         }, {
           start: {
-            line: 213,
+            line: 210,
             column: 10
           },
           end: {
-            line: 219,
+            line: 216,
             column: 12
           }
         }],
-        line: 212
+        line: 209
       },
       "9": {
         loc: {
           start: {
-            line: 216,
+            line: 213,
             column: 24
           },
           end: {
-            line: 216,
+            line: 213,
             column: 46
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 216,
+            line: 213,
             column: 24
           },
           end: {
-            line: 216,
+            line: 213,
             column: 36
           }
         }, {
           start: {
-            line: 216,
+            line: 213,
             column: 40
           },
           end: {
-            line: 216,
+            line: 213,
             column: 46
           }
         }],
-        line: 216
+        line: 213
       }
     },
     s: {
@@ -32678,7 +32738,7 @@ function cov_2e8k7gwd81() {
       "9": [0, 0]
     },
     _coverageSchema: "1a1c01bbd47fc00a2c39e90264f33305004495a9",
-    hash: "c885d28816766402f837ebd6b60689340526a7ef"
+    hash: "75bc0a57ebc0e79094a7a070d3da27cbc5fa1354"
   };
   var coverage = global[gcv] || (global[gcv] = {});
   if (!coverage[path] || coverage[path].hash !== hash) {
@@ -32704,7 +32764,6 @@ var Form = function Form(_ref) {
     onValueChange = _ref.onValueChange,
     showActionBlock = _ref.showActionBlock,
     formId = _ref.formId,
-    setShouldValidate = _ref.setShouldValidate,
     isDeletable = _ref.isDeletable,
     isRequiredField = _ref.isRequiredField,
     submitButtonProps = _ref.submitButtonProps,
@@ -32747,10 +32806,9 @@ var Form = function Form(_ref) {
       isValid: isValid,
       errors: errors,
       submitForm: submitForm,
-      resetForm: resetForm,
-      setShouldValidate: setShouldValidate
+      resetForm: resetForm
     });
-  }, [formId, setFormData, values, dirty, isSubmitting, isValid, errors, submitForm, resetForm, setShouldValidate]);
+  }, [formId, setFormData, values, dirty, isSubmitting, isValid, errors, submitForm, resetForm]);
   var _ref8 = (cov_2e8k7gwd81().s[9]++, values),
     questions = _ref8.questions;
   cov_2e8k7gwd81().s[10]++;
@@ -33252,7 +33310,7 @@ var formValidationSchema = (cov_13igvew484().s[2]++, object().shape({
 
 function cov_2nbnnlcv5p() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/BuildForm/index.jsx";
-  var hash = "6eb1d47c51f39613ed75d6b4a648a046341f2a2c";
+  var hash = "3657512e450f0fb3332d5e2b841a7570f6023ce7";
   var global = new Function("return this")();
   var gcv = "__coverage__";
   var coverageData = {
@@ -33264,267 +33322,257 @@ function cov_2nbnnlcv5p() {
           column: 18
         },
         end: {
-          line: 168,
+          line: 163,
           column: 1
         }
       },
       "1": {
         start: {
           line: 41,
-          column: 54
+          column: 22
         },
         end: {
           line: 41,
-          column: 69
+          column: 38
         }
       },
       "2": {
         start: {
           line: 43,
-          column: 22
+          column: 43
         },
         end: {
-          line: 43,
-          column: 38
+          line: 48,
+          column: 4
         }
       },
       "3": {
         start: {
           line: 45,
-          column: 43
+          column: 22
         },
         end: {
-          line: 50,
-          column: 4
+          line: 45,
+          column: 41
         }
       },
       "4": {
         start: {
           line: 47,
-          column: 22
+          column: 6
         },
         end: {
           line: 47,
-          column: 41
+          column: 28
         }
       },
       "5": {
         start: {
-          line: 49,
+          line: 56,
           column: 6
         },
         end: {
-          line: 49,
-          column: 28
+          line: 74,
+          column: 4
         }
       },
       "6": {
         start: {
           line: 58,
-          column: 6
-        },
-        end: {
-          line: 76,
-          column: 4
-        }
-      },
-      "7": {
-        start: {
-          line: 60,
           column: 23
         },
         end: {
-          line: 60,
+          line: 58,
           column: 39
         }
       },
-      "8": {
+      "7": {
         start: {
-          line: 78,
+          line: 76,
           column: 2
         },
         end: {
-          line: 84,
+          line: 82,
           column: 3
         }
       },
-      "9": {
+      "8": {
         start: {
-          line: 79,
+          line: 77,
           column: 4
         },
         end: {
-          line: 83,
+          line: 81,
           column: 6
         }
       },
-      "10": {
+      "9": {
         start: {
-          line: 86,
+          line: 84,
           column: 23
         },
         end: {
-          line: 93,
+          line: 91,
           column: 6
         }
       },
-      "11": {
+      "10": {
         start: {
-          line: 87,
+          line: 85,
           column: 4
         },
         end: {
-          line: 93,
+          line: 91,
           column: 6
         }
       },
-      "12": {
+      "11": {
         start: {
-          line: 95,
+          line: 93,
           column: 24
         },
         end: {
-          line: 107,
+          line: 105,
           column: 3
         }
       },
-      "13": {
+      "12": {
         start: {
-          line: 96,
+          line: 94,
           column: 32
         },
         end: {
-          line: 99,
+          line: 97,
           column: 6
         }
       },
-      "14": {
+      "13": {
         start: {
-          line: 101,
+          line: 99,
           column: 4
         },
         end: {
-          line: 106,
+          line: 104,
           column: 5
         }
       },
-      "15": {
+      "14": {
         start: {
-          line: 102,
+          line: 100,
           column: 6
         },
         end: {
-          line: 105,
+          line: 103,
           column: 8
         }
       },
-      "16": {
+      "15": {
         start: {
-          line: 110,
+          line: 108,
           column: 4
         },
         end: {
-          line: 111,
+          line: 109,
           column: 61
         }
       },
-      "17": {
+      "16": {
         start: {
-          line: 111,
+          line: 109,
           column: 17
         },
         end: {
-          line: 111,
+          line: 109,
           column: 60
         }
       },
-      "18": {
+      "17": {
         start: {
-          line: 114,
+          line: 112,
           column: 4
         },
         end: {
-          line: 114,
+          line: 112,
           column: 68
         }
       },
-      "19": {
+      "18": {
         start: {
-          line: 114,
+          line: 112,
           column: 38
         },
         end: {
-          line: 114,
+          line: 112,
           column: 67
         }
       },
-      "20": {
+      "19": {
         start: {
-          line: 116,
+          line: 114,
           column: 31
         },
         end: {
-          line: 116,
+          line: 114,
           column: 68
         }
       },
-      "21": {
+      "20": {
         start: {
-          line: 116,
+          line: 114,
           column: 62
         },
         end: {
-          line: 116,
+          line: 114,
           column: 67
         }
       },
-      "22": {
+      "21": {
         start: {
-          line: 118,
+          line: 116,
           column: 31
         },
         end: {
-          line: 120,
+          line: 118,
           column: 79
         }
       },
-      "23": {
+      "22": {
         start: {
-          line: 122,
+          line: 120,
           column: 2
         },
         end: {
-          line: 167,
+          line: 162,
           column: 4
         }
       },
-      "24": {
+      "23": {
         start: {
-          line: 135,
+          line: 131,
           column: 10
         },
         end: {
-          line: 158,
+          line: 153,
           column: 12
         }
       },
-      "25": {
+      "24": {
         start: {
-          line: 154,
+          line: 149,
           column: 14
         },
         end: {
-          line: 156,
+          line: 151,
           column: 15
         }
       },
-      "26": {
+      "25": {
         start: {
-          line: 155,
+          line: 150,
           column: 16
         },
         end: {
-          line: 155,
+          line: 150,
           column: 49
         }
       }
@@ -33548,7 +33596,7 @@ function cov_2nbnnlcv5p() {
             column: 6
           },
           end: {
-            line: 168,
+            line: 163,
             column: 1
           }
         },
@@ -33558,241 +33606,241 @@ function cov_2nbnnlcv5p() {
         name: "(anonymous_1)",
         decl: {
           start: {
-            line: 47,
+            line: 45,
             column: 13
           },
           end: {
-            line: 47,
+            line: 45,
             column: 14
           }
         },
         loc: {
           start: {
-            line: 47,
+            line: 45,
             column: 22
           },
           end: {
-            line: 47,
+            line: 45,
             column: 41
           }
         },
-        line: 47
+        line: 45
       },
       "2": {
         name: "(anonymous_2)",
         decl: {
           start: {
-            line: 48,
+            line: 46,
             column: 15
           },
           end: {
-            line: 48,
+            line: 46,
             column: 16
           }
         },
         loc: {
           start: {
-            line: 49,
+            line: 47,
             column: 6
           },
           end: {
-            line: 49,
+            line: 47,
             column: 28
           }
         },
-        line: 49
+        line: 47
       },
       "3": {
         name: "(anonymous_3)",
         decl: {
           start: {
-            line: 60,
+            line: 58,
             column: 15
           },
           end: {
-            line: 60,
+            line: 58,
             column: 16
           }
         },
         loc: {
           start: {
-            line: 60,
+            line: 58,
             column: 23
           },
           end: {
-            line: 60,
+            line: 58,
             column: 39
           }
         },
-        line: 60
+        line: 58
       },
       "4": {
         name: "(anonymous_4)",
         decl: {
           start: {
-            line: 86,
+            line: 84,
             column: 23
           },
           end: {
-            line: 86,
+            line: 84,
             column: 24
           }
         },
         loc: {
           start: {
-            line: 87,
+            line: 85,
             column: 4
           },
           end: {
-            line: 93,
+            line: 91,
             column: 6
           }
         },
-        line: 87
+        line: 85
       },
       "5": {
         name: "(anonymous_5)",
         decl: {
           start: {
-            line: 95,
+            line: 93,
             column: 24
           },
           end: {
-            line: 95,
+            line: 93,
             column: 25
           }
         },
         loc: {
           start: {
-            line: 95,
+            line: 93,
             column: 37
           },
           end: {
-            line: 107,
+            line: 105,
             column: 3
           }
         },
-        line: 95
+        line: 93
       },
       "6": {
         name: "(anonymous_6)",
         decl: {
           start: {
-            line: 111,
+            line: 109,
             column: 5
           },
           end: {
-            line: 111,
+            line: 109,
             column: 6
           }
         },
         loc: {
           start: {
-            line: 111,
+            line: 109,
             column: 17
           },
           end: {
-            line: 111,
+            line: 109,
             column: 60
           }
         },
-        line: 111
+        line: 109
       },
       "7": {
         name: "(anonymous_7)",
         decl: {
           start: {
-            line: 114,
+            line: 112,
             column: 24
           },
           end: {
-            line: 114,
+            line: 112,
             column: 25
           }
         },
         loc: {
           start: {
-            line: 114,
+            line: 112,
             column: 38
           },
           end: {
-            line: 114,
+            line: 112,
             column: 67
           }
         },
-        line: 114
+        line: 112
       },
       "8": {
         name: "(anonymous_8)",
         decl: {
           start: {
-            line: 116,
+            line: 114,
             column: 56
           },
           end: {
-            line: 116,
+            line: 114,
             column: 57
           }
         },
         loc: {
           start: {
-            line: 116,
+            line: 114,
             column: 62
           },
           end: {
-            line: 116,
+            line: 114,
             column: 67
           }
         },
-        line: 116
+        line: 114
       },
       "9": {
         name: "(anonymous_9)",
         decl: {
           start: {
-            line: 134,
+            line: 130,
             column: 9
           },
           end: {
-            line: 134,
+            line: 130,
             column: 10
           }
         },
         loc: {
           start: {
-            line: 135,
+            line: 131,
             column: 10
           },
           end: {
-            line: 158,
+            line: 153,
             column: 12
           }
         },
-        line: 135
+        line: 131
       },
       "10": {
         name: "(anonymous_10)",
         decl: {
           start: {
-            line: 153,
+            line: 148,
             column: 22
           },
           end: {
-            line: 153,
+            line: 148,
             column: 23
           }
         },
         loc: {
           start: {
-            line: 153,
+            line: 148,
             column: 31
           },
           end: {
-            line: 157,
+            line: 152,
             column: 13
           }
         },
-        line: 153
+        line: 148
       }
     },
     branchMap: {
@@ -34039,70 +34087,70 @@ function cov_2nbnnlcv5p() {
       "10": {
         loc: {
           start: {
-            line: 48,
+            line: 46,
             column: 18
           },
           end: {
-            line: 48,
+            line: 46,
             column: 70
           }
         },
         type: "default-arg",
         locations: [{
           start: {
-            line: 48,
+            line: 46,
             column: 27
           },
           end: {
-            line: 48,
+            line: 46,
             column: 70
           }
         }],
-        line: 48
+        line: 46
       },
       "11": {
         loc: {
           start: {
-            line: 53,
+            line: 51,
             column: 10
           },
           end: {
-            line: 56,
+            line: 54,
             column: 5
           }
         },
         type: "default-arg",
         locations: [{
           start: {
-            line: 53,
+            line: 51,
             column: 46
           },
           end: {
-            line: 56,
+            line: 54,
             column: 5
           }
         }],
-        line: 53
+        line: 51
       },
       "12": {
         loc: {
           start: {
-            line: 78,
+            line: 76,
             column: 2
           },
           end: {
-            line: 84,
+            line: 82,
             column: 3
           }
         },
         type: "if",
         locations: [{
           start: {
-            line: 78,
+            line: 76,
             column: 2
           },
           end: {
-            line: 84,
+            line: 82,
             column: 3
           }
         }, {
@@ -34115,69 +34163,69 @@ function cov_2nbnnlcv5p() {
             column: undefined
           }
         }],
-        line: 78
+        line: 76
       },
       "13": {
         loc: {
           start: {
-            line: 78,
+            line: 76,
             column: 6
           },
           end: {
-            line: 78,
+            line: 76,
             column: 53
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 78,
+            line: 76,
             column: 6
           },
           end: {
-            line: 78,
+            line: 76,
             column: 15
           }
         }, {
           start: {
-            line: 78,
+            line: 76,
             column: 20
           },
           end: {
-            line: 78,
+            line: 76,
             column: 30
           }
         }, {
           start: {
-            line: 78,
+            line: 76,
             column: 34
           },
           end: {
-            line: 78,
+            line: 76,
             column: 52
           }
         }],
-        line: 78
+        line: 76
       },
       "14": {
         loc: {
           start: {
-            line: 101,
+            line: 99,
             column: 4
           },
           end: {
-            line: 106,
+            line: 104,
             column: 5
           }
         },
         type: "if",
         locations: [{
           start: {
-            line: 101,
+            line: 99,
             column: 4
           },
           end: {
-            line: 106,
+            line: 104,
             column: 5
           }
         }, {
@@ -34190,192 +34238,192 @@ function cov_2nbnnlcv5p() {
             column: undefined
           }
         }],
-        line: 101
+        line: 99
       },
       "15": {
         loc: {
           start: {
-            line: 110,
+            line: 108,
             column: 4
           },
           end: {
-            line: 111,
+            line: 109,
             column: 61
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 110,
+            line: 108,
             column: 4
           },
           end: {
-            line: 110,
+            line: 108,
             column: 23
           }
         }, {
           start: {
-            line: 111,
+            line: 109,
             column: 5
           },
           end: {
-            line: 111,
+            line: 109,
             column: 60
           }
         }],
-        line: 110
+        line: 108
       },
       "16": {
         loc: {
           start: {
-            line: 114,
+            line: 112,
             column: 4
           },
           end: {
-            line: 114,
+            line: 112,
             column: 68
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 114,
+            line: 112,
             column: 4
           },
           end: {
-            line: 114,
+            line: 112,
             column: 19
           }
         }, {
           start: {
-            line: 114,
+            line: 112,
             column: 24
           },
           end: {
-            line: 114,
+            line: 112,
             column: 67
           }
         }],
-        line: 114
+        line: 112
       },
       "17": {
         loc: {
           start: {
-            line: 116,
+            line: 114,
             column: 31
           },
           end: {
-            line: 116,
+            line: 114,
             column: 68
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 116,
+            line: 114,
             column: 31
           },
           end: {
-            line: 116,
+            line: 114,
             column: 51
           }
         }, {
           start: {
-            line: 116,
+            line: 114,
             column: 56
           },
           end: {
-            line: 116,
+            line: 114,
             column: 67
           }
         }],
-        line: 116
+        line: 114
       },
       "18": {
         loc: {
           start: {
-            line: 118,
+            line: 116,
             column: 31
           },
           end: {
-            line: 120,
+            line: 118,
             column: 79
           }
         },
         type: "cond-expr",
         locations: [{
           start: {
-            line: 119,
+            line: 117,
             column: 6
           },
           end: {
-            line: 119,
+            line: 117,
             column: 20
           }
         }, {
           start: {
-            line: 120,
+            line: 118,
             column: 6
           },
           end: {
-            line: 120,
+            line: 118,
             column: 79
           }
         }],
-        line: 118
+        line: 116
       },
       "19": {
         loc: {
           start: {
-            line: 150,
+            line: 145,
             column: 14
           },
           end: {
-            line: 150,
+            line: 145,
             column: 77
           }
         },
         type: "cond-expr",
         locations: [{
           start: {
-            line: 150,
+            line: 145,
             column: 41
           },
           end: {
-            line: 150,
+            line: 145,
             column: 54
           }
         }, {
           start: {
-            line: 150,
+            line: 145,
             column: 57
           },
           end: {
-            line: 150,
+            line: 145,
             column: 77
           }
         }],
-        line: 150
+        line: 145
       },
       "20": {
         loc: {
           start: {
-            line: 154,
+            line: 149,
             column: 14
           },
           end: {
-            line: 156,
+            line: 151,
             column: 15
           }
         },
         type: "if",
         locations: [{
           start: {
-            line: 154,
+            line: 149,
             column: 14
           },
           end: {
-            line: 156,
+            line: 151,
             column: 15
           }
         }, {
@@ -34388,40 +34436,40 @@ function cov_2nbnnlcv5p() {
             column: undefined
           }
         }],
-        line: 154
+        line: 149
       },
       "21": {
         loc: {
           start: {
-            line: 161,
+            line: 156,
             column: 7
           },
           end: {
-            line: 165,
+            line: 160,
             column: 7
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 161,
+            line: 156,
             column: 7
           },
           end: {
-            line: 161,
+            line: 156,
             column: 25
           }
         }, {
           start: {
-            line: 162,
+            line: 157,
             column: 8
           },
           end: {
-            line: 164,
+            line: 159,
             column: 14
           }
         }],
-        line: 161
+        line: 156
       }
     },
     s: {
@@ -34450,8 +34498,7 @@ function cov_2nbnnlcv5p() {
       "22": 0,
       "23": 0,
       "24": 0,
-      "25": 0,
-      "26": 0
+      "25": 0
     },
     f: {
       "0": 0,
@@ -34491,7 +34538,7 @@ function cov_2nbnnlcv5p() {
       "21": [0, 0]
     },
     _coverageSchema: "1a1c01bbd47fc00a2c39e90264f33305004495a9",
-    hash: "6eb1d47c51f39613ed75d6b4a648a046341f2a2c"
+    hash: "3657512e450f0fb3332d5e2b841a7570f6023ce7"
   };
   var coverage = global[gcv] || (global[gcv] = {});
   if (!coverage[path] || coverage[path].hash !== hash) {
@@ -34511,7 +34558,7 @@ function ownKeys$b(object, enumerableOnly) { var keys = Object.keys(object); if
 function _objectSpread$a(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$b(Object(source), !0).forEach(function (key) { _defineProperty$a(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$b(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 cov_2nbnnlcv5p().s[0]++;
 var BuildForm = function BuildForm(_ref) {
-  var _ref8, _ref9, _ref11;
+  var _ref6, _ref7, _ref9;
   var id = _ref.id,
     onUpdate = _ref.onUpdate,
     buildRequestArgs = _ref.buildRequestArgs,
@@ -34542,32 +34589,28 @@ var BuildForm = function BuildForm(_ref) {
     _ref$allowAdditionalG = _ref.allowAdditionalGuests,
     allowAdditionalGuests = _ref$allowAdditionalG === void 0 ? (cov_2nbnnlcv5p().b[9][0]++, false) : _ref$allowAdditionalG;
   cov_2nbnnlcv5p().f[0]++;
-  var _ref2 = (cov_2nbnnlcv5p().s[1]++, useState(false)),
-    _ref3 = _slicedToArray$6(_ref2, 2),
-    shouldValidateForm = _ref3[0],
-    setShouldValidateForm = _ref3[1];
-  var queryClient = (cov_2nbnnlcv5p().s[2]++, useQueryClient());
-  var _ref4 = (cov_2nbnnlcv5p().s[3]++, useUpdateQuestions({
+  var queryClient = (cov_2nbnnlcv5p().s[1]++, useQueryClient());
+  var _ref2 = (cov_2nbnnlcv5p().s[2]++, useUpdateQuestions({
       formId: id,
       onError: function onError(error) {
         cov_2nbnnlcv5p().f[1]++;
-        cov_2nbnnlcv5p().s[4]++;
+        cov_2nbnnlcv5p().s[3]++;
         return Toastr.error(error);
       },
-      onSuccess: function onSuccess(_ref5) {
-        var _ref5$notice = _ref5.notice,
-          notice = _ref5$notice === void 0 ? (cov_2nbnnlcv5p().b[10][0]++, "Questions have been updated successfully!") : _ref5$notice;
+      onSuccess: function onSuccess(_ref3) {
+        var _ref3$notice = _ref3.notice,
+          notice = _ref3$notice === void 0 ? (cov_2nbnnlcv5p().b[10][0]++, "Questions have been updated successfully!") : _ref3$notice;
         cov_2nbnnlcv5p().f[2]++;
-        cov_2nbnnlcv5p().s[5]++;
+        cov_2nbnnlcv5p().s[4]++;
         return Toastr.success(notice);
       }
     })),
-    updateQuestions = _ref4.mutateAsync;
-  var _ref6 = (cov_2nbnnlcv5p().s[6]++, useForm({
+    updateQuestions = _ref2.mutateAsync;
+  var _ref4 = (cov_2nbnnlcv5p().s[5]++, useForm({
       formId: id,
       onSuccess: function onSuccess(data) {
         cov_2nbnnlcv5p().f[3]++;
-        cov_2nbnnlcv5p().s[7]++;
+        cov_2nbnnlcv5p().s[6]++;
         return onUpdate === null || onUpdate === void 0 ? void 0 : onUpdate(data);
       },
       placeholderData: {
@@ -34583,28 +34626,28 @@ var BuildForm = function BuildForm(_ref) {
         }]
       }
     })),
-    _ref6$data = _ref6.data,
-    _ref6$data2 = _ref6$data === void 0 ? (cov_2nbnnlcv5p().b[11][0]++, {
+    _ref4$data = _ref4.data,
+    _ref4$data2 = _ref4$data === void 0 ? (cov_2nbnnlcv5p().b[11][0]++, {
       title: "",
       questions: []
-    }) : _ref6$data,
-    questions = _ref6$data2.questions,
-    isQuestionsLoading = _ref6$data2.isQuestionsLoading,
-    isLoading = _ref6.isLoading;
-  cov_2nbnnlcv5p().s[8]++;
+    }) : _ref4$data,
+    questions = _ref4$data2.questions,
+    isQuestionsLoading = _ref4$data2.isQuestionsLoading,
+    isLoading = _ref4.isLoading;
+  cov_2nbnnlcv5p().s[7]++;
   if ((cov_2nbnnlcv5p().b[13][0]++, isLoading) || (cov_2nbnnlcv5p().b[13][1]++, showLoader) && (cov_2nbnnlcv5p().b[13][2]++, isQuestionsLoading)) {
     cov_2nbnnlcv5p().b[12][0]++;
-    cov_2nbnnlcv5p().s[9]++;
+    cov_2nbnnlcv5p().s[8]++;
     return /*#__PURE__*/React__default.createElement("div", {
       className: "flex h-full w-full items-center justify-center py-6"
     }, /*#__PURE__*/React__default.createElement(PageLoader, null));
   } else {
     cov_2nbnnlcv5p().b[12][1]++;
   }
-  cov_2nbnnlcv5p().s[10]++;
+  cov_2nbnnlcv5p().s[9]++;
   var handleSubmit = function handleSubmit(payload) {
     cov_2nbnnlcv5p().f[4]++;
-    cov_2nbnnlcv5p().s[11]++;
+    cov_2nbnnlcv5p().s[10]++;
     return updateQuestions({
       id: id,
       values: _objectSpread$a({
@@ -34612,56 +34655,54 @@ var BuildForm = function BuildForm(_ref) {
       }, buildRequestArgs)
     });
   };
-  cov_2nbnnlcv5p().s[12]++;
+  cov_2nbnnlcv5p().s[11]++;
   var onValueChange = function onValueChange(questions) {
     cov_2nbnnlcv5p().f[5]++;
-    var _ref7 = (cov_2nbnnlcv5p().s[13]++, queryClient.getQueryState([QUERY_KEYS.QUESTIONS, id])),
-      dataUpdateCount = _ref7.dataUpdateCount;
-    cov_2nbnnlcv5p().s[14]++;
+    var _ref5 = (cov_2nbnnlcv5p().s[12]++, queryClient.getQueryState([QUERY_KEYS.QUESTIONS, id])),
+      dataUpdateCount = _ref5.dataUpdateCount;
+    cov_2nbnnlcv5p().s[13]++;
     if (dataUpdateCount > 0) {
       cov_2nbnnlcv5p().b[14][0]++;
-      cov_2nbnnlcv5p().s[15]++;
+      cov_2nbnnlcv5p().s[14]++;
       queryClient.setQueryData([QUERY_KEYS.QUESTIONS, "preview/".concat(id)], assoc("questions", questions));
     } else {
       cov_2nbnnlcv5p().b[14][1]++;
     }
   };
-  var isDeletable = (cov_2nbnnlcv5p().s[16]++, (_ref8 = (cov_2nbnnlcv5p().b[15][0]++, isQuestionDeletable)) !== null && _ref8 !== void 0 ? _ref8 : (cov_2nbnnlcv5p().b[15][1]++, function (question) {
+  var isDeletable = (cov_2nbnnlcv5p().s[15]++, (_ref6 = (cov_2nbnnlcv5p().b[15][0]++, isQuestionDeletable)) !== null && _ref6 !== void 0 ? _ref6 : (cov_2nbnnlcv5p().b[15][1]++, function (question) {
     cov_2nbnnlcv5p().f[6]++;
-    cov_2nbnnlcv5p().s[17]++;
+    cov_2nbnnlcv5p().s[16]++;
     return !nonRemovableFields.includes(question.kind);
   }));
-  var isRequiredField = (cov_2nbnnlcv5p().s[18]++, (_ref9 = (cov_2nbnnlcv5p().b[16][0]++, isFieldRequired)) !== null && _ref9 !== void 0 ? _ref9 : (cov_2nbnnlcv5p().b[16][1]++, function (_ref10) {
-    var kind = _ref10.kind;
+  var isRequiredField = (cov_2nbnnlcv5p().s[17]++, (_ref7 = (cov_2nbnnlcv5p().b[16][0]++, isFieldRequired)) !== null && _ref7 !== void 0 ? _ref7 : (cov_2nbnnlcv5p().b[16][1]++, function (_ref8) {
+    var kind = _ref8.kind;
     cov_2nbnnlcv5p().f[7]++;
-    cov_2nbnnlcv5p().s[19]++;
+    cov_2nbnnlcv5p().s[18]++;
     return requiredFields.includes(kind);
   }));
-  var isDisabledFieldLabel = (cov_2nbnnlcv5p().s[20]++, (_ref11 = (cov_2nbnnlcv5p().b[17][0]++, isFieldLabelDisabled)) !== null && _ref11 !== void 0 ? _ref11 : (cov_2nbnnlcv5p().b[17][1]++, function () {
+  var isDisabledFieldLabel = (cov_2nbnnlcv5p().s[19]++, (_ref9 = (cov_2nbnnlcv5p().b[17][0]++, isFieldLabelDisabled)) !== null && _ref9 !== void 0 ? _ref9 : (cov_2nbnnlcv5p().b[17][1]++, function () {
     cov_2nbnnlcv5p().f[8]++;
-    cov_2nbnnlcv5p().s[21]++;
+    cov_2nbnnlcv5p().s[20]++;
     return false;
   }));
-  var defaultQuestionKinds = (cov_2nbnnlcv5p().s[22]++, allowAdditionalGuests ? (cov_2nbnnlcv5p().b[18][0]++, QUESTION_KINDS) : (cov_2nbnnlcv5p().b[18][1]++, removeBy({
+  var defaultQuestionKinds = (cov_2nbnnlcv5p().s[21]++, allowAdditionalGuests ? (cov_2nbnnlcv5p().b[18][0]++, QUESTION_KINDS) : (cov_2nbnnlcv5p().b[18][1]++, removeBy({
     type: QUESTION_KIND.ADDITIONAL_GUESTS.value
   }, QUESTION_KINDS)));
-  cov_2nbnnlcv5p().s[23]++;
+  cov_2nbnnlcv5p().s[22]++;
   return /*#__PURE__*/React__default.createElement("div", {
     className: "relative"
   }, /*#__PURE__*/React__default.createElement(Formik, {
     enableReinitialize: true,
-    validateOnBlur: shouldValidateForm,
-    validateOnChange: shouldValidateForm,
     validationSchema: formValidationSchema,
     initialValues: {
       questions: questions
     },
     onSubmit: handleSubmit
-  }, function (_ref12) {
-    var errors = _ref12.errors,
-      setFieldError = _ref12.setFieldError;
+  }, function (_ref10) {
+    var errors = _ref10.errors,
+      setFieldError = _ref10.setFieldError;
     cov_2nbnnlcv5p().f[9]++;
-    cov_2nbnnlcv5p().s[24]++;
+    cov_2nbnnlcv5p().s[23]++;
     return /*#__PURE__*/React__default.createElement(Form, _extends$9({}, formDomProps, {
       cancelButtonProps: cancelButtonProps,
       formId: id,
@@ -34671,7 +34712,6 @@ var BuildForm = function BuildForm(_ref) {
       isKindAlreadyActive: isKindAlreadyActive,
       isRequiredField: isRequiredField,
       kindUniqueOn: kindUniqueOn,
-      setShouldValidate: setShouldValidateForm,
       showActionBlock: showActionBlock,
       showAddQuestionDivider: showAddQuestionDivider,
       submitButtonProps: submitButtonProps,
@@ -34679,10 +34719,10 @@ var BuildForm = function BuildForm(_ref) {
       onValueChange: onValueChange,
       onChange: function onChange(event) {
         cov_2nbnnlcv5p().f[10]++;
-        cov_2nbnnlcv5p().s[25]++;
+        cov_2nbnnlcv5p().s[24]++;
         if (!isEmpty(errors)) {
           cov_2nbnnlcv5p().b[20][0]++;
-          cov_2nbnnlcv5p().s[26]++;
+          cov_2nbnnlcv5p().s[25]++;
           setFieldError(event.target.name);
         } else {
           cov_2nbnnlcv5p().b[20][1]++;
@@ -35939,6 +35979,7 @@ var Spinner = function Spinner(_ref) {
     strokeWidth: "1.5"
   })));
 };
+var Spinner$1 = /*#__PURE__*/React__default.memo(Spinner);
 
 var _excluded$e = ["label", "loading", "success", "className"];
 function cov_2ndo8sz9m4() {
@@ -36275,7 +36316,7 @@ var Button = function Button(_ref) {
   cov_2ndo8sz9m4().s[1]++;
   return /*#__PURE__*/React__default.createElement("button", _extends$9({
     className: classnames("neeto-form-engine-button", className)
-  }, otherProps), (cov_2ndo8sz9m4().b[3][0]++, loading) && (cov_2ndo8sz9m4().b[3][1]++, /*#__PURE__*/React__default.createElement(ButtonLoader, null)), (cov_2ndo8sz9m4().b[4][0]++, success) && (cov_2ndo8sz9m4().b[4][1]++, /*#__PURE__*/React__default.createElement(Success$1, null)), label);
+  }, otherProps), (cov_2ndo8sz9m4().b[3][0]++, loading) && (cov_2ndo8sz9m4().b[3][1]++, /*#__PURE__*/React__default.createElement(ButtonLoader, null)), (cov_2ndo8sz9m4().b[4][0]++, success) && (cov_2ndo8sz9m4().b[4][1]++, /*#__PURE__*/React__default.createElement(Success$2, null)), label);
 };
 cov_2ndo8sz9m4().s[2]++;
 var ButtonLoader = function ButtonLoader() {
@@ -36283,10 +36324,10 @@ var ButtonLoader = function ButtonLoader() {
   cov_2ndo8sz9m4().s[3]++;
   return /*#__PURE__*/React__default.createElement("div", {
     className: "neeto-form-engine-button__loader"
-  }, /*#__PURE__*/React__default.createElement(Spinner, null));
+  }, /*#__PURE__*/React__default.createElement(Spinner$1, null));
 };
 cov_2ndo8sz9m4().s[4]++;
-var Success$1 = function Success() {
+var Success$2 = function Success() {
   cov_2ndo8sz9m4().f[2]++;
   cov_2ndo8sz9m4().s[5]++;
   return /*#__PURE__*/React__default.createElement("div", {
@@ -58880,7 +58921,7 @@ var Condition = function Condition(_ref, ref) {
     className: "neeto-form-engine-input__error"
   }, error)));
 };
-var Condition$1 = /*#__PURE__*/forwardRef(Condition);
+var Condition$1 = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(Condition));
 
 function cov_2lhrgkh8e4() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/ExternalForm/Fields/ConditionField.jsx";
@@ -60485,6 +60526,7 @@ var Choices = function Choices(_ref) {
     className: "neeto-form-engine-input__error"
   }, error)));
 };
+var Choices$1 = /*#__PURE__*/React__default.memo(Choices);
 
 var _excluded$5 = ["size", "label", "error", "helpText", "className", "innerRef"];
 function cov_2mja3ufqil() {
@@ -61580,7 +61622,7 @@ var OptionsField = function OptionsField(_ref) {
     isRequired = _ref3.isRequired,
     _ref3$optionsAttribut = _ref3.optionsAttributes,
     options = _ref3$optionsAttribut === void 0 ? (cov_1i8uylwhkg().b[0][0]++, []) : _ref3$optionsAttribut;
-  var Component = (cov_1i8uylwhkg().s[3]++, kind === QUESTION_KIND.DROPDOWN.value ? (cov_1i8uylwhkg().b[1][0]++, Select) : (cov_1i8uylwhkg().b[1][1]++, Choices));
+  var Component = (cov_1i8uylwhkg().s[3]++, kind === QUESTION_KIND.DROPDOWN.value ? (cov_1i8uylwhkg().b[1][0]++, Select) : (cov_1i8uylwhkg().b[1][1]++, Choices$1));
   var transformedOptions = (cov_1i8uylwhkg().s[4]++, kind === QUESTION_KIND.DROPDOWN.value ? (cov_1i8uylwhkg().b[2][0]++, options.map(function (option) {
     cov_1i8uylwhkg().f[1]++;
     cov_1i8uylwhkg().s[5]++;
@@ -62251,6 +62293,7 @@ var Rating = function Rating(_ref) {
     className: "neeto-form-engine-input__error"
   }, error)));
 };
+var Rating$1 = /*#__PURE__*/React__default.memo(Rating);
 
 function cov_2lj2o2sww7() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/ExternalForm/Fields/RatingField.jsx";
@@ -62545,7 +62588,7 @@ var RatingField = function RatingField(_ref) {
       field = _ref3.field;
     cov_2lj2o2sww7().f[1]++;
     cov_2lj2o2sww7().s[3]++;
-    return /*#__PURE__*/React__default.createElement(Rating, _extends$9({
+    return /*#__PURE__*/React__default.createElement(Rating$1, _extends$9({
       averageRatingLabel: (cov_2lj2o2sww7().b[0][0]++, averageRatingLabel) || (cov_2lj2o2sww7().b[0][1]++, RATING_VALUES.AVERAGE.label),
       error: meta.touched ? (cov_2lj2o2sww7().b[1][0]++, meta.error) : (cov_2lj2o2sww7().b[1][1]++, ""),
       highestRatingLabel: (cov_2lj2o2sww7().b[2][0]++, highestRatingLabel) || (cov_2lj2o2sww7().b[2][1]++, RATING_VALUES.GOOD.label),
@@ -63344,6 +63387,7 @@ var StarRating = function StarRating(_ref2) {
     className: "neeto-form-engine-input__error"
   }, error)));
 };
+var StarRating$1 = /*#__PURE__*/React__default.memo(StarRating);
 
 function cov_14fczoh42d() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/ExternalForm/Fields/StarRatingField.jsx";
@@ -63535,7 +63579,7 @@ var StarRatingField = function StarRatingField(_ref) {
       field = _ref3.field;
     cov_14fczoh42d().f[1]++;
     cov_14fczoh42d().s[3]++;
-    return /*#__PURE__*/React__default.createElement(StarRating, _extends$9({
+    return /*#__PURE__*/React__default.createElement(StarRating$1, _extends$9({
       count: count,
       error: meta.touched ? (cov_14fczoh42d().b[0][0]++, meta.error) : (cov_14fczoh42d().b[0][1]++, ""),
       label: getLabel$1(label, isRequired),
@@ -63699,7 +63743,7 @@ var Terms = function Terms(_ref, ref) {
     className: "neeto-form-engine-input__error"
   }, error)));
 };
-var Terms$1 = /*#__PURE__*/forwardRef(Terms);
+var Terms$1 = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(Terms));
 
 function cov_14h4eyw3wy() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/ExternalForm/Fields/TermsField.jsx";
@@ -65055,6 +65099,7 @@ var Textarea = function Textarea(props) {
     className: "neeto-form-engine-input__error"
   }, error)));
 };
+var Textarea$1 = /*#__PURE__*/React__default.memo(Textarea);
 
 function cov_h64dar2vv() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/ExternalForm/Fields/TextField.jsx";
@@ -65421,7 +65466,7 @@ var TextField = function TextField(_ref) {
     _ref3$type = _ref3.type,
     type = _ref3$type === void 0 ? (cov_h64dar2vv().b[0][0]++, "text") : _ref3$type,
     otherProps = _ref3.otherProps;
-  var Component = (cov_h64dar2vv().s[3]++, kind === QUESTION_KIND.TEXTAREA.value ? (cov_h64dar2vv().b[1][0]++, Textarea) : (cov_h64dar2vv().b[1][1]++, FormInput));
+  var Component = (cov_h64dar2vv().s[3]++, kind === QUESTION_KIND.TEXTAREA.value ? (cov_h64dar2vv().b[1][0]++, Textarea$1) : (cov_h64dar2vv().b[1][1]++, FormInput));
   cov_h64dar2vv().s[4]++;
   return /*#__PURE__*/React__default.createElement(Field, {
     name: (cov_h64dar2vv().b[2][0]++, name) || (cov_h64dar2vv().b[2][1]++, nodeId),
@@ -65868,10 +65913,11 @@ var Success = function Success() {
     style: "h1"
   }, t("successPage.title2")));
 };
+var Success$1 = /*#__PURE__*/React__default.memo(Success);
 
 function cov_2jkcclu7mz() {
   var path = "/home/runner/work/neeto-form-frontend/neeto-form-frontend/src/components/ExternalForm/index.jsx";
-  var hash = "515884cbc114300a42b3d6d09d62dd236c05a20d";
+  var hash = "306fa6a0acfb642be1cbcbeef9eb9a705cee1876";
   var global = new Function("return this")();
   var gcv = "__coverage__";
   var coverageData = {
@@ -65883,7 +65929,7 @@ function cov_2jkcclu7mz() {
           column: 21
         },
         end: {
-          line: 346,
+          line: 344,
           column: 1
         }
       },
@@ -66533,137 +66579,137 @@ function cov_2jkcclu7mz() {
           column: 2
         },
         end: {
-          line: 345,
+          line: 343,
           column: 4
         }
       },
       "66": {
         start: {
-          line: 247,
+          line: 245,
           column: 10
         },
         end: {
-          line: 341,
+          line: 339,
           column: 23
         }
       },
       "67": {
         start: {
-          line: 261,
+          line: 259,
           column: 16
         },
         end: {
-          line: 263,
+          line: 261,
           column: 17
         }
       },
       "68": {
         start: {
-          line: 262,
+          line: 260,
           column: 18
         },
         end: {
-          line: 262,
+          line: 260,
           column: 51
         }
       },
       "69": {
         start: {
-          line: 267,
+          line: 265,
           column: 16
         },
         end: {
-          line: 277,
+          line: 275,
           column: 17
         }
       },
       "70": {
         start: {
-          line: 268,
+          line: 266,
           column: 18
         },
         end: {
-          line: 268,
+          line: 266,
           column: 62
         }
       },
       "71": {
         start: {
-          line: 269,
+          line: 267,
           column: 18
         },
         end: {
-          line: 269,
+          line: 267,
           column: 64
         }
       },
       "72": {
         start: {
-          line: 270,
+          line: 268,
           column: 18
         },
         end: {
-          line: 276,
+          line: 274,
           column: 22
         }
       },
       "73": {
         start: {
-          line: 278,
+          line: 276,
           column: 16
         },
         end: {
-          line: 278,
+          line: 276,
           column: 31
         }
       },
       "74": {
         start: {
-          line: 279,
+          line: 277,
           column: 16
         },
         end: {
-          line: 279,
+          line: 277,
           column: 43
         }
       },
       "75": {
         start: {
-          line: 288,
+          line: 286,
           column: 39
         },
         end: {
-          line: 288,
+          line: 286,
           column: 66
         }
       },
       "76": {
         start: {
-          line: 290,
+          line: 288,
           column: 16
         },
         end: {
-          line: 298,
+          line: 296,
           column: 18
         }
       },
       "77": {
         start: {
-          line: 338,
+          line: 336,
           column: 31
         },
         end: {
-          line: 338,
+          line: 336,
           column: 45
         }
       },
       "78": {
         start: {
-          line: 348,
+          line: 346,
           column: 0
         },
         end: {
-          line: 365,
+          line: 363,
           column: 2
         }
       }
@@ -66687,7 +66733,7 @@ function cov_2jkcclu7mz() {
             column: 6
           },
           end: {
-            line: 346,
+            line: 344,
             column: 1
           }
         },
@@ -66913,121 +66959,121 @@ function cov_2jkcclu7mz() {
         name: "(anonymous_10)",
         decl: {
           start: {
-            line: 246,
+            line: 244,
             column: 9
           },
           end: {
-            line: 246,
+            line: 244,
             column: 10
           }
         },
         loc: {
           start: {
-            line: 247,
+            line: 245,
             column: 10
           },
           end: {
-            line: 341,
+            line: 339,
             column: 23
           }
         },
-        line: 247
+        line: 245
       },
       "11": {
         name: "(anonymous_11)",
         decl: {
           start: {
-            line: 260,
+            line: 258,
             column: 24
           },
           end: {
-            line: 260,
+            line: 258,
             column: 25
           }
         },
         loc: {
           start: {
-            line: 260,
+            line: 258,
             column: 33
           },
           end: {
-            line: 264,
+            line: 262,
             column: 15
           }
         },
-        line: 260
+        line: 258
       },
       "12": {
         name: "(anonymous_12)",
         decl: {
           start: {
-            line: 266,
+            line: 264,
             column: 23
           },
           end: {
-            line: 266,
+            line: 264,
             column: 24
           }
         },
         loc: {
           start: {
-            line: 266,
+            line: 264,
             column: 28
           },
           end: {
-            line: 280,
+            line: 278,
             column: 15
           }
         },
-        line: 266
+        line: 264
       },
       "13": {
         name: "(anonymous_13)",
         decl: {
           start: {
-            line: 287,
+            line: 285,
             column: 37
           },
           end: {
-            line: 287,
+            line: 285,
             column: 38
           }
         },
         loc: {
           start: {
-            line: 287,
+            line: 285,
             column: 49
           },
           end: {
-            line: 299,
+            line: 297,
             column: 15
           }
         },
-        line: 287
+        line: 285
       },
       "14": {
         name: "(anonymous_14)",
         decl: {
           start: {
-            line: 338,
+            line: 336,
             column: 25
           },
           end: {
-            line: 338,
+            line: 336,
             column: 26
           }
         },
         loc: {
           start: {
-            line: 338,
+            line: 336,
             column: 31
           },
           end: {
-            line: 338,
+            line: 336,
             column: 45
           }
         },
-        line: 338
+        line: 336
       }
     },
     branchMap: {
@@ -68000,55 +68046,55 @@ function cov_2jkcclu7mz() {
       "32": {
         loc: {
           start: {
-            line: 242,
+            line: 240,
             column: 10
           },
           end: {
-            line: 242,
+            line: 240,
             column: 54
           }
         },
         type: "cond-expr",
         locations: [{
           start: {
-            line: 242,
+            line: 240,
             column: 27
           },
           end: {
-            line: 242,
+            line: 240,
             column: 38
           }
         }, {
           start: {
-            line: 242,
+            line: 240,
             column: 41
           },
           end: {
-            line: 242,
+            line: 240,
             column: 54
           }
         }],
-        line: 242
+        line: 240
       },
       "33": {
         loc: {
           start: {
-            line: 261,
+            line: 259,
             column: 16
           },
           end: {
-            line: 263,
+            line: 261,
             column: 17
           }
         },
         type: "if",
         locations: [{
           start: {
-            line: 261,
+            line: 259,
             column: 16
           },
           end: {
-            line: 263,
+            line: 261,
             column: 17
           }
         }, {
@@ -68061,27 +68107,27 @@ function cov_2jkcclu7mz() {
             column: undefined
           }
         }],
-        line: 261
+        line: 259
       },
       "34": {
         loc: {
           start: {
-            line: 267,
+            line: 265,
             column: 16
           },
           end: {
-            line: 277,
+            line: 275,
             column: 17
           }
         },
         type: "if",
         locations: [{
           start: {
-            line: 267,
+            line: 265,
             column: 16
           },
           end: {
-            line: 277,
+            line: 275,
             column: 17
           }
         }, {
@@ -68094,313 +68140,313 @@ function cov_2jkcclu7mz() {
             column: undefined
           }
         }],
-        line: 267
+        line: 265
       },
       "35": {
         loc: {
           start: {
-            line: 270,
+            line: 268,
             column: 18
           },
           end: {
-            line: 276,
+            line: 274,
             column: 21
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 270,
+            line: 268,
             column: 18
           },
           end: {
-            line: 270,
+            line: 268,
             column: 30
           }
         }, {
           start: {
-            line: 271,
+            line: 269,
             column: 20
           },
           end: {
-            line: 276,
+            line: 274,
             column: 21
           }
         }],
-        line: 270
+        line: 268
       },
       "36": {
         loc: {
           start: {
-            line: 282,
+            line: 280,
             column: 15
           },
           end: {
-            line: 286,
+            line: 284,
             column: 15
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 282,
+            line: 280,
             column: 15
           },
           end: {
-            line: 282,
+            line: 280,
             column: 36
           }
         }, {
           start: {
-            line: 283,
+            line: 281,
             column: 16
           },
           end: {
-            line: 285,
+            line: 283,
             column: 22
           }
         }],
-        line: 282
+        line: 280
       },
       "37": {
         loc: {
           start: {
-            line: 294,
+            line: 292,
             column: 25
           },
           end: {
-            line: 294,
+            line: 292,
             column: 55
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 294,
+            line: 292,
             column: 25
           },
           end: {
-            line: 294,
+            line: 292,
             column: 36
           }
         }, {
           start: {
-            line: 294,
+            line: 292,
             column: 40
           },
           end: {
-            line: 294,
+            line: 292,
             column: 55
           }
         }],
-        line: 294
+        line: 292
       },
       "38": {
         loc: {
           start: {
-            line: 300,
+            line: 298,
             column: 15
           },
           end: {
-            line: 307,
+            line: 305,
             column: 15
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 300,
+            line: 298,
             column: 15
           },
           end: {
-            line: 300,
+            line: 298,
             column: 29
           }
         }, {
           start: {
-            line: 300,
+            line: 298,
             column: 33
           },
           end: {
-            line: 300,
+            line: 298,
             column: 59
           }
         }, {
           start: {
-            line: 301,
+            line: 299,
             column: 16
           },
           end: {
-            line: 306,
+            line: 304,
             column: 22
           }
         }],
-        line: 300
+        line: 298
       },
       "39": {
         loc: {
           start: {
-            line: 309,
+            line: 307,
             column: 15
           },
           end: {
-            line: 329,
+            line: 327,
             column: 15
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 309,
+            line: 307,
             column: 15
           },
           end: {
-            line: 309,
+            line: 307,
             column: 42
           }
         }, {
           start: {
-            line: 310,
+            line: 308,
             column: 16
           },
           end: {
-            line: 328,
+            line: 326,
             column: 22
           }
         }],
-        line: 309
+        line: 307
       },
       "40": {
         loc: {
           start: {
-            line: 312,
+            line: 310,
             column: 30
           },
           end: {
-            line: 312,
+            line: 310,
             column: 57
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 312,
+            line: 310,
             column: 30
           },
           end: {
-            line: 312,
+            line: 310,
             column: 42
           }
         }, {
           start: {
-            line: 312,
+            line: 310,
             column: 46
           },
           end: {
-            line: 312,
+            line: 310,
             column: 57
           }
         }],
-        line: 312
+        line: 310
       },
       "41": {
         loc: {
           start: {
-            line: 317,
+            line: 315,
             column: 19
           },
           end: {
-            line: 324,
+            line: 322,
             column: 19
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 317,
+            line: 315,
             column: 19
           },
           end: {
-            line: 317,
+            line: 315,
             column: 35
           }
         }, {
           start: {
-            line: 318,
+            line: 316,
             column: 20
           },
           end: {
-            line: 323,
+            line: 321,
             column: 22
           }
         }],
-        line: 317
+        line: 315
       },
       "42": {
         loc: {
           start: {
-            line: 325,
+            line: 323,
             column: 19
           },
           end: {
-            line: 327,
+            line: 325,
             column: 19
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 325,
+            line: 323,
             column: 19
           },
           end: {
-            line: 325,
+            line: 323,
             column: 36
           }
         }, {
           start: {
-            line: 326,
+            line: 324,
             column: 20
           },
           end: {
-            line: 326,
+            line: 324,
             column: 68
           }
         }],
-        line: 325
+        line: 323
       },
       "43": {
         loc: {
           start: {
-            line: 331,
+            line: 329,
             column: 13
           },
           end: {
-            line: 340,
+            line: 338,
             column: 13
           }
         },
         type: "binary-expr",
         locations: [{
           start: {
-            line: 331,
+            line: 329,
             column: 13
           },
           end: {
-            line: 331,
+            line: 329,
             column: 33
           }
         }, {
           start: {
-            line: 332,
+            line: 330,
             column: 14
           },
           end: {
-            line: 339,
+            line: 337,
             column: 16
           }
         }],
-        line: 331
+        line: 329
       }
     },
     s: {
@@ -68548,7 +68594,7 @@ function cov_2jkcclu7mz() {
       "43": [0, 0]
     },
     _coverageSchema: "1a1c01bbd47fc00a2c39e90264f33305004495a9",
-    hash: "515884cbc114300a42b3d6d09d62dd236c05a20d"
+    hash: "306fa6a0acfb642be1cbcbeef9eb9a705cee1876"
   };
   var coverage = global[gcv] || (global[gcv] = {});
   if (!coverage[path] || coverage[path].hash !== hash) {
@@ -68922,7 +68968,7 @@ var ExternalForm = function ExternalForm(_ref) {
   if ((cov_2jkcclu7mz().b[29][0]++, displayThankYou) && (cov_2jkcclu7mz().b[29][1]++, showSuccess)) {
     cov_2jkcclu7mz().b[28][0]++;
     cov_2jkcclu7mz().s[64]++;
-    return /*#__PURE__*/React__default.createElement(Success, null);
+    return /*#__PURE__*/React__default.createElement(Success$1, null);
   } else {
     cov_2jkcclu7mz().b[28][1]++;
   }
@@ -68935,8 +68981,6 @@ var ExternalForm = function ExternalForm(_ref) {
     weight: "semibold"
   }, titleProps), (cov_2jkcclu7mz().b[31][0]++, formTitle) || (cov_2jkcclu7mz().b[31][1]++, title)))), /*#__PURE__*/React__default.createElement(Formik, {
     enableReinitialize: true,
-    validateOnBlur: false,
-    validateOnChange: false,
     initialValues: generateInitValues(questions, submission === null || submission === void 0 ? void 0 : submission.responses, preserveValues ? (cov_2jkcclu7mz().b[32][0]++, localValues) : (cov_2jkcclu7mz().b[32][1]++, initialValues)),
     onSubmit: onSubmit
   }, function (_ref19) {
@@ -68992,7 +69036,7 @@ var ExternalForm = function ExternalForm(_ref) {
       }
     }), (cov_2jkcclu7mz().b[36][0]++, submission === null || submission === void 0 ? void 0 : submission.isLoading) && (cov_2jkcclu7mz().b[36][1]++, /*#__PURE__*/React__default.createElement("div", {
       className: "neeto-ui-bg-gray-100 absolute top-0 left-0 right-0 bottom-0 flex items-center justify-center opacity-75"
-    }, /*#__PURE__*/React__default.createElement(Spinner$1, null))), renderedQuestions.map(function (question) {
+    }, /*#__PURE__*/React__default.createElement(Spinner$2, null))), renderedQuestions.map(function (question) {
       var _ref20;
       cov_2jkcclu7mz().f[13]++;
       var FieldComponent = (cov_2jkcclu7mz().s[75]++, getFieldComponent(question));