intelicoreact 1.2.51 → 1.2.53

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

@@ -37,6 +37,11 @@ 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 checkFormat = function checkFormat(date, format) {
+  var momentObj = (0, _momentTimezone.default)(date, format);
+  return momentObj.isValid() ? momentObj.format(format) : null;
+};
+
 var InputDateRange = function InputDateRange(props) {
   var _ref, _INTERVALS$actualValu;
 
@@ -61,15 +66,15 @@ var InputDateRange = function InputDateRange(props) {
       minDate = _props$minDate === void 0 ? null : _props$minDate,
       _props$maxDate = props.maxDate,
       maxDate = _props$maxDate === void 0 ? null : _props$maxDate,
-      _props$format = props.format,
-      format = _props$format === void 0 ? 'MM/DD/YYYY' : _props$format,
+      _props$minMaxDatePars = props.minMaxDateParseFormat,
+      minMaxDateParseFormat = _props$minMaxDatePars === void 0 ? 'MM/DD/YYYY' : _props$minMaxDatePars,
       isDontLimitFuture = props.isDontLimitFuture,
       isListTop = props.isListTop,
       isAltArrows = props.isAltArrows;
-  var formatedMinDate = (0, _momentTimezone.default)(minDate).format(format) !== 'Invalid date' ? (0, _momentTimezone.default)(minDate).format(format) : null;
-  var formatedMaxDate = (0, _momentTimezone.default)(maxDate).format(format) !== 'Invalid date' ? (0, _momentTimezone.default)(maxDate).format(format) : null;
-  var momentMinDate = (0, _momentTimezone.default)(formatedMinDate, format).startOf('day');
-  var momentMaxDate = (0, _momentTimezone.default)(formatedMaxDate, format).startOf('day');
+  var formatedMinDate = checkFormat(minDate, minMaxDateParseFormat);
+  var formatedMaxDate = checkFormat(maxDate, minMaxDateParseFormat);
+  var momentMinDate = (0, _momentTimezone.default)(formatedMinDate, minMaxDateParseFormat).startOf('day');
+  var momentMaxDate = (0, _momentTimezone.default)(formatedMaxDate, minMaxDateParseFormat).startOf('day');
   var actualValues = (0, _dependencies.getActualDateRange)(value);
 
   var _useToggle = (0, _dependencies.useToggle)(false),
@@ -97,14 +102,14 @@ var InputDateRange = function InputDateRange(props) {
 
     var formatedValue = _objectSpread(_objectSpread(_objectSpread({
       intervalKey: newValue.intervalKey,
-      start: newValue.start ? (0, _momentTimezone.default)(newValue.start).format('YYYY-MM-DDTHH:mm') : newValue.start,
-      end: newValue.end ? (0, _momentTimezone.default)(newValue.end).format('YYYY-MM-DDTHH:mm') : newValue.end
+      start: newValue.start ? (0, _momentTimezone.default)(newValue.start).format(_dependencies.MAIN_FORMAT) : newValue.start,
+      end: newValue.end ? (0, _momentTimezone.default)(newValue.end).format(_dependencies.MAIN_FORMAT) : newValue.end
     }, newValue.compare ? {
       compare: newValue.compare
     } : {}), newValue.startPrevDate ? {
-      startPrevDate: (0, _momentTimezone.default)(newValue.startPrevDate).format('YYYY-MM-DDTHH:mm')
+      startPrevDate: (0, _momentTimezone.default)(newValue.startPrevDate).format(_dependencies.MAIN_FORMAT)
     } : {}), newValue.endPrevDate ? {
-      endPrevDate: (0, _momentTimezone.default)(newValue.endPrevDate).format('YYYY-MM-DDTHH:mm')
+      endPrevDate: (0, _momentTimezone.default)(newValue.endPrevDate).format(_dependencies.MAIN_FORMAT)
     } : {});
 
     onChange(formatedValue);
@@ -122,8 +127,8 @@ var InputDateRange = function InputDateRange(props) {
     var start = actualValues.start,
         end = actualValues.end;
     if (!start || !end) return null;
-    var startTime = (0, _momentTimezone.default)(start).format('HH:mm');
-    var endTime = (0, _momentTimezone.default)(end).format('HH:mm');
+    var startTime = (0, _momentTimezone.default)(start).format(_dependencies.MAIN_TIME_FORMAT);
+    var endTime = (0, _momentTimezone.default)(end).format(_dependencies.MAIN_TIME_FORMAT);
     var firstPart = "".concat((0, _momentTimezone.default)(start).format('ll'), " ").concat(startTime !== '00:00' ? "(".concat(startTime, ")") : '');
     var secondPart = "".concat((endTime !== '00:00' ? (0, _momentTimezone.default)(end) : (0, _momentTimezone.default)(end).subtract(1, 'days')).format('ll'), " ").concat(endTime !== '00:00' ? "(".concat(endTime, ")") : '');
 
@@ -248,7 +253,6 @@ var InputDateRange = function InputDateRange(props) {
     onChange: handleChange,
     minDate: formatedMinDate,
     maxDate: formatedMaxDate,
-    format: format,
     momentMinDate: momentMinDate,
     momentMaxDate: momentMaxDate,
     isDontLimitFuture: isDontLimitFuture,

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

@@ -38,6 +38,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var outsideScope = {
   handleHoverTimerId: null
 };
+var DATE_INPUT_FORMAT = 'MM/DD/YYYY';
 
 var padTime = function padTime(time) {
   return "".concat(time.toString().padStart(2, '0'), ":00");
@@ -87,8 +88,8 @@ var Datepicker = function Datepicker(props) {
       setEndDate = _useState4[1];
 
   var dateInterval = getSelectedMode({
-    start: startDate.format('YYYY-MM-DDTHH:mm'),
-    end: endDate.format('YYYY-MM-DDTHH:mm')
+    start: startDate.format(_dependencies.MAIN_FORMAT),
+    end: endDate.format(_dependencies.MAIN_FORMAT)
   });
 
   var _useState5 = (0, _react.useState)(null),
@@ -165,7 +166,7 @@ var Datepicker = function Datepicker(props) {
   }, [startDate, endDate, isCompare]);
   var title = (0, _react.useMemo)(function () {
     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'), ")");
+      return "".concat((0, _momentTimezone.default)(startPrevDate).format('ll'), " (").concat((0, _momentTimezone.default)(startPrevDate).format(_dependencies.MAIN_TIME_FORMAT), ") - ").concat((0, _momentTimezone.default)(endPrevDate).format('ll'), " (").concat((0, _momentTimezone.default)(endPrevDate).format(_dependencies.MAIN_TIME_FORMAT), ")");
     } else return '';
   }, [startDate, endDate, isCompare]); // ********************
   // Methods
@@ -317,7 +318,7 @@ var Datepicker = function Datepicker(props) {
   };
 
   var processOverflow = function processOverflow(newDateAsString, valueForRollback, key) {
-    var newDateAsMomentObj = (0, _momentTimezone.default)(newDateAsString, 'MM/DD/YYYY'); // console.log('processOverflow - newDateAsString - ', newDateAsString);
+    var newDateAsMomentObj = (0, _momentTimezone.default)(newDateAsString, DATE_INPUT_FORMAT); // console.log('processOverflow - newDateAsString - ', newDateAsString);
     // console.log('processOverflow - valueForRollback - ', valueForRollback);
     // console.log('----------');
     // console.log('processOverflow - minDate - ', minDate);
@@ -423,10 +424,10 @@ var Datepicker = function Datepicker(props) {
       disabled: !startDate || !endDate,
       onClick: function onClick() {
         return onChange({
-          start: startDate,
-          end: endDate,
-          startPrevDate: startPrevDate,
-          endPrevDate: endPrevDate,
+          start: (0, _momentTimezone.default)(startDate).format(_dependencies.MAIN_FORMAT),
+          end: (0, _momentTimezone.default)(endDate).format(_dependencies.MAIN_FORMAT),
+          startPrevDate: (0, _momentTimezone.default)(startPrevDate).format(_dependencies.MAIN_FORMAT),
+          endPrevDate: (0, _momentTimezone.default)(endPrevDate).format(_dependencies.MAIN_FORMAT),
           compare: isCompare
         });
       }

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 = exports.getIsDateValid = void 0;
+exports.getActualDateRange = exports.MAIN_TIME_FORMAT = exports.MAIN_DATE_FORMAT = exports.MAIN_FORMAT = 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"));
 
@@ -237,6 +237,12 @@ var CUSTOM_INTERVAL_KEY = 'customDate';
 exports.CUSTOM_INTERVAL_KEY = CUSTOM_INTERVAL_KEY;
 var CUSTOM_INTERVAL_KEY_TEXT = 'Custom Date';
 exports.CUSTOM_INTERVAL_KEY_TEXT = CUSTOM_INTERVAL_KEY_TEXT;
+var MAIN_FORMAT = 'YYYY-MM-DDTHH:mm';
+exports.MAIN_FORMAT = MAIN_FORMAT;
+var MAIN_DATE_FORMAT = 'YYYY-MM-DD';
+exports.MAIN_DATE_FORMAT = MAIN_DATE_FORMAT;
+var MAIN_TIME_FORMAT = 'HH:mm';
+exports.MAIN_TIME_FORMAT = MAIN_TIME_FORMAT;
 
 var getActualDateRange = function getActualDateRange(inputDateRange) {
   var getActualIntervalKey = function getActualIntervalKey() {
@@ -270,8 +276,8 @@ var getActualDateRange = function getActualDateRange(inputDateRange) {
       endPrevDate: null
     };
     var actualValues = {
-      start: (_INTERVALS$intervalKe = INTERVALS[intervalKey]) === null || _INTERVALS$intervalKe === void 0 ? void 0 : (_INTERVALS$intervalKe2 = _INTERVALS$intervalKe.start()) === null || _INTERVALS$intervalKe2 === void 0 ? void 0 : _INTERVALS$intervalKe2.format('YYYY-MM-DDTHH:mm'),
-      end: (_INTERVALS$intervalKe3 = INTERVALS[intervalKey]) === null || _INTERVALS$intervalKe3 === void 0 ? void 0 : (_INTERVALS$intervalKe4 = _INTERVALS$intervalKe3.end()) === null || _INTERVALS$intervalKe4 === void 0 ? void 0 : _INTERVALS$intervalKe4.format('YYYY-MM-DDTHH:mm'),
+      start: (_INTERVALS$intervalKe = INTERVALS[intervalKey]) === null || _INTERVALS$intervalKe === void 0 ? void 0 : (_INTERVALS$intervalKe2 = _INTERVALS$intervalKe.start()) === null || _INTERVALS$intervalKe2 === void 0 ? void 0 : _INTERVALS$intervalKe2.format(MAIN_FORMAT),
+      end: (_INTERVALS$intervalKe3 = INTERVALS[intervalKey]) === null || _INTERVALS$intervalKe3 === void 0 ? void 0 : (_INTERVALS$intervalKe4 = _INTERVALS$intervalKe3.end()) === null || _INTERVALS$intervalKe4 === void 0 ? void 0 : _INTERVALS$intervalKe4.format(MAIN_FORMAT),
       compare: inputDateRange.compare
     };
 

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.51",
+  "version": "1.2.53",
   "description": "",
   "main": "dist/index.js",
   "files": [