@bigbinary/neeto-form-frontend 4.3.0 → 4.4.1

package/dist/BuildForm.js

@@ -1,16 +1,16 @@
 import { useQueryClient } from '@tanstack/react-query';
 import classnames from 'classnames';
-import { isPresent, truncate, findBy, isNotPresent, slugify, existsBy, hyphenate, noop, nullSafe, removeBy } from '@bigbinary/neeto-cist';
+import { isPresent, truncate, findBy, isNotPresent, slugify, existsBy, findById, findIndexById, hyphenate, noop, nullSafe, modifyBy, removeBy } from '@bigbinary/neeto-cist';
 import Spinner from '@bigbinary/neetoui/Spinner';
-import { equals, path, curry, assoc, prop, dissoc, when, includes, isEmpty, reject, keys, pick, omit, evolve, map, mergeLeft, isNil, pipe, filter, isNotNil, uniq, join, pluck, test, paths, difference, split, last, either, T, F } from 'ramda';
-import { k as useDeleteQuestion, Q as QUESTION_TYPES, a as useForm, l as useCreateQuestion, m as useUpdateQuestion, C as CAPTCHA_TYPES, n as useReorderQuestions, i as QUERY_KEYS } from './constants-B_OEW8Yc.js';
-import { f as buildDisplayLabel, h as INDEPENDENT_LABELS_MAP, i as QUESTION_ACTIONS, j as isElementOverflowing, k as Drag, l as SELECTABLE_KINDS, m as isAutoGeneratedQuestion, n as isRichTextQuestion, N as NON_BASIC_LATIN_CHARACTERS_REGEX, o as RESERVED_FIELD_CODES, d as LABEL_FIELDS, p as isDefaultLanguage, q as buildAddQuestionButtonProps, v as validateEditorContent, F as FIELD_CODES_REJECT_CHARS_REGEX, r as isImmutableField, Q as QUESTIONS_WITHOUT_FIELD_CODE, s as NON_HIDEABLE_FIELDS, t as NON_READ_ONLY_FIELDS, u as RICH_TEXT_QUESTIONS, O as OPINION_LABEL_MAX_LENGTH, w as FILE_TYPES_MAP, x as FILE_GROUPS, y as OPINION_SCALE_MIN_VALUE_OPTIONS, z as OPINION_SCALE_MAX_VALUE_OPTIONS, D as DEFAULT_CHOICE_QUESTION_ATTRIBUTES, M as MINIMUM_OPTIONS, A as IMAGE_HEIGHT_SLIDER_DEFAULTS, B as RATING_OPTIONS, G as STAR_RATING_MIN_VALUE_OPTIONS, H as STAR_RATING_MAX_VALUE_OPTIONS, J as STAR_RATING_ICONS_MAP, K as buildDisabledAddButtonHelpPopoverProps, T as buildReorderPayload, U as isMandatoryField, V as QUESTION_KINDS, a as QUESTION_KIND, W as getActiveQuestionKindDetails, X as DEFAULT_AVAILABLE_LANGUAGES, Y as DEFAULT_ADVANCED_FEATURES, Z as QUESTIONS_INITIAL_VALUE } from './constants-Dcy0vCkf.js';
+import { equals, path, when, assoc, includes, isEmpty, reject, keys, pick, omit, evolve, map, mergeLeft, isNil, pipe, filter, isNotNil, values, uniq, join, pathSatisfies, assocPath, dissoc, append, pluck, test, paths, difference, prop, startsWith, split, last, either, T, F } from 'ramda';
+import { k as useDeleteQuestion, Q as QUESTION_TYPES, a as useForm, l as useCreateQuestion, m as useUpdateQuestion, C as CAPTCHA_TYPES, n as useReorderQuestions, i as QUERY_KEYS } from './constants-30230o5k.js';
+import { h as buildDisplayLabel, i as INDEPENDENT_LABELS_MAP, j as QUESTION_ACTIONS, k as isElementOverflowing, l as Drag, m as SELECTABLE_KINDS, n as isAutoGeneratedQuestion, o as isRichTextQuestion, N as NON_BASIC_LATIN_CHARACTERS_REGEX, p as RESERVED_FIELD_CODES, r as renameKey, e as LABEL_FIELDS, q as isDefaultLanguage, s as buildAddQuestionButtonProps, v as validateEditorContent, F as FIELD_CODES_REJECT_CHARS_REGEX, t as isImmutableField, Q as QUESTIONS_WITHOUT_FIELD_CODE, u as NON_HIDEABLE_FIELDS, w as NON_READ_ONLY_FIELDS, x as RICH_TEXT_QUESTIONS, O as OPINION_LABEL_MAX_LENGTH, A as ADDRESS_FIELD_WIDTHS, d as ADDRESS_FIELD_TYPES, y as generateDefaultOptions, M as MINIMUM_ADDRESS_FIELDS, z as getDeletedRecords, B as randomId, G as getActiveRecords, H as FILE_TYPES_MAP, J as FILE_GROUPS, K as OPINION_SCALE_MIN_VALUE_OPTIONS, T as OPINION_SCALE_MAX_VALUE_OPTIONS, D as DEFAULT_CHOICE_QUESTION_ATTRIBUTES, U as MINIMUM_OPTIONS, V as IMAGE_HEIGHT_SLIDER_DEFAULTS, W as RATING_OPTIONS, X as STAR_RATING_MIN_VALUE_OPTIONS, Y as STAR_RATING_MAX_VALUE_OPTIONS, Z as STAR_RATING_ICONS_MAP, _ as buildDisabledAddButtonHelpPopoverProps, $ as buildReorderPayload, a0 as isMandatoryField, a1 as QUESTION_KINDS, a as QUESTION_KIND, a2 as getActiveQuestionKindDetails, a3 as DEFAULT_AVAILABLE_LANGUAGES, a4 as DEFAULT_ADVANCED_FEATURES, a5 as QUESTIONS_INITIAL_VALUE } from './yup-SHH_PrTm.js';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import { useState, useRef, useEffect, createElement } from 'react';
 import { Droppable, Draggable, DragDropContext } from '@hello-pangea/dnd';
 import { withT, isMetaKeyPressed, useStateWithDependency, useFuncDebounce, useOnClickOutside } from '@bigbinary/neeto-commons-frontend/react-utils';
 import { showThumbsUpToastr, withEventTargetValue, hyphenize } from '@bigbinary/neeto-commons-frontend/utils';
