@bigbinary/neeto-form-frontend 3.9.9 → 3.10.0

package/dist/BuildForm.js

@@ -2,14 +2,14 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { useState, useRef, useEffect, createElement } from 'react';
 import { useQueryClient } from '@tanstack/react-query';
 import classnames from 'classnames';
-import { useFormikContext, useField, FieldArray, Form as Form$3, Formik } from 'formik';
+import { useFormikContext, useField, Form as Form$3, Formik } from 'formik';
 import { isPresent, truncate, findBy, isNotPresent, slugify, hyphenate, noop, nullSafe, filterBy, removeBy } from '@bigbinary/neeto-cist';
 import { showThumbsUpToastr, withEventTargetValue, hyphenize } from '@bigbinary/neeto-commons-frontend/utils';
 import PageLoader from '@bigbinary/neeto-molecules/PageLoader';
-import { equals, includes, __, reduce, assoc, path, when, isEmpty, reject, keys, pick, omit, modify, without, mergeLeft, isNil, pipe, filter, isNotNil, uniq, join, pluck, map, test, difference, prop, split, last, concat, F } from 'ramda';
-import { h as useDeleteQuestion, i as useFetchQuestions, j as useCreateQuestion, k as useUpdateQuestion, l as useReorderQuestions, Q as QUERY_KEYS } from './useFormApi-BS-TCKwR.js';
+import { equals, path, when, assoc, includes, isEmpty, reject, keys, pick, omit, evolve, map, modify, without, mergeLeft, isNil, pipe, filter, isNotNil, uniq, join, pluck, test, difference, prop, split, last, __, concat, F } from 'ramda';
+import { h as useDeleteQuestion, i as useFetchQuestions, j as useCreateQuestion, k as useUpdateQuestion, l as useReorderQuestions, Q as QUERY_KEYS } from './useFormApi-DtoxIPE7.js';
 import { Q as QUESTION_KIND } from './constants-DlRX5mcQ.js';
-import { I as INDEPENDENT_LABELS_MAP, R as RICH_TEXT_QUESTIONS, A as AUTO_GENERATED_KINDS, a as IMMUTABLE_KINDS, h as htmlToPlainText, i as isElementOverflowing, D as Drag, b as QUESTION_TYPES, S as SELECTABLE_KINDS, N as NON_BASIC_LATIN_CHARACTERS_REGEX, c as RESERVED_FIELD_CODES, F as FIELD_CODES_REJECT_CHARS_REGEX, Q as QUESTIONS_WITHOUT_FIELD_CODE, d as NON_HIDEABLE_FIELDS, C as CAPTCHA_TYPES, e as FILE_TYPES_MAP, f as FILE_GROUPS, M as MINIMUM_OPTIONS, j as RATING_OPTIONS, k as STAR_RATING_MIN_VALUE_OPTIONS, l as STAR_RATING_MAX_VALUE_OPTIONS, m as STAR_RATING_ICONS_MAP, n as QUESTION_ACTIONS, o as QUESTION_KINDS, p as getActiveQuestionKindDetails, q as DEFAULT_AVAILABLE_LANGUAGES, r as QUESTIONS_INITIAL_VALUE, s as MANDATORY_KINDS } from './constants-C5wOjKeR.js';
+import { I as INDEPENDENT_LABELS_MAP, i as isRichTextQuestion, h as htmlToPlainText, a as isElementOverflowing, D as Drag, b as QUESTION_TYPES, S as SELECTABLE_KINDS, c as isAutoGeneratedQuestion, N as NON_BASIC_LATIN_CHARACTERS_REGEX, R as RESERVED_FIELD_CODES, d as isDefaultLanguage, e as buildDisabledAddButtonTooltipProps, f as buildAddQuestionButtonProps, v as validateEditorContent, F as FIELD_CODES_REJECT_CHARS_REGEX, j as isImmutableField, Q as QUESTIONS_WITHOUT_FIELD_CODE, k as NON_HIDEABLE_FIELDS, l as RICH_TEXT_QUESTIONS, C as CAPTCHA_TYPES, m as FILE_TYPES_MAP, n as FILE_GROUPS, M as MINIMUM_OPTIONS, o as RATING_OPTIONS, p as STAR_RATING_MIN_VALUE_OPTIONS, q as STAR_RATING_MAX_VALUE_OPTIONS, r as STAR_RATING_ICONS_MAP, s as QUESTION_ACTIONS, t as QUESTION_KINDS, u as getActiveQuestionKindDetails, w as DEFAULT_AVAILABLE_LANGUAGES, x as QUESTIONS_INITIAL_VALUE, y as buildReorderPayload, z as IMMUTABLE_KINDS, A as MANDATORY_KINDS } from './constants-AohkxnRH.js';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { Droppable, Draggable, DragDropContext } from '@hello-pangea/dnd';
@@ -17,7 +17,7 @@ import { isMetaKeyPressed, withT, useStateWithDependency, useOnClickOutside } fr
 import HelpPopover from '@bigbinary/neeto-molecules/HelpPopover';
 import ActionBlock from '@bigbinary/neetoui/formik/ActionBlock';
 import { useTranslation, Trans } from 'react-i18next';
-import { a as useBuildFormStore } from './buildForm-GdQQ62ve.js';
+import { a as useBuildFormStore } from './buildForm-Zw1xpuBS.js';
 import { shallow } from 'zustand/shallow';
 import Alert from '@bigbinary/neetoui/Alert';
 import { f as fieldWithFallback, i as isFunction } from './index-BL5SirYx.js';
@@ -26,9 +26,8 @@ import MoreDropdown from '@bigbinary/neeto-molecules/MoreDropdown';
 import Typography from '@bigbinary/neetoui/Typography';
 import Dropdown from '@bigbinary/neetoui/Dropdown';
 import Tooltip from '@bigbinary/neetoui/Tooltip';
