@xaypay/tui 0.2.9 → 0.2.10

package/dist/index.es.js

@@ -2291,9 +2291,6 @@ const handleUtilsCheckTypeNumber = (val, prevVal, maxLength, floatToFix, maxNumS
     if (val.length > 16 && !val.includes('.')) {
       val = val.substr(0, 16);
     }
-    if (val < Number.MIN_SAFE_INTEGER || val > Number.MAX_SAFE_INTEGER || innerMinNumSize && val < innerMinNumSize || maxNumSize && val > maxNumSize) {
-      val = prevVal;
-    }
     const floatNumParts = typeof val === 'string' ? val.split(/\.|\․|\.|\,/) : val;
     const int = floatNumParts[0];
     const float = floatNumParts[1];
@@ -4056,23 +4053,31 @@ const NumberInput = ({
   float,
   radius,
   disabled,
-  maxLength,
   inpStyles,
   minNumSize,
   maxNumSize,
   inputChange,
-  inpAttributes
+  inpAttributes,
+  setInnerErrorMessage
 }) => {
   const [innerValue, setInnerValue] = useState('');
   const [innerMinNumSize, setInnerMinNumSize] = useState(0);
   const handleChange = event => {
     let prevValue = innerValue;
     let currentValue = event.target.value;
-    const max = maxLength ? maxLength : null;
-    currentValue = handleUtilsCheckTypeNumber(currentValue, prevValue, max, float, maxNumSize, dots, innerMinNumSize);
+    currentValue = handleUtilsCheckTypeNumber(currentValue, prevValue, null, float, maxNumSize, dots);
     setInnerValue(() => currentValue);
     if (inputChange && currentValue !== prevValue) {
-      inputChange(currentValue);
+      if (currentValue < Number.MIN_SAFE_INTEGER || currentValue > Number.MAX_SAFE_INTEGER || innerMinNumSize && currentValue < innerMinNumSize || maxNumSize && currentValue > maxNumSize) {
+        if (currentValue === '') {
+          setInnerErrorMessage(() => '');
+        } else {
+          setInnerErrorMessage(() => `Լրացված դաշտի արժեքը պետք է լինի ${innerMinNumSize} - ${maxNumSize} միջակայքում`);
+        }
+      } else if (currentValue >= Number.MIN_SAFE_INTEGER || currentValue <= Number.MAX_SAFE_INTEGER || innerMinNumSize && currentValue >= innerMinNumSize || maxNumSize && currentValue <= maxNumSize) {
+        inputChange(currentValue);
+        setInnerErrorMessage(() => '');
+      }
     }
   };
   useEffect(() => {
@@ -4082,18 +4087,14 @@ const NumberInput = ({
     } else if (minNumSize && minNumSize >= 0) {
       setInnerMinNumSize(minNumSize);
     }
-    if ((maxNumSize || maxNumSize === 0 || minNumSize || minNumSize === 0) && (maxLength || maxLength === 0)) {
-      alert("You can't use maxNumSize or minNumSize and maxLength props together when Input type is number");
-    }
-    if (maxNumSize < minNumSize) {
+    if (maxNumSize && maxNumSize < minNumSize) {
       alert("maxNumSize prop can't be less then minNumSize");
     }
-  }, [maxLength, minNumSize, maxNumSize]);
+  }, [minNumSize, maxNumSize]);
   useEffect(() => {
     let newValue = '';
     if (value !== undefined && value !== null) {
-      const max = maxLength ? maxLength : null;
-      newValue = handleUtilsCheckTypeNumber(value, newValue, max, float, maxNumSize, dots, innerMinNumSize);
+      newValue = handleUtilsCheckTypeNumber(value, newValue, null, float, maxNumSize, dots);
     }
     setInnerValue(() => newValue);
   }, [dots, value, float, maxNumSize, minNumSize]);
@@ -4327,11 +4328,11 @@ const Input = ({
     float: floatToFix,
     disabled: disabled,
     inputChange: change,
-    maxLength: maxLength,
     inpStyles: inpStyles,
     inpAttributes: inpAttributes,
     minNumSize: minNumSize ? minNumSize : '',
     maxNumSize: maxNumSize ? maxNumSize : '',
+    setInnerErrorMessage: setInnerErrorMessage,
     radius: radius ?? configStyles.INPUT.radius
   }) : type === 'password' ? /*#__PURE__*/React__default.createElement(PassInput, {
     show: show,
@@ -4339,18 +4340,18 @@ const Input = ({
     value: innerValue,
     disabled: disabled,
     inputChange: change,
-    maxLength: maxLength,
     inpStyles: inpStyles,
     inpAttributes: inpAttributes,
-    radius: radius ?? configStyles.INPUT.radius
+    radius: radius ?? configStyles.INPUT.radius,
+    maxLength: maxLength ?? configStyles.INPUT.maxLength
   }) : /*#__PURE__*/React__default.createElement(TextInput, {
     value: innerValue,
     disabled: disabled,
     inputChange: change,
     inpStyles: inpStyles,
-    maxLength: maxLength,
     inpAttributes: inpAttributes,
-    radius: radius ?? configStyles.INPUT.radius
+    radius: radius ?? configStyles.INPUT.radius,
+    maxLength: maxLength ?? configStyles.INPUT.maxLength
   }), rightIcon && rightIcon.length > 0 ? /*#__PURE__*/React__default.createElement("div", {
     onClick: type === 'password' ? handleShowPass : _ => _,
     style: {
@@ -4829,9 +4830,9 @@ const Select = ({
       }
     }
     if (!multiple) {
-      options && options.length > 0 && setExistOptions(options);
+      options && setExistOptions(options);
     } else {
-      const modifiedOptions = options && options.length > 0 && options.map(item => {
+      const modifiedOptions = options && options.map(item => {
         item.checked = false;
         if (selected && selected.length > 0) {
           selected.map(innerItem => {

package/dist/index.js

@@ -2322,9 +2322,6 @@ const handleUtilsCheckTypeNumber = (val, prevVal, maxLength, floatToFix, maxNumS
     if (val.length > 16 && !val.includes('.')) {
       val = val.substr(0, 16);
     }
-    if (val < Number.MIN_SAFE_INTEGER || val > Number.MAX_SAFE_INTEGER || innerMinNumSize && val < innerMinNumSize || maxNumSize && val > maxNumSize) {
-      val = prevVal;
-    }
     const floatNumParts = typeof val === 'string' ? val.split(/\.|\․|\.|\,/) : val;
     const int = floatNumParts[0];
     const float = floatNumParts[1];
@@ -4087,23 +4084,31 @@ const NumberInput = ({
   float,
   radius,
   disabled,
-  maxLength,
   inpStyles,
   minNumSize,
   maxNumSize,
   inputChange,
-  inpAttributes
+  inpAttributes,
+  setInnerErrorMessage
 }) => {
   const [innerValue, setInnerValue] = React.useState('');
   const [innerMinNumSize, setInnerMinNumSize] = React.useState(0);
   const handleChange = event => {
     let prevValue = innerValue;
     let currentValue = event.target.value;
-    const max = maxLength ? maxLength : null;
-    currentValue = handleUtilsCheckTypeNumber(currentValue, prevValue, max, float, maxNumSize, dots, innerMinNumSize);
+    currentValue = handleUtilsCheckTypeNumber(currentValue, prevValue, null, float, maxNumSize, dots);
     setInnerValue(() => currentValue);
     if (inputChange && currentValue !== prevValue) {
-      inputChange(currentValue);
+      if (currentValue < Number.MIN_SAFE_INTEGER || currentValue > Number.MAX_SAFE_INTEGER || innerMinNumSize && currentValue < innerMinNumSize || maxNumSize && currentValue > maxNumSize) {
+        if (currentValue === '') {
+          setInnerErrorMessage(() => '');
+        } else {
+          setInnerErrorMessage(() => `Լրացված դաշտի արժեքը պետք է լինի ${innerMinNumSize} - ${maxNumSize} միջակայքում`);
+        }
+      } else if (currentValue >= Number.MIN_SAFE_INTEGER || currentValue <= Number.MAX_SAFE_INTEGER || innerMinNumSize && currentValue >= innerMinNumSize || maxNumSize && currentValue <= maxNumSize) {
+        inputChange(currentValue);
+        setInnerErrorMessage(() => '');
+      }
     }
   };
   React.useEffect(() => {
@@ -4113,18 +4118,14 @@ const NumberInput = ({
     } else if (minNumSize && minNumSize >= 0) {
       setInnerMinNumSize(minNumSize);
     }
-    if ((maxNumSize || maxNumSize === 0 || minNumSize || minNumSize === 0) && (maxLength || maxLength === 0)) {
-      alert("You can't use maxNumSize or minNumSize and maxLength props together when Input type is number");
-    }
-    if (maxNumSize < minNumSize) {
+    if (maxNumSize && maxNumSize < minNumSize) {
       alert("maxNumSize prop can't be less then minNumSize");
     }
-  }, [maxLength, minNumSize, maxNumSize]);
+  }, [minNumSize, maxNumSize]);
   React.useEffect(() => {
     let newValue = '';
     if (value !== undefined && value !== null) {
-      const max = maxLength ? maxLength : null;
-      newValue = handleUtilsCheckTypeNumber(value, newValue, max, float, maxNumSize, dots, innerMinNumSize);
+      newValue = handleUtilsCheckTypeNumber(value, newValue, null, float, maxNumSize, dots);
     }
     setInnerValue(() => newValue);
   }, [dots, value, float, maxNumSize, minNumSize]);
@@ -4358,11 +4359,11 @@ const Input = ({
     float: floatToFix,
     disabled: disabled,
     inputChange: change,
-    maxLength: maxLength,
     inpStyles: inpStyles,
     inpAttributes: inpAttributes,
     minNumSize: minNumSize ? minNumSize : '',
     maxNumSize: maxNumSize ? maxNumSize : '',
+    setInnerErrorMessage: setInnerErrorMessage,
     radius: radius ?? configStyles.INPUT.radius
   }) : type === 'password' ? /*#__PURE__*/React__default["default"].createElement(PassInput, {
     show: show,
@@ -4370,18 +4371,18 @@ const Input = ({
     value: innerValue,
     disabled: disabled,
     inputChange: change,
-    maxLength: maxLength,
     inpStyles: inpStyles,
     inpAttributes: inpAttributes,
-    radius: radius ?? configStyles.INPUT.radius
+    radius: radius ?? configStyles.INPUT.radius,
+    maxLength: maxLength ?? configStyles.INPUT.maxLength
   }) : /*#__PURE__*/React__default["default"].createElement(TextInput, {
     value: innerValue,
     disabled: disabled,
     inputChange: change,
     inpStyles: inpStyles,
-    maxLength: maxLength,
     inpAttributes: inpAttributes,
-    radius: radius ?? configStyles.INPUT.radius
+    radius: radius ?? configStyles.INPUT.radius,
+    maxLength: maxLength ?? configStyles.INPUT.maxLength
   }), rightIcon && rightIcon.length > 0 ? /*#__PURE__*/React__default["default"].createElement("div", {
     onClick: type === 'password' ? handleShowPass : _ => _,
     style: {
@@ -4860,9 +4861,9 @@ const Select = ({
       }
     }
     if (!multiple) {
-      options && options.length > 0 && setExistOptions(options);
+      options && setExistOptions(options);
     } else {
-      const modifiedOptions = options && options.length > 0 && options.map(item => {
+      const modifiedOptions = options && options.map(item => {
         item.checked = false;
         if (selected && selected.length > 0) {
           selected.map(innerItem => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaypay/tui",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.es.js",