-import { a as useBuildFormStore } from './buildForm-DA1LRDwr.js';
+import { a as useBuildFormStore } from './buildForm-CkVmGF-A.js';
 import { shallow } from 'zustand/shallow';
 import Alert from '@bigbinary/neetoui/Alert';
 import { useTranslation, Trans } from 'react-i18next';
@@ -21,13 +21,13 @@ import MoreDropdown from '@bigbinary/neeto-molecules/MoreDropdown';
 import Dropdown from '@bigbinary/neetoui/Dropdown';
 import Tooltip from '@bigbinary/neetoui/Tooltip';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { i as isFunction, f as fieldWithFallback, c as isNameQuestion } from './index-DGvqFcqA.js';
+import { i as isFunction, f as fieldWithFallback, c as isNameQuestion } from './index-BfavwyMH.js';
+import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import { t } from 'i18next';
 import { v4 } from 'uuid';
 import NoData from '@bigbinary/neetoui/NoData';
 import Button from '@bigbinary/neetoui/Button';
-import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import Pane from '@bigbinary/neetoui/Pane';
 import ActionBlock from '@bigbinary/neetoui/formik/ActionBlock';
 import Form$2 from '@bigbinary/neetoui/formik/Form';
@@ -40,6 +40,8 @@ import NeetoEditor from '@bigbinary/neeto-editor/Editor';
 import Input from '@bigbinary/neetoui/formik/Input';
 import { isEditorEmpty } from '@bigbinary/neeto-editor/utils';
 import * as yup from 'yup';
+import OptionFields from '@bigbinary/neeto-molecules/OptionFields';
+import { AnimatePresence, motion } from 'framer-motion';
 import Radio from '@bigbinary/neetoui/formik/Radio';
 import Label from '@bigbinary/neetoui/Label';
 import CreatableSelect from 'react-select/creatable';
@@ -51,7 +53,6 @@ import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
 import Checkbox$1 from '@bigbinary/neetoui/formik/Checkbox';
 import Checkbox from '@bigbinary/neetoui/Checkbox';
-import OptionFields from '@bigbinary/neeto-molecules/OptionFields';
 import Slider from '@bigbinary/neetoui/Slider';
 import HelpPopover from '@bigbinary/neeto-molecules/HelpPopover';
 import '@bigbinary/neeto-commons-frontend/constants';