-import { t } from 'i18next';
-import Plus from '@bigbinary/neeto-icons/Plus';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
+import { t } from 'i18next';
 import { v4 } from 'uuid';
 import NoData from '@bigbinary/neetoui/NoData';
 import Pane from '@bigbinary/neetoui/Pane';
@@ -53,10 +52,11 @@ 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 Delete from '@bigbinary/neeto-icons/Delete';
+import OptionFields from '@bigbinary/neeto-molecules/OptionFields';
 import '@bigbinary/neeto-commons-frontend/constants';
 import 'axios';
 import 'dompurify';
+import '@bigbinary/neeto-icons/Plus';
 import 'zustand';
 import '@babel/runtime/helpers/typeof';
 
@@ -233,50 +233,8 @@ var Overview = function Overview(_ref) {
   });
 };
 
-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 validateEditorContent = function validateEditorContent(editorRef) {
-  return function () {
-    var _editorRef$current, _editorRef$current$ed;
-    return (_editorRef$current = editorRef.current) !== null && _editorRef$current !== void 0 && (_editorRef$current$ed = _editorRef$current.editor) !== null && _editorRef$current$ed !== void 0 && _editorRef$current$ed.isEmpty ? t("neetoForm.common.thisFieldIsRequired") : "";
-  };
-};
-var buildReorderPayload = function buildReorderPayload(questions) {
-  return reduce(function (acc, _ref) {
-    var id = _ref.id,
-      displayOrder = _ref.displayOrder;
-    return assoc(id, displayOrder, acc);
-  }, {}, questions);
-};
-var isRichTextQuestion = includes(__, RICH_TEXT_QUESTIONS);
-var isAutoGeneratedQuestion = includes(__, AUTO_GENERATED_KINDS);
-var isImmutableField = function isImmutableField(field) {
-  return IMMUTABLE_KINDS.includes(field.kind);
-};
-var buildAddQuestionButtonProps = function buildAddQuestionButtonProps(onAdd, isDisabled, tooltipProps) {
-  return _objectSpread$h({
-    "data-cy": "neeto-form-engine-add-question-button",
-    disabled: isDisabled,
-    label: t("neetoForm.questions.common.primaryPanel.addQuestion"),
-    icon: Plus,
-    iconPosition: "left",
-    style: "link",
-    onClick: onAdd
-  }, isDisabled && {
-    tooltipProps: tooltipProps
-  });
-};
-var buildDisabledAddButtonTooltipProps = function buildDisabledAddButtonTooltipProps(isDisabled) {
-  var disabledAddButtonTooltipProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return _objectSpread$h({
-    disabled: !isDisabled,
-    position: "top",
-    content: t("neetoForm.questions.common.primaryPanel.noQuestionLeft")
-  }, disabledAddButtonTooltipProps);
-};
-
-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; }
+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 Card = function Card(_ref) {
   var _ref$question = _ref.question,
     question = _ref$question === void 0 ? {} : _ref$question,
@@ -336,7 +294,7 @@ var Card = function Card(_ref) {
       })]
     }), /*#__PURE__*/jsxs("div", {
       className: "flex items-center gap-1",
-      children: [isSmsReminderQuestion && /*#__PURE__*/jsx(HelpPopover, _objectSpread$g({
+      children: [isSmsReminderQuestion && /*#__PURE__*/jsx(HelpPopover, _objectSpread$f({
         description: t("neetoForm.smsReminder.popoverDescription"),
         popoverProps: {
           position: "top"
@@ -375,8 +333,8 @@ var Card = function Card(_ref) {
   });
 };
 
-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; }
+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 Questions = function Questions(_ref) {
   var questions = _ref.questions,
     isDeletable = _ref.isDeletable,
@@ -393,7 +351,7 @@ var Questions = function Questions(_ref) {
       var droppableProps = _ref2.droppableProps,
         placeholder = _ref2.placeholder,
         innerRef = _ref2.innerRef;
-      return /*#__PURE__*/jsxs("div", _objectSpread$f(_objectSpread$f({}, droppableProps), {}, {
+      return /*#__PURE__*/jsxs("div", _objectSpread$e(_objectSpread$e({}, droppableProps), {}, {
         className: "space-y-2",
         ref: innerRef,
         children: [questions.map(function (question, index) {
@@ -406,7 +364,7 @@ var Questions = function Questions(_ref) {
             var draggableProps = _ref3.draggableProps,
               dragHandleProps = _ref3.dragHandleProps,
               innerRef = _ref3.innerRef;
-            return /*#__PURE__*/jsx("div", _objectSpread$f(_objectSpread$f(_objectSpread$f({}, draggableProps), dragHandleProps), {}, {
+            return /*#__PURE__*/jsx("div", _objectSpread$e(_objectSpread$e(_objectSpread$e({}, draggableProps), dragHandleProps), {}, {
               ref: innerRef,
               children: /*#__PURE__*/jsx(Card, {
                 allQuestionKinds: allQuestionKinds,
@@ -438,8 +396,8 @@ var arrayHelpers = {
   moveItem: moveItem
 };
 
-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$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 isChoiceQuestion = function isChoiceQuestion(question) {
   return includes(question === null || question === void 0 ? void 0 : question.kind, SELECTABLE_KINDS);
 };
@@ -466,12 +424,24 @@ var generateFieldCodePrefix = function generateFieldCodePrefix(label, kind) {
   }
   return addSuffixForReservedFieldCode(prefix) || "";
 };
-var generateUniqueFieldCode = function generateUniqueFieldCode(_ref) {
-  var questions = _ref.questions,
-    _ref$label = _ref.label,
-    label = _ref$label === void 0 ? "" : _ref$label,
-    _ref$kind = _ref.kind,
-    kind = _ref$kind === void 0 ? "" : _ref$kind;
+var modifyDefaultValues = function modifyDefaultValues(_ref) {
+  var values = _ref.values,
+    kind = _ref.kind,
+    selectedLanguage = _ref.selectedLanguage,
+    isUsingDefaultQuestionKinds = _ref.isUsingDefaultQuestionKinds;
+  if (!includes(kind, SELECTABLE_KINDS) || isDefaultLanguage(selectedLanguage) || !isUsingDefaultQuestionKinds) {
+    return values;
+  }
+  return evolve({
+    optionsAttributes: map(assoc("label", ""))
+  }, values);
+};
+var generateUniqueFieldCode = function generateUniqueFieldCode(_ref2) {
+  var questions = _ref2.questions,
+    _ref2$label = _ref2.label,
+    label = _ref2$label === void 0 ? "" : _ref2$label,
+    _ref2$kind = _ref2.kind,
+    kind = _ref2$kind === void 0 ? "" : _ref2$kind;
   var prefix = generateFieldCodePrefix(label, kind);
   var uniqueNumber = Math.max.apply(Math, [0].concat(_toConsumableArray(getUniqueNumbersFromExistingFieldCodes(prefix, questions))));
   var candidateFieldCode = "";
@@ -487,37 +457,45 @@ var generateUniqueFieldCode = function generateUniqueFieldCode(_ref) {
   }
   return candidateFieldCode;
 };
-var isQuestionKindAlreadyActive = function isQuestionKindAlreadyActive(_ref2) {
-  var activeQuestions = _ref2.activeQuestions,
-    kind = _ref2.kind;
+var isQuestionKindAlreadyActive = function isQuestionKindAlreadyActive(_ref3) {
+  var activeQuestions = _ref3.activeQuestions,
+    kind = _ref3.kind;
   return activeQuestions.some(function (activeQuestion) {
     return activeQuestion.kind === kind.type && activeQuestion._destroy !== true;
   });
 };
-var handleFieldDragEnd = function handleFieldDragEnd(_ref3) {
-  var items = _ref3.items,
-    setValue = _ref3.setValue,
-    source = _ref3.source,
-    destination = _ref3.destination;
+var handleFieldDragEnd = function handleFieldDragEnd(_ref4) {
+  var items = _ref4.items,
+    setValue = _ref4.setValue,
+    source = _ref4.source,
+    destination = _ref4.destination;
   if (!(destination && items instanceof Array)) return;
   var nextItems = _toConsumableArray(items);
   arrayHelpers.moveItem(nextItems, source.index, destination.index);
   var orderedItems = nextItems.map(function (item, index) {
-    return _objectSpread$e(_objectSpread$e({}, item), {}, {
+    return _objectSpread$d(_objectSpread$d({}, item), {}, {
       displayOrder: index
     });
   });
   setValue("questions", orderedItems);
 };
-var createFieldData = function createFieldData(_ref4) {
-  var _ref4$kind = _ref4.kind,
-    defaults = _ref4$kind.defaults,
-    type = _ref4$kind.type,
-    metadata = _ref4$kind.metadata,
-    _ref4$isRequired = _ref4.isRequired,
-    isRequired = _ref4$isRequired === void 0 ? undefined : _ref4$isRequired,
-    questions = _ref4.questions;
-  return _objectSpread$e(_objectSpread$e({}, defaults), {}, {
+var createFieldData = function createFieldData(_ref5) {
+  var _ref5$kind = _ref5.kind,
+    defaults = _ref5$kind.defaults,
+    type = _ref5$kind.type,
+    metadata = _ref5$kind.metadata,
+    _ref5$isRequired = _ref5.isRequired,
+    isRequired = _ref5$isRequired === void 0 ? undefined : _ref5$isRequired,
+    questions = _ref5.questions,
+    selectedLanguage = _ref5.selectedLanguage,
+    isUsingDefaultQuestionKinds = _ref5.isUsingDefaultQuestionKinds;
+  var modifiedDefaultValues = modifyDefaultValues({
+    values: defaults,
+    kind: type,
+    selectedLanguage: selectedLanguage,
+    isUsingDefaultQuestionKinds: isUsingDefaultQuestionKinds
+  });
+  return _objectSpread$d(_objectSpread$d({}, modifiedDefaultValues), {}, {
     metadata: metadata,
     isRequired: isRequired,
     kind: type,
@@ -529,10 +507,10 @@ var createFieldData = function createFieldData(_ref4) {
     })
   });
 };
-var duplicateFieldData = function duplicateFieldData(_ref5) {
-  var item = _ref5.item,
-    questionKinds = _ref5.questionKinds,
-    questions = _ref5.questions;
+var duplicateFieldData = function duplicateFieldData(_ref6) {
+  var item = _ref6.item,
+    questionKinds = _ref6.questionKinds,
+    questions = _ref6.questions;
   var isRequired = item.isRequired,
     kind = item.kind,
     optionsAttributes = item.optionsAttributes;
@@ -545,7 +523,7 @@ var duplicateFieldData = function duplicateFieldData(_ref5) {
   var newQuestionLabel = isRichTextQuestion(kind) ? label : t("neetoForm.common.clonedElementLabel", {
     label: label
   });
-  return _objectSpread$e(_objectSpread$e({}, defaultAttributes), {}, {
+  return _objectSpread$d(_objectSpread$d({}, defaultAttributes), {}, {
     isRequired: isRequired,
     kind: kind,
     label: newQuestionLabel,
@@ -559,11 +537,11 @@ var duplicateFieldData = function duplicateFieldData(_ref5) {
     displayOrder: item.displayOrder + 1
   });
 };
-var getAvailableQuestionKinds = function getAvailableQuestionKinds(_ref6) {
-  var allQuestionKinds = _ref6.allQuestionKinds,
-    _ref6$activeQuestions = _ref6.activeQuestions,
-    activeQuestions = _ref6$activeQuestions === void 0 ? [] : _ref6$activeQuestions,
-    isKindAlreadyActive = _ref6.isKindAlreadyActive;
+var getAvailableQuestionKinds = function getAvailableQuestionKinds(_ref7) {
+  var allQuestionKinds = _ref7.allQuestionKinds,
+    _ref7$activeQuestions = _ref7.activeQuestions,
+    activeQuestions = _ref7$activeQuestions === void 0 ? [] : _ref7$activeQuestions,
+    isKindAlreadyActive = _ref7.isKindAlreadyActive;
   if (isEmpty(activeQuestions)) return allQuestionKinds;
   return reject(function (kind) {
     var isSingularKind = kind.isSingular;
@@ -629,8 +607,8 @@ var INITIAL_VALUES = {
 var VALID_FIELD_CODE_REGEX = /^[a-z0-9]+(_[a-z0-9]+)*$/;
 
 var _excluded$8 = ["label", "name"];
-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; }
+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 FormikAdaptiveInput = function FormikAdaptiveInput(_ref) {
   var label = _ref.label,
     name = _ref.name,
@@ -649,7 +627,7 @@ var FormikAdaptiveInput = function FormikAdaptiveInput(_ref) {
     var end = element.value.length;
     element.setSelectionRange(end, end);
   };
-  return /*#__PURE__*/jsx(Textarea, _objectSpread$d({
+  return /*#__PURE__*/jsx(Textarea, _objectSpread$c({
     label: label,
     name: name,
     className: "neeto-form-nano-adaptive-input",
@@ -715,8 +693,8 @@ var useUpdateEditorContent = function useUpdateEditorContent(_ref) {
     return store.formState.richTextFieldsToReset.includes(fieldCode);
   });
   var setEditorContent = function setEditorContent(content) {
-    var _editorRef$current$ed, _editorRef$current$ed2;
-    return (_editorRef$current$ed = editorRef.current.editor) === null || _editorRef$current$ed === void 0 ? void 0 : (_editorRef$current$ed2 = _editorRef$current$ed.commands) === null || _editorRef$current$ed2 === void 0 ? void 0 : _editorRef$current$ed2.setContent(content);
+    var _editorRef$current$ed;
+    return (_editorRef$current$ed = editorRef.current.editor) === null || _editorRef$current$ed === void 0 || (_editorRef$current$ed = _editorRef$current$ed.commands) === null || _editorRef$current$ed === void 0 ? void 0 : _editorRef$current$ed.setContent(content);
   };
   if (shouldReset) {
     setEditorContent(initialValue);
@@ -804,8 +782,8 @@ var RequiredSwitch = withT(function (_ref) {
 });
 
 var _excluded$7 = ["maxLength"];
-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; }
+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 InputWithMaxLength = function InputWithMaxLength(_ref) {
   var maxLength = _ref.maxLength,
     props = _objectWithoutProperties(_ref, _excluded$7);
@@ -819,7 +797,7 @@ var InputWithMaxLength = function InputWithMaxLength(_ref) {
     }
   }, [value, maxLength, setValue]);
   var shouldShowMaxLength = value && value.length > maxLength - 10;
-  return /*#__PURE__*/jsx(Input, _objectSpread$c(_objectSpread$c({}, props), shouldShowMaxLength && {
+  return /*#__PURE__*/jsx(Input, _objectSpread$b(_objectSpread$b({}, props), shouldShowMaxLength && {
     maxLength: maxLength
   }));
 };
@@ -876,14 +854,18 @@ var Form$1 = function Form(_ref) {
     setFieldValue = _useFormikContext.setFieldValue;
   var hideQuestionHelpDoc = useBuildFormStore(path(["formState", "helpDocUrls", "hideQuestion"]));
   var _useBuildFormStore = useBuildFormStore(function (store) {
-      var _store$formState, _store$formState2;
+      var _store$formState, _store$formState2, _store$formState3, _store$formState4;
       return {
         enableDomainWhitelisting: (_store$formState = store["formState"]) === null || _store$formState === void 0 ? void 0 : _store$formState["enableDomainWhitelisting"],
-        enableDomainBlacklisting: (_store$formState2 = store["formState"]) === null || _store$formState2 === void 0 ? void 0 : _store$formState2["enableDomainBlacklisting"]
+        enableDomainBlacklisting: (_store$formState2 = store["formState"]) === null || _store$formState2 === void 0 ? void 0 : _store$formState2["enableDomainBlacklisting"],
+        selectedLanguage: (_store$formState3 = store["formState"]) === null || _store$formState3 === void 0 ? void 0 : _store$formState3["selectedLanguage"],
+        isUsingDefaultQuestionKinds: (_store$formState4 = store["formState"]) === null || _store$formState4 === void 0 ? void 0 : _store$formState4["isUsingDefaultQuestionKinds"]
       };
     }, shallow),
     enableDomainWhitelisting = _useBuildFormStore.enableDomainWhitelisting,
-    enableDomainBlacklisting = _useBuildFormStore.enableDomainBlacklisting;
+    enableDomainBlacklisting = _useBuildFormStore.enableDomainBlacklisting,
+    selectedLanguage = _useBuildFormStore.selectedLanguage,
+    isUsingDefaultQuestionKinds = _useBuildFormStore.isUsingDefaultQuestionKinds;
   var kind = values.kind;
   var questionKinds = isEdit ? allQuestionKinds : availableQuestionKinds;
   var questionKindUniquenessPattern = mergeLeft(isEdit && additionalQuestionKindPattern ? additionalQuestionKindPattern(values) : {}, {
@@ -924,7 +906,9 @@ var Form$1 = function Form(_ref) {
     return createFieldData({
       kind: questionKind,
       isRequired: isRequired,
-      questions: questions
+      questions: questions,
+      selectedLanguage: selectedLanguage,
+      isUsingDefaultQuestionKinds: isUsingDefaultQuestionKinds
     });
   };
   var updateFormState = function updateFormState(data) {
@@ -1024,15 +1008,13 @@ var formValidationSchema = function formValidationSchema() {
     fieldCode: yup.string().trim().notOneOf(RESERVED_FIELD_CODES, t("neetoForm.error.invalidFieldCode")).when("kind", function (kind, schema) {
       return enableFieldCode && !includes(kind, QUESTIONS_WITHOUT_FIELD_CODE) ? fieldCodeValidation(schema, t("neetoForm.questions.common.questionFields.field.fieldCode")) : schema.notRequired();
     }),
-    optionsAttributes: yup.array().when("_destroy", {
-      is: true,
-      otherwise: function otherwise(schema) {
-        return schema.when("kind", function (kind, schema) {
-          return includes(kind, SELECTABLE_KINDS) ? schema.of(yup.object().shape({
-            label: requiredLabelValidation(yup.string(), t("neetoForm.questions.common.questionFields.field.option"))
-          })) : schema.notRequired();
-        });
-      }
+    optionsAttributes: yup.array().when("kind", function (kind, schema) {
+      return includes(kind, SELECTABLE_KINDS) ? schema.of(yup.object().shape({
+        label: yup.string().when("_destroy", {
+          is: true,
+          otherwise: requiredLabelValidation(yup.string(), t("neetoForm.questions.common.questionFields.field.option"))
+        })
+      })) : schema.notRequired();
     }),
     highestRatingLabel: yup.string().nullable(),
     averageRatingLabel: yup.string().nullable(),
@@ -1041,8 +1023,8 @@ var formValidationSchema = function formValidationSchema() {
 };
 
 var _excluded$6 = ["question", "onClose", "questions", "handleSelect", "buildRequestArgs", "isOpen"];
-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$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 Add = function Add(_ref) {
   var question = _ref.question,
     onClose = _ref.onClose,
@@ -1073,7 +1055,7 @@ var Add = function Add(_ref) {
   var handleSubmit = function handleSubmit(values) {
     if (isCreating || !isOpen) return;
     var displayOrder = question ? question.displayOrder + 1 : questions.length;
-    createQuestion(_objectSpread$b({
+    createQuestion(_objectSpread$a({
       language: language,
       neetoFormQuestion: mergeLeft({
         displayOrder: displayOrder
@@ -1102,7 +1084,7 @@ var Add = function Add(_ref) {
         onSubmit: handleSubmit
       },
       children: /*#__PURE__*/jsxs(Fragment, {
-        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$b({}, _objectSpread$b(_objectSpread$b({}, props), {}, {
+        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$a({}, _objectSpread$a(_objectSpread$a({}, props), {}, {
           question: question,
           questions: questions
         }))), /*#__PURE__*/jsx(Pane.Footer, {
@@ -1119,8 +1101,8 @@ var Add = function Add(_ref) {
 };
 
 var _excluded$5 = ["question", "isOpen", "onClose"];
-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$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 Edit = function Edit(_ref) {
   var question = _ref.question,
     isOpen = _ref.isOpen,
@@ -1172,7 +1154,7 @@ var Edit = function Edit(_ref) {
         onSubmit: handleSubmit
       },
       children: /*#__PURE__*/jsxs(Fragment, {
-        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$a(_objectSpread$a({}, _objectSpread$a({
+        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$9(_objectSpread$9({}, _objectSpread$9({
           question: question
         }, props)), {}, {
           isEdit: true
@@ -1208,8 +1190,8 @@ var Captcha = withT(function (_ref) {
 });
 
 var _excluded$4 = ["name", "title", "className"];
-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; }
+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 SwitchBlock = function SwitchBlock(_ref) {
   var name = _ref.name,
     title = _ref.title,
@@ -1219,7 +1201,7 @@ var SwitchBlock = function SwitchBlock(_ref) {
   return /*#__PURE__*/jsxs(Label, {
     className: classnames("flex items-center justify-start gap-2 ", className),
     "data-cy": "neeto-form-engine-".concat(hyphenate(title && name), "-toggle-label"),
-    children: [/*#__PURE__*/jsx(Switch, _objectSpread$9(_objectSpread$9({}, _objectSpread$9(_objectSpread$9({}, otherProps), {}, {
+    children: [/*#__PURE__*/jsx(Switch, _objectSpread$8(_objectSpread$8({}, _objectSpread$8(_objectSpread$8({}, otherProps), {}, {
       name: name
     })), {}, {
       "data-cy": "neeto-form-engine-".concat(hyphenate(title && name), "-switch")
@@ -1231,15 +1213,15 @@ var SwitchBlock = function SwitchBlock(_ref) {
   });
 };
 
-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; }
+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 TitleWithHelpPopover = function TitleWithHelpPopover(_ref) {
   var title = _ref.title,
     description = _ref.description,
     helpLink = _ref.helpLink;
   return /*#__PURE__*/jsxs("div", {
     className: "flex gap-2",
-    children: [title, /*#__PURE__*/jsx(HelpPopover, _objectSpread$8({
+    children: [title, /*#__PURE__*/jsx(HelpPopover, _objectSpread$7({
       description: description,
       popoverProps: {
         position: "top"
@@ -1266,8 +1248,8 @@ var DOMAIN_RESTRICTION_TRANSLATIONS = {
 };
 
 var _excluded$3 = ["children"];
-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; }
+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))",
@@ -1279,8 +1261,8 @@ var STYLES = {
   }
 };
 var MultiValueRemove = function MultiValueRemove(props) {
-  return /*#__PURE__*/jsx(components.MultiValueRemove, _objectSpread$7(_objectSpread$7({}, props), {}, {
-    innerProps: _objectSpread$7(_objectSpread$7({}, props.innerProps), {}, _defineProperty({}, "data-cy", "".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-cy", "".concat(hyphenize(props.data.label), "-remove-icon"))),
     children: /*#__PURE__*/jsx(Close, {
       size: 16
     })
@@ -1300,8 +1282,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$7(_objectSpread$7({}, props), {}, {
-    innerProps: _objectSpread$7(_objectSpread$7({}, props.innerProps), {}, _defineProperty({}, "data-cy", "multi-domain-input-container")),
+  return /*#__PURE__*/jsxs(components.ValueContainer, _objectSpread$6(_objectSpread$6({}, props), {}, {
+    innerProps: _objectSpread$6(_objectSpread$6({}, props.innerProps), {}, _defineProperty({}, "data-cy", "multi-domain-input-container")),
     children: [shouldCollapse ? firstChild.slice(0, visibleDomainsCount) : firstChild, shouldCollapse && /*#__PURE__*/jsx(Tag, {
       style: "secondary",
       label: t("neetoForm.common.remainingItemsCount", {
@@ -1311,8 +1293,8 @@ var ValueContainer = function ValueContainer(_ref) {
   }));
 };
 var ClearIndicator = function ClearIndicator(props) {
-  return /*#__PURE__*/jsx(components.ClearIndicator, _objectSpread$7(_objectSpread$7({}, props), {}, {
-    innerProps: _objectSpread$7(_objectSpread$7({}, props.innerProps), {}, _defineProperty({}, "data-cy", "clear-all-button")),
+  return /*#__PURE__*/jsx(components.ClearIndicator, _objectSpread$6(_objectSpread$6({}, props), {}, {
+    innerProps: _objectSpread$6(_objectSpread$6({}, props.innerProps), {}, _defineProperty({}, "data-cy", "clear-all-button")),
     children: /*#__PURE__*/jsx(Close, {
       className: "cursor-pointer",
       size: 16
@@ -1333,7 +1315,7 @@ var CUSTOM_STYLES = {
   input: assoc("overflow", "hidden"),
   multiValue: function multiValue(styles, _ref2) {
     var valid = _ref2.data.valid;
-    return _objectSpread$7(_objectSpread$7({}, styles), {}, {
+    return _objectSpread$6(_objectSpread$6({}, styles), {}, {
       border: valid ? STYLES.border["default"] : STYLES.border.error,
       color: valid ? STYLES.color["default"] : STYLES.color.error
     });
@@ -1376,8 +1358,8 @@ var formatErrorMessage = function formatErrorMessage(error) {
 };
 
 var _excluded$2 = ["label", "value", "onChange", "error", "onBlur"];
-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; }
+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,
@@ -1436,7 +1418,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
         "data-cy": "".concat(hyphenize(label), "-input-label"),
         children: label
       })
-    }), /*#__PURE__*/jsx(CreatableSelect, _objectSpread$6({
+    }), /*#__PURE__*/jsx(CreatableSelect, _objectSpread$5({
       isMulti: true,
       required: true,
       classNamePrefix: "neeto-ui-react-select",
@@ -1446,7 +1428,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$6(_objectSpread$6({}, CUSTOM_STYLES), {}, {
+      styles: _objectSpread$5(_objectSpread$5({}, CUSTOM_STYLES), {}, {
         control: mergeLeft({
           maxHeight: "200px",
           overflowY: "auto"
@@ -1458,7 +1440,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
       },
       onInputChange: setInputValue,
       onKeyDown: handleKeyDown
-    }, _objectSpread$6({
+    }, _objectSpread$5({
       inputValue: inputValue,
       isFocused: isFocused,
       onChange: onChange,
@@ -1685,73 +1667,6 @@ var FileUpload = function FileUpload() {
   });
 };
 
-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 defaultConfig = {
-  strict: true,
-  matchKey: "value"
-};
-var findOptionByValue = function findOptionByValue(value) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  var configObject = _objectSpread$5(_objectSpread$5({}, defaultConfig), config);
-  var matchKey = configObject.matchKey,
-    strict = configObject.strict;
-  return options.find(function (option) {
-    return (
-      // eslint-disable-next-line eqeqeq
-      strict ? option[matchKey] === value : option[matchKey] == value
-    );
-  });
-};
-var filterOptionsByValues = function filterOptionsByValues() {
-  var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  var configObject = _objectSpread$5(_objectSpread$5({}, defaultConfig), config);
-  var matchKey = configObject.matchKey,
-    strict = configObject.strict;
-  return options.filter(function (option) {
-    return values.some(function (value) {
-      return (
-        // eslint-disable-next-line eqeqeq
-        strict ? option[matchKey] === value : option[matchKey] == value
-      );
-    });
-  });
-};
-var destroyFromList = function destroyFromList(items, index) {
-  var itemToRemove = items[index];
-  if (itemToRemove) {
-    var nextItems = _toConsumableArray(items);
-    nextItems.splice(index, 1);
-    if (itemToRemove.id) {
-      nextItems.push(_objectSpread$5(_objectSpread$5({}, itemToRemove), {}, {
-        _destroy: true
-      }));
-    }
-    return nextItems;
-  }
-  return items;
-};
-var insertToList = function insertToList(items, item, index) {
-  var nextItems = _toConsumableArray(items !== null && items !== void 0 ? items : []);
-  nextItems.splice(index, 0, item);
-  return nextItems;
-};
-var pushToList = function pushToList(items, item) {
-  var nextItems = _toConsumableArray(items !== null && items !== void 0 ? items : []);
-  nextItems.push(item);
-  return nextItems;
-};
-var formHelpers = {
-  findOptionByValue: findOptionByValue,
-  filterOptionsByValues: filterOptionsByValues,
-  destroyFromList: destroyFromList,
-  insertToList: insertToList,
-  pushToList: pushToList
-};
-
 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 Options = function Options(_ref) {
@@ -1765,9 +1680,10 @@ var Options = function Options(_ref) {
       };
     }, shallow),
     selectedLanguage = _useBuildFormStore.selectedLanguage;
-  var _useField = useField("optionsAttributes"),
-    _useField2 = _slicedToArray(_useField, 3),
-    optionsAttributes = _useField2[0].value;
+  var name = "optionsAttributes";
+  var _useField = useField(name),
+    _useField2 = _slicedToArray(_useField, 3);
+    _useField2[0];
     _useField2[1];
     var setOptionsAttributes = _useField2[2].setValue;
   var _ref2 = questionProps || {},
@@ -1779,73 +1695,28 @@ var Options = function Options(_ref) {
     disableAddOption = _ref2$disableAddOptio === void 0 ? false : _ref2$disableAddOptio,
     _ref2$disableRemoveOp = _ref2.disableRemoveOption,
     disableRemoveOption = _ref2$disableRemoveOp === void 0 ? false : _ref2$disableRemoveOp;
-  var handleRemoveOption = function handleRemoveOption(index) {
-    var nextOptions = formHelpers.destroyFromList(optionsAttributes, index);
-    setOptionsAttributes(nextOptions);
-  };
   var isManageOptionDisabled = isFunction(freezeOptions) ? freezeOptions(selectedLanguage) : freezeOptions;
   var isAddOptionDisabled = disableAddOption || isManageOptionDisabled;
   var isRemoveOptionDisabled = disableRemoveOption || isManageOptionDisabled;
-  return /*#__PURE__*/jsx("div", {
+  return /*#__PURE__*/jsxs("div", {
     className: "w-full",
-    children: /*#__PURE__*/jsx(FieldArray, {
-      name: "optionsAttributes",
-      children: function children(_ref3) {
-        var handlePush = _ref3.handlePush;
-        return /*#__PURE__*/jsxs(Fragment, {
-          children: [/*#__PURE__*/jsx(Label, _objectSpread$4(_objectSpread$4({
-            className: "mb-1 block"
-          }, optionLabelProps), {}, {
-            children: t("neetoForm.questions.common.questionFields.field.options")
-          })), /*#__PURE__*/jsx("div", {
-            className: "flex w-2/3 flex-col space-y-2",
-            children: optionsAttributes === null || optionsAttributes === void 0 ? void 0 : optionsAttributes.map(function (option, index) {
-              var _option$id;
-              return !option._destroy && /*#__PURE__*/jsxs("div", {
-                className: "flex items-start gap-1",
-                "data-cy": "neeto-form-engine-option-".concat(index),
-                children: [/*#__PURE__*/jsx(InputWithMaxLength, {
-                  required: true,
-                  disabled: isManageOptionDisabled,
-                  name: "optionsAttributes.".concat(index, ".label"),
-                  placeholder: t("neetoForm.questions.common.questionFields.field.numberedOption", {
-                    number: index + 1
-                  })
-                }), !isRemoveOptionDisabled && /*#__PURE__*/jsx(Button, {
-                  "data-cy": "neeto-form-engine-delete-option-button",
-                  icon: Delete,
-                  size: "small",
-                  style: "text",
-                  className: classnames({
-                    invisible: index < MINIMUM_OPTIONS
-                  }),
-                  tooltipProps: {
-                    position: "top",
-                    content: t("neetoForm.common.delete")
-                  },
-                  onClick: function onClick() {
-                    return handleRemoveOption(index);
-                  }
-                })]
-              }, "question-option-".concat((_option$id = option.id) !== null && _option$id !== void 0 ? _option$id : index));
-            })
-          }), !isAddOptionDisabled && /*#__PURE__*/jsx("div", {
-            className: "mt-3 w-full",
-            children: /*#__PURE__*/jsx(Button, {
-              "data-cy": "neeto-form-engine-add-option-button",
-              icon: Plus,
-              iconPosition: "left",
-              size: "small",
-              style: "text",
-              label: t("neetoForm.questions.common.questionFields.field.addOption"),
-              onClick: handlePush({
-                label: ""
-              })
-            })
-          })]
-        });
-      }
-    })
+    children: [/*#__PURE__*/jsx(Label, _objectSpread$4(_objectSpread$4({
+      className: "mb-2 block"
+    }, optionLabelProps), {}, {
+      children: t("neetoForm.questions.common.questionFields.field.options")
+    })), /*#__PURE__*/jsx(OptionFields, {
+      name: name,
+      shouldDestroy: true,
+      destroyFlagName: "_destroy",
+      disabled: isManageOptionDisabled,
+      draggable: !isManageOptionDisabled,
+      isAddOptionEnabled: !isAddOptionDisabled,
+      isDeleteOptionEnabled: !isRemoveOptionDisabled,
+      isNewItemsPrefilled: isDefaultLanguage(selectedLanguage),
+      minOptions: MINIMUM_OPTIONS,
+      shouldResetEmptyOptionOnBlur: false,
+      onChange: setOptionsAttributes
+    })]
   });
 };
 
@@ -2061,7 +1932,7 @@ var AddQuestion = function AddQuestion(_ref) {
   }));
 };
 
-var _excluded = ["questionKinds", "onValueChange", "formId", "isDeletable", "isRequiredField", "submitButtonProps", "cancelButtonProps", "isKindAlreadyActive", "getActiveKindDetails", "isDisabledFieldLabel", "disabledAddButtonTooltipProps", "enableFieldCode", "isFormEnabled", "savedTitle", "formTitle", "formDescription", "selectedLanguage", "availableLanguages", "onLanguageChange", "additionalActionOptions", "isReordering", "additionalQuestionKindPattern", "showActionBlock", "buildRequestArgs", "enableDomainBlacklisting", "enableDomainWhitelisting", "helpDocUrls", "questionsHelpProps"];
+var _excluded = ["questionKinds", "onValueChange", "formId", "isDeletable", "isRequiredField", "submitButtonProps", "cancelButtonProps", "isKindAlreadyActive", "getActiveKindDetails", "isDisabledFieldLabel", "disabledAddButtonTooltipProps", "enableFieldCode", "isFormEnabled", "savedTitle", "formTitle", "formDescription", "selectedLanguage", "availableLanguages", "onLanguageChange", "additionalActionOptions", "isReordering", "additionalQuestionKindPattern", "showActionBlock", "buildRequestArgs", "enableDomainBlacklisting", "enableDomainWhitelisting", "helpDocUrls", "questionsHelpProps", "isUsingDefaultQuestionKinds"];
 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; }
 function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Form = function Form(_ref) {
@@ -2093,6 +1964,7 @@ var Form = function Form(_ref) {
     enableDomainWhitelisting = _ref.enableDomainWhitelisting,
     helpDocUrls = _ref.helpDocUrls,
     questionsHelpProps = _ref.questionsHelpProps,
+    isUsingDefaultQuestionKinds = _ref.isUsingDefaultQuestionKinds,
     formDomProps = _objectWithoutProperties(_ref, _excluded);
   var containerRef = useRef();
   var _useTranslation = useTranslation(),
@@ -2142,9 +2014,10 @@ var Form = function Form(_ref) {
       selectedLanguage: selectedLanguage,
       helpDocUrls: helpDocUrls,
       enableDomainBlacklisting: enableDomainBlacklisting,
-      enableDomainWhitelisting: enableDomainWhitelisting
+      enableDomainWhitelisting: enableDomainWhitelisting,
+      isUsingDefaultQuestionKinds: isUsingDefaultQuestionKinds
     });
-  }, [formId, isFormEnabled, savedTitle, setFormData, values, dirty, isSubmitting, isValid, errors, submitForm, resetForm, selectedLanguage, helpDocUrls, enableDomainBlacklisting, enableDomainWhitelisting]);
+  }, [formId, isFormEnabled, savedTitle, setFormData, values, dirty, isSubmitting, isValid, errors, submitForm, resetForm, selectedLanguage, helpDocUrls, enableDomainBlacklisting, enableDomainWhitelisting, isUsingDefaultQuestionKinds]);
   var questions = values.questions;
   var handleSelect = function handleSelect(question) {
     setSelectedQuestion(question);
@@ -2190,7 +2063,7 @@ var Form = function Form(_ref) {
     enabled: !(isDeleteAlertOpen || isManageQuestionPaneOpen)
   });
   useEffect(function () {
-    onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(questions);
+    onValueChange === null || onValueChange === void 0 || onValueChange(questions);
   }, [questions]);
   var availableQuestionKinds = getAvailableQuestionKinds({
     allQuestionKinds: questionKinds,
@@ -2379,7 +2252,7 @@ var BuildForm = function BuildForm(_ref) {
     isQuestionsLoading = _ref2.isQuestionsLoading;
   useEffect(function () {
     if (data) {
-      onUpdate === null || onUpdate === void 0 ? void 0 : onUpdate(data);
+      onUpdate === null || onUpdate === void 0 || onUpdate(data);
     }
   }, [data]);
   if (isLoading || showLoader && isQuestionsLoading && !isQuestionsPending) {
@@ -2422,6 +2295,7 @@ var BuildForm = function BuildForm(_ref) {
   var defaultQuestionKinds = allowAdditionalGuests ? QUESTION_KINDS : removeBy({
     type: QUESTION_KIND.ADDITIONAL_GUESTS.value
   }, QUESTION_KINDS);
+  var isUsingDefaultQuestionKinds = isNil(questionKinds);
   return /*#__PURE__*/jsxs("div", {
     className: classnames("neeto-form-nano-form-outer-wrapper relative", className),
     children: [/*#__PURE__*/jsx(Formik, {
@@ -2453,6 +2327,7 @@ var BuildForm = function BuildForm(_ref) {
           isKindAlreadyActive: isKindAlreadyActive,
           isReordering: isReordering,
           isRequiredField: isRequiredField,
+          isUsingDefaultQuestionKinds: isUsingDefaultQuestionKinds,
           kindUniqueOn: kindUniqueOn,
           onLanguageChange: onLanguageChange,
           onValueChange: onValueChange,
@@ -2463,7 +2338,7 @@ var BuildForm = function BuildForm(_ref) {
           submitButtonProps: submitButtonProps
         })), {}, {
           formId: id,
-          questionKinds: isNil(questionKinds) ? defaultQuestionKinds : questionKinds,
+          questionKinds: isUsingDefaultQuestionKinds ? defaultQuestionKinds : questionKinds,
           onChange: function onChange(event) {
             if (isEmpty(errors)) return;
             setFieldError(event.target.name);