intelicoreact 1.2.50 → 1.2.52

package/dist/Atomic/FormElements/Dropdown/Dropdown.js

@@ -79,12 +79,13 @@ var Dropdown = function Dropdown(_ref) {
       _ref$noOptionsText = _ref.noOptionsText,
       noOptionsText = _ref$noOptionsText === void 0 ? 'No options available' : _ref$noOptionsText,
       _ref$attributesOfNati = _ref.attributesOfNativeInput,
-      attributesOfNativeInput = _ref$attributesOfNati === void 0 ? {} : _ref$attributesOfNati;
+      attributesOfNativeInput = _ref$attributesOfNati === void 0 ? {} : _ref$attributesOfNati,
+      isDoNotPullOutListOfMainContainer = _ref.isDoNotPullOutListOfMainContainer;
 
   var _useIsMobile = (0, _useIsMobile2.default)(),
       isMobile = _useIsMobile.isMobile;
 
-  var dropdownId = fieldKey || id;
+  var dropdownId = id || fieldKey;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -309,6 +310,7 @@ var Dropdown = function Dropdown(_ref) {
   var getParentNode = function getParentNode() {
     var _document$querySelect;
 
+    if (isDoNotPullOutListOfMainContainer) return dropdownRef.current;
     return (_document$querySelect = document.querySelector('div#root')) !== null && _document$querySelect !== void 0 ? _document$querySelect : document.querySelector('div#app');
   };
 
@@ -362,18 +364,19 @@ var Dropdown = function Dropdown(_ref) {
     var newData = (0, _toConsumableArray2.default)(data);
 
     if (sortAlphabetical) {
-      var _newData, _newData2, _newData3;
-
-      newData = [].concat((0, _toConsumableArray2.default)((_newData = newData) === null || _newData === void 0 ? void 0 : _newData.filter(function (_ref4) {
+      var openModalOption = newData.filter(function (_ref4) {
         var value = _ref4.value;
         return value === 'open_modal';
-      })), (0, _toConsumableArray2.default)((_newData2 = newData) === null || _newData2 === void 0 ? void 0 : _newData2.filter(function (_ref5) {
+      });
+      var emptyOption = newData.filter(function (_ref5) {
         var value = _ref5.value;
         return value === '';
-      })), (0, _toConsumableArray2.default)((_newData3 = newData) === null || _newData3 === void 0 ? void 0 : _newData3.filter(function (_ref6) {
+      });
+      var restOfOptions = newData.filter(function (_ref6) {
         var value = _ref6.value;
         return value !== 'open_modal' && value !== '';
-      }).sort(_utils.compareAlphabetical))).map(function (item) {
+      }).sort(_utils.compareAlphabetical);
+      newData = [].concat((0, _toConsumableArray2.default)(openModalOption), (0, _toConsumableArray2.default)(emptyOption), (0, _toConsumableArray2.default)(restOfOptions)).map(function (item) {
         if (item !== null && item !== void 0 && item.items) {
           item.items = (0, _toConsumableArray2.default)(item.items).sort(_utils.compareAlphabetical);
         }
@@ -472,8 +475,10 @@ var Dropdown = function Dropdown(_ref) {
 
   var closeList = isOpen ? handleClickOutside : function () {};
   (0, _react.useEffect)(function () {
-    initListContainer();
-  }, []);
+    if (!isDoNotPullOutListOfMainContainer || dropdownRef.current) {
+      initListContainer();
+    }
+  }, [isDoNotPullOutListOfMainContainer, dropdownRef.current]);
   (0, _react.useLayoutEffect)(function () {
     var _getListContainer2;
 

package/dist/Atomic/FormElements/InputDateRange/InputDateRange.js

@@ -236,6 +236,7 @@ var InputDateRange = function InputDateRange(props) {
     disabled: disabled || (actualValues === null || actualValues === void 0 ? void 0 : actualValues.intervalKey) === _dependencies.ALL_TIME_KEY || !isDontLimitFuture && (formatedMaxDate ? (0, _momentTimezone.default)(actualValues === null || actualValues === void 0 ? void 0 : actualValues.end).endOf('day').subtract((0, _momentTimezone.default)(actualValues === null || actualValues === void 0 ? void 0 : actualValues.end).diff(actualValues === null || actualValues === void 0 ? void 0 : actualValues.start, 'hours'), 'hours').isAfter(momentMaxDate.startOf('day')) : (0, _momentTimezone.default)(actualValues === null || actualValues === void 0 ? void 0 : actualValues.end).add((0, _momentTimezone.default)(actualValues === null || actualValues === void 0 ? void 0 : actualValues.end).diff(actualValues === null || actualValues === void 0 ? void 0 : actualValues.start, 'hours'), 'hours').isAfter((0, _momentTimezone.default)().add(1, 'day').startOf('day'))),
     isAlt: isAltArrows
   }))), isToggled && !isUseAbs && /*#__PURE__*/_react.default.createElement(_OpenedPart.default, (0, _extends2.default)({}, props, {
+    mainId: id,
     testId: testId,
     ref: internalContainerRef,
     actualValues: actualValues,

package/dist/Atomic/FormElements/InputDateRange/InputDateRange.scss

@@ -328,7 +328,7 @@
 
     & > div:not(.date-picker__inputs-separator) {
       box-sizing: border-box;
-      width: 110px;
+      width: 100px;
       min-height: 100%;
       margin-right: 9px;
 
@@ -368,20 +368,48 @@
 
   &__date-input {
     box-sizing: border-box;
-    width: fit-content;
-    height: fit-content;
-    padding: 3px 10px;
-
-    letter-spacing: inherit;
 
+    padding: 3px 10px;
+    
     color: inherit;
+    background-color: #FFF;
     border-radius: var(--border-radius);
-
+    
     font-family: var(--font-family);
     font-size: var(--font-size);
     font-weight: 300;
     font-style: normal;
-    line-height: var(--input-height);
+    line-height: calc(var(--input-height) / 2);
+    letter-spacing: inherit;
+    
+    &-interactive {
+      // &.input-mask3_wrapper>div {
+      //   width: 100%;
+      //   height: 100%;
+      //   padding: 0;
+      //   border: none;
+      //   font-size: 12px;
+      // }
+    }
+
+    &-emulation {
+      display: flex;
+      flex-flow: row nowrap;
+      justify-content: flex-start;
+      align-items: center;
+      padding: 3px 10px;
+
+      width: 100%;
+      height: 100%;
+      background-color: #FFF;
+
+      cursor: pointer;
+
+      &_disabled {
+        pointer-events: none;
+        cursor: auto;
+      }
+    }
   }
 
   &__hour-select-input {
@@ -408,6 +436,10 @@
       font-weight: inherit;
       font-style: inherit;
       line-height: inherit;
+
+      & > .text {
+        padding: 0;
+      }
     }
 
     & .dropdown__list-item {

package/dist/Atomic/FormElements/InputDateRange/components/DateInput.js

@@ -0,0 +1,113 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _momentTimezone = _interopRequireDefault(require("moment-timezone"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _mobileKeyboardTypesPresets = require("../../../../Functions/presets/mobileKeyboardTypesPresets");
+
+var _Input = _interopRequireDefault(require("../../Input/Input"));
+
+// import InputMask3 from '../../InputMask3/InputMask3';
+var handleDateInputOnChange = function handleDateInputOnChange(value) {
+  var replace = function replace(val) {
+    return val === null || val === void 0 ? void 0 : val.replace(/[^0-9\/]/g, '');
+  };
+
+  var input = replace(value);
+  var lastSymbol = input ? input.slice(-1) : '';
+  var previousValue = input ? input.slice(0, input.length - 1) : '';
+  if (value.length > 10 || lastSymbol === '/') return previousValue;
+  return previousValue.length === 2 || previousValue.length === 5 ? previousValue + '/' + lastSymbol : input;
+};
+
+var DateInput = function DateInput(props, ref) {
+  var RC = props.RC,
+      className = props.className,
+      testId = props.testId,
+      isFocused = props.isFocused,
+      disabled = props.disabled,
+      value = props.value,
+      _props$valueParseForm = props.valueParseFormat,
+      valueParseFormat = _props$valueParseForm === void 0 ? 'MM/DD/YYYY' : _props$valueParseForm,
+      date = props.date,
+      prepareDate = props.prepareDate,
+      _onChange = props.onChange,
+      onFocus = props.onFocus,
+      onBlur = props.onBlur,
+      onKeyUp = props.onKeyUp;
+
+  var preparedDate = function () {
+    var _prepareDate, _output$toString;
+
+    var prepareDateDefault = function prepareDateDefault(date) {
+      return (0, _momentTimezone.default)(date).format('ll');
+    };
+
+    var output = (_prepareDate = prepareDate === null || prepareDate === void 0 ? void 0 : prepareDate(date)) !== null && _prepareDate !== void 0 ? _prepareDate : prepareDateDefault(date);
+    return ((output === null || output === void 0 ? void 0 : (_output$toString = output.toString) === null || _output$toString === void 0 ? void 0 : _output$toString.call(output).toLowerCase()) || '') !== 'invalid date' ? output : '';
+  }();
+
+  return isFocused ? /*#__PURE__*/_react.default.createElement(_Input.default, (0, _extends2.default)({
+    ref: ref,
+    testId: testId,
+    className: (0, _classnames.default)(className, "".concat(RC, "-interactive")),
+    value: value,
+    disabled: disabled,
+    onChange: function onChange(value) {
+      return _onChange(handleDateInputOnChange(value));
+    },
+    onBlur: onBlur,
+    onKeyUp: onKeyUp
+  }, _mobileKeyboardTypesPresets.NUMERIC_KEYBOARD)) : /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames.default)(className, "".concat(RC, "-emulation"), (0, _defineProperty2.default)({}, "".concat(RC, "-emulation_disabled"), disabled)),
+    onClick: disabled ? null : function () {
+      return onFocus();
+    }
+  }, /*#__PURE__*/_react.default.createElement("span", {
+    className: (0, _classnames.default)('')
+  }, preparedDate)); // return isFocused ? (
+  //   <InputMask3
+  //     ref={ref}
+  //     testId={testId}
+  //     className={cn(className, `${RC}-interactive`)}
+  //     value={value}
+  //     disabled={disabled}
+  //     onChange={onChange}
+  //     onBlur={onBlur}
+  //     onKeyUp={onKeyUp}
+  //     maskPattern="DD/DD/DDDD"
+  //     maskPatternPlaceholder="MM/DD/YYYY"
+  //     usePatternPlaceholder
+  //     isNumericMobileKeyboard
+  //     blinkErrors
+  //     showErrors={false}
+  //     autocomplete="bday"
+  //     focusSelector="input"
+  //   />
+  // ) : (
+  //   <div
+  //     className={cn(className, `${RC}-emulation`, {[`${RC}-emulation_disabled`]: disabled})}
+  //     onClick={disabled ? null : () => onFocus()}
+  //   >
+  //     <span className={cn('')}>{preparedDate}</span>
+  //   </div>
+  // );
+};
+
+var _default = /*#__PURE__*/_react.default.forwardRef(DateInput);
+
+exports.default = _default;

package/dist/Atomic/FormElements/InputDateRange/components/Datepicker.js

@@ -9,8 +9,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -23,11 +21,9 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _dependencies = require("../dependencies");
 
-var _mobileKeyboardTypesPresets = require("../../../../Functions/presets/mobileKeyboardTypesPresets");
-
 var _Dropdown = _interopRequireDefault(require("../../Dropdown/Dropdown"));
 
-var _Input = _interopRequireDefault(require("../../Input/Input"));
+var _DateInput = _interopRequireDefault(require("./DateInput"));
 
 var _Button = _interopRequireDefault(require("../../../UI/Button/Button"));
 
@@ -39,20 +35,12 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 // eslint-disable-next-line no-unused-vars
 // import Switcher from '../../Switcher/Switcher';
-var padTime = function padTime(time) {
-  return "".concat(time.toString().padStart(2, '0'), ":00");
+var outsideScope = {
+  handleHoverTimerId: null
 };
 
-var handleDateInputOnChange = function handleDateInputOnChange(value) {
-  var replace = function replace(val) {
-    return val === null || val === void 0 ? void 0 : val.replace(/[^0-9\/]/g, '');
-  };
-
-  var input = replace(value);
-  var lastSymbol = input ? input.slice(-1) : '';
-  var previousValue = input ? input.slice(0, input.length - 1) : '';
-  if (value.length > 10 || lastSymbol === '/') return previousValue;
-  return previousValue.length === 2 || previousValue.length === 5 ? previousValue + '/' + lastSymbol : input;
+var padTime = function padTime(time) {
+  return "".concat(time.toString().padStart(2, '0'), ":00");
 };
 
 var Datepicker = function Datepicker(props) {
@@ -77,8 +65,8 @@ var Datepicker = function Datepicker(props) {
       momentMinDate = props.momentMinDate,
       momentMaxDate = props.momentMaxDate,
       isDontLimitFuture = props.isDontLimitFuture,
-      format = props.format,
-      testId = props.testId;
+      testId = props.testId,
+      mainId = props.mainId;
   var _values$start = values.start,
       start = _values$start === void 0 ? null : _values$start,
       _values$end = values.end,
@@ -88,71 +76,74 @@ var Datepicker = function Datepicker(props) {
   var startDateInputRef = (0, _react.useRef)(null);
   var endDateInputRef = (0, _react.useRef)(null);
 
-  var _useState = (0, _react.useState)(start),
+  var _useState = (0, _react.useState)((0, _momentTimezone.default)(start)),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       startDate = _useState2[0],
       setStartDate = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(end),
+  var _useState3 = (0, _react.useState)((0, _momentTimezone.default)(end)),
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
       endDate = _useState4[0],
       setEndDate = _useState4[1];
 
   var dateInterval = getSelectedMode({
-    start: startDate,
-    end: endDate
+    start: startDate.format('YYYY-MM-DDTHH:mm'),
+    end: endDate.format('YYYY-MM-DDTHH:mm')
   });
 
-  var _useState5 = (0, _react.useState)(start),
+  var _useState5 = (0, _react.useState)(null),
       _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
       startDateInput = _useState6[0],
       setStartDateInput = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(end),
+  var _useState7 = (0, _react.useState)(null),
       _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
       endDateInput = _useState8[0],
       setEndDateInput = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(start ? (0, _momentTimezone.default)(start).hour() : 0),
+  var _useState9 = (0, _react.useState)(false),
       _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-      startHour = _useState10[0],
-      setStartHour = _useState10[1];
+      isStartFocused = _useState10[0],
+      setIsStartFocused = _useState10[1];
 
-  var _useState11 = (0, _react.useState)(end ? (0, _momentTimezone.default)(end).hour() : 0),
+  var _useState11 = (0, _react.useState)(false),
       _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-      endHour = _useState12[0],
-      setEndHour = _useState12[1]; // eslint-disable-next-line no-unused-vars
-
+      isEndFocused = _useState12[0],
+      setIsEndFocused = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(compare),
+  var _useState13 = (0, _react.useState)(start ? (0, _momentTimezone.default)(start).hour() : 0),
       _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-      isCompare = _useState14[0],
-      setIsCompare = _useState14[1];
+      startHour = _useState14[0],
+      setStartHour = _useState14[1];
 
-  var _useState15 = (0, _react.useState)(start ? (0, _momentTimezone.default)(start).toDate() : (0, _momentTimezone.default)().subtract(1, 'month').toDate()),
+  var _useState15 = (0, _react.useState)(end ? (0, _momentTimezone.default)(end).hour() : 0),
       _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-      date1 = _useState16[0],
-      setDate1 = _useState16[1];
+      endHour = _useState16[0],
+      setEndHour = _useState16[1]; // eslint-disable-next-line no-unused-vars
 
-  var _useState17 = (0, _react.useState)(end ? (0, _momentTimezone.default)(end).toDate() : (0, _momentTimezone.default)().toDate()),
+
+  var _useState17 = (0, _react.useState)(compare),
       _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
-      date2 = _useState18[0],
-      setDate2 = _useState18[1];
+      isCompare = _useState18[0],
+      setIsCompare = _useState18[1];
 
-  var _useState19 = (0, _react.useState)(false),
+  var _useState19 = (0, _react.useState)(start ? (0, _momentTimezone.default)(start) : (0, _momentTimezone.default)().subtract(1, 'month')),
       _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
-      isStartFocused = _useState20[0],
-      setIsStartFocused = _useState20[1];
+      date1 = _useState20[0],
+      setDate1 = _useState20[1];
 
-  var _useState21 = (0, _react.useState)(false),
+  var _useState21 = (0, _react.useState)(end ? (0, _momentTimezone.default)(end) : (0, _momentTimezone.default)()),
       _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
-      isEndFocused = _useState22[0],
-      setIsEndFocused = _useState22[1];
+      date2 = _useState22[0],
+      setDate2 = _useState22[1];
 
   var _useState23 = (0, _react.useState)(null),
       _useState24 = (0, _slicedToArray2.default)(_useState23, 2),
       hoverStatus = _useState24[0],
-      setHoverStatus = _useState24[1];
+      setHoverStatus = _useState24[1]; // ********************
+  // Constants
+  // ********************
+
 
   var isNearby = (0, _react.useMemo)(function () {
     return (0, _momentTimezone.default)(date2).subtract(1, 'month').isSame((0, _momentTimezone.default)(date1), 'month');
@@ -160,36 +151,7 @@ var Datepicker = function Datepicker(props) {
   var isPreviousPeriodShowed = (0, _react.useMemo)(function () {
     return isCompare && !isCompareHidden && startDate && endDate;
   }, [startDate, endDate, isCompare]);
-
-  var setInterval = function setInterval() {
-    setActiveInterval((0, _dependencies.getActualDateRange)({
-      start: startDate,
-      end: endDate
-    }).intervalKey);
-  };
-
   var prevEndHour = (0, _react.useRef)(endHour);
-
-  var getStartHourItems = function getStartHourItems() {
-    return (0, _toConsumableArray2.default)(Array(24).keys()).map(function (hour) {
-      return {
-        label: padTime(hour),
-        value: hour,
-        disabled: (0, _momentTimezone.default)(startDate).isSame(endDate, 'day') && endHour <= hour
-      };
-    });
-  };
-
-  var getEndHourItems = function getEndHourItems() {
-    return (0, _toConsumableArray2.default)(Array(24).keys()).map(function (hour) {
-      return {
-        label: padTime(hour + 1),
-        value: hour === 23 ? 0 : hour + 1,
-        disabled: ((0, _momentTimezone.default)(startDate).isSame(endDate, 'day') || (0, _momentTimezone.default)(startDate).isSame((0, _momentTimezone.default)(endDate).subtract(1, 'days'), 'day') && endHour === 0) && hour < startHour
-      };
-    });
-  };
-
   var startPrevDate = (0, _react.useMemo)(function () {
     if (isPreviousPeriodShowed) {
       var intervalHoursCount = (0, _momentTimezone.default)(endDate).diff(startDate, 'hours');
@@ -205,78 +167,61 @@ var Datepicker = function Datepicker(props) {
     if (isCompare && !isCompareHidden && startDate && endDate) {
       return "".concat((0, _momentTimezone.default)(startPrevDate).format('ll'), " (").concat((0, _momentTimezone.default)(startPrevDate).format('HH:mm'), ") - ").concat((0, _momentTimezone.default)(endPrevDate).format('ll'), " (").concat((0, _momentTimezone.default)(endPrevDate).format('HH:mm'), ")");
     } else return '';
-  }, [startDate, endDate, isCompare]);
+  }, [startDate, endDate, isCompare]); // ********************
+  // Methods
+  // ********************
 
-  var subtractDay = function subtractDay(date) {
-    return endHour === 0 ? (0, _momentTimezone.default)(date).subtract(1, 'days') : date;
+  var getCorrectedDateForDateInput = function getCorrectedDateForDateInput(key, date) {
+    if (key === 'startDateInput') return (0, _momentTimezone.default)(date);
+    return (0, _momentTimezone.default)(date).subtract(1, 'm');
   };
 
-  var addDay = function addDay(date) {
-    return endHour === 0 ? (0, _momentTimezone.default)(date).add(1, 'days') : date;
+  var setInterval = function setInterval() {
+    setActiveInterval((0, _dependencies.getActualDateRange)({
+      start: startDate,
+      end: endDate
+    }).intervalKey);
   };
 
-  (0, _react.useEffect)(function () {
-    if ((0, _momentTimezone.default)(startDate).isSameOrAfter(endDate)) {
-      setStartDate((0, _momentTimezone.default)(endDate).subtract(1, 'd').toDate());
-      setDate1((0, _momentTimezone.default)(endDate).subtract(1, 'd'));
-    }
-  }, [startDate]);
-  (0, _react.useEffect)(function () {
-    if ((0, _momentTimezone.default)(endDate).isSameOrBefore(startDate)) {
-      setEndDate((0, _momentTimezone.default)(startDate).add(1, 'd').toDate());
-      setDate2((0, _momentTimezone.default)(startDate).add(1, 'd'));
-    }
-  }, [endDate]);
-  (0, _react.useEffect)(function () {
-    setStartDateInput(startDate);
-    setEndDateInput(endDate);
+  var subtractDay = function subtractDay(date) {
+    return endHour === 0 ? (0, _momentTimezone.default)(date).subtract(1, 'days') : (0, _momentTimezone.default)(date);
+  };
 
-    if ((0, _momentTimezone.default)(startDate).isBefore((0, _momentTimezone.default)(endDate), 'month')) {
-      setDate1((0, _momentTimezone.default)(startDate));
-      setDate2((0, _momentTimezone.default)(endDate));
-    }
+  var addDay = function addDay(date) {
+    return endHour === 0 ? (0, _momentTimezone.default)(date).add(1, 'days') : (0, _momentTimezone.default)(date);
+  }; // ********************
+  // Handlers
+  // ********************
 
-    setInterval();
-  }, [startDate, endDate]);
-  (0, _react.useEffect)(function () {
-    if ((0, _momentTimezone.default)(date1).isSameOrAfter((0, _momentTimezone.default)(date2), 'month')) {
-      setDate1((0, _momentTimezone.default)(date2).subtract(1, 'month'));
-    }
-  }, [date1, date2]);
-  (0, _react.useEffect)(function () {
-    onChangeInterval(dateInterval);
-  }, [dateInterval]);
 
   var handleClick = function handleClick(date) {
     prevEndHour.current = 0;
 
     if (!startDate || startDate && endDate && !((0, _momentTimezone.default)(startDate).add(1, 'd').isSame(endDate, 'day') && endHour === 0)) {
-      setStartDate((0, _momentTimezone.default)(date).startOf('day').toDate());
-      setEndDate((0, _momentTimezone.default)(date).add(1, 'd').startOf('day').toDate());
+      setStartDate((0, _momentTimezone.default)(date).startOf('day'));
+      setEndDate((0, _momentTimezone.default)(date).add(1, 'd').startOf('day'));
       setStartHour(0);
       setEndHour(0);
     } else if ((0, _momentTimezone.default)(date).isBefore((0, _momentTimezone.default)(startDate), 'day')) {
-      setEndDate((0, _momentTimezone.default)(startDate).add(1, 'd').startOf('day').toDate());
-      setStartDate((0, _momentTimezone.default)(date).set('hour', parseInt(startHour, 10)).toDate());
+      setEndDate((0, _momentTimezone.default)(startDate).add(1, 'd').startOf('day'));
+      setStartDate((0, _momentTimezone.default)(date).set('hour', parseInt(startHour, 10)));
     } else if ((0, _momentTimezone.default)(date).isAfter((0, _momentTimezone.default)(startDate), 'day')) {
-      setEndDate((0, _momentTimezone.default)(date).add(1, 'd').startOf('day').toDate());
+      setEndDate((0, _momentTimezone.default)(date).add(1, 'd').startOf('day'));
     }
 
     setHoverStatus(null);
   };
 
-  var timerId;
-
   var handleHover = function handleHover(date) {
+    if (outsideScope.handleHoverTimerId) clearTimeout(outsideScope.handleHoverTimerId);
+
     if (!date) {
-      timerId = setTimeout(function () {
+      outsideScope.handleHoverTimerId = setTimeout(function () {
         setHoverStatus(null);
       }, 400);
       return;
     }
 
-    if (timerId) clearTimeout(timerId);
-
     if ((0, _momentTimezone.default)(startDate).add(1, 'd').isSame(endDate, 'day') && endHour === 0) {
       if ((0, _momentTimezone.default)(date).isAfter((0, _momentTimezone.default)(startDate), 'day')) setHoverStatus('end');else if ((0, _momentTimezone.default)(date).isBefore((0, _momentTimezone.default)(startDate), 'day')) setHoverStatus('start');else setHoverStatus(null);
     } else {
@@ -286,7 +231,7 @@ var Datepicker = function Datepicker(props) {
 
   var handleChangeStartHour = function handleChangeStartHour(val) {
     setStartHour(+val);
-    setStartDate((0, _momentTimezone.default)(startDate || (0, _momentTimezone.default)()).set('hour', +val).toDate());
+    setStartDate((0, _momentTimezone.default)(startDate || (0, _momentTimezone.default)()).set('hour', +val));
   };
 
   var handleChangeEndHour = function handleChangeEndHour(val) {
@@ -303,7 +248,164 @@ var Datepicker = function Datepicker(props) {
     }
 
     prevEndHour.current = newHour;
-    setEndDate((0, _momentTimezone.default)(newEndDate).set('hour', newHour).toDate());
+    setEndDate((0, _momentTimezone.default)(newEndDate).set('hour', newHour));
+  }; // const doBlur = (type, e) => {
+  //   const executor = type === 'start' ? setIsStartFocused : setIsEndFocused;
+  //   e.target.blur();
+  //   executor(false);
+  // };
+  // const handleStartDateBlur = e => {
+  //   let newDate;
+  //   if (!moment(startDateInput).isValid()) {
+  //     newDate = moment(startDate);
+  //   } else {
+  //     if (minDate && moment(startDateInput).isBefore(minDate)) newDate = momentMinDate;
+  //     else if (!isDontLimitFuture) {
+  //       const edge = maxDate ? momentMaxDate : moment().add(1, 'day').startOf('day');
+  //       if (moment(startDateInput).isAfter(edge)) newDate = edge;
+  //       else newDate = moment(startDateInput);
+  //     } else newDate = moment(startDateInput);
+  //   }
+  //   setStartDateInput(newDate.format(format));
+  //   setStartDate(newDate.set('hour', parseInt(startHour, 10)).toDate());
+  //   doBlur('start', e);
+  //   setDate1(
+  //     moment(newDate).isSameOrAfter(moment(date2), 'month') ? moment(date2).subtract(1, 'month') : moment(newDate),
+  //   );
+  // };
+  // const handleEndDateBlur = e => {
+  //   let newDate;
+  //   if (!moment(endDateInput).isValid()) {
+  //     newDate = moment(endDate);
+  //   } else {
+  //     if (minDate && moment(endDateInput).isBefore(minDate)) newDate = momentMinDate;
+  //     else if (!isDontLimitFuture) {
+  //       const edge = maxDate ? momentMaxDate : moment().endOf('day');
+  //       if (moment(endDateInput).isAfter(edge)) newDate = maxDate ? edge : edge.startOf('day');
+  //       else newDate = moment(startDateInput);
+  //     } else newDate = moment(startDateInput);
+  //   }
+  //   setEndDate(addDay(newDate.set('hour', parseInt(endHour, 10)).toDate()));
+  //   setEndDateInput(newDate.format(format));
+  //   doBlur('end', e);
+  //   setDate2(newDate);
+  // };
+
+
+  var handleDateInputFocus = function handleDateInputFocus(key, e) {
+    var changeFlag = key === 'startDateInput' ? setIsStartFocused : setIsEndFocused;
+    var set = key === 'startDateInput' ? setStartDateInput : setEndDateInput;
+    var date = key === 'startDateInput' ? startDate : endDate;
+    changeFlag(true);
+    set(getCorrectedDateForDateInput(key, date).format('L'));
+    setTimeout(function () {
+      var _e$target;
+
+      var defaultTarget = key === 'startDateInput' ? startDateInputRef.current : endDateInputRef.current;
+      var target = (_e$target = e === null || e === void 0 ? void 0 : e.target) !== null && _e$target !== void 0 ? _e$target : defaultTarget;
+      target.select(); //? Для инпут-маск, почему-то нужно пропустить 2 эвентлупа
+      // setTimeout(() => {
+      //   target.select();
+      // }, 0);
+    }, 0);
+  };
+
+  var doBlur = function doBlur(type, e) {
+    var executor = type === 'startDateInput' ? setIsStartFocused : setIsEndFocused;
+    e.target.blur();
+    executor(false);
+  };
+
+  var processOverflow = function processOverflow(newDateAsString, valueForRollback, key) {
+    var newDateAsMomentObj = (0, _momentTimezone.default)(newDateAsString, 'MM/DD/YYYY'); // console.log('processOverflow - newDateAsString - ', newDateAsString);
+    // console.log('processOverflow - valueForRollback - ', valueForRollback);
+    // console.log('----------');
+    // console.log('processOverflow - minDate - ', minDate);
+    // console.log('processOverflow - maxDate - ', maxDate);
+    // console.log('----------');
+    // console.log('processOverflow - momentMinDate - ', momentMinDate);
+    // console.log('processOverflow - momentMaxDate - ', momentMaxDate);
+    // console.log('----------');
+    // console.log('processOverflow - newDateAsMomentObj - ', newDateAsMomentObj);
+    // console.log('*********');
+    //? Если значение не валидно...
+
+    if (!newDateAsMomentObj.isValid()) {
+      //? ... то откатываем к дате до набора руками
+      return valueForRollback;
+    } else {
+      var beforeOfFuture = (0, _momentTimezone.default)().endOf('day');
+      var hour = key === 'startDateInput' ? startHour : endHour;
+      var output; //? Если есть минимальная дата и введенная меньше минимальной, то ставим минимальную
+
+      if (minDate && newDateAsMomentObj.isBefore(momentMinDate)) output = momentMinDate; //? Если есть максимальная дата и введенная больше максимальной, то ставим максимальную
+      else if (maxDate && newDateAsMomentObj.isAfter(momentMaxDate)) output = momentMaxDate; //? Если нет установки не ограничивать дату по будущему...
+      else if (!isDontLimitFuture && newDateAsMomentObj.isAfter(beforeOfFuture)) {
+        output = beforeOfFuture.startOf('day');
+      } else output = newDateAsMomentObj; // if (key === 'startDateInput') {
+      //   console.log('endDate - ', endDate.format('YYYY-MM-DDTHH:mm'));
+      //   console.log('endDate.subtract(1, d) - ', endDate.subtract(1, 'd').format('YYYY-MM-DDTHH:mm'));
+      //   if (output.isAfter(endDate.subtract(1, 'd'))) output = endDate.subtract(1, 'd');
+      // }
+
+      if (key === 'endDateInput') {
+        // console.log('startDate - ', startDate.format('YYYY-MM-DDTHH:mm'));
+        // if (output.isBefore(startDate)) output = startDate.add(1, 'd');
+        output = addDay(output);
+      } // console.log('output - ', output.format('YYYY-MM-DDTHH:mm'));
+      // console.log('************');
+
+
+      return output.set('hour', parseInt(hour, 10));
+    }
+  };
+
+  var handleDateInputBlur = function handleDateInputBlur(key, e) {
+    var _e$target$value, _e$target2;
+
+    var reserveValue = key === 'startDateInput' ? startDateInput : endDateInput;
+    var valueForRollback = key === 'startDateInput' ? startDate : endDate;
+    var execute = key === 'startDateInput' ? setStartDate : setEndDate;
+    var executeForCalendar = key === 'startDateInput' ? setDate1 : setDate2;
+
+    var prepareValueForCalendar = function prepareValueForCalendar(newDate) {
+      if (key === 'endDateInput') return newDate;
+      return (0, _momentTimezone.default)(newDate).isSameOrAfter((0, _momentTimezone.default)(date2), 'month') ? (0, _momentTimezone.default)(date2).subtract(1, 'month') : (0, _momentTimezone.default)(newDate);
+    };
+
+    var newDateValue = (_e$target$value = e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value) !== null && _e$target$value !== void 0 ? _e$target$value : reserveValue;
+    var processedNewDate = processOverflow(newDateValue, valueForRollback, key);
+    execute(processedNewDate);
+    executeForCalendar(prepareValueForCalendar(processedNewDate));
+    doBlur(key, e);
+  };
+
+  var handleKeyPressed = function handleKeyPressed(code, e, type) {
+    if (code === 13) handleDateInputBlur(type, e);
+    if (code === 27) doBlur(type, e);
+  }; // ********************
+  // Render Functions
+  // ********************
+
+
+  var getStartHourItems = function getStartHourItems() {
+    return (0, _toConsumableArray2.default)(Array(24).keys()).map(function (hour) {
+      return {
+        label: padTime(hour),
+        value: hour,
+        disabled: (0, _momentTimezone.default)(startDate).isSame(endDate, 'day') && endHour <= hour
+      };
+    });
+  };
+
+  var getEndHourItems = function getEndHourItems() {
+    return (0, _toConsumableArray2.default)(Array(24).keys()).map(function (hour) {
+      return {
+        label: padTime(hour + 1),
+        value: hour === 23 ? 0 : hour + 1,
+        disabled: ((0, _momentTimezone.default)(startDate).isSame(endDate, 'day') || (0, _momentTimezone.default)(startDate).isSame((0, _momentTimezone.default)(endDate).subtract(1, 'days'), 'day') && endHour === 0) && hour < startHour
+      };
+    });
   };
 
   var renderButtons = function renderButtons() {
@@ -335,97 +437,67 @@ var Datepicker = function Datepicker(props) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, txt.labels.previousPeriod, ": ", /*#__PURE__*/_react.default.createElement("span", {
       className: "date-picker__previous-period-interval"
     }, title));
-  };
-
-  var doBlur = function doBlur(type, e) {
-    var executor = type === 'start' ? setIsStartFocused : setIsEndFocused;
-    e.target.blur();
-    executor(false);
-  };
-
-  var handleStartDateFocus = function handleStartDateFocus(e) {
-    setIsStartFocused(true);
-    setStartDateInput((0, _momentTimezone.default)(startDate).format('L'));
-    setTimeout(function () {
-      return e.target.select();
-    }, 0);
-  };
+  }; // ********************
+  // useEffects
+  // ********************
 
-  var handleStartDateBlur = function handleStartDateBlur(e) {
-    var newDate;
 
-    if (!(0, _momentTimezone.default)(startDateInput).isValid()) {
-      newDate = (0, _momentTimezone.default)(startDate);
-    } else {
-      if (minDate && (0, _momentTimezone.default)(startDateInput).isBefore(minDate)) newDate = momentMinDate;else if (!isDontLimitFuture) {
-        var edge = maxDate ? momentMaxDate : (0, _momentTimezone.default)().add(1, 'day').startOf('day');
-        if ((0, _momentTimezone.default)(startDateInput).isAfter(edge)) newDate = edge;else newDate = (0, _momentTimezone.default)(startDateInput);
-      } else newDate = (0, _momentTimezone.default)(startDateInput);
+  (0, _react.useEffect)(function () {
+    if ((0, _momentTimezone.default)(startDate).isSameOrAfter(endDate)) {
+      setStartDate((0, _momentTimezone.default)(endDate).subtract(1, 'd'));
+      setDate1((0, _momentTimezone.default)(endDate).subtract(1, 'd'));
     }
-
-    setStartDateInput(newDate.format(format));
-    setStartDate(newDate.set('hour', parseInt(startHour, 10)).toDate());
-    doBlur('start', e);
-    setDate1((0, _momentTimezone.default)(newDate).isSameOrAfter((0, _momentTimezone.default)(date2), 'month') ? (0, _momentTimezone.default)(date2).subtract(1, 'month') : (0, _momentTimezone.default)(newDate));
-  };
-
-  var handleEndDateFocus = function handleEndDateFocus(e) {
-    setIsEndFocused(true);
-    setEndDateInput((0, _momentTimezone.default)(subtractDay(endDateInput)).format('L'));
-    setTimeout(function () {
-      return e.target.select();
-    }, 0);
-  };
-
-  var handleEndDateBlur = function handleEndDateBlur(e) {
-    var newDate;
-
-    if (!(0, _momentTimezone.default)(endDateInput).isValid()) {
-      newDate = (0, _momentTimezone.default)(endDate);
-    } else {
-      if (minDate && (0, _momentTimezone.default)(endDateInput).isBefore(minDate)) newDate = momentMinDate;else if (!isDontLimitFuture) {
-        var edge = maxDate ? momentMaxDate : (0, _momentTimezone.default)().endOf('day');
-        if ((0, _momentTimezone.default)(endDateInput).isAfter(edge)) newDate = maxDate ? edge : edge.startOf('day');else newDate = (0, _momentTimezone.default)(startDateInput);
-      } else newDate = (0, _momentTimezone.default)(startDateInput);
+  }, [startDate]);
+  (0, _react.useEffect)(function () {
+    if ((0, _momentTimezone.default)(endDate).isSameOrBefore(startDate)) {
+      setEndDate((0, _momentTimezone.default)(startDate).add(1, 'd'));
+      setDate2((0, _momentTimezone.default)(startDate).add(1, 'd'));
+    }
+  }, [endDate]);
+  (0, _react.useEffect)(function () {
+    if ((0, _momentTimezone.default)(startDate).isBefore((0, _momentTimezone.default)(endDate), 'month')) {
+      setDate1((0, _momentTimezone.default)(startDate));
+      setDate2((0, _momentTimezone.default)(endDate));
     }
 
-    setEndDate(addDay(newDate.set('hour', parseInt(endHour, 10)).toDate()));
-    setEndDateInput(newDate.format(format));
-    doBlur('end', e);
-    setDate2(newDate);
-  };
-
-  var handleKeyPressed = function handleKeyPressed(code, e, type) {
-    if (code === 13) (type === 'start' ? handleStartDateBlur : handleEndDateBlur)(e);
-    if (code === 27) doBlur(type, e);
-  };
-
-  var startDateValue = startDate ? (0, _momentTimezone.default)(startDate).format('ll') : '';
-  var endDateValue = endDate ? (0, _momentTimezone.default)(endDate).subtract(1, 'm').format('ll') : '';
+    setInterval();
+  }, [startDate, endDate]);
+  (0, _react.useEffect)(function () {
+    if ((0, _momentTimezone.default)(date1).isSameOrAfter((0, _momentTimezone.default)(date2), 'month')) {
+      setDate1((0, _momentTimezone.default)(date2).subtract(1, 'month'));
+    }
+  }, [date1, date2]);
+  (0, _react.useEffect)(function () {
+    onChangeInterval(dateInterval);
+  }, [dateInterval]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('date-picker', className)
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "date-picker__header"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "date-picker__inputs-block"
-  }, /*#__PURE__*/_react.default.createElement(_Input.default, (0, _extends2.default)({
-    dataTest: "datepicker_start-date-input",
-    className: (0, _classnames.default)({
-      'date-picker__date-input_active': hoverStatus === 'start'
-    }),
-    value: isStartFocused ? startDateInput : startDateValue,
-    onChange: function onChange(value) {
-      return setStartDateInput(handleDateInputOnChange(value));
-    },
-    onFocus: handleStartDateFocus,
+  }, /*#__PURE__*/_react.default.createElement(_DateInput.default, {
+    ref: startDateInputRef,
+    testId: "datepicker-".concat(testId, "_start-date-input"),
+    RC: "date-picker__date-input",
+    className: (0, _classnames.default)('date-picker__date-input'),
+    isFocused: isStartFocused,
+    value: startDateInput,
+    date: getCorrectedDateForDateInput('startDateInput', startDate),
     disabled: !startDate,
-    onBlur: handleStartDateBlur,
-    onKeyUp: function onKeyUp(code, e) {
-      return handleKeyPressed(code, e, 'start');
+    onChange: setStartDateInput,
+    onFocus: function onFocus(e) {
+      return handleDateInputFocus('startDateInput', e);
+    },
+    onBlur: function onBlur(e) {
+      return handleDateInputBlur('startDateInput', e);
     },
-    "data-testid": "datePicker--input-".concat(testId, "--startDate")
-  }, _mobileKeyboardTypesPresets.NUMERIC_KEYBOARD)), /*#__PURE__*/_react.default.createElement(_Dropdown.default, {
+    onKeyUp: function onKeyUp(code, e) {
+      return handleKeyPressed(code, e, 'startDateInput');
+    }
+  }), /*#__PURE__*/_react.default.createElement(_Dropdown.default, {
     testId: testId,
+    id: "datepicker-id-".concat(mainId, "_start-hour-select-input"),
     dataTest: "datepicker_start-hour-select-input",
     className: (0, _classnames.default)('date-picker__hour-select-input'),
     onChange: function onChange(value) {
@@ -434,27 +506,32 @@ var Datepicker = function Datepicker(props) {
     value: startHour,
     options: getStartHourItems(),
     disabled: !startDate,
+    isDoNotPullOutListOfMainContainer: true,
     short: true
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: "date-picker__inputs-separator date-picker__header--gray"
-  }, "\u2014"), /*#__PURE__*/_react.default.createElement(_Input.default, (0, _extends2.default)({
-    dataTest: "datepicker_end-date-input",
-    className: (0, _classnames.default)({
-      'date-picker__date-input_active': hoverStatus === 'end'
-    }),
-    value: isEndFocused ? endDateInput : endDateValue,
+  }, "\u2014"), /*#__PURE__*/_react.default.createElement(_DateInput.default, {
+    ref: endDateInputRef,
+    testId: "datepicker-".concat(testId, "_start-date-input"),
+    RC: "date-picker__date-input",
+    className: (0, _classnames.default)('date-picker__date-input'),
+    isFocused: isEndFocused,
+    value: endDateInput,
+    date: getCorrectedDateForDateInput('endDateInput', endDate),
     disabled: !endDate,
-    onChange: function onChange(value) {
-      return setEndDateInput(handleDateInputOnChange(value));
+    onChange: setEndDateInput,
+    onFocus: function onFocus(e) {
+      return handleDateInputFocus('endDateInput', e);
     },
-    onFocus: handleEndDateFocus,
-    onBlur: handleEndDateBlur,
-    onKeyUp: function onKeyUp(code, e) {
-      return handleKeyPressed(code, e, 'end');
+    onBlur: function onBlur(e) {
+      return handleDateInputBlur('endDateInput', e);
     },
-    "data-testid": "datePicker--input-".concat(testId, "--endDate")
-  }, _mobileKeyboardTypesPresets.NUMERIC_KEYBOARD)), /*#__PURE__*/_react.default.createElement(_Dropdown.default, {
+    onKeyUp: function onKeyUp(code, e) {
+      return handleKeyPressed(code, e, 'endDateInput');
+    }
+  }), /*#__PURE__*/_react.default.createElement(_Dropdown.default, {
     testId: testId,
+    id: "datepicker-id-".concat(mainId, "_end-hour-select-input"),
     dataTest: "datepicker_end-hour-select-input",
     className: (0, _classnames.default)('date-picker__hour-select-input'),
     onChange: function onChange(value) {
@@ -463,6 +540,7 @@ var Datepicker = function Datepicker(props) {
     value: endHour,
     options: getEndHourItems(),
     disabled: !endDate,
+    isDoNotPullOutListOfMainContainer: true,
     short: true
   })), isCompare && !isCompareHidden && startDate && endDate && /*#__PURE__*/_react.default.createElement("div", {
     className: "date-picker__previous-period"

package/dist/Atomic/FormElements/InputDateRange/components/OpenedPart.js

@@ -39,7 +39,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 var classNames = require('classnames');
 
-var OpenedPart = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+var OpenedPart = function OpenedPart(props, ref) {
   var txt = props.txt,
       buttonsTypes = props.buttonsTypes,
       actualValues = props.actualValues,
@@ -63,11 +63,11 @@ var OpenedPart = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       isShortWeekNames = props.isShortWeekNames,
       minDate = props.minDate,
       maxDate = props.maxDate,
-      format = props.format,
       momentMinDate = props.momentMinDate,
       momentMaxDate = props.momentMaxDate,
       isDontLimitFuture = props.isDontLimitFuture,
       isListTop = props.isListTop,
+      mainId = props.mainId,
       testId = props.testId;
 
   var boxRef = (0, _react.useRef)();
@@ -150,6 +150,7 @@ var OpenedPart = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       disabled: item === _dependencies.CUSTOM_INTERVAL_KEY || minDate && ((_intervals$item3 = _dependencies.INTERVALS[item]) === null || _intervals$item3 === void 0 ? void 0 : (_intervals$item3$star = _intervals$item3.start) === null || _intervals$item3$star === void 0 ? void 0 : (_intervals$item3$star2 = _intervals$item3$star.call(_intervals$item3)) === null || _intervals$item3$star2 === void 0 ? void 0 : (_intervals$item3$star3 = _intervals$item3$star2.isBefore) === null || _intervals$item3$star3 === void 0 ? void 0 : _intervals$item3$star3.call(_intervals$item3$star2, momentMinDate))
     });
   })), !isCompact && /*#__PURE__*/_react.default.createElement(_Datepicker.default, {
+    mainId: mainId,
     testId: testId,
     className: (0, _classnames.default)('opened-part__date-picker'),
     buttonsTypes: buttonsTypes,
@@ -175,12 +176,12 @@ var OpenedPart = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     isShortWeekNames: isShortWeekNames,
     minDate: minDate,
     maxDate: maxDate,
-    format: format,
     momentMinDate: momentMinDate,
     momentMaxDate: momentMaxDate,
     isDontLimitFuture: isDontLimitFuture
   })));
-});
+};
+
+var _default = /*#__PURE__*/_react.default.forwardRef(OpenedPart);
 
-var _default = OpenedPart;
 exports.default = _default;

package/dist/Atomic/FormElements/InputDateRange/dependencies.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getActualDateRange = exports.CUSTOM_INTERVAL_KEY_TEXT = exports.CUSTOM_INTERVAL_KEY = exports.ALL_TIME_KEY = exports.INTERVALS = exports.useToggle = exports.useClickOutside = void 0;
+exports.getActualDateRange = exports.CUSTOM_INTERVAL_KEY_TEXT = exports.CUSTOM_INTERVAL_KEY = exports.ALL_TIME_KEY = exports.INTERVALS = exports.useToggle = exports.useClickOutside = exports.getIsDateValid = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -27,6 +27,12 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
+var getIsDateValid = function getIsDateValid(date) {
+  return (0, _momentTimezone.default)(date).isValid();
+};
+
+exports.getIsDateValid = getIsDateValid;
+
 var useClickOutside = function useClickOutside(hideComponent, additionalComponent) {
   var ref = (0, _react.useRef)(null);
 

package/dist/Atomic/FormElements/RangeCalendar/RangeCalendar.js

@@ -95,7 +95,7 @@ var RangeCalendar = function RangeCalendar(props) {
     var classNames = (0, _classnames.default)('range-calendar__day', {
       'range-calendar__day--clickable': day
     }, {
-      'range-calendar__day--disabled': isPastDay || minDate && (0, _momentTimezone.default)(day === null || day === void 0 ? void 0 : day.date).isBefore(minDate, 'day') || !isDontLimitFuture && (maxDate ? (0, _momentTimezone.default)(day === null || day === void 0 ? void 0 : day.date).isAfter(momentMaxDate) : isFutureDay)
+      'range-calendar__day--disabled': isPastDay || minDate && (0, _momentTimezone.default)(day === null || day === void 0 ? void 0 : day.date).isBefore(momentMinDate, 'day') || !isDontLimitFuture && (maxDate ? (0, _momentTimezone.default)(day === null || day === void 0 ? void 0 : day.date).isAfter(momentMaxDate) : isFutureDay)
     }, {
       'range-calendar__day--range-start': isRangeStart
     }, {

package/dist/Atomic/UI/Price/Price.js

@@ -9,18 +9,19 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _fieldValueFormatters = require("../../../Functions/fieldValueFormatters");
+
 var Price = function Price(_ref) {
   var value = _ref.value,
-      _ref$unit = _ref.unit,
-      unit = _ref$unit === void 0 ? '$' : _ref$unit,
-      unitAfter = _ref.unitAfter,
+      currencyCode = _ref.currencyCode,
+      isSymbolAfter = _ref.isSymbolAfter,
       className = _ref.className;
-  if (value === undefined || value === null) return null;
-  var formatted = Number(value === null || value === void 0 ? void 0 : value.toString().replace(/[+*?$^(,)]/g, '')).toLocaleString('en-US');
+  if (value === undefined || value === null) return null; // const formatted = Number(value?.toString().replace(/[+*?$^(,)]/g, '')).toLocaleString('en-US');
+
   return /*#__PURE__*/_react.default.createElement("div", {
     "data-testid": 'test-price',
     className: "price ".concat(className)
-  }, !unitAfter && unit, formatted, unitAfter && unit);
+  }, (0, _fieldValueFormatters.formatToPriceWithCurrency)(value, currencyCode, isSymbolAfter ? 'after' : 'before'));
 };
 
 var _default = Price;

package/dist/Functions/fieldValueFormatters.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.formatToReplaceAllWhiteSpace = formatToReplaceAllWhiteSpace;
-exports.formatToHideValuePartially = exports.filterNumeric = exports.filterFloat = exports.formatToHex = exports.formatToLimitLength = exports.formatNumberValueToMask = exports.formatToCutOffDotAtTheEnd = exports.formatToOnlyASCIICodeText = exports.formatToPriceWithUSD = exports.formatToTwoDigitAfterDot = exports.formatToDollarSign = exports.formatToAddBitDepthPoints = exports.formatToRemoveComa = exports.formatOnlyNumbers = exports.intlNumbersFormatter = exports.getSafelyValue = void 0;
+exports.formatToHideValuePartially = exports.filterNumeric = exports.filterFloat = exports.formatToHex = exports.formatToLimitLength = exports.formatNumberValueToMask = exports.formatToCutOffDotAtTheEnd = exports.formatToOnlyASCIICodeText = exports.formatToPriceWithCurrency = exports.formatToPriceWithUSD = exports.formatToTwoDigitAfterDot = exports.formatToDollarSign = exports.formatToAddBitDepthPoints = exports.formatToRemoveComa = exports.formatOnlyNumbers = exports.intlNumbersFormatter = exports.getSafelyValue = void 0;
 
 // The first word "format" in the function name means a
 //logic in which the function transforms the incoming value in any case.
@@ -79,10 +79,23 @@ var intlNumbersFormatter = function intlNumbersFormatter(inputValue) {
 
   var quantity = fractionDigits.quantity,
       _fractionDigits$isRen = fractionDigits.isRenderAlways,
-      isRenderAlways = _fractionDigits$isRen === void 0 ? false : _fractionDigits$isRen;
+      isRenderAlways = _fractionDigits$isRen === void 0 ? false : _fractionDigits$isRen,
+      inputMinimumFractionDigits = fractionDigits.minimumFractionDigits,
+      inputMaximumFractionDigits = fractionDigits.maximumFractionDigits,
+      conditionallyMinimumFractionDigits = fractionDigits.conditionallyMinimumFractionDigits;
   var dotIndex = inputValue === null || inputValue === void 0 ? void 0 : inputValue.indexOf('.');
   var afterDot = dotIndex !== -1 ? inputValue.slice(dotIndex + 1) : '';
-  var minimumFractionDigits = afterDot && lastSym !== '.' ? inputValue.slice(dotIndex).length - 1 : isRenderAlways ? quantity : 0;
+
+  var minimumFractionDigits = function () {
+    if (typeof inputMinimumFractionDigits === 'number') return inputMinimumFractionDigits;
+
+    if (typeof conditionallyMinimumFractionDigits === 'number') {
+      return afterDot && lastSym !== '.' ? conditionallyMinimumFractionDigits : 0;
+    }
+
+    return afterDot && lastSym !== '.' ? inputValue.slice(dotIndex).length - 1 : isRenderAlways ? quantity : 0;
+  }();
+
   var priceSettings = {
     useGrouping: useGrouping,
     //группировка разрядов
@@ -94,8 +107,8 @@ var intlNumbersFormatter = function intlNumbersFormatter(inputValue) {
     //валюта в виде символа
     //минимально не надо отображать центы, если их нет, иначе всегда будет .00
     minimumFractionDigits: minimumFractionDigits,
-    maximumFractionDigits: quantity //максимально отображать 2 цифры после запятой, если центы всё же есть
-
+    //максимально отображать 2 цифры после запятой, если центы всё же есть
+    maximumFractionDigits: inputMaximumFractionDigits !== null && inputMaximumFractionDigits !== void 0 ? inputMaximumFractionDigits : quantity
   };
   var output;
 
@@ -165,14 +178,33 @@ var formatToPriceWithUSD = function formatToPriceWithUSD(value) {
       currencyType: 'USD'
     },
     fractionDigits: {
-      quantity: 2
+      quantity: 2,
+      conditionallyMinimumFractionDigits: 2
     }
   });
-}; // eslint-disable-next-line no-control-regex
+}; //! symbolPosition временно не реализовано
 
 
 exports.formatToPriceWithUSD = formatToPriceWithUSD;
 
+var formatToPriceWithCurrency = function formatToPriceWithCurrency(value, currencyCode) {
+  var symbolPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'before';
+  if (isNaN(Number(value))) return value;
+  return intlNumbersFormatter(getSafelyValue(value), {
+    withSymbol: 'currency',
+    currency: {
+      currencyType: currencyCode
+    },
+    fractionDigits: {
+      quantity: 2,
+      conditionallyMinimumFractionDigits: 2
+    }
+  });
+}; // eslint-disable-next-line no-control-regex
+
+
+exports.formatToPriceWithCurrency = formatToPriceWithCurrency;
+
 var formatToOnlyASCIICodeText = function formatToOnlyASCIICodeText(text) {
   return getSafelyValue(text).replace(/[^\x00-\x7F]+/g, '');
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intelicoreact",
-  "version": "1.2.50",
+  "version": "1.2.52",
   "description": "",
   "main": "dist/index.js",
   "files": [