@bigbinary/neeto-form-frontend 3.4.0 → 3.4.1

package/app/javascript/src/translations/en.json

@@ -106,7 +106,7 @@
         "title": "You have unsaved changes"
       },
       "common": {
-        "notFound": "No questions found",
+        "noData": "There are no questions to show",
         "primaryPanel": {
           "addQuestion": "Add question",
           "noQuestionLeft": "No more question fields to add"

package/dist/BuildForm.js

@@ -9,7 +9,7 @@ import PageLoader from '@bigbinary/neeto-molecules/PageLoader';
 import { equals, includes, __, reduce, assoc, when, isEmpty, reject, keys, pick, omit, pluck, modify, without, path, mergeLeft, isNil, pipe, filter, isNotNil, uniq, join, map, test, difference, prop, split, last, concat } from 'ramda';
 import { e as useDeleteQuestion, f as useFetchQuestions, g as useCreateQuestion, h as useUpdateQuestion, i as useReorderQuestions, Q as QUERY_KEYS } from './useFormApi-d733cb8d.js';
 import { Q as QUESTION_KIND } from './constants-9310a7c2.js';
-import { I as INDEPENDENT_LABELS_MAP, R as RICH_TEXT_QUESTIONS, h as htmlToPlainText, D as Drag, S as SELECTABLE_KINDS, a as RESERVED_FIELD_CODES, b as SvgNoQuestions, Q as QUESTION_TYPES, c as QUESTIONS_WITHOUT_FIELD_CODE, C as CAPTCHA_TYPES, F as FILE_TYPES_MAP, d as FILE_GROUPS, M as MINIMUM_OPTIONS, e as RATING_OPTIONS, f as STAR_RATING_MIN_VALUE_OPTIONS, g as STAR_RATING_MAX_VALUE_OPTIONS, i as STAR_RATING_ICONS_MAP, j as QUESTION_ACTIONS, k as QUESTION_KINDS, l as getActiveQuestionKindDetails, m as DEFAULT_AVAILABLE_LANGUAGES, n as QUESTIONS_INITIAL_VALUE, o as MANDATORY_KINDS } from './no-questions-832318c3.js';
+import { I as INDEPENDENT_LABELS_MAP, R as RICH_TEXT_QUESTIONS, h as htmlToPlainText, D as Drag, S as SELECTABLE_KINDS, a as RESERVED_FIELD_CODES, Q as QUESTION_TYPES, b as QUESTIONS_WITHOUT_FIELD_CODE, C as CAPTCHA_TYPES, F as FILE_TYPES_MAP, c as FILE_GROUPS, M as MINIMUM_OPTIONS, d as RATING_OPTIONS, e as STAR_RATING_MIN_VALUE_OPTIONS, f as STAR_RATING_MAX_VALUE_OPTIONS, g as STAR_RATING_ICONS_MAP, i as QUESTION_ACTIONS, j as QUESTION_KINDS, k as getActiveQuestionKindDetails, l as DEFAULT_AVAILABLE_LANGUAGES, m as QUESTIONS_INITIAL_VALUE, n as MANDATORY_KINDS } from './constants-8afd221a.js';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { Droppable, Draggable, DragDropContext } from '@hello-pangea/dnd';
@@ -26,7 +26,9 @@ 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 NoData from '@bigbinary/neetoui/NoData';
 import Pane from '@bigbinary/neetoui/Pane';
 import Form$2 from '@bigbinary/neetoui/formik/Form';
 import Select from '@bigbinary/neetoui/formik/Select';
@@ -51,7 +53,6 @@ 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 Plus from '@bigbinary/neeto-icons/Plus';
 import '@bigbinary/neeto-commons-frontend/constants';
 import 'axios';
 import 'dompurify';
@@ -231,6 +232,8 @@ var Overview = function Overview(_ref) {
   });
 };
 
+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 validateEditorContent = function validateEditorContent(editorRef) {
   return function () {
     var _editorRef$current;
@@ -245,6 +248,27 @@ var buildReorderPayload = function buildReorderPayload(questions) {
   }, {}, questions);
 };
 var isRichTextQuestion = includes(__, RICH_TEXT_QUESTIONS);