@@ -325,8 +326,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,
@@ -345,7 +346,7 @@ var Questions = function Questions(_ref) {
       var droppableProps = _ref2.droppableProps,
         placeholder = _ref2.placeholder,
         innerRef = _ref2.innerRef;
-      return /*#__PURE__*/jsxs("div", _objectSpread$e(_objectSpread$e({}, droppableProps), {}, {
+      return /*#__PURE__*/jsxs("div", _objectSpread$i(_objectSpread$i({}, droppableProps), {}, {
         className: "space-y-2",
         ref: innerRef,
         children: [questions.map(function (question, index) {
@@ -359,7 +360,7 @@ var Questions = function Questions(_ref) {
             var draggableProps = _ref3.draggableProps,
               dragHandleProps = _ref3.dragHandleProps,
               innerRef = _ref3.innerRef;
-            return /*#__PURE__*/jsx("div", _objectSpread$e(_objectSpread$e(_objectSpread$e({}, draggableProps), dragHandleProps), {}, {
+            return /*#__PURE__*/jsx("div", _objectSpread$i(_objectSpread$i(_objectSpread$i({}, draggableProps), dragHandleProps), {}, {
               ref: innerRef,
               children: /*#__PURE__*/jsx(Card, {
                 allQuestionKinds: allQuestionKinds,
@@ -392,11 +393,15 @@ 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 includes(question === null || question === void 0 ? void 0 : question.kind, SELECTABLE_KINDS);
 };
+var isAddressQuestion = function isAddressQuestion(question) {
+  return (question === null || question === void 0 ? void 0 : question.kind) === QUESTION_TYPES.ADDRESS;
+};
 var underscoredWithoutSpecialCharacters = function underscoredWithoutSpecialCharacters(string) {
   return string.toLowerCase().replace(/[\s-]/g, "_").replace(/[\W]/gi, "").replace(/_+/g, "_").replace(/^_+|_+$/, "");
 };
@@ -420,9 +425,6 @@ var generateFieldCodePrefix = function generateFieldCodePrefix(label, kind) {
   }
   return addSuffixForReservedFieldCode(prefix) || "";
 };
-var renameKey = curry(function (oldKey, newKey, obj) {
-  return assoc(newKey, prop(oldKey, obj), dissoc(oldKey, obj));
-});
 var modifyDefaultValues = function modifyDefaultValues(_ref) {
   var values = _ref.values,
     kind = _ref.kind,
@@ -475,7 +477,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
     });
   });
@@ -497,7 +499,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,
@@ -521,15 +523,18 @@ var duplicateFieldData = function duplicateFieldData(_ref6) {
   }, questionKinds);
   var label = fieldWithFallback(item, "label");
   var defaultAttributeNames = keys(questionKind.defaults || {});
-  var defaultAttributes = pick(defaultAttributeNames, item);
+  var _pick = pick(defaultAttributeNames, item),
+    fields = _pick.fields,
+    defaultAttributes = _objectWithoutProperties(_pick, _excluded$b);
   var newQuestionLabel = isRichTextQuestion(kind) ? label : 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(omit(["id"])),
+    fieldsAttributes: fields && fields.map(omit(["id"])),
     nodeId: v4(),
     fieldCode: generateUniqueFieldCode({
       questions: questions,
@@ -553,7 +558,9 @@ var getAvailableQuestionKinds = function getAvailableQuestionKinds(_ref7) {
     });
   }, allQuestionKinds);
 };
-var formatQuestionAttributesForClone = when(isChoiceQuestion, assoc("isCloning", true));
+var formatQuestionAttributesForClone = when(function (question) {
+  return isChoiceQuestion(question) || isAddressQuestion(question);
+}, assoc("isCloning", true));
 
 var HelpText = withT(function (_ref) {
   var t = _ref.t,
@@ -605,8 +612,9 @@ var NAME = QUESTION_TYPES.NAME,
   DATE = QUESTION_TYPES.DATE,
   FILE_UPLOAD$1 = QUESTION_TYPES.FILE_UPLOAD,
   CAPTCHA$1 = QUESTION_TYPES.CAPTCHA,
-  SMS_REMINDER = QUESTION_TYPES.SMS_REMINDER;
-var QUESTIONS_WITH_ADDITIONAL_DATA = [].concat(_toConsumableArray(SELECTABLE_KINDS), [STAR_RATING$1, OPINION_SCALE$1, RATING$1, FILE_UPLOAD$1, CAPTCHA$1, EMAIL$1]);
+  SMS_REMINDER = QUESTION_TYPES.SMS_REMINDER,
+  ADDRESS$1 = QUESTION_TYPES.ADDRESS;
+var QUESTIONS_WITH_ADDITIONAL_DATA = [].concat(_toConsumableArray(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: t("neetoForm.questions.common.questionFields.field.labelExample", {
@@ -626,18 +634,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 useBuildFormStore(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 = useFormikContext(),
     dirty = _useFormikContext.dirty,
     isValid = _useFormikContext.isValid,
@@ -652,7 +661,7 @@ var FormikAdaptiveInput = function FormikAdaptiveInput(_ref) {
     var end = element.value.length;
     element.setSelectionRange(end, end);
   };
-  return /*#__PURE__*/jsx(Textarea, _objectSpread$c({
+  return /*#__PURE__*/jsx(Textarea, _objectSpread$g({
     label: label,
     name: name,
     className: "neeto-form-nano-adaptive-input",
@@ -666,8 +675,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,
@@ -681,14 +690,14 @@ var LabelWithPlaceholder = function LabelWithPlaceholder(_ref) {
   var shouldShowPlaceholder = includes(kind, QUESTIONS_WITH_PLACEHOLDERS);
   return /*#__PURE__*/jsxs("div", {
     className: "space-y-4",
-    children: [/*#__PURE__*/jsx(FormikAdaptiveInput, _objectSpread$b({
+    children: [/*#__PURE__*/jsx(FormikAdaptiveInput, _objectSpread$f({
       required: true,
       disabled: isLabelDisabled,
       label: t("neetoForm.questions.common.questionFields.field.question"),
       name: "label",
       placeholder: DEFAULT_PLACEHOLDERS[kind],
       onChange: withEventTargetValue(handleLabelChange)
-    }, labelProps)), shouldShowPlaceholder && /*#__PURE__*/jsx(FormikAdaptiveInput, _objectSpread$b({
+    }, labelProps)), shouldShowPlaceholder && /*#__PURE__*/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")
@@ -696,8 +705,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;
@@ -717,7 +726,7 @@ var Name = function Name(_ref) {
       label: t("neetoForm.common.splitAsFirstAndLastNames"),
       name: "isSplitMode"
     }), isSplitMode && !usesCustomSubmissionComponent ? /*#__PURE__*/jsxs(Fragment, {
-      children: [/*#__PURE__*/jsx(LabelWithPlaceholder, _objectSpread$a(_objectSpread$a({}, commonProps), {}, {
+      children: [/*#__PURE__*/jsx(LabelWithPlaceholder, _objectSpread$e(_objectSpread$e({}, commonProps), {}, {
         handleLabelChange: function handleLabelChange(value) {
           return _handleLabelChange(value, LABEL_FIELDS.FIRST_NAME);
         },
@@ -729,7 +738,7 @@ var Name = function Name(_ref) {
           label: t("neetoForm.questions.common.questionFields.field.firstNamePlaceholder"),
           name: "firstNamePlaceholder"
         }
-      })), /*#__PURE__*/jsx(LabelWithPlaceholder, _objectSpread$a(_objectSpread$a({}, commonProps), {}, {
+      })), /*#__PURE__*/jsx(LabelWithPlaceholder, _objectSpread$e(_objectSpread$e({}, commonProps), {}, {
         handleLabelChange: function handleLabelChange(value) {
           return _handleLabelChange(value, LABEL_FIELDS.LAST_NAME);
         },
@@ -742,7 +751,7 @@ var Name = function Name(_ref) {
           name: "lastNamePlaceholder"
         }
       }))]
-    }) : /*#__PURE__*/jsx(LabelWithPlaceholder, _objectSpread$a(_objectSpread$a({}, commonProps), {}, {
+    }) : /*#__PURE__*/jsx(LabelWithPlaceholder, _objectSpread$e(_objectSpread$e({}, commonProps), {}, {
       labelProps: {
         name: LABEL_FIELDS.FULL_NAME
       },
@@ -909,12 +918,12 @@ var RequiredSwitch = 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 = useField(props),
     _useField2 = _slicedToArray(_useField, 3),
     value = _useField2[0].value,
@@ -925,7 +934,7 @@ var InputWithMaxLength = function InputWithMaxLength(_ref) {
     }
   }, [value, maxLength, setValue]);
   var shouldShowMaxLength = value && value.length > maxLength - 10;
-  return /*#__PURE__*/jsx(Input, _objectSpread$9(_objectSpread$9({}, props), shouldShowMaxLength && {
+  return /*#__PURE__*/jsx(Input, _objectSpread$d(_objectSpread$d({}, props), shouldShowMaxLength && {
     maxLength: maxLength
   }));
 };
@@ -1090,7 +1099,7 @@ var Form$1 = function Form(_ref) {
           dataTestid: "settings-card",
           title: t("neetoForm.common.settings"),
           children: [isBasicSettingsVisible && /*#__PURE__*/jsxs(Fragment, {
-            children: [!isImmutable && /*#__PURE__*/jsx(RequiredSwitch, {}), shouldShowHideSwitch && /*#__PURE__*/jsx(Switch, {
+            children: [!isImmutable && kind !== QUESTION_TYPES.ADDRESS && /*#__PURE__*/jsx(RequiredSwitch, {}), shouldShowHideSwitch && /*#__PURE__*/jsx(Switch, {
               label: t("neetoForm.common.hideQuestion"),
               name: "isHidden",
               labelProps: hideSwitchLabelProps(hideQuestionHelpDocUrl)
@@ -1185,6 +1194,14 @@ var formValidationSchema = function formValidationSchema(question) {
         })
       })) : schema.notRequired();
     }),
+    fields: yup.array().when("kind", function (kind, schema) {
+      return kind === QUESTION_TYPES.ADDRESS ? schema.of(yup.object().shape({
+        label: yup.string().when("_destroy", {
+          is: true,
+          otherwise: yup.string().trim().required(t("neetoForm.error.allFieldsRequired"))
+        })
+      })) : schema.notRequired();
+    }),
     highestRatingLabel: yup.string().nullable(),
     averageRatingLabel: yup.string().nullable(),
     lowestRatingLabel: yup.string().nullable(),
@@ -1193,16 +1210,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 = useBuildFormStore(function (store) {
       var _store$formState, _store$formState2, _store$formState3;
       return {
@@ -1236,7 +1253,7 @@ var Add = function Add(_ref) {
       language: language,
       neetoFormQuestion: mergeLeft({
         displayOrder: displayOrder
-      }, values)
+      }, transformValues(values))
     }, {
       onSuccess: function onSuccess(_ref2) {
         var questions = _ref2.questions;
@@ -1261,7 +1278,7 @@ var Add = function Add(_ref) {
         onSubmit: handleSubmit
       },
       children: /*#__PURE__*/jsxs(Fragment, {
-        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$8({}, _objectSpread$8(_objectSpread$8({}, props), {}, {
+        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$c({}, _objectSpread$c(_objectSpread$c({}, props), {}, {
           question: question,
           questions: questions
         }))), /*#__PURE__*/jsx(Pane.Footer, {
@@ -1277,14 +1294,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 = useTranslation(),
     t = _useTranslation.t;
   var _useBuildFormStore = useBuildFormStore(function (store) {
@@ -1305,7 +1322,7 @@ var Edit = function Edit(_ref) {
     if (isUpdating || !isOpen) return;
     var payload = {
       language: language,
-      neetoFormQuestion: values
+      neetoFormQuestion: transformValues(values)
     };
     updateQuestion({
       questionId: question.id,
@@ -1338,7 +1355,7 @@ var Edit = function Edit(_ref) {
         onSubmit: handleSubmit
       },
       children: /*#__PURE__*/jsxs(Fragment, {
-        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$7(_objectSpread$7({}, _objectSpread$7({
+        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$b(_objectSpread$b({}, _objectSpread$b({
           question: question
         }, props)), {}, {
           isEdit: true
@@ -1355,6 +1372,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__*/jsx(AnimatePresence, {
+    children: open && /*#__PURE__*/jsx(motion.div, _objectSpread$a(_objectSpread$a({
+      animate: "visible",
+      exit: "hidden",
+      initial: "hidden",
+      transition: {
+        duration: 0.3
+      },
+      variants: VARIANTS
+    }, otherProps), {}, {
+      children: /*#__PURE__*/jsx("div", {
+        className: className,
+        children: children
+      })
+    }))
+  });
+};
+
+var ADDRESS_FIELD_WIDTH_OPTIONS = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ADDRESS_FIELD_WIDTHS.FULL, {
+  label: t("neetoForm.questions.address.widths.full"),
+  value: ADDRESS_FIELD_WIDTHS.FULL
+}), ADDRESS_FIELD_WIDTHS.HALF, {
+  label: t("neetoForm.questions.address.widths.half"),
+  value: ADDRESS_FIELD_WIDTHS.HALF
+}), ADDRESS_FIELD_WIDTHS.ONE_FOURTH, {
+  label: t("neetoForm.questions.address.widths.oneFourth"),
+  value: ADDRESS_FIELD_WIDTHS.ONE_FOURTH
+}), ADDRESS_FIELD_WIDTHS.THREE_FOURTH, {
+  label: t("neetoForm.questions.address.widths.threeFourth"),
+  value: ADDRESS_FIELD_WIDTHS.THREE_FOURTH
+});
+var ADDRESS_FIELD_TYPE_OPTIONS = _defineProperty(_defineProperty({}, ADDRESS_FIELD_TYPES.INPUT, {
+  label: t("neetoForm.questions.address.types.textInput"),
+  value: ADDRESS_FIELD_TYPES.INPUT
+}), ADDRESS_FIELD_TYPES.SELECT, {
+  label: t("neetoForm.questions.address.types.dropdown"),
+  value: ADDRESS_FIELD_TYPES.SELECT
+});
+var ADDRESS_FIELD_FORM_VALIDATION_SCHEMA = yup.object().shape({
+  label: yup.string().trim().required(t("neetoForm.error.requiredField", {
+    label: t("neetoForm.questions.common.questionFields.field.label")
+  })),
+  width: yup.object().nullable().required(t("neetoForm.error.requiredField", {
+    label: t("neetoForm.questions.address.width")
+  })),
+  fieldType: yup.object().nullable().required(t("neetoForm.error.requiredField", {
+    label: t("neetoForm.questions.address.type")
+  })),
+  properties: yup.object().shape({
+    options: yup.array().of(yup.object().shape({
+      label: yup.string().required(t("neetoForm.error.requiredField", {
+        label: t("neetoForm.common.option")
+      }))
+    })).unique("label", 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 = pipe(filter(isNotNil), map(values), uniq, 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[ADDRESS_FIELD_WIDTHS.FULL],
+    fieldType: ADDRESS_FIELD_TYPE_OPTIONS[ADDRESS_FIELD_TYPES.INPUT]
+  };
+};
+var sanitizeAddressField = function sanitizeAddressField(field, isSelectField, defaultOptions) {
+  var hasOptions = pathSatisfies(isPresent, ["properties", "options"], field);
+  if (isSelectField && !hasOptions) {
+    return assocPath(["properties", "options"], defaultOptions, field);
+  }
+  if (!isSelectField && hasOptions) {
+    return 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 = useField("fields"),
+    _useField2 = _slicedToArray(_useField, 3),
+    allFields = _useField2[0].value,
+    setValue = _useField2[2].setValue;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var defaultOptions = generateDefaultOptions(MINIMUM_ADDRESS_FIELDS);
+  var editingField = 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 = getDeletedRecords(allFields);
+    var isSelectField = fieldType.value === ADDRESS_FIELD_TYPES.SELECT;
+    var sanitizedField = sanitizeAddressField(field, isSelectField, defaultOptions);
+    if (isNil(selectedFieldId)) {
+      var position = fields.length;
+      var id = "draft-".concat(randomId());
+      var newField = _objectSpread$8(_objectSpread$8({
+        id: id
+      }, sanitizedField), {}, {
+        altId: "alt-".concat(randomId()),
+        position: position,
+        width: width.value,
+        fieldType: fieldType.value
+      });
+      var nextFields = append(newField, fields);
+      setValue([].concat(_toConsumableArray(nextFields), _toConsumableArray(deletedFields)));
+    } else {
+      var selectedFieldIndex = findIndexById(selectedFieldId, fields);
+      setValue(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 === ADDRESS_FIELD_TYPES.SELECT && isNotPresent((_values$properties = values.properties) === null || _values$properties === void 0 ? void 0 : _values$properties.options)) {
+        setFieldValue("properties.options", defaultOptions);
+      }
+    };
+  };
+  return /*#__PURE__*/jsxs(Pane, {
+    initialFocusRef: initialFocusRef,
+    isOpen: isOpen,
+    onClose: onClose,
+    children: [/*#__PURE__*/jsx(Pane.Header, {
+      children: /*#__PURE__*/jsx(Typography, {
+        "data-testid": "add-address-field-title",
+        style: "h2",
+        weight: "semibold",
+        children: title
+      })
+    }), /*#__PURE__*/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__*/jsxs(Fragment, {
+          children: [/*#__PURE__*/jsx(Pane.Body, {
+            children: /*#__PURE__*/jsxs("div", {
+              className: "w-full space-y-6",
+              children: [/*#__PURE__*/jsx(Input, {
+                name: "label",
+                ref: initialFocusRef,
+                label: t("neetoForm.questions.common.questionFields.field.label"),
+                placeholder: t("neetoForm.questions.address.fieldLabelPlaceholder")
+              }), /*#__PURE__*/jsxs("div", {
+                className: "grid grid-cols-2 gap-6",
+                children: [/*#__PURE__*/jsx(Select, {
+                  label: t("neetoForm.questions.address.width"),
+                  name: "width",
+                  options: Object.values(ADDRESS_FIELD_WIDTH_OPTIONS)
+                }), /*#__PURE__*/jsx(Select, {
+                  label: t("neetoForm.questions.address.type"),
+                  name: "fieldType",
+                  options: Object.values(ADDRESS_FIELD_TYPE_OPTIONS),
+                  onChange: handleFieldTypeChange(setFieldValue, values)
+                })]
+              }), /*#__PURE__*/jsx(Collapsible, {
+                open: (values === null || values === void 0 || (_values$fieldType = values.fieldType) === null || _values$fieldType === void 0 ? void 0 : _values$fieldType.value) === ADDRESS_FIELD_TYPES.SELECT,
+                children: /*#__PURE__*/jsx("div", {
+                  className: "flex flex-col",
+                  children: /*#__PURE__*/jsx(OptionFields, {
+                    draggable: true,
+                    minOptions: MINIMUM_ADDRESS_FIELDS,
+                    name: "properties.options"
+                  })
+                })
+              }), /*#__PURE__*/jsx("div", {
+                className: "flex items-center gap-4",
+                children: /*#__PURE__*/jsx(Switch, {
+                  label: t("neetoForm.common.required"),
+                  name: "isRequired"
+                })
+              })]
+            })
+          }), /*#__PURE__*/jsx(Pane.Footer, {
+            children: /*#__PURE__*/jsx("div", {
+              className: "flex items-center gap-2",
+              children: /*#__PURE__*/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 = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isAddressFieldPaneOpen = _useState2[0],
+    setIsAddressFieldPaneOpen = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isDeleteAddressFieldAlertOpen = _useState4[0],
+    setIsDeleteAddressFieldAlertOpen = _useState4[1];
+  var _useState5 = useState(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    selectedFieldId = _useState6[0],
+    setSelectedFieldId = _useState6[1];
+  var initialFocusRef = useRef(null);
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var _useBuildFormStore = useBuildFormStore(function (store) {
+      var _store$formState;
+      return {
+        selectedLanguage: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["selectedLanguage"]
+      };
+    }, shallow),
+    selectedLanguage = _useBuildFormStore.selectedLanguage;
+  var name = "fields";
+  var _useField = 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 = getDeletedRecords(fields);
+    var nextFields = getActiveRecords(fields);
+    var selectedFieldIndex = findIndexById(selectedFieldId, nextFields);
+    nextFields = assocPath([selectedFieldIndex, "deleted"], true, nextFields);
+    setFields([].concat(_toConsumableArray(nextFields), _toConsumableArray(deletedFields)));
+  };
+  return /*#__PURE__*/jsxs(Fragment, {
+    children: [/*#__PURE__*/jsx(Block, {
+      dataTestid: "address-fields-block",
+      title: t("neetoForm.questions.address.fields"),
+      children: /*#__PURE__*/jsxs("div", {
+        children: [/*#__PURE__*/jsx(OptionFields, {
+          name: name,
+          draggable: true,
+          shouldDestroy: true,
+          editable: false,
+          isNewItemsPrefilled: isDefaultLanguage(selectedLanguage),
+          itemLabel: t("neetoForm.common.field"),
+          minOptions: 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__*/jsx("p", {
+          className: "neeto-form-engine-input__error",
+          "data-testid": "neeto-form-engine-address-fields-error",
+          children: formatErrorMessage$1(error)
+        })]
+      })
+    }), /*#__PURE__*/jsx(ManagePane, {
+      initialFocusRef: initialFocusRef,
+      selectedFieldId: selectedFieldId,
+      fields: getActiveRecords(fields),
+      isOpen: isAddressFieldPaneOpen,
+      title: isNotNil(selectedFieldId) ? t("neetoForm.questions.address.editField") : t("neetoForm.questions.address.addField"),
+      onClose: function onClose() {
+        setIsAddressFieldPaneOpen(false);
+        setSelectedFieldId(null);
+      }
+    }), /*#__PURE__*/jsx(Alert, {
+      isOpen: isDeleteAddressFieldAlertOpen,
+      submitButtonLabel: t("neetoForm.common.delete"),
+      title: t("neetoForm.questions.address.deleteAlert.title"),
+      message: /*#__PURE__*/jsx(Trans, {
+        i18nKey: "neetoForm.questions.address.deleteAlert.message",
+        values: {
+          label: (_findById = 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 = withT(function (_ref) {
   var t = _ref.t;
   return /*#__PURE__*/jsxs(Radio, {
@@ -1373,19 +1743,19 @@ var Captcha = 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__*/jsxs(Label, {
     className: classnames("flex items-center justify-start gap-2 ", className),
     "data-testid": "neeto-form-engine-".concat(hyphenate(title && name), "-toggle-label"),
-    children: [/*#__PURE__*/jsx(Switch, _objectSpread$6(_objectSpread$6({}, _objectSpread$6(_objectSpread$6({}, otherProps), {}, {
+    children: [/*#__PURE__*/jsx(Switch, _objectSpread$7(_objectSpread$7({}, _objectSpread$7(_objectSpread$7({}, otherProps), {}, {
       name: name
     })), {}, {
       "data-testid": "neeto-form-engine-".concat(hyphenate(title && name), "-switch")
@@ -1414,9 +1784,9 @@ var EMAIL_VERIFICATION_TRANSLATIONS = {
   popoverDescription: 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))",
@@ -1428,8 +1798,8 @@ var STYLES = {
   }
 };
 var MultiValueRemove = function MultiValueRemove(props) {
-  return /*#__PURE__*/jsx(components.MultiValueRemove, _objectSpread$5(_objectSpread$5({}, props), {}, {
-    innerProps: _objectSpread$5(_objectSpread$5({}, props.innerProps), {}, _defineProperty({}, "data-testid", "".concat(hyphenize(props.data.label), "-remove-icon"))),
+  return /*#__PURE__*/jsx(components.MultiValueRemove, _objectSpread$6(_objectSpread$6({}, props), {}, {
+    innerProps: _objectSpread$6(_objectSpread$6({}, props.innerProps), {}, _defineProperty({}, "data-testid", "".concat(hyphenize(props.data.label), "-remove-icon"))),
     children: /*#__PURE__*/jsx(Close, {
       size: 16
     })
@@ -1437,7 +1807,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 = useTranslation(),
     t = _useTranslation.t;
   var getValue = props.getValue,
@@ -1449,8 +1819,8 @@ var ValueContainer = function ValueContainer(_ref) {
     firstChild = _children[0],
     rest = _children.slice(1);
   var shouldCollapse = !isFocused && value.length > visibleDomainsCount;
-  return /*#__PURE__*/jsxs(components.ValueContainer, _objectSpread$5(_objectSpread$5({}, props), {}, {
-    innerProps: _objectSpread$5(_objectSpread$5({}, props.innerProps), {}, _defineProperty({}, "data-testid", "multi-domain-input-container")),
+  return /*#__PURE__*/jsxs(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__*/jsx(Tag, {
       style: "secondary",
       label: t("neetoForm.common.remainingItemsCount", {
@@ -1460,8 +1830,8 @@ var ValueContainer = function ValueContainer(_ref) {
   }));
 };
 var ClearIndicator = function ClearIndicator(props) {
-  return /*#__PURE__*/jsx(components.ClearIndicator, _objectSpread$5(_objectSpread$5({}, props), {}, {
-    innerProps: _objectSpread$5(_objectSpread$5({}, props.innerProps), {}, _defineProperty({}, "data-testid", "clear-all-button")),
+  return /*#__PURE__*/jsx(components.ClearIndicator, _objectSpread$6(_objectSpread$6({}, props), {}, {
+    innerProps: _objectSpread$6(_objectSpread$6({}, props.innerProps), {}, _defineProperty({}, "data-testid", "clear-all-button")),
     children: /*#__PURE__*/jsx(Close, {
       className: "cursor-pointer",
       size: 16
@@ -1482,7 +1852,7 @@ var CUSTOM_STYLES = {
   input: 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
     });
@@ -1524,9 +1894,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,
@@ -1538,7 +1908,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
     error = _ref$error === void 0 ? "" : _ref$error,
     _ref$onBlur = _ref.onBlur,
     onBlur = _ref$onBlur === void 0 ? noop : _ref$onBlur,
-    otherProps = _objectWithoutProperties(_ref, _excluded$1);
+    otherProps = _objectWithoutProperties(_ref, _excluded$2);
   var _useState = useState(""),
     _useState2 = _slicedToArray(_useState, 2),
     inputValue = _useState2[0],
@@ -1585,7 +1955,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
         "data-testid": "".concat(hyphenize(label), "-input-label"),
         children: label
       })
-    }), /*#__PURE__*/jsx(CreatableSelect, _objectSpread$4({
+    }), /*#__PURE__*/jsx(CreatableSelect, _objectSpread$5({
       isMulti: true,
       required: true,
       classNamePrefix: "neeto-ui-react-select",
@@ -1595,7 +1965,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: mergeLeft({
           maxHeight: "200px",
           overflowY: "auto"
@@ -1607,7 +1977,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
       },
       onInputChange: setInputValue,
       onKeyDown: handleKeyDown
-    }, _objectSpread$4({
+    }, _objectSpread$5({
       inputValue: inputValue,
       isFocused: isFocused,
       onChange: onChange,
@@ -1629,8 +1999,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.array().of(yup.string().test("verify domains", t("neetoForm.error.invalidDomain"), function (domain) {
     return VALID_DOMAIN_REGEX.test(domain);
@@ -1670,7 +2040,7 @@ var buildHelpPopoverLabelProps = function buildHelpPopoverLabelProps(popoverDesc
   return {
     helpIconProps: {
       "data-testid": "help-popover-button",
-      popoverProps: _objectSpread$3({
+      popoverProps: _objectSpread$4({
         description: popoverDescription
       }, helpLink && {
         helpLinkProps: {
@@ -1921,8 +2291,8 @@ var OpinionScale = function OpinionScale() {
   });
 };
 
-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 = useTranslation(),
@@ -1967,7 +2337,7 @@ var Options = function Options(_ref) {
   return /*#__PURE__*/jsxs("div", {
     className: "w-full space-y-4",
     children: [/*#__PURE__*/jsxs("div", {
-      children: [/*#__PURE__*/jsx(Label, _objectSpread$2(_objectSpread$2({
+      children: [/*#__PURE__*/jsx(Label, _objectSpread$3(_objectSpread$3({
         className: "mb-2 block"
       }, optionLabelProps), {}, {
         children: t("neetoForm.questions.common.questionFields.field.options")
@@ -2123,6 +2493,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 = QUESTION_TYPES.CHECKBOX,
   RADIO = QUESTION_TYPES.RADIO,
   DROPDOWN = QUESTION_TYPES.DROPDOWN,
@@ -2131,12 +2504,16 @@ var CHECKBOX = QUESTION_TYPES.CHECKBOX,
   RATING = QUESTION_TYPES.RATING,
   FILE_UPLOAD = QUESTION_TYPES.FILE_UPLOAD,
   CAPTCHA = QUESTION_TYPES.CAPTCHA,
-  EMAIL = QUESTION_TYPES.EMAIL;
+  EMAIL = QUESTION_TYPES.EMAIL,
+  ADDRESS = QUESTION_TYPES.ADDRESS;
 var transformValueForOption = function transformValueForOption(_ref) {
   var label = _ref.label,
     type = _ref.type;
   return "".concat(slugify(label), "-").concat(type);
 };
+var omitDraftId = modifyBy({
+  id: startsWith(DRAFT_ID_PREFIX)
+}, omit(["id"]));
 var renderAdditionalData = function renderAdditionalData(_ref2) {
   var kind = _ref2.kind,
     questionProps = _ref2.questionProps,
@@ -2158,6 +2535,8 @@ var renderAdditionalData = function renderAdditionalData(_ref2) {
       return /*#__PURE__*/jsx(FileUpload, {});
     case CAPTCHA:
       return /*#__PURE__*/jsx(Captcha, {});
+    case ADDRESS:
+      return /*#__PURE__*/jsx(Address, {});
     case EMAIL:
       return !usesCustomSubmissionComponent && /*#__PURE__*/jsx(Email, {
         usesCustomSubmissionComponent: usesCustomSubmissionComponent
@@ -2234,6 +2613,21 @@ var readOnlySwitchLabelProps = function readOnlySwitchLabelProps(helpUrl) {
     }
   };
 };
+var transformValues = function transformValues(values) {
+  switch (values.kind) {
+    case 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: map(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; }