@bigbinary/neeto-form-frontend 1.2.55 → 1.3.0

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

@@ -30,7 +30,7 @@
       "phoneNumberValidation": "phone number starting with country code",
       "yes": "Yes",
       "count": "Count",
-      "icon": "Icon",
+      "shape": "Shape",
       "good": "Good",
       "okay": "Okay",
       "bad": "Bad",
@@ -40,7 +40,9 @@
       "hobbies": "Hobbies",
       "country": "Country",
       "addGuests": "Add guests",
-      "addGuestsHelper": "Enter emails separated by comma."
+      "addGuestsHelper": "Enter emails separated by comma.",
+      "start": "Start",
+      "end": "End"
     },
     "fields": {
       "mcf": "Multiple choice",

package/dist/index.cjs.js

@@ -20,8 +20,8 @@ var formik$1 = require('@bigbinary/neetoui/formik');
 var reactI18next = require('react-i18next');
 var zustand = require('zustand');
 var classnames = require('classnames');
-var yup = require('yup');
 var neetoEditor = require('@bigbinary/neeto-editor');
+var yup = require('yup');
 var useHotkeys = require('@bigbinary/neeto-hotkeys');
 var dayjs = require('dayjs');
 var PhoneNumber$1 = require('@bigbinary/neeto-molecules/PhoneNumber');
@@ -10077,7 +10077,8 @@ var Accordion = function Accordion(_ref) {
     showAddQuestionDivider = _ref.showAddQuestionDivider,
     isDeletable = _ref.isDeletable,
     kindUniqueOn = _ref.kindUniqueOn,
-    disabledAddButtonTooltipProps = _ref.disabledAddButtonTooltipProps;
+    disabledAddButtonTooltipProps = _ref.disabledAddButtonTooltipProps,
+    dragHandleProps = _ref.dragHandleProps;
   var _useState = React$2.useState(false),
     _useState2 = _slicedToArray$3(_useState, 2),
     isAddQuestionOpen = _useState2[0],
@@ -10091,14 +10092,14 @@ var Accordion = function Accordion(_ref) {
     className: classnames__default["default"]("neeto-form-engine-question-accordion relative", {
       "pr-4 md:pr-8": showAddQuestionDivider
     })
-  }, /*#__PURE__*/React__default["default"].createElement("div", {
+  }, /*#__PURE__*/React__default["default"].createElement("div", _extends$8({
     "data-cy": "neeto-form-engine-question-accordion-header",
     className: classnames__default["default"]({
       "neeto-form-engine-question-accordion__header flex h-10 cursor-pointer select-none items-center justify-between px-3 py-2": true,
       "neeto-ui-text-gray-700 border": !isExpanded,
       "neeto-ui-bg-gray-800 neeto-ui-text-white rounded-b-none": isExpanded
     })
-  }, /*#__PURE__*/React__default["default"].createElement("div", {
+  }, dragHandleProps), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "neeto-form-engine-question-accordion__header-left flex items-center overflow-hidden"
   }, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "flex w-8 items-center"
@@ -10302,6 +10303,39 @@ var Condition$1 = function Condition(_ref) {
   })));
 };
 
