intelicoreact 1.1.64 → 1.1.66

package/dist/Atomic/FormElements/InputMask2/InputMask2.js

@@ -601,18 +601,22 @@ function InputMask2() {
 
   (0, _react.useEffect)(function () {
     if (isMaskRendered && isInitValue) {
-      var _prevValueRef$current, _prevValueRef$current2;
-
       setError(false);
       var values = [getClearInnerValueAsString(), getInputValue({
         noLastTyppedCharIndexCheck: true
       })];
       if (returnMaskedValue) values.reverse();
-
-      if ((prevValueRef === null || prevValueRef === void 0 ? void 0 : (_prevValueRef$current = prevValueRef.current) === null || _prevValueRef$current === void 0 ? void 0 : _prevValueRef$current[0]) !== values[0] && (prevValueRef === null || prevValueRef === void 0 ? void 0 : (_prevValueRef$current2 = prevValueRef.current) === null || _prevValueRef$current2 === void 0 ? void 0 : _prevValueRef$current2[1]) !== values[1] && value !== values[0] && value !== values[1]) {
+      onChangeProp.apply(void 0, values); //todo Этот функционал ломает логику - инпут начиначиет возвращать промежуточные онченджи с пустым вэлью, при правильной отрисовке форма видит пустое вэлью.
+
+      /*if (
+        prevValueRef?.current?.[0] !== values[0] &&
+        prevValueRef?.current?.[1] !== values[1] &&
+        value !== values[0] &&
+        value !== values[1]
+      ) {
         prevValueRef.current = values;
-        onChangeProp.apply(void 0, values);
-      }
+        onChangeProp(...values);
+      }*/
     }
   }, [innerValue, isMaskRendered, isInitValue, value]); // Blink Error
 

package/dist/Atomic/FormElements/NumericInput/NumericInput.js

@@ -21,8 +21,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _reactFeather = require("react-feather");
 
-var _reactInputMask = _interopRequireDefault(require("react-input-mask"));
-
 var _index = require("../../../Constants/index.constants");
 
 var _fieldValueFormatters = require("../../../Functions/fieldValueFormatters");
@@ -41,9 +39,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-var timerOutside;
-var timerFocus;
-
 var NumericInput = function NumericInput(_ref) {
   var disabled = _ref.disabled,
       withDelete = _ref.withDelete,
@@ -69,12 +64,10 @@ var NumericInput = function NumericInput(_ref) {
       onKeyUp = _ref$onKeyUp === void 0 ? function () {} : _ref$onKeyUp,
       _ref$onKeyDown = _ref.onKeyDown,
       onKeyDown = _ref$onKeyDown === void 0 ? function () {} : _ref$onKeyDown,
-      mask = _ref.mask,
       maskChar = _ref.maskChar,
       formatChars = _ref.formatChars,
       error = _ref.error,
       icon = _ref.icon,
-      symbolsLimit = _ref.symbolsLimit,
       isNotBlinkErrors = _ref.isNotBlinkErrors,
       blinkTime = _ref.blinkTime,
       isPriceInput = _ref.isPriceInput,
@@ -85,14 +78,17 @@ var NumericInput = function NumericInput(_ref) {
       _ref$isUseAutoSelect = _ref.isUseAutoSelect,
       isUseAutoSelect = _ref$isUseAutoSelect === void 0 ? true : _ref$isUseAutoSelect,
       _ref$isLoading = _ref.isLoading,
-      isLoading = _ref$isLoading === void 0 ? false : _ref$isLoading;
+      isLoading = _ref$isLoading === void 0 ? false : _ref$isLoading,
+      _ref$onlyNumbers = _ref.onlyNumbers,
+      onlyNumbers = _ref$onlyNumbers === void 0 ? {
+    type: 'int'
+  } : _ref$onlyNumbers;
   var DEFAULT_BLINK_TIME = 200; //REFS
 
   var inputRef = (0, _react.useRef)(null);
   var decRef = (0, _react.useRef)(null);
   var incRef = (0, _react.useRef)(null);
-  var wrapRef = (0, _react.useRef)(null);
-  var previousValueRef = (0, _react.useRef)(value || min || ''); // STATES
+  var wrapRef = (0, _react.useRef)(null); // STATES
 
   var _useState = (0, _react.useState)(value || min || ''),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -116,27 +112,18 @@ var NumericInput = function NumericInput(_ref) {
 
   var _useState9 = (0, _react.useState)(false),
       _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-      isEditing = _useState10[0],
-      setEditing = _useState10[1];
+      isAttemptToChange = _useState10[0],
+      setIsAttemptToChange = _useState10[1];
 
   var _useState11 = (0, _react.useState)(false),
       _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-      isAttemptToChange = _useState12[0],
-      setIsAttemptToChange = _useState12[1];
+      isToHighlightError = _useState12[0],
+      setIsToHighlightError = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(false),
+  var _useState13 = (0, _react.useState)(value || min || ''),
       _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-      isToHighlightError = _useState14[0],
-      setIsToHighlightError = _useState14[1];
-
-  var _useState15 = (0, _react.useState)(value || min || ''),
-      _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-      prevValue = _useState16[0],
-      setPreviousValue = _useState16[1];
-
-  var formatedValue = (0, _react.useMemo)(function () {
-    return isFocused ? (0, _fieldValueFormatters.formatToRemoveComa)(inputValue) : (0, _fieldValueFormatters.formatToAddBitDepthPoints)(inputValue);
-  }, [inputValue, isFocused]);
+      prevValue = _useState14[0],
+      setPreviousValue = _useState14[1];
 
   var setCursorToEnd = function setCursorToEnd() {
     var _input$value;
@@ -151,15 +138,7 @@ var NumericInput = function NumericInput(_ref) {
 
   var handle = {
     change: function change(e) {
-      var inputValue = e.target ? (0, _fieldValueFormatters.filterNumeric)(e.target.value, {
-        type: 'int'
-      }) : e; // ToDo - не совсем понятно что проверяется, т.к. при нажатии инкремента/декримента
-      //ToDo все равно в change приходит число, а не эвент
-      // ToDo - боюсь сломать, временно оставляю, выпилить через какое-то время
-      // if (inputValue && (decRef.current?.contains?.(e.target) || incRef.current?.contains?.(e.target))) {
-      // if (symbolsLimit) inputValue = inputValue.toString().substring(0, +symbolsLimit);
-      // if (isPriceInput && inputValue?.length > 0) inputValue = addCommas(inputValue);
-
+      var inputValue = e.target ? (0, _fieldValueFormatters.filterNumeric)(e.target.value, onlyNumbers) : e;
       setInputValue(inputValue.toString());
     },
     clear: function clear() {
@@ -167,13 +146,10 @@ var NumericInput = function NumericInput(_ref) {
     },
     focus: function focus(e) {
       setIsFocused(true);
-      setEditing(true);
       if (onFocus) onFocus(e);
     },
     blur: function blur(e) {
       setIsFocused(false);
-      setEditing(false);
-      var transformedInputValue = parseFloat(inputValue);
       if (Number.isNaN(inputValue) || inputValue < min) setInputValue(min);
       if (max && +max < inputValue) setInputValue(max);
       if (onBlur) onBlur(e);
@@ -290,7 +266,6 @@ var NumericInput = function NumericInput(_ref) {
   }, [isFocused]);
   (0, _react.useEffect)(function () {
     if (inputRef !== null && inputRef !== void 0 && inputRef.current && typeof isFocusDefault === 'boolean') setIsFocused(isFocusDefault);
-    setEditing(isFocusDefault);
   }, [inputRef, isFocusDefault]);
 
   function renderInput() {

package/dist/Functions/fieldValueFormatters.js

@@ -264,34 +264,55 @@ function formatToReplaceAllWhiteSpace(str) {
   var value = getSafelyValue(str);
   return value.replace(/\s+/g, '');
 } // *** filter ***
+// export const filterFloat = (inputValue, decimalPlaces = null) => {
+//   const value = getSafelyValue(inputValue);
+//   const replaser = input => ('' + input).replace(/[^\.\d]/g, '');
+//
+//   if (value.length === 1 && (value[0] === '.' || value[0] === ',')) return '0.';
+//   let output = ('' + value)?.replace(/,/g, '.');
+//   if (value.length > 1 && value[0] === '0' && value[1] !== '.' && value[0] !== ',') output = value.slice(1);
+//
+//   const previousValue = '' + output.slice(0, -1);
+//   const lastSym = '' + output.slice(-1);
+//
+//   if (
+//     decimalPlaces &&
+//     typeof decimalPlaces === 'number' &&
+//     previousValue.includes('.') &&
+//     previousValue.indexOf('.') + 1 + decimalPlaces === previousValue.length
+//   )
+//     return replaser(previousValue);
+//   return replaser(lastSym === '.' && previousValue.includes('.') ? previousValue : output);
+// };
 
 
 var filterFloat = function filterFloat(inputValue) {
-  var _ref3;
-
   var decimalPlaces = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   var value = getSafelyValue(inputValue);
 
-  var replaser = function replaser(input) {
-    return ('' + input).replace(/[^\.\d]/g, '');
+  var replacer = function replacer(input) {
+    return ('' + input).replace(/[^\.\d,]/g, '');
   };
 
   if (value.length === 1 && (value[0] === '.' || value[0] === ',')) return '0.';
-  var output = (_ref3 = '' + value) === null || _ref3 === void 0 ? void 0 : _ref3.replace(/,/g, '.');
-  if (value.length > 1 && value[0] === '0' && value[1] !== '.' && value[0] !== ',') output = value.slice(1);
+  var output = value;
   var previousValue = '' + output.slice(0, -1);
   var lastSym = '' + output.slice(-1);
-  if (decimalPlaces && typeof decimalPlaces === 'number' && previousValue.includes('.') && previousValue.indexOf('.') + 1 + decimalPlaces === previousValue.length) return replaser(previousValue);
-  return replaser(lastSym === '.' && previousValue.includes('.') ? previousValue : output);
+
+  if (decimalPlaces && typeof decimalPlaces === 'number' && previousValue.includes('.') && previousValue.indexOf('.') + 1 + decimalPlaces === previousValue.length) {
+    return replacer(previousValue);
+  }
+
+  return replacer(lastSym === '.' && previousValue.includes('.') ? previousValue : output);
 };
 
 exports.filterFloat = filterFloat;
 
 var filterNumeric = function filterNumeric(value, settings) {
-  var _ref4 = settings || {},
-      _ref4$type = _ref4.type,
-      type = _ref4$type === void 0 ? 'float' : _ref4$type,
-      decimalPlaces = _ref4.decimalPlaces;
+  var _ref3 = settings || {},
+      _ref3$type = _ref3.type,
+      type = _ref3$type === void 0 ? 'float' : _ref3$type,
+      decimalPlaces = _ref3.decimalPlaces;
 
   var executor = type === 'float' ? filterFloat : formatOnlyNumbers;
   return executor(getSafelyValue(value), decimalPlaces);
@@ -300,13 +321,13 @@ var filterNumeric = function filterNumeric(value, settings) {
 exports.filterNumeric = filterNumeric;
 
 var formatToHideValuePartially = function formatToHideValuePartially(value, settings) {
-  var _ref5 = settings || {},
-      _ref5$showSymbolsCoun = _ref5.showSymbolsCount,
-      showSymbolsCount = _ref5$showSymbolsCoun === void 0 ? 4 : _ref5$showSymbolsCoun,
-      _ref5$isVisibleFromFr = _ref5.isVisibleFromFront,
-      isVisibleFromFront = _ref5$isVisibleFromFr === void 0 ? false : _ref5$isVisibleFromFr,
-      _ref5$isCutOutWhiteSp = _ref5.isCutOutWhiteSpaces,
-      isCutOutWhiteSpaces = _ref5$isCutOutWhiteSp === void 0 ? true : _ref5$isCutOutWhiteSp;
+  var _ref4 = settings || {},
+      _ref4$showSymbolsCoun = _ref4.showSymbolsCount,
+      showSymbolsCount = _ref4$showSymbolsCoun === void 0 ? 4 : _ref4$showSymbolsCoun,
+      _ref4$isVisibleFromFr = _ref4.isVisibleFromFront,
+      isVisibleFromFront = _ref4$isVisibleFromFr === void 0 ? false : _ref4$isVisibleFromFr,
+      _ref4$isCutOutWhiteSp = _ref4.isCutOutWhiteSpaces,
+      isCutOutWhiteSpaces = _ref4$isCutOutWhiteSp === void 0 ? true : _ref4$isCutOutWhiteSp;
 
   var safelyValue = getSafelyValue(value);
   var newValue = isCutOutWhiteSpaces ? safelyValue.replace(/\s/g, '') : safelyValue;

package/dist/Molecular/InputAddress/InputAddress.js

@@ -252,7 +252,7 @@ var InputAddress = function InputAddress(_ref) {
     if (!isListVisible) setListItems([]);
   }, [isListVisible]);
   (0, _react.useEffect)(function () {
-    if (preparedValue !== query || !isValueInited) {
+    if (preparedValue !== query && !isValueInited) {
       setQuery(preparedValue);
       setIsValueInited(true);
     }

package/package.json

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