@bigbinary/neeto-form-frontend 4.3.0 → 4.4.0

package/dist/cjs/BuildForm.js

@@ -5,14 +5,14 @@ var classnames = require('classnames');
 var neetoCist = require('@bigbinary/neeto-cist');
 var Spinner = require('@bigbinary/neetoui/Spinner');
 var ramda = require('ramda');
-var constants = require('../constants-DcN-Mvx7.js');
-var constants$1 = require('../constants-BEKfDeAd.js');
+var constants = require('../constants-DNNZYQ9X.js');
+var yup = require('../yup-DcJey7xZ.js');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var React = require('react');
 var dnd = require('@hello-pangea/dnd');
 var reactUtils = require('@bigbinary/neeto-commons-frontend/react-utils');
 var utils = require('@bigbinary/neeto-commons-frontend/utils');
-var buildForm = require('../buildForm-vzjjarhs.js');
+var buildForm = require('../buildForm-Bdc3ubm4.js');
 var shallow = require('zustand/shallow');
 var Alert = require('@bigbinary/neetoui/Alert');
 var reactI18next = require('react-i18next');
@@ -23,13 +23,13 @@ var MoreDropdown = require('@bigbinary/neeto-molecules/MoreDropdown');
 var Dropdown = require('@bigbinary/neetoui/Dropdown');
 var Tooltip = require('@bigbinary/neetoui/Tooltip');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var index = require('../index-BQf-XQOv.js');
+var index = require('../index-Dz5Yvk3n.js');
+var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var i18next = require('i18next');
 var uuid = require('uuid');
 var NoData = require('@bigbinary/neetoui/NoData');
 var Button = require('@bigbinary/neetoui/Button');
-var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var Pane = require('@bigbinary/neetoui/Pane');
 var ActionBlock = require('@bigbinary/neetoui/formik/ActionBlock');
 var Form$2 = require('@bigbinary/neetoui/formik/Form');
@@ -41,7 +41,9 @@ var Textarea = require('@bigbinary/neetoui/formik/Textarea');
 var NeetoEditor = require('@bigbinary/neeto-editor/Editor');
 var Input = require('@bigbinary/neetoui/formik/Input');
 var utils$1 = require('@bigbinary/neeto-editor/utils');
-var yup = require('yup');
+var yup$1 = require('yup');
+var OptionFields = require('@bigbinary/neeto-molecules/OptionFields');
+var framerMotion = require('framer-motion');
 var Radio = require('@bigbinary/neetoui/formik/Radio');
 var Label = require('@bigbinary/neetoui/Label');
 var CreatableSelect = require('react-select/creatable');
@@ -53,7 +55,6 @@ var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
 var Checkbox$1 = require('@bigbinary/neetoui/formik/Checkbox');
 var Checkbox = require('@bigbinary/neetoui/Checkbox');
-var OptionFields = require('@bigbinary/neeto-molecules/OptionFields');
 var Slider = require('@bigbinary/neetoui/Slider');
 var HelpPopover = require('@bigbinary/neeto-molecules/HelpPopover');
 require('@bigbinary/neeto-commons-frontend/constants');
@@ -80,7 +81,7 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 
-var yup__namespace = /*#__PURE__*/_interopNamespaceDefault(yup);
+var yup__namespace = /*#__PURE__*/_interopNamespaceDefault(yup$1);
 
 var DeleteAlert = function DeleteAlert(_ref) {
   var selectedQuestion = _ref.selectedQuestion,
@@ -101,9 +102,9 @@ var DeleteAlert = function DeleteAlert(_ref) {
     onMutateSuccess = _useBuildFormStore.onMutateSuccess;
   var renderQuestionLabel = function renderQuestionLabel() {
     var questionKind = selectedQuestion.kind;
-    var independentLabel = constants$1.INDEPENDENT_LABELS_MAP[questionKind];
+    var independentLabel = yup.INDEPENDENT_LABELS_MAP[questionKind];
     if (neetoCist.isPresent(independentLabel)) return independentLabel;
-    var questionLabel = constants$1.buildDisplayLabel(selectedQuestion);
+    var questionLabel = yup.buildDisplayLabel(selectedQuestion);
     return neetoCist.truncate(questionLabel, 40);
   };
   var _useDeleteQuestion = constants.useDeleteQuestion(selectedQuestion === null || selectedQuestion === void 0 ? void 0 : selectedQuestion.formId, selectedLanguage, {
@@ -112,7 +113,7 @@ var DeleteAlert = function DeleteAlert(_ref) {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [constants$1.QUESTION_ACTIONS.DELETE].concat(args));
+        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [yup.QUESTION_ACTIONS.DELETE].concat(args));
         onClose();
       }
     }),
@@ -283,11 +284,11 @@ var Card = function Card(_ref) {
       item: question
     }),
     isSingular = _getActiveKindDetails.isSingular;
-  var questionLabel = constants$1.buildDisplayLabel(question);
+  var questionLabel = yup.buildDisplayLabel(question);
   React.useEffect(function () {
     var element = questionLabelRef.current;
     if (neetoCist.isNotPresent(element)) return;
-    setIsTooltipEnabled(constants$1.isElementOverflowing(element));
+    setIsTooltipEnabled(yup.isElementOverflowing(element));
   }, [questionLabel]);
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     "data-testid": "neeto-form-engine-".concat(neetoCist.slugify(questionLabel)),
@@ -299,7 +300,7 @@ var Card = function Card(_ref) {
     },
     children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "flex min-w-0 grow items-center gap-1",