+var getActiveQuestionKindDetails = function getActiveQuestionKindDetails(_ref) {
+  var allQuestionKinds = _ref.allQuestionKinds,
+    item = _ref.item;
+  var kind = item.kind,
+    label = item.label;
+  var _findBy = neetoCist.findBy({
+      type: kind
+    }, allQuestionKinds),
+    FieldComponent = _findBy.component,
+    FieldIcon = _findBy.icon,
+    isSingular = _findBy.isSingular;
+  return {
+    kind: kind,
+    label: label,
+    FieldComponent: FieldComponent,
+    FieldIcon: FieldIcon,
+    isSingular: isSingular
+  };
+};
+var generateArray = function generateArray(start, end) {
+  return ramda.range(start, end + 1);
+};
+
+var validateEditorContent = function validateEditorContent(editorRef) {
+  return function () {
+    var _editorRef$current;
+    return (_editorRef$current = editorRef.current) !== null && _editorRef$current !== void 0 && (_editorRef$current = _editorRef$current.editor) !== null && _editorRef$current !== void 0 && _editorRef$current.isEmpty ? i18next.t("neetoForm.common.thisFieldIsRequired") : "";
+  };
+};
+var generateRatingOptions = function generateRatingOptions(range) {
+  return generateArray.apply(void 0, _toConsumableArray$1(range)).map(neetoCist.toLabelAndValue);
+};
+
 var _FILE_TYPES_MAP;
 var FILE_TYPES = {
   DOCUMENTS: "documents",
@@ -10318,6 +10352,8 @@ var STAR_RATING_ICONS_MAP = {
   trophy: MemoizedTrophy,
   zap: MemoizedZap
 };
+var STAR_RATING_MAX_VALUE_OPTIONS = generateRatingOptions([3, 10]);
+var STAR_RATING_MIN_VALUE_OPTIONS = generateRatingOptions([0, 1]);
 var FILE_TYPES_MAP = (_FILE_TYPES_MAP = {}, _defineProperty$6(_FILE_TYPES_MAP, FILE_TYPES.DOCUMENTS, ["pdf", "doc", "docx", "xls", "xlsx", "csv", "txt", "rtf", "html", "zip", "md"]), _defineProperty$6(_FILE_TYPES_MAP, FILE_TYPES.IMAGES, ["jpg", "jpeg", "png", "gif"]), _defineProperty$6(_FILE_TYPES_MAP, FILE_TYPES.AUDIO_VIDEO, ["mp3", "wma", "mpg", "flv", "avi"]), _FILE_TYPES_MAP);
 var DEFAULT_ALLOWED_FILE_TYPES = ramda.values(FILE_TYPES_MAP).flat().join(", ");
 var FILE_GROUPS = [{
@@ -10330,8 +10366,6 @@ var FILE_GROUPS = [{
   label: i18next.t("neetoForm.fileTypes.audioVideo"),
   name: FILE_TYPES.AUDIO_VIDEO
 }];
-var STAR_RATING_MIN_COUNT = 0;
-var STAR_RATING_MAX_COUNT = 10;
 
 var Dropdown$1 = function Dropdown(_ref) {
   var item = _ref.item,
@@ -10982,32 +11016,6 @@ var SingleChoice$1 = function SingleChoice(_ref) {
   }));
 };
 
-var validateEditorContent = function validateEditorContent(editorRef) {
-  return function () {
-    var _editorRef$current;
-    return (_editorRef$current = editorRef.current) !== null && _editorRef$current !== void 0 && (_editorRef$current = _editorRef$current.editor) !== null && _editorRef$current !== void 0 && _editorRef$current.isEmpty ? i18next.t("neetoForm.common.thisFieldIsRequired") : "";
-  };
-};
-var validateStarRatingCount = function validateStarRatingCount(value) {
-  try {
-    var schema = yup__namespace.number().integer().transform(function (value) {
-      return isNaN(value) ? null : value;
-    }).min(STAR_RATING_MIN_COUNT, i18next.t("neetoForm.error.minCount", {
-      field: i18next.t("neetoForm.common.count"),
-      value: STAR_RATING_MIN_COUNT
-    })).max(STAR_RATING_MAX_COUNT, i18next.t("neetoForm.error.maxCount", {
-      field: i18next.t("neetoForm.common.count"),
-      value: STAR_RATING_MAX_COUNT
-    })).nullable().required(i18next.t("neetoForm.common.fieldReq", {
-      field: i18next.t("neetoForm.common.count")
-    }));
-    schema.validateSync(value);
-    return undefined;
-  } catch (error) {
-    return error.message;
-  }
-};
-
 var StarRating$3 = function StarRating(_ref) {
   var name = _ref.name,
     isRequired = _ref.isRequired,
@@ -11015,21 +11023,13 @@ var StarRating$3 = function StarRating(_ref) {
     enableFieldCode = _ref.enableFieldCode;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  var _useField = formik.useField("".concat(name, ".shape")),
+  var _useFormikContext = formik.useFormikContext(),
+    setFieldValue = _useFormikContext.setFieldValue;
+  var _useField = formik.useField("".concat(name, ".iconType")),
     _useField2 = _slicedToArray$3(_useField, 3),
-    shape = _useField2[0].value;
+    iconType = _useField2[0].value;
     _useField2[1];
-    var setShape = _useField2[2].setValue;
-  var _useField3 = formik.useField({
-      name: "".concat(name, ".count"),
-      validate: validateStarRatingCount
-    }),
-    _useField4 = _slicedToArray$3(_useField3, 3),
-    countField = _useField4[0],
-    _useField4$ = _useField4[1],
-    countTouched = _useField4$.touched,
-    countError = _useField4$.error,
-    setCount = _useField4[2].setValue;
+    var setIconType = _useField2[2].setValue;
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: "space-y-4"
   }, /*#__PURE__*/React__default["default"].createElement("div", {
@@ -11040,22 +11040,31 @@ var StarRating$3 = function StarRating(_ref) {
     label: t("neetoForm.questions.common.questionFields.field.question"),
     name: "".concat(name, ".label"),
     rows: 1
-  })), /*#__PURE__*/React__default["default"].createElement(InputWithMaxLength, _extends$8({
-    required: true
-  }, countField, {
-    error: countTouched ? countError : "",
-    label: t("neetoForm.common.count"),
-    max: STAR_RATING_MAX_COUNT,
-    min: STAR_RATING_MIN_COUNT,
-    type: "number",
-    onChange: utils.withEventTargetValue(setCount)
-  })), /*#__PURE__*/React__default["default"].createElement(neetoui.Label, null, t("neetoForm.common.icon")), /*#__PURE__*/React__default["default"].createElement("div", {
+  })), /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "flex space-x-4"
+  }, /*#__PURE__*/React__default["default"].createElement(formik$1.Select, {
+    className: "w-1/2",
+    label: t("neetoForm.common.start"),
+    name: "".concat(name, ".minValue"),
+    options: STAR_RATING_MIN_VALUE_OPTIONS,
+    onChange: function onChange(option) {
+      return setFieldValue("".concat(name, ".minValue"), option === null || option === void 0 ? void 0 : option.value);
+    }
+  }), /*#__PURE__*/React__default["default"].createElement(formik$1.Select, {
+    className: "w-1/2",
+    label: t("neetoForm.common.end"),
+    name: "".concat(name, ".maxValue"),
+    options: STAR_RATING_MAX_VALUE_OPTIONS,
+    onChange: function onChange(option) {
+      return setFieldValue("".concat(name, ".maxValue"), option === null || option === void 0 ? void 0 : option.value);
+    }
+  })), /*#__PURE__*/React__default["default"].createElement(neetoui.Label, null, t("neetoForm.common.shape")), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "flex gap-2"
   }, Object.entries(STAR_RATING_ICONS_MAP).map(function (_ref2) {
     var _ref3 = _slicedToArray$3(_ref2, 2),
       name = _ref3[0],
-      Shape = _ref3[1];
-    var isActive = name === shape;
+      IconType = _ref3[1];
+    var isActive = name === iconType;
     return /*#__PURE__*/React__default["default"].createElement("div", {
       key: name,
       className: classnames__default["default"]("flex h-10 w-10 items-center justify-center gap-2", "neeto-ui-border-gray-800 neeto-ui-rounded-full cursor-pointer border", "transition-all duration-300 ease-in-out", {
@@ -11063,9 +11072,9 @@ var StarRating$3 = function StarRating(_ref) {
         "neeto-ui-text-white neeto-ui-bg-gray-800": isActive
       }),
       onClick: function onClick() {
-        return setShape(name);
+        return setIconType(name);
       }
-    }, /*#__PURE__*/React__default["default"].createElement(Shape, null));
+    }, /*#__PURE__*/React__default["default"].createElement(IconType, null));
   })), !isRequired && /*#__PURE__*/React__default["default"].createElement("div", {
     className: "w-full"
   }, /*#__PURE__*/React__default["default"].createElement(formik$1.Checkbox, {
@@ -11126,19 +11135,30 @@ var Terms$1 = function Terms(_ref) {
     }),
     _useField2 = _slicedToArray$3(_useField, 3),
     value = _useField2[0].value,
-    error = _useField2[1].error,
-    setValue = _useField2[2].setValue;
+    _useField2$ = _useField2[1],
+    touched = _useField2$.touched,
+    error = _useField2$.error,
+    _useField2$2 = _useField2[2],
+    setTouched = _useField2$2.setTouched,
+    setValue = _useField2$2.setValue;
   useUpdateEditorContent(editorRef, fieldName, value);
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: "w-full cursor-auto"
   }, /*#__PURE__*/React__default["default"].createElement(neetoEditor.Editor, {
-    error: error,
+    className: "px-2 pb-2",
+    contentClassName: "border-none",
     disabled: isLabelDisabled,
+    error: touched ? error : "",
+    errorWrapperClassName: "border-none",
     id: "editor",
     initialValue: value,
     key: fieldName,
+    menuClassName: "border-none",
     name: fieldName,
     ref: editorRef,
+    onBlur: function onBlur() {
+      return setTouched(true);
+    },
     onChange: setValue
   }));
 };