+var buildAddQuestionButtonProps = function buildAddQuestionButtonProps(onAdd, isDisabled, tooltipProps) {
+  return _objectSpread$g({
+    "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$g({
+    disabled: !isDisabled,
+    position: "top",
+    content: t("neetoForm.questions.common.primaryPanel.noQuestionLeft")
+  }, disabledAddButtonTooltipProps);
+};
 
 var Card = function Card(_ref) {
   var _ref$question = _ref.question,
@@ -314,8 +338,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$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 Questions = function Questions(_ref) {
   var questions = _ref.questions,
     isDeletable = _ref.isDeletable,
@@ -332,7 +356,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$f(_objectSpread$f({}, droppableProps), {}, {
         className: "space-y-2",
         ref: innerRef,
         children: [questions.map(function (question, index) {
@@ -345,7 +369,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$f(_objectSpread$f(_objectSpread$f({}, draggableProps), dragHandleProps), {}, {
               ref: innerRef,
               children: /*#__PURE__*/jsx(Card, {
                 allQuestionKinds: allQuestionKinds,
@@ -442,8 +466,8 @@ 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; }
+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 isChoiceQuestion = function isChoiceQuestion(question) {
   return includes(question === null || question === void 0 ? void 0 : question.kind, SELECTABLE_KINDS);
 };
@@ -482,7 +506,7 @@ var handleFieldDragEnd = function handleFieldDragEnd(_ref2) {
   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$e(_objectSpread$e({}, item), {}, {
       displayOrder: index
     });
   });
@@ -496,7 +520,7 @@ var createFieldData = function createFieldData(_ref3) {
     _ref3$isRequired = _ref3.isRequired,
     isRequired = _ref3$isRequired === void 0 ? undefined : _ref3$isRequired,
     questions = _ref3.questions;
-  return _objectSpread$d(_objectSpread$d({}, defaults), {}, {
+  return _objectSpread$e(_objectSpread$e({}, defaults), {}, {
     metadata: metadata,
     isRequired: isRequired,
     kind: type,
@@ -520,7 +544,7 @@ var duplicateFieldData = function duplicateFieldData(_ref4) {
   var newQuestionLabel = isRichTextQuestion(kind) ? label : t("neetoForm.common.clonedElementLabel", {
     label: label
   });
-  return _objectSpread$d(_objectSpread$d({}, defaultAttributes), {}, {
+  return _objectSpread$e(_objectSpread$e({}, defaultAttributes), {}, {
     isRequired: isRequired,
     kind: kind,
     label: newQuestionLabel,
@@ -547,13 +571,20 @@ var getAvailableQuestionKinds = function getAvailableQuestionKinds(_ref5) {
 var formatQuestionAttributesForClone = when(isChoiceQuestion, assoc("isCloning", true));
 
 var AddFirstQuestion = function AddFirstQuestion(_ref) {
-  var children = _ref.children;
-  return /*#__PURE__*/jsxs("div", {
+  var onAdd = _ref.onAdd,
+    isDisabled = _ref.isDisabled,
+    disabledAddButtonTooltipProps = _ref.disabledAddButtonTooltipProps;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var tooltipProps = buildDisabledAddButtonTooltipProps(isDisabled, disabledAddButtonTooltipProps);
+  return /*#__PURE__*/jsx("div", {
     className: "flex h-full flex-col items-center justify-center py-8",
-    children: [/*#__PURE__*/jsx("div", {
-      className: "mb-6",
-      children: /*#__PURE__*/jsx(SvgNoQuestions, {})
-    }), children]
+    children: /*#__PURE__*/jsx(NoData, {
+      showTooltipWhenButtonDisabled: true,
+      className: "min-h-80",
+      title: t("neetoForm.questions.common.noData"),
+      primaryButtonProps: buildAddQuestionButtonProps(onAdd, isDisabled, tooltipProps)
+    })
   });
 };
 
@@ -591,8 +622,8 @@ var INITIAL_VALUES = {
 };
 
 var _excluded$8 = ["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; }
+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 FormikAdaptiveInput = function FormikAdaptiveInput(_ref) {
   var label = _ref.label,
     name = _ref.name,
@@ -611,7 +642,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$d({
     label: label,
     name: name,
     className: "neeto-form-nano-adaptive-input",
@@ -766,8 +797,8 @@ var RequiredSwitch = withT(function (_ref) {
 });
 
 var _excluded$7 = ["maxLength"];
-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$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 InputWithMaxLength = function InputWithMaxLength(_ref) {
   var maxLength = _ref.maxLength,
     props = _objectWithoutProperties(_ref, _excluded$7);
@@ -781,7 +812,7 @@ var InputWithMaxLength = function InputWithMaxLength(_ref) {
     }
   }, [value, maxLength, setValue]);
   var shouldShowMaxLength = value && value.length > maxLength - 10;
-  return /*#__PURE__*/jsx(Input, _objectSpread$b(_objectSpread$b({}, props), shouldShowMaxLength && {
+  return /*#__PURE__*/jsx(Input, _objectSpread$c(_objectSpread$c({}, props), shouldShowMaxLength && {
     maxLength: maxLength
   }));
 };
@@ -971,8 +1002,8 @@ var formValidationSchema = yup.object().shape({
 });
 
 var _excluded$6 = ["question", "onClose", "questions", "handleSelect", "buildRequestArgs", "isOpen", "fieldCodeHelpDocUrl", "domainRestrictionHelpDocUrl"];
-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$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 Add = function Add(_ref) {
   var question = _ref.question,
     onClose = _ref.onClose,
@@ -1005,7 +1036,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$a({
+    createQuestion(_objectSpread$b({
       language: language,
       neetoFormQuestion: mergeLeft({
         displayOrder: displayOrder
@@ -1034,7 +1065,7 @@ var Add = function Add(_ref) {
         onSubmit: handleSubmit
       },
       children: /*#__PURE__*/jsxs(Fragment, {
-        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$a({}, _objectSpread$a(_objectSpread$a({}, props), {}, {
+        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$b({}, _objectSpread$b(_objectSpread$b({}, props), {}, {
           domainRestrictionHelpDocUrl: domainRestrictionHelpDocUrl,
           fieldCodeHelpDocUrl: fieldCodeHelpDocUrl,
           question: question,
@@ -1053,8 +1084,8 @@ var Add = function Add(_ref) {
 };
 
 var _excluded$5 = ["question", "isOpen", "onClose", "fieldCodeHelpDocUrl", "domainRestrictionHelpDocUrl"];
-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$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 Edit = function Edit(_ref) {
   var question = _ref.question,
     isOpen = _ref.isOpen,
@@ -1108,7 +1139,7 @@ var Edit = function Edit(_ref) {
         onSubmit: handleSubmit
       },
       children: /*#__PURE__*/jsxs(Fragment, {
-        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$9(_objectSpread$9({}, _objectSpread$9({
+        children: [/*#__PURE__*/jsx(Form$1, _objectSpread$a(_objectSpread$a({}, _objectSpread$a({
           domainRestrictionHelpDocUrl: domainRestrictionHelpDocUrl,
           fieldCodeHelpDocUrl: fieldCodeHelpDocUrl,
           question: question
@@ -1146,8 +1177,8 @@ var Captcha = withT(function (_ref) {
 });
 
 var _excluded$4 = ["name", "title", "className"];
-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$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 SwitchBlock = function SwitchBlock(_ref) {
   var name = _ref.name,
     title = _ref.title,
@@ -1157,7 +1188,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), "-toggle-label"),
-    children: [/*#__PURE__*/jsx(Switch, _objectSpread$8(_objectSpread$8({}, _objectSpread$8(_objectSpread$8({}, otherProps), {}, {
+    children: [/*#__PURE__*/jsx(Switch, _objectSpread$9(_objectSpread$9({}, _objectSpread$9(_objectSpread$9({}, otherProps), {}, {
       name: name
     })), {}, {
       "data-cy": "neeto-form-engine-".concat(hyphenate(title), "-switch")
@@ -1170,8 +1201,8 @@ var SwitchBlock = function SwitchBlock(_ref) {
 };
 
 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$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 STYLES = {
   border: {
     "default": "1px solid rgb(var(--neeto-ui-gray-400))",
@@ -1183,8 +1214,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$8(_objectSpread$8({}, props), {}, {
+    innerProps: _objectSpread$8(_objectSpread$8({}, props.innerProps), {}, _defineProperty({}, "data-cy", "".concat(hyphenize(props.data.label), "-remove-icon"))),
     children: /*#__PURE__*/jsx(Close, {
       size: 16
     })
@@ -1204,8 +1235,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$8(_objectSpread$8({}, props), {}, {
+    innerProps: _objectSpread$8(_objectSpread$8({}, 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", {
@@ -1215,8 +1246,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$8(_objectSpread$8({}, props), {}, {
+    innerProps: _objectSpread$8(_objectSpread$8({}, props.innerProps), {}, _defineProperty({}, "data-cy", "clear-all-button")),
     children: /*#__PURE__*/jsx(Close, {
       className: "cursor-pointer",
       size: 16
@@ -1237,7 +1268,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$8(_objectSpread$8({}, styles), {}, {
       border: valid ? STYLES.border["default"] : STYLES.border.error,
       color: valid ? STYLES.color["default"] : STYLES.color.error
     });
@@ -1280,8 +1311,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$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 MultiDomainInput = function MultiDomainInput(_ref) {
   var _ref$label = _ref.label,
     label = _ref$label === void 0 ? "" : _ref$label,
@@ -1340,7 +1371,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
         "data-cy": "".concat(hyphenize(label), "-input-label"),
         children: label
       })
-    }), /*#__PURE__*/jsx(CreatableSelect, _objectSpread$6({
+    }), /*#__PURE__*/jsx(CreatableSelect, _objectSpread$7({
       isMulti: true,
       required: true,
       classNamePrefix: "neeto-ui-react-select",
@@ -1350,7 +1381,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$7(_objectSpread$7({}, CUSTOM_STYLES), {}, {
         control: mergeLeft({
           maxHeight: "200px",
           overflowY: "auto"
@@ -1362,7 +1393,7 @@ var MultiDomainInput = function MultiDomainInput(_ref) {
       },
       onInputChange: setInputValue,
       onKeyDown: handleKeyDown
-    }, _objectSpread$6({
+    }, _objectSpread$7({
       inputValue: inputValue,
       isFocused: isFocused,
       onChange: onChange,
@@ -1452,8 +1483,8 @@ var RestrictedDomains = function RestrictedDomains() {
   });
 };
 
-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; }
+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 Email = function Email(_ref) {
   var _ref$domainRestrictio = _ref.domainRestrictionHelpDocUrl,
     domainRestrictionHelpDocUrl = _ref$domainRestrictio === void 0 ? "" : _ref$domainRestrictio;
@@ -1469,7 +1500,7 @@ var Email = function Email(_ref) {
       name: "isDomainRestrictionEnabled",
       title: /*#__PURE__*/jsxs("div", {
         className: "flex gap-2",
-        children: [t("neetoForm.domainRestriction.label"), /*#__PURE__*/jsx(HelpPopover, _objectSpread$5({
+        children: [t("neetoForm.domainRestriction.label"), /*#__PURE__*/jsx(HelpPopover, _objectSpread$6({
           description: t("neetoForm.domainRestriction.popoverDescription"),
           popoverProps: {
             position: "top"
@@ -1568,8 +1599,8 @@ var FileUpload = function FileUpload() {
   });
 };
 
-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; }
+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"
@@ -1577,7 +1608,7 @@ var defaultConfig = {
 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$4(_objectSpread$4({}, defaultConfig), config);
+  var configObject = _objectSpread$5(_objectSpread$5({}, defaultConfig), config);
   var matchKey = configObject.matchKey,
     strict = configObject.strict;
   return options.find(function (option) {
@@ -1591,7 +1622,7 @@ 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$4(_objectSpread$4({}, defaultConfig), config);
+  var configObject = _objectSpread$5(_objectSpread$5({}, defaultConfig), config);
   var matchKey = configObject.matchKey,
     strict = configObject.strict;
   return options.filter(function (option) {
@@ -1609,7 +1640,7 @@ var destroyFromList = function destroyFromList(items, index) {
     var nextItems = _toConsumableArray(items);
     nextItems.splice(index, 1);
     if (itemToRemove.id) {
-      nextItems.push(_objectSpread$4(_objectSpread$4({}, itemToRemove), {}, {
+      nextItems.push(_objectSpread$5(_objectSpread$5({}, itemToRemove), {}, {
         _destroy: true
       }));
     }
@@ -1635,8 +1666,8 @@ var formHelpers = {
   pushToList: pushToList
 };
 
-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 Options = function Options(_ref) {
   var questionProps = _ref.questionProps;
   var _useTranslation = useTranslation(),
@@ -1676,7 +1707,7 @@ var Options = function Options(_ref) {
       children: function children(_ref3) {
         var handlePush = _ref3.handlePush;
         return /*#__PURE__*/jsxs(Fragment, {
-          children: [/*#__PURE__*/jsx(Label, _objectSpread$3(_objectSpread$3({
+          children: [/*#__PURE__*/jsx(Label, _objectSpread$4(_objectSpread$4({
             className: "mb-1 block"
           }, optionLabelProps), {}, {
             children: t("neetoForm.questions.common.questionFields.field.options")
@@ -1891,8 +1922,8 @@ var buildDefaultValueForKind = function buildDefaultValueForKind(questionKind) {
 };
 
 var _excluded$1 = ["isOpen", "onClose", "action", "question", "availableQuestionKinds", "fieldCodeHelpDocUrl", "domainRestrictionHelpDocUrl"];
-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 ManageQuestionPane = function ManageQuestionPane(_ref) {
   var isOpen = _ref.isOpen,
     onClose = _ref.onClose,
@@ -1908,7 +1939,7 @@ var ManageQuestionPane = function ManageQuestionPane(_ref) {
     initialFocusRef: initialFocusRef,
     isOpen: isOpen,
     onClose: onClose,
-    children: /*#__PURE__*/jsx(Component, _objectSpread$2({}, _objectSpread$2({
+    children: /*#__PURE__*/jsx(Component, _objectSpread$3({}, _objectSpread$3({
       availableQuestionKinds: availableQuestionKinds,
       domainRestrictionHelpDocUrl: domainRestrictionHelpDocUrl,
       fieldCodeHelpDocUrl: fieldCodeHelpDocUrl,
@@ -1920,28 +1951,19 @@ var ManageQuestionPane = function ManageQuestionPane(_ref) {
   });
 };
 
-var AddQuestion = withT(function (_ref) {
-  var t = _ref.t,
-    onAdd = _ref.onAdd,
+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 AddQuestion = function AddQuestion(_ref) {
+  var onAdd = _ref.onAdd,
     disabledAddButtonTooltipProps = _ref.disabledAddButtonTooltipProps,
     isDisabled = _ref.isDisabled;
-  return /*#__PURE__*/jsx(Tooltip, {
-    disabled: !isDisabled,
-    position: "top",
-    content: (disabledAddButtonTooltipProps === null || disabledAddButtonTooltipProps === void 0 ? void 0 : disabledAddButtonTooltipProps.content) || t("neetoForm.questions.common.primaryPanel.noQuestionLeft"),
+  var tooltipProps = buildDisabledAddButtonTooltipProps(isDisabled, disabledAddButtonTooltipProps);
+  return /*#__PURE__*/jsx(Tooltip, _objectSpread$2(_objectSpread$2({}, isDisabled && tooltipProps), {}, {
     children: /*#__PURE__*/jsx("span", {
-      children: /*#__PURE__*/jsx(Button, {
-        "data-cy": "neeto-form-engine-add-question",
-        disabled: isDisabled,
-        icon: Plus,
-        iconPosition: "left",
-        label: t("neetoForm.questions.common.primaryPanel.addQuestion"),
-        style: "link",
-        onClick: onAdd
-      })
+      children: /*#__PURE__*/jsx(Button, _objectSpread$2({}, buildAddQuestionButtonProps(onAdd, isDisabled)))
     })
-  });
-});
+  }));
+};
 
 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", "fieldCodeHelpDocUrl", "enableDomainRestriction", "domainRestrictionHelpDocUrl"];
 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; }
@@ -2147,11 +2169,9 @@ var Form = function Form(_ref) {
             })
           })]
         }) : /*#__PURE__*/jsx(AddFirstQuestion, {
-          children: /*#__PURE__*/jsx(AddQuestion, {
-            disabledAddButtonTooltipProps: disabledAddButtonTooltipProps,
-            isDisabled: isEmpty(availableQuestionKinds),
-            onAdd: handleAdd
-          })
+          disabledAddButtonTooltipProps: disabledAddButtonTooltipProps,
+          isDisabled: isEmpty(availableQuestionKinds),
+          onAdd: handleAdd
         })
       }), (showActionBlock || dirty) && /*#__PURE__*/jsx("div", {
         className: "neeto-ui-border-gray-300 neeto-form-nano-form-wrapper__footer neeto-ui-bg-white sticky bottom-0 flex flex-shrink-0 justify-end border-t px-6 py-4",