-      children: [canManageQuestions && /*#__PURE__*/jsxRuntime.jsx(constants$1.Drag, {
+      children: [canManageQuestions && /*#__PURE__*/jsxRuntime.jsx(yup.Drag, {
         className: "neeto-ui-text-gray-600 shrink-0"
       }), /*#__PURE__*/jsxRuntime.jsx(Tooltip, {
         content: questionLabel,
@@ -346,8 +347,8 @@ var Card = function Card(_ref) {
   });
 };
 
-function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$i(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$i(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$i(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$i(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Questions = function Questions(_ref) {
   var questions = _ref.questions,
     isDeletable = _ref.isDeletable,
@@ -366,7 +367,7 @@ var Questions = function Questions(_ref) {
       var droppableProps = _ref2.droppableProps,
         placeholder = _ref2.placeholder,
         innerRef = _ref2.innerRef;
-      return /*#__PURE__*/jsxRuntime.jsxs("div", _objectSpread$e(_objectSpread$e({}, droppableProps), {}, {
+      return /*#__PURE__*/jsxRuntime.jsxs("div", _objectSpread$i(_objectSpread$i({}, droppableProps), {}, {
         className: "space-y-2",
         ref: innerRef,
         children: [questions.map(function (question, index) {
@@ -380,7 +381,7 @@ var Questions = function Questions(_ref) {
             var draggableProps = _ref3.draggableProps,
               dragHandleProps = _ref3.dragHandleProps,
               innerRef = _ref3.innerRef;
-            return /*#__PURE__*/jsxRuntime.jsx("div", _objectSpread$e(_objectSpread$e(_objectSpread$e({}, draggableProps), dragHandleProps), {}, {
+            return /*#__PURE__*/jsxRuntime.jsx("div", _objectSpread$i(_objectSpread$i(_objectSpread$i({}, draggableProps), dragHandleProps), {}, {
               ref: innerRef,
               children: /*#__PURE__*/jsxRuntime.jsx(Card, {
                 allQuestionKinds: allQuestionKinds,
@@ -413,16 +414,20 @@ var arrayHelpers = {
   moveItem: moveItem
 };
 
-function ownKeys$d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$b = ["fields"];
+function ownKeys$h(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$h(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$h(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$h(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var isChoiceQuestion = function isChoiceQuestion(question) {
-  return ramda.includes(question === null || question === void 0 ? void 0 : question.kind, constants$1.SELECTABLE_KINDS);
+  return ramda.includes(question === null || question === void 0 ? void 0 : question.kind, yup.SELECTABLE_KINDS);
+};
+var isAddressQuestion = function isAddressQuestion(question) {
+  return (question === null || question === void 0 ? void 0 : question.kind) === constants.QUESTION_TYPES.ADDRESS;
 };
 var underscoredWithoutSpecialCharacters = function underscoredWithoutSpecialCharacters(string) {
   return string.toLowerCase().replace(/[\s-]/g, "_").replace(/[\W]/gi, "").replace(/_+/g, "_").replace(/^_+|_+$/, "");
 };
 var addSuffixForReservedFieldCode = function addSuffixForReservedFieldCode(fieldCode) {
-  return constants$1.RESERVED_FIELD_CODES.includes(fieldCode) ? "".concat(fieldCode, "_field") : fieldCode;
+  return yup.RESERVED_FIELD_CODES.includes(fieldCode) ? "".concat(fieldCode, "_field") : fieldCode;
 };
 var getUniqueNumbersFromExistingFieldCodes = function getUniqueNumbersFromExistingFieldCodes(prefix, questions) {
   return questions.filter(function (question) {
@@ -433,7 +438,7 @@ var getUniqueNumbersFromExistingFieldCodes = function getUniqueNumbersFromExisti
 };
 var generateFieldCodePrefix = function generateFieldCodePrefix(label, kind) {
   var prefix;
-  if (index.isNameQuestion(kind) || constants$1.NON_BASIC_LATIN_CHARACTERS_REGEX.test(label) || ramda.isEmpty(label)) {
+  if (index.isNameQuestion(kind) || yup.NON_BASIC_LATIN_CHARACTERS_REGEX.test(label) || ramda.isEmpty(label)) {
     prefix = kind;
   } else {
     var sanitizedLabel = underscoredWithoutSpecialCharacters(label).slice(0, 30);
@@ -441,18 +446,15 @@ var generateFieldCodePrefix = function generateFieldCodePrefix(label, kind) {
   }
   return addSuffixForReservedFieldCode(prefix) || "";
 };
-var renameKey = ramda.curry(function (oldKey, newKey, obj) {
-  return ramda.assoc(newKey, ramda.prop(oldKey, obj), ramda.dissoc(oldKey, obj));
-});
 var modifyDefaultValues = function modifyDefaultValues(_ref) {
   var values = _ref.values,
     kind = _ref.kind,
     selectedLanguage = _ref.selectedLanguage,
     isUsingDefaultQuestionKinds = _ref.isUsingDefaultQuestionKinds;
   if (index.isNameQuestion(kind)) {
-    return renameKey(constants$1.LABEL_FIELDS.DEFAULT, constants$1.LABEL_FIELDS.FULL_NAME, values);
+    return yup.renameKey(yup.LABEL_FIELDS.DEFAULT, yup.LABEL_FIELDS.FULL_NAME, values);
   }
-  if (!ramda.includes(kind, constants$1.SELECTABLE_KINDS) || constants$1.isDefaultLanguage(selectedLanguage) || !isUsingDefaultQuestionKinds) {
+  if (!ramda.includes(kind, yup.SELECTABLE_KINDS) || yup.isDefaultLanguage(selectedLanguage) || !isUsingDefaultQuestionKinds) {
     return values;
   }
   return ramda.evolve({
@@ -496,7 +498,7 @@ var handleFieldDragEnd = function handleFieldDragEnd(_ref4) {
   var nextItems = _toConsumableArray(items);
   arrayHelpers.moveItem(nextItems, source.index, destination.index);
   var orderedItems = nextItems.map(function (item, index) {
-    return _objectSpread$d(_objectSpread$d({}, item), {}, {
+    return _objectSpread$h(_objectSpread$h({}, item), {}, {
       displayOrder: index
     });
   });
@@ -518,7 +520,7 @@ var createFieldData = function createFieldData(_ref5) {
     selectedLanguage: selectedLanguage,
     isUsingDefaultQuestionKinds: isUsingDefaultQuestionKinds
   });
-  return _objectSpread$d(_objectSpread$d({}, modifiedDefaultValues), {}, {
+  return _objectSpread$h(_objectSpread$h({}, modifiedDefaultValues), {}, {
     metadata: metadata,
     isRequired: isRequired,
     kind: type,
@@ -542,15 +544,18 @@ var duplicateFieldData = function duplicateFieldData(_ref6) {
   }, questionKinds);
   var label = index.fieldWithFallback(item, "label");
   var defaultAttributeNames = ramda.keys(questionKind.defaults || {});
-  var defaultAttributes = ramda.pick(defaultAttributeNames, item);
-  var newQuestionLabel = constants$1.isRichTextQuestion(kind) ? label : i18next.t("neetoForm.common.clonedElementLabel", {
+  var _pick = ramda.pick(defaultAttributeNames, item),
+    fields = _pick.fields,
+    defaultAttributes = _objectWithoutProperties(_pick, _excluded$b);
+  var newQuestionLabel = yup.isRichTextQuestion(kind) ? label : i18next.t("neetoForm.common.clonedElementLabel", {
     label: label
   });
-  return _objectSpread$d(_objectSpread$d({}, defaultAttributes), {}, {
+  return _objectSpread$h(_objectSpread$h({}, defaultAttributes), {}, {
     isRequired: isRequired,
     kind: kind,
     label: newQuestionLabel,
     optionsAttributes: optionsAttributes && optionsAttributes.map(ramda.omit(["id"])),
+    fieldsAttributes: fields && fields.map(ramda.omit(["id"])),
     nodeId: uuid.v4(),
     fieldCode: generateUniqueFieldCode({
       questions: questions,
@@ -568,13 +573,15 @@ var getAvailableQuestionKinds = function getAvailableQuestionKinds(_ref7) {
   if (ramda.isEmpty(activeQuestions)) return allQuestionKinds;
   return ramda.reject(function (kind) {
     var isSingularKind = kind.isSingular;
-    return constants$1.isAutoGeneratedQuestion(kind.type) || isSingularKind && isKindAlreadyActive({
+    return yup.isAutoGeneratedQuestion(kind.type) || isSingularKind && isKindAlreadyActive({
       activeQuestions: activeQuestions,
       kind: kind
     });
   }, allQuestionKinds);
 };
-var formatQuestionAttributesForClone = ramda.when(isChoiceQuestion, ramda.assoc("isCloning", true));
+var formatQuestionAttributesForClone = ramda.when(function (question) {
+  return isChoiceQuestion(question) || isAddressQuestion(question);
+}, ramda.assoc("isCloning", true));
 
 var HelpText = reactUtils.withT(function (_ref) {
   var t = _ref.t,
@@ -605,7 +612,7 @@ var AddFirstQuestion = function AddFirstQuestion(_ref) {
       helpText: neetoCist.isPresent(href) ? /*#__PURE__*/jsxRuntime.jsx(HelpText, {
         href: href
       }) : null,
-      primaryButtonProps: constants$1.buildAddQuestionButtonProps(onAdd, isDisabled),
+      primaryButtonProps: yup.buildAddQuestionButtonProps(onAdd, isDisabled),
       title: t("neetoForm.questions.common.noData")
     })
   });
@@ -626,8 +633,9 @@ var NAME = constants.QUESTION_TYPES.NAME,
   DATE = constants.QUESTION_TYPES.DATE,
   FILE_UPLOAD$1 = constants.QUESTION_TYPES.FILE_UPLOAD,
   CAPTCHA$1 = constants.QUESTION_TYPES.CAPTCHA,
-  SMS_REMINDER = constants.QUESTION_TYPES.SMS_REMINDER;
-var QUESTIONS_WITH_ADDITIONAL_DATA = [].concat(_toConsumableArray(constants$1.SELECTABLE_KINDS), [STAR_RATING$1, OPINION_SCALE$1, RATING$1, FILE_UPLOAD$1, CAPTCHA$1, EMAIL$1]);
+  SMS_REMINDER = constants.QUESTION_TYPES.SMS_REMINDER,
+  ADDRESS$1 = constants.QUESTION_TYPES.ADDRESS;
+var QUESTIONS_WITH_ADDITIONAL_DATA = [].concat(_toConsumableArray(yup.SELECTABLE_KINDS), [STAR_RATING$1, OPINION_SCALE$1, RATING$1, FILE_UPLOAD$1, CAPTCHA$1, EMAIL$1, ADDRESS$1]);
 var QUESTIONS_WITH_PLACEHOLDERS = [NAME, PHONE, EMAIL$1, ADDITIONAL_GUESTS, TEXT, TEXTAREA, RICH_TEXT, INTEGER, DECIMAL, DATE, SMS_REMINDER];
 var DEFAULT_PLACEHOLDERS = {
   CHECKBOX: i18next.t("neetoForm.questions.common.questionFields.field.labelExample", {
@@ -647,18 +655,19 @@ var INITIAL_VALUES = {
   isSplitMode: false
 };
 var VALID_FIELD_CODE_REGEX = /^[a-z0-9]+(_[a-z0-9]+)*$/;
+var DRAFT_ID_PREFIX = "draft-";
 
 var useHelpDoc = function useHelpDoc(key) {
   return buildForm.useBuildFormStore(ramda.path(["formState", "helpDocUrls", key]));
 };
 
-var _excluded$7 = ["label", "name"];
-function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$a = ["label", "name"];
+function ownKeys$g(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$g(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$g(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$g(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var FormikAdaptiveInput = function FormikAdaptiveInput(_ref) {
   var label = _ref.label,
     name = _ref.name,
-    otherProps = _objectWithoutProperties(_ref, _excluded$7);
+    otherProps = _objectWithoutProperties(_ref, _excluded$a);
   var _useFormikContext = formik.useFormikContext(),
     dirty = _useFormikContext.dirty,
     isValid = _useFormikContext.isValid,
@@ -673,7 +682,7 @@ var FormikAdaptiveInput = function FormikAdaptiveInput(_ref) {
     var end = element.value.length;
     element.setSelectionRange(end, end);
   };
-  return /*#__PURE__*/jsxRuntime.jsx(Textarea, _objectSpread$c({
+  return /*#__PURE__*/jsxRuntime.jsx(Textarea, _objectSpread$g({
     label: label,
     name: name,
     className: "neeto-form-nano-adaptive-input",
@@ -687,8 +696,8 @@ var FormikAdaptiveInput = function FormikAdaptiveInput(_ref) {
   }, otherProps));
 };
 
-function ownKeys$b(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$f(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$f(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$f(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$f(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LabelWithPlaceholder = function LabelWithPlaceholder(_ref) {
   var kind = _ref.kind,
     isLabelDisabled = _ref.isLabelDisabled,
@@ -702,14 +711,14 @@ var LabelWithPlaceholder = function LabelWithPlaceholder(_ref) {
   var shouldShowPlaceholder = ramda.includes(kind, QUESTIONS_WITH_PLACEHOLDERS);
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "space-y-4",
-    children: [/*#__PURE__*/jsxRuntime.jsx(FormikAdaptiveInput, _objectSpread$b({
+    children: [/*#__PURE__*/jsxRuntime.jsx(FormikAdaptiveInput, _objectSpread$f({
       required: true,
       disabled: isLabelDisabled,
       label: t("neetoForm.questions.common.questionFields.field.question"),
       name: "label",
       placeholder: DEFAULT_PLACEHOLDERS[kind],
       onChange: utils.withEventTargetValue(handleLabelChange)
-    }, labelProps)), shouldShowPlaceholder && /*#__PURE__*/jsxRuntime.jsx(FormikAdaptiveInput, _objectSpread$b({
+    }, labelProps)), shouldShowPlaceholder && /*#__PURE__*/jsxRuntime.jsx(FormikAdaptiveInput, _objectSpread$f({
       className: "neeto-form-nano-placeholder-input neeto-form-nano-placeholder-input-".concat(kind),
       name: "placeholder",
       label: t("neetoForm.questions.common.questionFields.field.placeholder")
@@ -717,8 +726,8 @@ var LabelWithPlaceholder = function LabelWithPlaceholder(_ref) {
   });
 };
 
-function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Name = function Name(_ref) {
   var isLabelDisabled = _ref.isLabelDisabled,
     _handleLabelChange = _ref.handleLabelChange;
@@ -738,40 +747,40 @@ var Name = function Name(_ref) {
       label: t("neetoForm.common.splitAsFirstAndLastNames"),
       name: "isSplitMode"
     }), isSplitMode && !usesCustomSubmissionComponent ? /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-      children: [/*#__PURE__*/jsxRuntime.jsx(LabelWithPlaceholder, _objectSpread$a(_objectSpread$a({}, commonProps), {}, {
+      children: [/*#__PURE__*/jsxRuntime.jsx(LabelWithPlaceholder, _objectSpread$e(_objectSpread$e({}, commonProps), {}, {
         handleLabelChange: function handleLabelChange(value) {
-          return _handleLabelChange(value, constants$1.LABEL_FIELDS.FIRST_NAME);
+          return _handleLabelChange(value, yup.LABEL_FIELDS.FIRST_NAME);
         },
         labelProps: {
           label: t("neetoForm.questions.common.questionFields.field.firstNameQuestion"),
-          name: constants$1.LABEL_FIELDS.FIRST_NAME
+          name: yup.LABEL_FIELDS.FIRST_NAME
         },
         placeholderProps: {
           label: t("neetoForm.questions.common.questionFields.field.firstNamePlaceholder"),
           name: "firstNamePlaceholder"
         }
-      })), /*#__PURE__*/jsxRuntime.jsx(LabelWithPlaceholder, _objectSpread$a(_objectSpread$a({}, commonProps), {}, {
+      })), /*#__PURE__*/jsxRuntime.jsx(LabelWithPlaceholder, _objectSpread$e(_objectSpread$e({}, commonProps), {}, {
         handleLabelChange: function handleLabelChange(value) {
-          return _handleLabelChange(value, constants$1.LABEL_FIELDS.LAST_NAME);
+          return _handleLabelChange(value, yup.LABEL_FIELDS.LAST_NAME);
         },
         labelProps: {
           label: t("neetoForm.questions.common.questionFields.field.lastNameQuestion"),
-          name: constants$1.LABEL_FIELDS.LAST_NAME
+          name: yup.LABEL_FIELDS.LAST_NAME
         },
         placeholderProps: {
           label: t("neetoForm.questions.common.questionFields.field.lastNamePlaceholder"),
           name: "lastNamePlaceholder"
         }
       }))]
-    }) : /*#__PURE__*/jsxRuntime.jsx(LabelWithPlaceholder, _objectSpread$a(_objectSpread$a({}, commonProps), {}, {
+    }) : /*#__PURE__*/jsxRuntime.jsx(LabelWithPlaceholder, _objectSpread$e(_objectSpread$e({}, commonProps), {}, {
       labelProps: {
-        name: constants$1.LABEL_FIELDS.FULL_NAME
+        name: yup.LABEL_FIELDS.FULL_NAME
       },
       placeholderProps: {
         name: "fullNamePlaceholder"
       },
       handleLabelChange: function handleLabelChange(value) {
-        return _handleLabelChange(value, constants$1.LABEL_FIELDS.FULL_NAME);
+        return _handleLabelChange(value, yup.LABEL_FIELDS.FULL_NAME);
       }
     }))]
   });
@@ -887,7 +896,7 @@ var Editor = function Editor() {
   var fieldName = "label";
   var _useField = formik.useField({
       name: fieldName,
-      validate: constants$1.validateEditorContent(editorRef)
+      validate: yup.validateEditorContent(editorRef)
     }),
     _useField2 = _slicedToArray(_useField, 3),
     value = _useField2[0].value,
@@ -930,12 +939,12 @@ var RequiredSwitch = reactUtils.withT(function (_ref) {
   });
 });
 
-var _excluded$6 = ["maxLength"];
-function ownKeys$9(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$9(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$9(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$9(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$9 = ["maxLength"];
+function ownKeys$d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var InputWithMaxLength = function InputWithMaxLength(_ref) {
   var maxLength = _ref.maxLength,
-    props = _objectWithoutProperties(_ref, _excluded$6);
+    props = _objectWithoutProperties(_ref, _excluded$9);
   var _useField = formik.useField(props),
     _useField2 = _slicedToArray(_useField, 3),
     value = _useField2[0].value,
@@ -946,7 +955,7 @@ var InputWithMaxLength = function InputWithMaxLength(_ref) {
     }
   }, [value, maxLength, setValue]);
   var shouldShowMaxLength = value && value.length > maxLength - 10;
-  return /*#__PURE__*/jsxRuntime.jsx(Input, _objectSpread$9(_objectSpread$9({}, props), shouldShowMaxLength && {
+  return /*#__PURE__*/jsxRuntime.jsx(Input, _objectSpread$d(_objectSpread$d({}, props), shouldShowMaxLength && {
     maxLength: maxLength
   }));
 };
@@ -959,7 +968,7 @@ var FieldCode = function FieldCode() {
     required: true,
     label: t("neetoForm.questions.common.questionFields.field.fieldCode"),
     name: "fieldCode",
-    rejectCharsRegex: constants$1.FIELD_CODES_REJECT_CHARS_REGEX,
+    rejectCharsRegex: yup.FIELD_CODES_REJECT_CHARS_REGEX,
     helpText: helpDocUrl && /*#__PURE__*/jsxRuntime.jsx(reactI18next.Trans, {
       i18nKey: "neetoForm.questions.common.questionFields.field.fieldCodeHelpDescription",
       components: {
@@ -1039,11 +1048,11 @@ var Form$1 = function Form(_ref) {
   }, [submitCount]);
   var isRequired = questionKind && isRequiredField(questionKind);
   var isLabelDisabled = questionKind && isDisabledFieldLabel(questionKind);
-  var isImmutable = questionKind && constants$1.isImmutableField(questionKind);
-  var shouldShowFieldCode = isFieldCodeEnabled && !ramda.includes(kind, constants$1.QUESTIONS_WITHOUT_FIELD_CODE);
-  var shouldShowHideSwitch = isFieldCodeEnabled && !usesCustomSubmissionComponent && !ramda.includes(kind, constants$1.NON_HIDEABLE_FIELDS);
-  var canRestrictResponseVisibilityToHost = restrictResponseVisibilityToHost && !ramda.includes(kind, constants$1.NON_HIDEABLE_FIELDS);
-  var canMarkResponsesAsReadOnly = markResponsesAsReadOnly && !ramda.includes(kind, constants$1.NON_READ_ONLY_FIELDS);
+  var isImmutable = questionKind && yup.isImmutableField(questionKind);
+  var shouldShowFieldCode = isFieldCodeEnabled && !ramda.includes(kind, yup.QUESTIONS_WITHOUT_FIELD_CODE);
+  var shouldShowHideSwitch = isFieldCodeEnabled && !usesCustomSubmissionComponent && !ramda.includes(kind, yup.NON_HIDEABLE_FIELDS);
+  var canRestrictResponseVisibilityToHost = restrictResponseVisibilityToHost && !ramda.includes(kind, yup.NON_HIDEABLE_FIELDS);
+  var canMarkResponsesAsReadOnly = markResponsesAsReadOnly && !ramda.includes(kind, yup.NON_READ_ONLY_FIELDS);
   var isBasicSettingsVisible = !isRequired && (!isImmutable || shouldShowHideSwitch);
   var isSettingsBlockVisible = isBasicSettingsVisible || canMarkResponsesAsReadOnly;
   var handleKindChange = function handleKindChange(option) {
@@ -1075,7 +1084,7 @@ var Form$1 = function Form(_ref) {
     setTouched({});
   };
   var handleLabelChange = function handleLabelChange(label) {
-    var name = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : constants$1.LABEL_FIELDS.DEFAULT;
+    var name = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : yup.LABEL_FIELDS.DEFAULT;
     setFieldValue(name, label);
     if (isEdit) return;
     var uniqueFieldCode = generateUniqueFieldCode({
@@ -1098,7 +1107,7 @@ var Form$1 = function Form(_ref) {
         options: buildKindOptions(questionKinds),
         label: t("neetoForm.questions.common.questionFields.field.questionType"),
         onChange: handleKindChange
-      }), constants$1.isRichTextQuestion(kind) ? /*#__PURE__*/jsxRuntime.jsx(Editor, {
+      }), yup.isRichTextQuestion(kind) ? /*#__PURE__*/jsxRuntime.jsx(Editor, {
         isLabelDisabled: isLabelDisabled
       }) : /*#__PURE__*/jsxRuntime.jsxs("div", {
         className: "space-y-6",
@@ -1111,7 +1120,7 @@ var Form$1 = function Form(_ref) {
           dataTestid: "settings-card",
           title: t("neetoForm.common.settings"),
           children: [isBasicSettingsVisible && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-            children: [!isImmutable && /*#__PURE__*/jsxRuntime.jsx(RequiredSwitch, {}), shouldShowHideSwitch && /*#__PURE__*/jsxRuntime.jsx(Switch, {
+            children: [!isImmutable && kind !== constants.QUESTION_TYPES.ADDRESS && /*#__PURE__*/jsxRuntime.jsx(RequiredSwitch, {}), shouldShowHideSwitch && /*#__PURE__*/jsxRuntime.jsx(Switch, {
               label: t("neetoForm.common.hideQuestion"),
               name: "isHidden",
               labelProps: hideSwitchLabelProps(hideQuestionHelpDocUrl)
@@ -1166,7 +1175,7 @@ var buildLabelValidationSchema = function buildLabelValidationSchema(kind, schem
   if (index.isNameQuestion(kind)) {
     return schema.notRequired();
   }
-  return ramda.includes(kind, constants$1.RICH_TEXT_QUESTIONS) ? schema.test("required", richTextFieldMissingErrorMessage(kind), function (value) {
+  return ramda.includes(kind, yup.RICH_TEXT_QUESTIONS) ? schema.test("required", richTextFieldMissingErrorMessage(kind), function (value) {
     return !utils$1.isEditorEmpty(value);
   }) : requiredLabelValidation(schema, i18next.t("neetoForm.questions.common.questionFields.field.question"));
 };
@@ -1178,8 +1187,8 @@ var buildNameLabelValidationSchema = function buildNameLabelValidationSchema(que
 var buildOpinionScaleLabelValidationSchema = function buildOpinionScaleLabelValidationSchema(label) {
   return stringSchema.when("hasOpinionLabels", {
     is: true,
-    then: requiredLabelValidation(stringSchema, label).max(constants$1.OPINION_LABEL_MAX_LENGTH, i18next.t("neetoForm.error.mustBeOrLessThanOrEqualTo", {
-      value: constants$1.OPINION_LABEL_MAX_LENGTH
+    then: requiredLabelValidation(stringSchema, label).max(yup.OPINION_LABEL_MAX_LENGTH, i18next.t("neetoForm.error.mustBeOrLessThanOrEqualTo", {
+      value: yup.OPINION_LABEL_MAX_LENGTH
     })),
     otherwise: stringSchema.notRequired()
   });
@@ -1195,17 +1204,25 @@ var formValidationSchema = function formValidationSchema(question) {
     fullNameLabel: buildNameLabelValidationSchema(question, stringSchema, true),
     firstNameLabel: buildNameLabelValidationSchema(question, stringSchema),
     lastNameLabel: buildNameLabelValidationSchema(question, stringSchema),
-    fieldCode: yup__namespace.string().trim().notOneOf(constants$1.RESERVED_FIELD_CODES, i18next.t("neetoForm.error.invalidFieldCode")).when("kind", function (kind, schema) {
-      return isFieldCodeEnabled && !ramda.includes(kind, constants$1.QUESTIONS_WITHOUT_FIELD_CODE) ? fieldCodeValidation(schema, i18next.t("neetoForm.questions.common.questionFields.field.fieldCode")) : schema.notRequired();
+    fieldCode: yup__namespace.string().trim().notOneOf(yup.RESERVED_FIELD_CODES, i18next.t("neetoForm.error.invalidFieldCode")).when("kind", function (kind, schema) {
+      return isFieldCodeEnabled && !ramda.includes(kind, yup.QUESTIONS_WITHOUT_FIELD_CODE) ? fieldCodeValidation(schema, i18next.t("neetoForm.questions.common.questionFields.field.fieldCode")) : schema.notRequired();
     }),
     optionsAttributes: yup__namespace.array().when("kind", function (kind, schema) {
-      return ramda.includes(kind, constants$1.SELECTABLE_KINDS) ? schema.of(yup__namespace.object().shape({
+      return ramda.includes(kind, yup.SELECTABLE_KINDS) ? schema.of(yup__namespace.object().shape({
         label: yup__namespace.string().when("_destroy", {
           is: true,
           otherwise: requiredLabelValidation(yup__namespace.string(), i18next.t("neetoForm.questions.common.questionFields.field.option"))
         })
       })) : schema.notRequired();
     }),
+    fields: yup__namespace.array().when("kind", function (kind, schema) {
+      return kind === constants.QUESTION_TYPES.ADDRESS ? schema.of(yup__namespace.object().shape({
+        label: yup__namespace.string().when("_destroy", {
+          is: true,
+          otherwise: yup__namespace.string().trim().required(i18next.t("neetoForm.error.allFieldsRequired"))
+        })
+      })) : schema.notRequired();
+    }),
     highestRatingLabel: yup__namespace.string().nullable(),
     averageRatingLabel: yup__namespace.string().nullable(),
     lowestRatingLabel: yup__namespace.string().nullable(),
@@ -1214,16 +1231,16 @@ var formValidationSchema = function formValidationSchema(question) {
   });
 };
 
-var _excluded$5 = ["question", "onClose", "questions", "handleSelect", "isOpen"];
-function ownKeys$8(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$8 = ["question", "onClose", "questions", "handleSelect", "isOpen"];
+function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Add = function Add(_ref) {
   var question = _ref.question,
     onClose = _ref.onClose,
     questions = _ref.questions,
     handleSelect = _ref.handleSelect,
     isOpen = _ref.isOpen,
-    props = _objectWithoutProperties(_ref, _excluded$5);
+    props = _objectWithoutProperties(_ref, _excluded$8);
   var _useBuildFormStore = buildForm.useBuildFormStore(function (store) {
       var _store$formState, _store$formState2, _store$formState3;
       return {
@@ -1243,7 +1260,7 @@ var Add = function Add(_ref) {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [constants$1.QUESTION_ACTIONS.ADD].concat(args));
+        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [yup.QUESTION_ACTIONS.ADD].concat(args));
         utils.showThumbsUpToastr();
         onClose();
       }
@@ -1257,7 +1274,7 @@ var Add = function Add(_ref) {
       language: language,
       neetoFormQuestion: ramda.mergeLeft({
         displayOrder: displayOrder
-      }, values)
+      }, transformValues(values))
     }, {
       onSuccess: function onSuccess(_ref2) {
         var questions = _ref2.questions;
@@ -1282,7 +1299,7 @@ var Add = function Add(_ref) {
         onSubmit: handleSubmit
       },
       children: /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-        children: [/*#__PURE__*/jsxRuntime.jsx(Form$1, _objectSpread$8({}, _objectSpread$8(_objectSpread$8({}, props), {}, {
+        children: [/*#__PURE__*/jsxRuntime.jsx(Form$1, _objectSpread$c({}, _objectSpread$c(_objectSpread$c({}, props), {}, {
           question: question,
           questions: questions
         }))), /*#__PURE__*/jsxRuntime.jsx(Pane.Footer, {
@@ -1298,14 +1315,14 @@ var Add = function Add(_ref) {
   });
 };
 
-var _excluded$4 = ["question", "isOpen", "onClose"];
-function ownKeys$7(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$7 = ["question", "isOpen", "onClose"];
+function ownKeys$b(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Edit = function Edit(_ref) {
   var question = _ref.question,
     isOpen = _ref.isOpen,
     onClose = _ref.onClose,
-    props = _objectWithoutProperties(_ref, _excluded$4);
+    props = _objectWithoutProperties(_ref, _excluded$7);
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var _useBuildFormStore = buildForm.useBuildFormStore(function (store) {
@@ -1326,7 +1343,7 @@ var Edit = function Edit(_ref) {
     if (isUpdating || !isOpen) return;
     var payload = {
       language: language,
-      neetoFormQuestion: values
+      neetoFormQuestion: transformValues(values)
     };
     updateQuestion({
       questionId: question.id,
@@ -1336,7 +1353,7 @@ var Edit = function Edit(_ref) {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [constants$1.QUESTION_ACTIONS.EDIT].concat(args));
+        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [yup.QUESTION_ACTIONS.EDIT].concat(args));
         utils.showThumbsUpToastr();
         onClose();
       },
@@ -1359,7 +1376,7 @@ var Edit = function Edit(_ref) {
         onSubmit: handleSubmit
       },
       children: /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-        children: [/*#__PURE__*/jsxRuntime.jsx(Form$1, _objectSpread$7(_objectSpread$7({}, _objectSpread$7({
+        children: [/*#__PURE__*/jsxRuntime.jsx(Form$1, _objectSpread$b(_objectSpread$b({}, _objectSpread$b({
           question: question
         }, props)), {}, {
           isEdit: true
@@ -1376,6 +1393,359 @@ var Edit = function Edit(_ref) {
   });
 };
 
+var VARIANTS = {
+  hidden: {
+    opacity: 0,
+    height: 0,
+    overflow: "hidden"
+  },
+  visible: {
+    opacity: 1,
+    height: "auto"
+  }
+};
+
+var _excluded$6 = ["open", "className", "children"];
+function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var Collapsible = function Collapsible(_ref) {
+  var open = _ref.open,
+    _ref$className = _ref.className,
+    className = _ref$className === void 0 ? "" : _ref$className,
+    children = _ref.children,
+    otherProps = _objectWithoutProperties(_ref, _excluded$6);
+  return /*#__PURE__*/jsxRuntime.jsx(framerMotion.AnimatePresence, {
+    children: open && /*#__PURE__*/jsxRuntime.jsx(framerMotion.motion.div, _objectSpread$a(_objectSpread$a({
+      animate: "visible",
+      exit: "hidden",
+      initial: "hidden",
+      transition: {
+        duration: 0.3
+      },
+      variants: VARIANTS
+    }, otherProps), {}, {
+      children: /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: className,
+        children: children
+      })
+    }))
+  });
+};
+
+var ADDRESS_FIELD_WIDTH_OPTIONS = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, yup.ADDRESS_FIELD_WIDTHS.FULL, {
+  label: i18next.t("neetoForm.questions.address.widths.full"),
+  value: yup.ADDRESS_FIELD_WIDTHS.FULL
+}), yup.ADDRESS_FIELD_WIDTHS.HALF, {
+  label: i18next.t("neetoForm.questions.address.widths.half"),
+  value: yup.ADDRESS_FIELD_WIDTHS.HALF
+}), yup.ADDRESS_FIELD_WIDTHS.ONE_FOURTH, {
+  label: i18next.t("neetoForm.questions.address.widths.oneFourth"),
+  value: yup.ADDRESS_FIELD_WIDTHS.ONE_FOURTH
+}), yup.ADDRESS_FIELD_WIDTHS.THREE_FOURTH, {
+  label: i18next.t("neetoForm.questions.address.widths.threeFourth"),
+  value: yup.ADDRESS_FIELD_WIDTHS.THREE_FOURTH
+});
+var ADDRESS_FIELD_TYPE_OPTIONS = _defineProperty(_defineProperty({}, yup.ADDRESS_FIELD_TYPES.INPUT, {
+  label: i18next.t("neetoForm.questions.address.types.textInput"),
+  value: yup.ADDRESS_FIELD_TYPES.INPUT
+}), yup.ADDRESS_FIELD_TYPES.SELECT, {
+  label: i18next.t("neetoForm.questions.address.types.dropdown"),
+  value: yup.ADDRESS_FIELD_TYPES.SELECT
+});
+var ADDRESS_FIELD_FORM_VALIDATION_SCHEMA = yup__namespace.object().shape({
+  label: yup__namespace.string().trim().required(i18next.t("neetoForm.error.requiredField", {
+    label: i18next.t("neetoForm.questions.common.questionFields.field.label")
+  })),
+  width: yup__namespace.object().nullable().required(i18next.t("neetoForm.error.requiredField", {
+    label: i18next.t("neetoForm.questions.address.width")
+  })),
+  fieldType: yup__namespace.object().nullable().required(i18next.t("neetoForm.error.requiredField", {
+    label: i18next.t("neetoForm.questions.address.type")
+  })),
+  properties: yup__namespace.object().shape({
+    options: yup__namespace.array().of(yup__namespace.object().shape({
+      label: yup__namespace.string().required(i18next.t("neetoForm.error.requiredField", {
+        label: i18next.t("neetoForm.common.option")
+      }))
+    })).unique("label", i18next.t("neetoForm.error.removeDuplicates"))
+  })
+});
+var ERROR_MESSAGE_DELIMITER$1 = ". ";
+
+function ownKeys$9(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$9(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$9(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$9(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var removeDuplicateErrorMessages$1 = ramda.pipe(ramda.filter(ramda.isNotNil), ramda.map(ramda.values), ramda.uniq, ramda.join(ERROR_MESSAGE_DELIMITER$1));
+var getAddressModalInitialValues = function getAddressModalInitialValues(field) {
+  return field ? _objectSpread$9(_objectSpread$9({}, field), {}, {
+    width: ADDRESS_FIELD_WIDTH_OPTIONS[field.width],
+    fieldType: ADDRESS_FIELD_TYPE_OPTIONS[field.fieldType]
+  }) : {
+    label: "",
+    isRequired: false,
+    width: ADDRESS_FIELD_WIDTH_OPTIONS[yup.ADDRESS_FIELD_WIDTHS.FULL],
+    fieldType: ADDRESS_FIELD_TYPE_OPTIONS[yup.ADDRESS_FIELD_TYPES.INPUT]
+  };
+};
+var sanitizeAddressField = function sanitizeAddressField(field, isSelectField, defaultOptions) {
+  var hasOptions = ramda.pathSatisfies(neetoCist.isPresent, ["properties", "options"], field);
+  if (isSelectField && !hasOptions) {
+    return ramda.assocPath(["properties", "options"], defaultOptions, field);
+  }
+  if (!isSelectField && hasOptions) {
+    return ramda.dissoc("properties", field);
+  }
+  return field;
+};
+var formatErrorMessage$1 = function formatErrorMessage(error) {
+  if (typeof error === "string") return error;
+  return removeDuplicateErrorMessages$1(error);
+};
+
+var _excluded$5 = ["width", "fieldType"];
+function ownKeys$8(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var ManagePane = function ManagePane(_ref) {
+  var isOpen = _ref.isOpen,
+    selectedFieldId = _ref.selectedFieldId,
+    onClose = _ref.onClose,
+    title = _ref.title,
+    fields = _ref.fields,
+    initialFocusRef = _ref.initialFocusRef;
+  var _useField = formik.useField("fields"),
+    _useField2 = _slicedToArray(_useField, 3),
+    allFields = _useField2[0].value,
+    setValue = _useField2[2].setValue;
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
+  var defaultOptions = yup.generateDefaultOptions(yup.MINIMUM_ADDRESS_FIELDS);
+  var editingField = neetoCist.findById(selectedFieldId, fields);
+  var initialValues = getAddressModalInitialValues(editingField);
+  var handleSubmit = function handleSubmit(_ref2) {
+    var width = _ref2.width,
+      fieldType = _ref2.fieldType,
+      field = _objectWithoutProperties(_ref2, _excluded$5);
+    var deletedFields = yup.getDeletedRecords(allFields);
+    var isSelectField = fieldType.value === yup.ADDRESS_FIELD_TYPES.SELECT;
+    var sanitizedField = sanitizeAddressField(field, isSelectField, defaultOptions);
+    if (ramda.isNil(selectedFieldId)) {
+      var position = fields.length;
+      var id = "draft-".concat(yup.randomId());
+      var newField = _objectSpread$8(_objectSpread$8({
+        id: id
+      }, sanitizedField), {}, {
+        altId: "alt-".concat(yup.randomId()),
+        position: position,
+        width: width.value,
+        fieldType: fieldType.value
+      });
+      var nextFields = ramda.append(newField, fields);
+      setValue([].concat(_toConsumableArray(nextFields), _toConsumableArray(deletedFields)));
+    } else {
+      var selectedFieldIndex = neetoCist.findIndexById(selectedFieldId, fields);
+      setValue(ramda.assoc(selectedFieldIndex, _objectSpread$8(_objectSpread$8({}, sanitizedField), {}, {
+        width: width.value,
+        fieldType: fieldType.value
+      }), [].concat(_toConsumableArray(fields), _toConsumableArray(deletedFields))));
+    }
+    onClose();
+  };
+  var handleFieldTypeChange = function handleFieldTypeChange(setFieldValue, values) {
+    return function (fieldType) {
+      var _values$properties;
+      setFieldValue("fieldType", fieldType);
+      if (fieldType.value === yup.ADDRESS_FIELD_TYPES.SELECT && neetoCist.isNotPresent((_values$properties = values.properties) === null || _values$properties === void 0 ? void 0 : _values$properties.options)) {
+        setFieldValue("properties.options", defaultOptions);
+      }
+    };
+  };
+  return /*#__PURE__*/jsxRuntime.jsxs(Pane, {
+    initialFocusRef: initialFocusRef,
+    isOpen: isOpen,
+    onClose: onClose,
+    children: [/*#__PURE__*/jsxRuntime.jsx(Pane.Header, {
+      children: /*#__PURE__*/jsxRuntime.jsx(Typography, {
+        "data-testid": "add-address-field-title",
+        style: "h2",
+        weight: "semibold",
+        children: title
+      })
+    }), /*#__PURE__*/jsxRuntime.jsx(Form$2, {
+      formikProps: {
+        initialValues: initialValues,
+        validationSchema: ADDRESS_FIELD_FORM_VALIDATION_SCHEMA,
+        onSubmit: handleSubmit
+      },
+      children: function children(_ref3) {
+        var _values$fieldType;
+        var values = _ref3.values,
+          setFieldValue = _ref3.setFieldValue;
+        return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+          children: [/*#__PURE__*/jsxRuntime.jsx(Pane.Body, {
+            children: /*#__PURE__*/jsxRuntime.jsxs("div", {
+              className: "w-full space-y-6",
+              children: [/*#__PURE__*/jsxRuntime.jsx(Input, {
+                name: "label",
+                ref: initialFocusRef,
+                label: t("neetoForm.questions.common.questionFields.field.label"),
+                placeholder: t("neetoForm.questions.address.fieldLabelPlaceholder")
+              }), /*#__PURE__*/jsxRuntime.jsxs("div", {
+                className: "grid grid-cols-2 gap-6",
+                children: [/*#__PURE__*/jsxRuntime.jsx(Select, {
+                  label: t("neetoForm.questions.address.width"),
+                  name: "width",
+                  options: Object.values(ADDRESS_FIELD_WIDTH_OPTIONS)
+                }), /*#__PURE__*/jsxRuntime.jsx(Select, {
+                  label: t("neetoForm.questions.address.type"),
+                  name: "fieldType",
+                  options: Object.values(ADDRESS_FIELD_TYPE_OPTIONS),
+                  onChange: handleFieldTypeChange(setFieldValue, values)
+                })]
+              }), /*#__PURE__*/jsxRuntime.jsx(Collapsible, {
+                open: (values === null || values === void 0 || (_values$fieldType = values.fieldType) === null || _values$fieldType === void 0 ? void 0 : _values$fieldType.value) === yup.ADDRESS_FIELD_TYPES.SELECT,
+                children: /*#__PURE__*/jsxRuntime.jsx("div", {
+                  className: "flex flex-col",
+                  children: /*#__PURE__*/jsxRuntime.jsx(OptionFields, {
+                    draggable: true,
+                    minOptions: yup.MINIMUM_ADDRESS_FIELDS,
+                    name: "properties.options"
+                  })
+                })
+              }), /*#__PURE__*/jsxRuntime.jsx("div", {
+                className: "flex items-center gap-4",
+                children: /*#__PURE__*/jsxRuntime.jsx(Switch, {
+                  label: t("neetoForm.common.required"),
+                  name: "isRequired"
+                })
+              })]
+            })
+          }), /*#__PURE__*/jsxRuntime.jsx(Pane.Footer, {
+            children: /*#__PURE__*/jsxRuntime.jsx("div", {
+              className: "flex items-center gap-2",
+              children: /*#__PURE__*/jsxRuntime.jsx(ActionBlock, {
+                className: "flex gap-x-2",
+                cancelButtonProps: {
+                  type: "reset",
+                  onClick: onClose,
+                  disabled: false
+                },
+                submitButtonProps: {
+                  label: t("neetoForm.common.saveChanges")
+                }
+              })
+            })
+          })]
+        });
+      }
+    })]
+  });
+};
+
+var Address = function Address() {
+  var _findById;
+  var _useState = React.useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isAddressFieldPaneOpen = _useState2[0],
+    setIsAddressFieldPaneOpen = _useState2[1];
+  var _useState3 = React.useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isDeleteAddressFieldAlertOpen = _useState4[0],
+    setIsDeleteAddressFieldAlertOpen = _useState4[1];
+  var _useState5 = React.useState(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    selectedFieldId = _useState6[0],
+    setSelectedFieldId = _useState6[1];
+  var initialFocusRef = React.useRef(null);
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
+  var _useBuildFormStore = buildForm.useBuildFormStore(function (store) {
+      var _store$formState;
+      return {
+        selectedLanguage: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["selectedLanguage"]
+      };
+    }, shallow.shallow),
+    selectedLanguage = _useBuildFormStore.selectedLanguage;
+  var name = "fields";
+  var _useField = formik.useField(name),
+    _useField2 = _slicedToArray(_useField, 3),
+    fields = _useField2[0].value,
+    _useField2$ = _useField2[1],
+    error = _useField2$.error,
+    touched = _useField2$.touched,
+    setFields = _useField2[2].setValue;
+  var handleDelete = function handleDelete() {
+    var deletedFields = yup.getDeletedRecords(fields);
+    var nextFields = yup.getActiveRecords(fields);
+    var selectedFieldIndex = neetoCist.findIndexById(selectedFieldId, nextFields);
+    nextFields = ramda.assocPath([selectedFieldIndex, "deleted"], true, nextFields);
+    setFields([].concat(_toConsumableArray(nextFields), _toConsumableArray(deletedFields)));
+  };
+  return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/jsxRuntime.jsx(Block, {
+      dataTestid: "address-fields-block",
+      title: t("neetoForm.questions.address.fields"),
+      children: /*#__PURE__*/jsxRuntime.jsxs("div", {
+        children: [/*#__PURE__*/jsxRuntime.jsx(OptionFields, {
+          name: name,
+          draggable: true,
+          shouldDestroy: true,
+          editable: false,
+          isNewItemsPrefilled: yup.isDefaultLanguage(selectedLanguage),
+          itemLabel: t("neetoForm.common.field"),
+          minOptions: yup.MINIMUM_ADDRESS_FIELDS,
+          shouldResetEmptyOptionOnBlur: false,
+          buttonProps: {
+            label: t("neetoForm.questions.address.addField"),
+            onClick: function onClick() {
+              return setIsAddressFieldPaneOpen(true);
+            }
+          },
+          onDelete: function onDelete(id) {
+            setSelectedFieldId(id);
+            setIsDeleteAddressFieldAlertOpen(true);
+          },
+          onEdit: function onEdit(id) {
+            setSelectedFieldId(id);
+            setIsAddressFieldPaneOpen(true);
+          }
+        }), touched && error && /*#__PURE__*/jsxRuntime.jsx("p", {
+          className: "neeto-form-engine-input__error",
+          "data-testid": "neeto-form-engine-address-fields-error",
+          children: formatErrorMessage$1(error)
+        })]
+      })
+    }), /*#__PURE__*/jsxRuntime.jsx(ManagePane, {
+      initialFocusRef: initialFocusRef,
+      selectedFieldId: selectedFieldId,
+      fields: yup.getActiveRecords(fields),
+      isOpen: isAddressFieldPaneOpen,
+      title: ramda.isNotNil(selectedFieldId) ? t("neetoForm.questions.address.editField") : t("neetoForm.questions.address.addField"),
+      onClose: function onClose() {
+        setIsAddressFieldPaneOpen(false);
+        setSelectedFieldId(null);
+      }
+    }), /*#__PURE__*/jsxRuntime.jsx(Alert, {
+      isOpen: isDeleteAddressFieldAlertOpen,
+      submitButtonLabel: t("neetoForm.common.delete"),
+      title: t("neetoForm.questions.address.deleteAlert.title"),
+      message: /*#__PURE__*/jsxRuntime.jsx(reactI18next.Trans, {
+        i18nKey: "neetoForm.questions.address.deleteAlert.message",
+        values: {
+          label: (_findById = neetoCist.findById(selectedFieldId, fields)) === null || _findById === void 0 ? void 0 : _findById.label
+        }
+      }),
+      onClose: function onClose() {
+        setIsDeleteAddressFieldAlertOpen(false);
+        setSelectedFieldId(null);
+      },
+      onSubmit: function onSubmit() {
+        setIsDeleteAddressFieldAlertOpen(false);
+        handleDelete();
+        setSelectedFieldId(null);
+      }
+    })]
+  });
+};
+
 var Captcha = reactUtils.withT(function (_ref) {
   var t = _ref.t;
   return /*#__PURE__*/jsxRuntime.jsxs(Radio, {
@@ -1394,19 +1764,19 @@ var Captcha = reactUtils.withT(function (_ref) {
   });
 });
 
-var _excluded$3 = ["name", "title", "className"];
-function ownKeys$6(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$4 = ["name", "title", "className"];
+function ownKeys$7(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SwitchBlock = function SwitchBlock(_ref) {
   var name = _ref.name,
     title = _ref.title,
     _ref$className = _ref.className,
     className = _ref$className === void 0 ? "" : _ref$className,
-    otherProps = _objectWithoutProperties(_ref, _excluded$3);
+    otherProps = _objectWithoutProperties(_ref, _excluded$4);
   return /*#__PURE__*/jsxRuntime.jsxs(Label, {
     className: classnames("flex items-center justify-start gap-2 ", className),
     "data-testid": "neeto-form-engine-".concat(neetoCist.hyphenate(title && name), "-toggle-label"),
-    children: [/*#__PURE__*/jsxRuntime.jsx(Switch, _objectSpread$6(_objectSpread$6({}, _objectSpread$6(_objectSpread$6({}, otherProps), {}, {
+    children: [/*#__PURE__*/jsxRuntime.jsx(Switch, _objectSpread$7(_objectSpread$7({}, _objectSpread$7(_objectSpread$7({}, otherProps), {}, {
       name: name
     })), {}, {
       "data-testid": "neeto-form-engine-".concat(neetoCist.hyphenate(title && name), "-switch")
@@ -1435,9 +1805,9 @@ var EMAIL_VERIFICATION_TRANSLATIONS = {
   popoverDescription: i18next.t("neetoForm.emailVerification.popoverDescription")
 };
 
-var _excluded$2 = ["children"];
-function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$3 = ["children"];
+function ownKeys$6(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var STYLES = {
   border: {
     "default": "1px solid rgb(var(--neeto-ui-gray-400))",
@@ -1449,8 +1819,8 @@ var STYLES = {
   }
 };
 var MultiValueRemove = function MultiValueRemove(props) {
-  return /*#__PURE__*/jsxRuntime.jsx(reactSelect.components.MultiValueRemove, _objectSpread$5(_objectSpread$5({}, props), {}, {
-    innerProps: _objectSpread$5(_objectSpread$5({}, props.innerProps), {}, _defineProperty({}, "data-testid", "".concat(utils.hyphenize(props.data.label), "-remove-icon"))),
+  return /*#__PURE__*/jsxRuntime.jsx(reactSelect.components.MultiValueRemove, _objectSpread$6(_objectSpread$6({}, props), {}, {
+    innerProps: _objectSpread$6(_objectSpread$6({}, props.innerProps), {}, _defineProperty({}, "data-testid", "".concat(utils.hyphenize(props.data.label), "-remove-icon"))),
     children: /*#__PURE__*/jsxRuntime.jsx(Close, {
       size: 16
     })
@@ -1458,7 +1828,7 @@ var MultiValueRemove = function MultiValueRemove(props) {
 };
 var ValueContainer = function ValueContainer(_ref) {
   var children = _ref.children,
-    props = _objectWithoutProperties(_ref, _excluded$2);
+    props = _objectWithoutProperties(_ref, _excluded$3);
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var getValue = props.getValue,
@@ -1470,8 +1840,8 @@ var ValueContainer = function ValueContainer(_ref) {
     firstChild = _children[0],
     rest = _children.slice(1);
   var shouldCollapse = !isFocused && value.length > visibleDomainsCount;
-  return /*#__PURE__*/jsxRuntime.jsxs(reactSelect.components.ValueContainer, _objectSpread$5(_objectSpread$5({}, props), {}, {
-    innerProps: _objectSpread$5(_objectSpread$5({}, props.innerProps), {}, _defineProperty({}, "data-testid", "multi-domain-input-container")),
+  return /*#__PURE__*/jsxRuntime.jsxs(reactSelect.components.ValueContainer, _objectSpread$6(_objectSpread$6({}, props), {}, {
+    innerProps: _objectSpread$6(_objectSpread$6({}, props.innerProps), {}, _defineProperty({}, "data-testid", "multi-domain-input-container")),
     children: [shouldCollapse ? firstChild.slice(0, visibleDomainsCount) : firstChild, shouldCollapse && /*#__PURE__*/jsxRuntime.jsx(Tag, {
       style: "secondary",
       label: t("neetoForm.common.remainingItemsCount", {
@@ -1481,8 +1851,8 @@ var ValueContainer = function ValueContainer(_ref) {
   }));
 };
 var ClearIndicator = function ClearIndicator(props) {
-  return /*#__PURE__*/jsxRuntime.jsx(reactSelect.components.ClearIndicator, _objectSpread$5(_objectSpread$5({}, props), {}, {
-    innerProps: _objectSpread$5(_objectSpread$5({}, props.innerProps), {}, _defineProperty({}, "data-testid", "clear-all-button")),
+  return /*#__PURE__*/jsxRuntime.jsx(reactSelect.components.ClearIndicator, _objectSpread$6(_objectSpread$6({}, props), {}, {
+    innerProps: _objectSpread$6(_objectSpread$6({}, props.innerProps), {}, _defineProperty({}, "data-testid", "clear-all-button")),
     children: /*#__PURE__*/jsxRuntime.jsx(Close, {
       className: "cursor-pointer",
       size: 16
@@ -1503,7 +1873,7 @@ var CUSTOM_STYLES = {
   input: ramda.assoc("overflow", "hidden"),
   multiValue: function multiValue(styles, _ref2) {
     var valid = _ref2.data.valid;
-    return _objectSpread$5(_objectSpread$5({}, styles), {}, {
+    return _objectSpread$6(_objectSpread$6({}, styles), {}, {
       border: valid ? STYLES.border["default"] : STYLES.border.error,
       color: valid ? STYLES.color["default"] : STYLES.color.error
     });
@@ -1545,9 +1915,9 @@ var formatErrorMessage = function formatErrorMessage(error) {
   return removeDuplicateErrorMessages(error);
 };
 
-var _excluded$1 = ["label", "value", "onChange", "error", "onBlur"];
-function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var _excluded$2 = ["label", "value", "onChange", "error", "onBlur"];
+function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MultiDomainInput = function MultiDomainInput(_ref) {
   var _ref$label = _ref.label,
     label = _ref$label === void 0 ? "" : _ref$label,
@@ -1559,7 +1929,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
     error = _ref$error === void 0 ? "" : _ref$error,
     _ref$onBlur = _ref.onBlur,
     onBlur = _ref$onBlur === void 0 ? neetoCist.noop : _ref$onBlur,
-    otherProps = _objectWithoutProperties(_ref, _excluded$1);
+    otherProps = _objectWithoutProperties(_ref, _excluded$2);
   var _useState = React.useState(""),
     _useState2 = _slicedToArray(_useState, 2),
     inputValue = _useState2[0],
@@ -1606,7 +1976,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
         "data-testid": "".concat(utils.hyphenize(label), "-input-label"),
         children: label
       })
-    }), /*#__PURE__*/jsxRuntime.jsx(CreatableSelect, _objectSpread$4({
+    }), /*#__PURE__*/jsxRuntime.jsx(CreatableSelect, _objectSpread$5({
       isMulti: true,
       required: true,
       classNamePrefix: "neeto-ui-react-select",
@@ -1616,7 +1986,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
       className: classnames("neeto-ui-react-select__container neeto-ui-react-select__container--medium neeto-ui-email-input__select", {
         "neeto-ui-react-select__container--error": !!error
       }),
-      styles: _objectSpread$4(_objectSpread$4({}, CUSTOM_STYLES), {}, {
+      styles: _objectSpread$5(_objectSpread$5({}, CUSTOM_STYLES), {}, {
         control: ramda.mergeLeft({
           maxHeight: "200px",
           overflowY: "auto"
@@ -1628,7 +1998,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
       },
       onInputChange: setInputValue,
       onKeyDown: handleKeyDown
-    }, _objectSpread$4({
+    }, _objectSpread$5({
       inputValue: inputValue,
       isFocused: isFocused,
       onChange: onChange,
@@ -1650,8 +2020,8 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
   });
 };
 
-function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var validateDomains = function validateDomains(value) {
   var schema = yup__namespace.array().of(yup__namespace.string().test("verify domains", i18next.t("neetoForm.error.invalidDomain"), function (domain) {
     return VALID_DOMAIN_REGEX.test(domain);
@@ -1691,7 +2061,7 @@ var buildHelpPopoverLabelProps = function buildHelpPopoverLabelProps(popoverDesc
   return {
     helpIconProps: {
       "data-testid": "help-popover-button",
-      popoverProps: _objectSpread$3({
+      popoverProps: _objectSpread$4({
         description: popoverDescription
       }, helpLink && {
         helpLinkProps: {
@@ -1830,15 +2200,15 @@ var getAllowedFileTypes = function getAllowedFileTypes(_ref) {
     allowedFileTypes = _ref.allowedFileTypes;
   var fileTypes = buildFileTypesList(allowedFileTypes);
   if (isChecked) {
-    var fileTypesSet = new Set([].concat(_toConsumableArray(constants$1.FILE_TYPES_MAP[type]), _toConsumableArray(fileTypes)));
+    var fileTypesSet = new Set([].concat(_toConsumableArray(yup.FILE_TYPES_MAP[type]), _toConsumableArray(fileTypes)));
     return Array.from(fileTypesSet).join(", ");
   }
-  var newFileTypes = ramda.difference(fileTypes, constants$1.FILE_TYPES_MAP[type]);
+  var newFileTypes = ramda.difference(fileTypes, yup.FILE_TYPES_MAP[type]);
   return newFileTypes.join(", ");
 };
 var isFileTypeEnabled = function isFileTypeEnabled(type, allowedFileTypes) {
   var fileTypes = buildFileTypesList(allowedFileTypes);
-  return ramda.isEmpty(ramda.difference(constants$1.FILE_TYPES_MAP[type], fileTypes));
+  return ramda.isEmpty(ramda.difference(yup.FILE_TYPES_MAP[type], fileTypes));
 };
 
 var FileUpload = function FileUpload() {
@@ -1874,7 +2244,7 @@ var FileUpload = function FileUpload() {
         children: t("neetoForm.fileUpload.fileTypes")
       }), /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "flex space-x-4",
-        children: constants$1.FILE_GROUPS.map(function (_ref2) {
+        children: yup.FILE_GROUPS.map(function (_ref2) {
           var name = _ref2.name,
             label = _ref2.label;
           return /*#__PURE__*/React.createElement(FileGroup, {
@@ -1905,7 +2275,7 @@ var OpinionScale = function OpinionScale() {
         "data-testid": "neeto-form-engine-opinion-scale-min-value",
         label: t("neetoForm.common.start"),
         name: "minValue",
-        options: constants$1.OPINION_SCALE_MIN_VALUE_OPTIONS,
+        options: yup.OPINION_SCALE_MIN_VALUE_OPTIONS,
         onChange: function onChange(option) {
           return setFieldValue("minValue", option === null || option === void 0 ? void 0 : option.value);
         }
@@ -1914,7 +2284,7 @@ var OpinionScale = function OpinionScale() {
         "data-testid": "neeto-form-engine-opinion-scale-max-value",
         label: t("neetoForm.common.end"),
         name: "maxValue",
-        options: constants$1.OPINION_SCALE_MAX_VALUE_OPTIONS,
+        options: yup.OPINION_SCALE_MAX_VALUE_OPTIONS,
         onChange: function onChange(option) {
           return setFieldValue("maxValue", option === null || option === void 0 ? void 0 : option.value);
         }
@@ -1929,21 +2299,21 @@ var OpinionScale = function OpinionScale() {
         className: "w-1/2",
         "data-testid": "neeto-form-engine-opinion-scale-left-label",
         label: t("neetoForm.questions.opinionScale.leftLabel"),
-        maxLength: constants$1.OPINION_LABEL_MAX_LENGTH,
+        maxLength: yup.OPINION_LABEL_MAX_LENGTH,
         name: "leftOpinionLabel"
       }), /*#__PURE__*/jsxRuntime.jsx(Input, {
         className: "w-1/2",
         "data-testid": "neeto-form-engine-opinion-scale-right-label",
         label: t("neetoForm.questions.opinionScale.rightLabel"),
-        maxLength: constants$1.OPINION_LABEL_MAX_LENGTH,
+        maxLength: yup.OPINION_LABEL_MAX_LENGTH,
         name: "rightOpinionLabel"
       })]
     })]
   });
 };
 
-function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Options = function Options(_ref) {
   var questionProps = _ref.questionProps;
   var _useTranslation = reactI18next.useTranslation(),
@@ -1980,15 +2350,15 @@ var Options = function Options(_ref) {
   var isAddOptionDisabled = disableAddOption || isManageOptionDisabled;
   var isRemoveOptionDisabled = disableRemoveOption || isManageOptionDisabled;
   var isDropdown = values.kind === constants.QUESTION_TYPES.DROPDOWN;
-  var isPictureChoice = isPictureChoiceEnabled && !isDropdown && (values.isPictureChoice || constants$1.DEFAULT_CHOICE_QUESTION_ATTRIBUTES.isPictureChoice);
-  var imageHeight = values.imageHeight || constants$1.DEFAULT_CHOICE_QUESTION_ATTRIBUTES.imageHeight;
+  var isPictureChoice = isPictureChoiceEnabled && !isDropdown && (values.isPictureChoice || yup.DEFAULT_CHOICE_QUESTION_ATTRIBUTES.isPictureChoice);
+  var imageHeight = values.imageHeight || yup.DEFAULT_CHOICE_QUESTION_ATTRIBUTES.imageHeight;
   var handleImageHeightChange = function handleImageHeightChange(value) {
     setFieldValue("imageHeight", value);
   };
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "w-full space-y-4",
     children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
-      children: [/*#__PURE__*/jsxRuntime.jsx(Label, _objectSpread$2(_objectSpread$2({
+      children: [/*#__PURE__*/jsxRuntime.jsx(Label, _objectSpread$3(_objectSpread$3({
         className: "mb-2 block"
       }, optionLabelProps), {}, {
         children: t("neetoForm.questions.common.questionFields.field.options")
@@ -2012,8 +2382,8 @@ var Options = function Options(_ref) {
           draggable: !isManageOptionDisabled,
           isAddOptionEnabled: !isAddOptionDisabled,
           isDeleteOptionEnabled: !isRemoveOptionDisabled,
-          isNewItemsPrefilled: constants$1.isDefaultLanguage(selectedLanguage),
-          minOptions: constants$1.MINIMUM_OPTIONS,
+          isNewItemsPrefilled: yup.isDefaultLanguage(selectedLanguage),
+          minOptions: yup.MINIMUM_OPTIONS,
           shouldResetEmptyOptionOnBlur: false,
           onChange: setOptionsAttributes
         })
@@ -2043,8 +2413,8 @@ var Options = function Options(_ref) {
             weight: "medium",
             children: t("neetoForm.questions.common.questionFields.field.imageHeight")
           }), /*#__PURE__*/jsxRuntime.jsx(Slider, {
-            max: constants$1.IMAGE_HEIGHT_SLIDER_DEFAULTS.max,
-            min: constants$1.IMAGE_HEIGHT_SLIDER_DEFAULTS.min,
+            max: yup.IMAGE_HEIGHT_SLIDER_DEFAULTS.max,
+            min: yup.IMAGE_HEIGHT_SLIDER_DEFAULTS.min,
             value: imageHeight,
             onChange: handleImageHeightChange
           })]
@@ -2068,7 +2438,7 @@ var Rating = function Rating() {
       className: "w-full",
       children: /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "flex gap-6",
-        children: constants$1.RATING_OPTIONS$1.map(function (_ref2) {
+        children: yup.RATING_OPTIONS$1.map(function (_ref2) {
           var Icon = _ref2.icon,
             name = _ref2.name,
             color = _ref2.color;
@@ -2105,7 +2475,7 @@ var StarRating = function StarRating() {
         "data-testid": "neeto-form-engine-star-rating-min-value",
         label: t("neetoForm.common.start"),
         name: "minValue",
-        options: constants$1.STAR_RATING_MIN_VALUE_OPTIONS,
+        options: yup.STAR_RATING_MIN_VALUE_OPTIONS,
         onChange: function onChange(option) {
           return setFieldValue("minValue", option === null || option === void 0 ? void 0 : option.value);
         }
@@ -2114,7 +2484,7 @@ var StarRating = function StarRating() {
         "data-testid": "neeto-form-engine-star-rating-max-value",
         label: t("neetoForm.common.end"),
         name: "maxValue",
-        options: constants$1.STAR_RATING_MAX_VALUE_OPTIONS,
+        options: yup.STAR_RATING_MAX_VALUE_OPTIONS,
         onChange: function onChange(option) {
           return setFieldValue("maxValue", option === null || option === void 0 ? void 0 : option.value);
         }
@@ -2123,7 +2493,7 @@ var StarRating = function StarRating() {
       children: t("neetoForm.common.shape")
     }), /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "flex gap-2",
-      children: Object.entries(constants$1.STAR_RATING_ICONS_MAP).map(function (_ref) {
+      children: Object.entries(yup.STAR_RATING_ICONS_MAP).map(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
           name = _ref2[0],
           IconType = _ref2[1];
@@ -2144,6 +2514,9 @@ var StarRating = function StarRating() {
   });
 };
 
+var _excluded$1 = ["fields"];
+function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var CHECKBOX = constants.QUESTION_TYPES.CHECKBOX,
   RADIO = constants.QUESTION_TYPES.RADIO,
   DROPDOWN = constants.QUESTION_TYPES.DROPDOWN,
@@ -2152,12 +2525,16 @@ var CHECKBOX = constants.QUESTION_TYPES.CHECKBOX,
   RATING = constants.QUESTION_TYPES.RATING,
   FILE_UPLOAD = constants.QUESTION_TYPES.FILE_UPLOAD,
   CAPTCHA = constants.QUESTION_TYPES.CAPTCHA,
-  EMAIL = constants.QUESTION_TYPES.EMAIL;
+  EMAIL = constants.QUESTION_TYPES.EMAIL,
+  ADDRESS = constants.QUESTION_TYPES.ADDRESS;
 var transformValueForOption = function transformValueForOption(_ref) {
   var label = _ref.label,
     type = _ref.type;
   return "".concat(neetoCist.slugify(label), "-").concat(type);
 };
+var omitDraftId = neetoCist.modifyBy({
+  id: ramda.startsWith(DRAFT_ID_PREFIX)
+}, ramda.omit(["id"]));
 var renderAdditionalData = function renderAdditionalData(_ref2) {
   var kind = _ref2.kind,
     questionProps = _ref2.questionProps,
@@ -2179,6 +2556,8 @@ var renderAdditionalData = function renderAdditionalData(_ref2) {
       return /*#__PURE__*/jsxRuntime.jsx(FileUpload, {});
     case CAPTCHA:
       return /*#__PURE__*/jsxRuntime.jsx(Captcha, {});
+    case ADDRESS:
+      return /*#__PURE__*/jsxRuntime.jsx(Address, {});
     case EMAIL:
       return !usesCustomSubmissionComponent && /*#__PURE__*/jsxRuntime.jsx(Email, {
         usesCustomSubmissionComponent: usesCustomSubmissionComponent
@@ -2188,7 +2567,7 @@ var renderAdditionalData = function renderAdditionalData(_ref2) {
   }
 };
 var resolveActionComponent = function resolveActionComponent(action) {
-  return ramda.equals(action, constants$1.QUESTION_ACTIONS.ADD) ? Add : Edit;
+  return ramda.equals(action, yup.QUESTION_ACTIONS.ADD) ? Add : Edit;
 };
 var getQuestionKind = function getQuestionKind(questionKinds, pattern) {
   var questionKind = neetoCist.findBy(pattern, questionKinds);
@@ -2255,6 +2634,21 @@ var readOnlySwitchLabelProps = function readOnlySwitchLabelProps(helpUrl) {
     }
   };
 };
+var transformValues = function transformValues(values) {
+  switch (values.kind) {
+    case constants.QUESTION_TYPES.ADDRESS:
+      {
+        var _values$fields = values.fields,
+          fields = _values$fields === void 0 ? [] : _values$fields,
+          rest = _objectWithoutProperties(values, _excluded$1);
+        return _objectSpread$2(_objectSpread$2({}, rest), {}, {
+          fieldsAttributes: ramda.map(yup.renameKey("deleted", "_destroy"), omitDraftId(fields))
+        });
+      }
+    default:
+      return values;
+  }
+};
 
 var _excluded = ["isOpen", "onClose", "action", "question", "availableQuestionKinds"];
 function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -2289,10 +2683,10 @@ var AddQuestion = function AddQuestion(_ref) {
     disabledAddButtonHelpPopoverProps = _ref.disabledAddButtonHelpPopoverProps,
     isDisabled = _ref.isDisabled,
     addQuestionHelpProps = _ref.addQuestionHelpProps;
-  var helpPopoverProps = isDisabled ? constants$1.buildDisabledAddButtonHelpPopoverProps(disabledAddButtonHelpPopoverProps) : {};
+  var helpPopoverProps = isDisabled ? yup.buildDisabledAddButtonHelpPopoverProps(disabledAddButtonHelpPopoverProps) : {};
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "mb-8 flex w-full items-center gap-x-1",
-    children: [/*#__PURE__*/jsxRuntime.jsx(Button, _objectSpread({}, constants$1.buildAddQuestionButtonProps(onAdd, isDisabled))), isDisabled && /*#__PURE__*/jsxRuntime.jsx(HelpPopover, _objectSpread({}, helpPopoverProps)), neetoCist.isPresent(addQuestionHelpProps) && !isDisabled && /*#__PURE__*/jsxRuntime.jsx("span", {
+    children: [/*#__PURE__*/jsxRuntime.jsx(Button, _objectSpread({}, yup.buildAddQuestionButtonProps(onAdd, isDisabled))), isDisabled && /*#__PURE__*/jsxRuntime.jsx(HelpPopover, _objectSpread({}, helpPopoverProps)), neetoCist.isPresent(addQuestionHelpProps) && !isDisabled && /*#__PURE__*/jsxRuntime.jsx("span", {
       children: /*#__PURE__*/jsxRuntime.jsx(HelpPopover, _objectSpread({}, addQuestionHelpProps))
     })]
   });
@@ -2358,7 +2752,7 @@ var Form = function Form(_ref) {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [constants$1.QUESTION_ACTIONS.CLONE].concat(args));
+        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [yup.QUESTION_ACTIONS.CLONE].concat(args));
         utils.showThumbsUpToastr();
       }
     }),
@@ -2368,7 +2762,7 @@ var Form = function Form(_ref) {
         for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
           args[_key2] = arguments[_key2];
         }
-        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [constants$1.QUESTION_ACTIONS.REORDER].concat(args));
+        onMutateSuccess === null || onMutateSuccess === void 0 || onMutateSuccess.apply(void 0, [yup.QUESTION_ACTIONS.REORDER].concat(args));
         setFormData({
           isReorderingQuestions: false
         });
@@ -2379,7 +2773,7 @@ var Form = function Form(_ref) {
   var handleReorder = function handleReorder(questions) {
     var payload = {
       neetoFormQuestions: {
-        questions: constants$1.buildReorderPayload(questions)
+        questions: yup.buildReorderPayload(questions)
       },
       language: selectedLanguage
     };
@@ -2408,11 +2802,11 @@ var Form = function Form(_ref) {
     setSelectedQuestion(question);
   };
   var handleAdd = function handleAdd() {
-    setSelectedAction(constants$1.QUESTION_ACTIONS.ADD);
+    setSelectedAction(yup.QUESTION_ACTIONS.ADD);
     setIsManageQuestionPaneOpen(true);
   };
   var handleEdit = function handleEdit() {
-    setSelectedAction(constants$1.QUESTION_ACTIONS.EDIT);
+    setSelectedAction(yup.QUESTION_ACTIONS.EDIT);
     setIsManageQuestionPaneOpen(true);
   };
   var handleClone = function handleClone() {
@@ -2552,7 +2946,7 @@ var BuildForm = function BuildForm(_ref) {
     _ref$isKindAlreadyAct = _ref.isKindAlreadyActive,
     isKindAlreadyActive = _ref$isKindAlreadyAct === void 0 ? isQuestionKindAlreadyActive : _ref$isKindAlreadyAct,
     _ref$getActiveKindDet = _ref.getActiveKindDetails,
-    getActiveKindDetails = _ref$getActiveKindDet === void 0 ? constants$1.getActiveQuestionKindDetails : _ref$getActiveKindDet,
+    getActiveKindDetails = _ref$getActiveKindDet === void 0 ? yup.getActiveQuestionKindDetails : _ref$getActiveKindDet,
     kindUniqueOn = _ref.kindUniqueOn,
     _ref$isQuestionDeleta = _ref.isQuestionDeletable,
     isQuestionDeletable = _ref$isQuestionDeleta === void 0 ? ramda.T : _ref$isQuestionDeleta,
@@ -2563,7 +2957,7 @@ var BuildForm = function BuildForm(_ref) {
     formTitle = _ref$formTitle === void 0 ? "" : _ref$formTitle,
     formDescription = _ref.formDescription,
     _ref$availableLanguag = _ref.availableLanguages,
-    availableLanguages = _ref$availableLanguag === void 0 ? constants$1.DEFAULT_AVAILABLE_LANGUAGES : _ref$availableLanguag,
+    availableLanguages = _ref$availableLanguag === void 0 ? yup.DEFAULT_AVAILABLE_LANGUAGES : _ref$availableLanguag,
     _ref$selectedLanguage = _ref.selectedLanguage,
     selectedLanguage = _ref$selectedLanguage === void 0 ? "en" : _ref$selectedLanguage,
     _ref$onLanguageChange = _ref.onLanguageChange,
@@ -2577,7 +2971,7 @@ var BuildForm = function BuildForm(_ref) {
     _ref$allowAdditionalG = _ref.allowAdditionalGuests,
     allowAdditionalGuests = _ref$allowAdditionalG === void 0 ? false : _ref$allowAdditionalG,
     _ref$advancedFeatures = _ref.advancedFeatures,
-    advancedFeatures = _ref$advancedFeatures === void 0 ? constants$1.DEFAULT_ADVANCED_FEATURES : _ref$advancedFeatures,
+    advancedFeatures = _ref$advancedFeatures === void 0 ? yup.DEFAULT_ADVANCED_FEATURES : _ref$advancedFeatures,
     helpDocUrls = _ref.helpDocUrls,
     className = _ref.className,
     _ref$usesCustomSubmis = _ref.usesCustomSubmissionComponent,
@@ -2597,7 +2991,7 @@ var BuildForm = function BuildForm(_ref) {
     data = _useForm.data,
     isLoading = _useForm.isLoading,
     isQuestionsPending = _useForm.isPending;
-  var _ref2 = data || constants$1.QUESTIONS_INITIAL_VALUE,
+  var _ref2 = data || yup.QUESTIONS_INITIAL_VALUE,
     isFormEnabled = _ref2.enabled,
     savedTitle = _ref2.title,
     questionsFromCache = _ref2.questions,
@@ -2615,13 +3009,13 @@ var BuildForm = function BuildForm(_ref) {
       queryClient.setQueryData([constants.QUERY_KEYS.QUESTIONS, "preview/".concat(id), selectedLanguage], ramda.assoc("questions", questions));
     }
   };
-  var isRequiredField = ramda.either(constants$1.isMandatoryField, isFieldRequired);
+  var isRequiredField = ramda.either(yup.isMandatoryField, isFieldRequired);
   var isDisabledFieldLabel = function isDisabledFieldLabel(field) {
-    return constants$1.isImmutableField(field) || (isFieldLabelDisabled !== null && isFieldLabelDisabled !== void 0 ? isFieldLabelDisabled : ramda.F)(field);
+    return yup.isImmutableField(field) || (isFieldLabelDisabled !== null && isFieldLabelDisabled !== void 0 ? isFieldLabelDisabled : ramda.F)(field);
   };
-  var defaultQuestionKinds = allowAdditionalGuests ? constants$1.QUESTION_KINDS : neetoCist.removeBy({
-    type: constants$1.QUESTION_KIND.ADDITIONAL_GUESTS.value
-  }, constants$1.QUESTION_KINDS);
+  var defaultQuestionKinds = allowAdditionalGuests ? yup.QUESTION_KINDS : neetoCist.removeBy({
+    type: yup.QUESTION_KIND.ADDITIONAL_GUESTS.value
+  }, yup.QUESTION_KINDS);
   var isUsingDefaultQuestionKinds = ramda.isNil(questionKinds);
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     className: classnames("neeto-form-nano-form-outer-wrapper relative", className),