@@ -11361,8 +11381,9 @@ var QUESTION_KINDS = [{
   defaults: {
     label: "",
     isRequired: true,
-    count: 5,
-    shape: "star"
+    minValue: 1,
+    maxValue: 5,
+    iconType: "star"
   }
 }, {
   type: "rating",
@@ -11446,7 +11467,8 @@ var FormField = function FormField(props) {
     allQuestionKinds = props.allQuestionKinds,
     getActiveKindDetails = props.getActiveKindDetails,
     kindUniqueOn = props.kindUniqueOn,
-    disabledAddButtonTooltipProps = props.disabledAddButtonTooltipProps;
+    disabledAddButtonTooltipProps = props.disabledAddButtonTooltipProps,
+    dragHandleProps = props.dragHandleProps;
   var _getActiveKindDetails = getActiveKindDetails({
       allQuestionKinds: allQuestionKinds,
       item: item
@@ -11458,6 +11480,7 @@ var FormField = function FormField(props) {
     isSingular = _getActiveKindDetails.isSingular;
   return /*#__PURE__*/React__default["default"].createElement(Accordion, {
     disabledAddButtonTooltipProps: disabledAddButtonTooltipProps,
+    dragHandleProps: dragHandleProps,
     isDeletable: isDeletable,
     isExpanded: isExpanded,
     kindUniqueOn: kindUniqueOn,
@@ -11506,11 +11529,12 @@ var Question = function Question(_ref) {
         var draggableProps = _ref3.draggableProps,
           dragHandleProps = _ref3.dragHandleProps,
           innerRef = _ref3.innerRef;
-        return /*#__PURE__*/React__default["default"].createElement("div", _extends$8({}, draggableProps, dragHandleProps, {
+        return /*#__PURE__*/React__default["default"].createElement("div", _extends$8({}, draggableProps, {
           ref: innerRef
         }), /*#__PURE__*/React__default["default"].createElement(FormField, _extends$8({
           allQuestionKinds: allQuestionKinds,
           disabledAddButtonTooltipProps: disabledAddButtonTooltipProps,
+          dragHandleProps: dragHandleProps,
           getActiveKindDetails: getActiveKindDetails,
           kindUniqueOn: kindUniqueOn,
           isDeletable: isDeletable(item),
@@ -12000,26 +12024,6 @@ var Form = function Form(_ref) {
   }))));
 };
 
-var getActiveQuestionKindDetails = function getActiveQuestionKindDetails(_ref) {
-  var allQuestionKinds = _ref.allQuestionKinds,
-    item = _ref.item;
-  var kind = item.kind,
-    label = item.label;
-  var _findBy = neetoCist.findBy({
-      type: kind
-    }, allQuestionKinds),
-    FieldComponent = _findBy.component,
-    FieldIcon = _findBy.icon,
-    isSingular = _findBy.isSingular;
-  return {
-    kind: kind,
-    label: label,
-    FieldComponent: FieldComponent,
-    FieldIcon: FieldIcon,
-    isSingular: isSingular
-  };
-};
-
 /* eslint-disable @bigbinary/neeto/file-name-and-export-name-standards */
 var requiredLabelValidation = function requiredLabelValidation(schema, field) {
   return schema.trim().required(i18next__default["default"].t("neetoForm.common.fieldReq", {
@@ -16176,13 +16180,13 @@ var getMultipleOptionsFromURL = function getMultipleOptionsFromURL(_ref2) {
   });
 };
 var getStarRatingFromUrl = function getStarRatingFromUrl(_ref3) {
-  var starCount = _ref3.starCount,
+  var minValue = _ref3.minValue,
+    maxValue = _ref3.maxValue,
     fieldCodes = _ref3.fieldCodes,
     fieldCode = _ref3.fieldCode;
   var fieldCodeValue = fieldCodes[fieldCode];
   var rating = parseInt(fieldCodeValue);
-  if (!rating || rating < 0) return "";
-  return "".concat(rating >= starCount ? starCount : rating, " / ").concat(starCount);
+  return ramda.isNil(rating) || isNaN(rating) ? "" : ramda.clamp(minValue, maxValue, rating);
 };
 var getAdditionalGuestsFromUrl = function getAdditionalGuestsFromUrl(_ref4) {
   var fieldCodes = _ref4.fieldCodes,
@@ -16239,7 +16243,8 @@ var generateInitValues = function generateInitValues(_ref7) {
       kind = question.kind,
       optionsAttributes = question.optionsAttributes,
       fieldCode = question.fieldCode,
-      count = question.count;
+      minValue = question.minValue,
+      maxValue = question.maxValue;
     switch (kind) {
       case QUESTION_KIND.CONDITION.value:
         {
@@ -16327,7 +16332,8 @@ var generateInitValues = function generateInitValues(_ref7) {
         {
           var _valuesMap$id$value4, _valuesMap7;
           initValues[id] = (_valuesMap$id$value4 = (_valuesMap7 = valuesMap) === null || _valuesMap7 === void 0 || (_valuesMap7 = _valuesMap7[id]) === null || _valuesMap7 === void 0 ? void 0 : _valuesMap7.value) !== null && _valuesMap$id$value4 !== void 0 ? _valuesMap$id$value4 : getStarRatingFromUrl({
-            starCount: count,
+            minValue: minValue,
+            maxValue: maxValue,
             fieldCodes: fieldCodes,
             fieldCode: fieldCode
           });
@@ -16452,6 +16458,10 @@ var renderButtonsInOrder = function renderButtonsInOrder(buttonsArray, shouldRev
   var orderedButtons = shouldReverse ? buttonsArray.reverse() : buttonsArray;
   return ramda.map(ramda.identity, orderedButtons);
 };
+var getSelectedRating = function getSelectedRating(value) {
+  var parsedValue = parseInt(value);
+  return isNaN(parsedValue) ? -1 : parsedValue;
+};
 
 var _excluded$3 = ["value"];
 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; }
@@ -26939,20 +26949,19 @@ var RichTextEditor = function RichTextEditor(_ref) {
   }));
 };
 
-var _excluded$1 = ["value", "shape", "label", "rating", "count"];
+var _excluded$1 = ["value", "iconType", "label", "rating"];
 var RatingButton = function RatingButton(_ref) {
   var _ref$value = _ref.value,
-    value = _ref$value === void 0 ? "0" : _ref$value,
-    shape = _ref.shape,
+    value = _ref$value === void 0 ? 0 : _ref$value,
+    iconType = _ref.iconType,
     label = _ref.label,
     rating = _ref.rating,
-    count = _ref.count,
     otherProps = _objectWithoutProperties$1(_ref, _excluded$1);
   var handleClick = function handleClick(e) {
     return e.currentTarget.nextElementSibling.click();
   };
-  var Icon = ICONS_MAP[shape];
-  var selectedRating = value ? String(value).split(" / ")[0] : 0;
+  var Icon = ICONS_MAP[iconType];
+  var selectedRating = getSelectedRating(value);
   return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("button", {
     className: classnames__default["default"]({
       active: rating === value
@@ -26962,24 +26971,24 @@ var RatingButton = function RatingButton(_ref) {
   }, /*#__PURE__*/React__default["default"].createElement(Icon, {
     size: 24,
     className: classnames__default["default"]("neeto-form-engine-star-rating__icon", {
-      "neeto-form-engine-star-rating__icon--active": rating <= Number(selectedRating)
+      "neeto-form-engine-star-rating__icon--active": rating <= selectedRating
     })
   }), /*#__PURE__*/React__default["default"].createElement("label", {
     className: "neeto-form-engine-label"
   }, label)), /*#__PURE__*/React__default["default"].createElement("input", _extends$8({
     hidden: true,
-    checked: "".concat(rating, " / ").concat(count) === value,
+    checked: ramda.equals(rating, value),
     type: "radio",
-    value: "".concat(rating, " / ").concat(count)
+    value: rating
   }, otherProps)));
 };
 var RatingButton$1 = /*#__PURE__*/React__default["default"].memo(RatingButton);
 
-var _excluded = ["label", "count", "shape", "error"];
+var _excluded = ["label", "minValue", "maxValue", "error"];
 var StarRating = function StarRating(_ref) {
   var label = _ref.label,
-    count = _ref.count,
-    shape = _ref.shape,
+    minValue = _ref.minValue,
+    maxValue = _ref.maxValue,
     error = _ref.error,
     props = _objectWithoutProperties$1(_ref, _excluded);
   return /*#__PURE__*/React__default["default"].createElement("div", {
@@ -26990,15 +26999,13 @@ var StarRating = function StarRating(_ref) {
     className: "neeto-form-engine-label"
   }, label)), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "neeto-form-engine-star-rating__row"
-  }, ramda.times(function (index) {
+  }, generateArray(minValue, maxValue).map(function (index) {
     return /*#__PURE__*/React__default["default"].createElement(RatingButton$1, _extends$8({
-      count: count,
-      shape: shape,
       key: index,
-      label: index + 1,
-      rating: index + 1
+      label: index,
+      rating: index
     }, props));
-  }, count)), !!error && typeof error === "string" && /*#__PURE__*/React__default["default"].createElement("p", {
+  })), !!error && typeof error === "string" && /*#__PURE__*/React__default["default"].createElement("p", {
     className: "neeto-form-engine-input__error",
     "data-cy": "neeto-form-engine-star-rating-error"
   }, error));
@@ -27011,10 +27018,10 @@ var StarRatingField = function StarRatingField(_ref) {
   var name = question.id,
     kind = question.kind,
     isRequired = question.isRequired,
-    count = question.count,
-    shape = question.shape;
+    minValue = question.minValue,
+    maxValue = question.maxValue,
+    iconType = question.iconType;
   var label = fieldWithFallback(question, "label");
-  var sanitizedCount = ramda.clamp(0, 10, parseInt(count)) || 0;
   return /*#__PURE__*/React__default["default"].createElement(formik.Field, {
     name: name,
     validate: validateFieldValue({
@@ -27027,9 +27034,10 @@ var StarRatingField = function StarRatingField(_ref) {
     var meta = _ref2.meta,
       field = _ref2.field;
     return /*#__PURE__*/React__default["default"].createElement(StarRating$1, _extends$8({
+      iconType: iconType,
+      maxValue: maxValue,
+      minValue: minValue,
       name: name,
-      shape: shape,
-      count: sanitizedCount,
       error: meta.touched ? meta.error : "",
       label: getLabel(label, isRequired)
     }, field));