diginet-core-ui 1.4.52-beta.0 → 1.4.52-beta.2

package/components/form-control/number-input/index2.js

@@ -99,13 +99,13 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
 
   // if (valueProps || valueProps === 0) valueProps = clamp(valueProps, min, max);
 
-  /**
-   * Convert number to format money
-   * @param vl {number} - value
-   * @type {function}
-   * @return {string}
-   * @example 1200300.123 => 1,200,300.123
-   * @example 1200300,123 => 1.200.300,123
+  /**
+   * Convert number to format money
+   * @param vl {number} - value
+   * @type {function}
+   * @return {string}
+   * @example 1200300.123 => 1,200,300.123
+   * @example 1200300,123 => 1.200.300,123
    */
   const parseNumberToMoney = useCallback((vl, isNumber) => {
     var _number, _number2, _number$, _number3;
@@ -114,6 +114,15 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
         selectionStart
       }
     } = inputRef;
+    if (fixedDecimalDigit && !!decimalDigit) {
+      var _strVal$split;
+      const strVal = String(vl);
+      const isDecimalNum = strVal.indexOf('.') > -1 && (((_strVal$split = strVal.split('.')) === null || _strVal$split === void 0 ? void 0 : _strVal$split[1]) || '').length >= decimalDigit;
+      if (isDecimalNum) {
+        const val = Number(vl.replace(thousandSymbol, '')).toFixed(decimalDigit);
+        number = String(val);
+      }
+    }
     let number = convertMoneyToNumber(vl, isNumber);
 
     // if (disabledNegative && Number(number || 0) < 0) number = clamp(number, min, max);
@@ -138,25 +147,16 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
     if (((_number3 = number) === null || _number3 === void 0 ? void 0 : _number3.indexOf(thousandSymbol)) > -1 && selectionStart !== number.length + 1) {
       pos.current = selectionStart + (number.toString().length - 1 === vl.toString().length ? 1 : 0);
     }
-    if (fixedDecimalDigit && !!decimalDigit) {
-      var _strVal$split;
-      const strVal = String(vl);
-      const isDecimalNum = strVal.indexOf('.') > -1 && (((_strVal$split = strVal.split('.')) === null || _strVal$split === void 0 ? void 0 : _strVal$split[1]) || '').length >= decimalDigit;
-      if (isDecimalNum) {
-        const val = Number(vl).toFixed(decimalDigit);
-        number = String(val);
-      }
-    }
     return number;
   }, [decimalSymbol, max, value, decimalDigit, fixedDecimalDigit]);
 
-  /**
-   * Convert money to format number
-   * @param vl {string} - value
-   * @type {function}
-   * @return {number}
-   * @example 1,200,300.123 => 1200300.123
-   * @example 1.200.300,123 => 1200300.123
+  /**
+   * Convert money to format number
+   * @param vl {string} - value
+   * @type {function}
+   * @return {number}
+   * @example 1,200,300.123 => 1200300.123
+   * @example 1.200.300,123 => 1200300.123
    */
   const convertMoneyToNumber = useCallback((vl, isNumber) => {
     var _number4, _number4$toString, _number4$toString$rep, _number4$toString$rep2, _number4$toString$rep3;
@@ -281,14 +281,19 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
     onFocus && onFocus(e);
   };
   const _onChange = e => {
-    const target = e.target;
-    target.value = globalRef.current.valueString;
-    target.valueString = globalRef.current.returnValue;
-    onChange({
-      ...e,
-      value: globalRef.current.value,
-      target
-    });
+    if (delayOnChange) {
+      if (inputTimer.current) clearTimeout(inputTimer.current);
+      inputTimer.current = setTimeout(() => {
+        const target = e.target;
+        target.value = globalRef.current.valueString;
+        target.valueString = globalRef.current.returnValue;
+        onChange({
+          ...e,
+          value: globalRef.current.value,
+          target
+        });
+      }, delayOnChange);
+    }
   };
   const validateResult = validates && onValidate(Number(convertMoneyToNumber(value) || 0), validates, true);
   useEffect(() => {
@@ -314,17 +319,12 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
     // if (typeof valueProps !== 'undefined')
     //     if (disabledNegative && Number(valueProps || 0) < 0) {
     if (!isNaN(valueProps) || !isNaN(value)) {
+      var _valueProps;
       if (min === 0 && Number(valueProps || 0) < 0) {
         // nếu không cho nhập số âm mà value đầu vào là âm thì reset value về 0
         valueProps = clamp(0, min, max);
       }
-      if (delayOnChange) {
-        if (inputTimer.current) clearTimeout(inputTimer.current);
-        inputTimer.current = setTimeout(() => {
-          var _valueProps;
-          setValue(parseNumberToMoney((_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.toString().replace(regexValidNumber, ''), true));
-        }, delayOnChange);
-      }
+      setValue(parseNumberToMoney((_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.toString().replace(regexValidNumber, ''), true));
       // setValue(parseNumberToMoney(valueProps?.toString().replace(regexValidNumber, ''), true));
     }
   }, [valueProps, decimalDigit]);
@@ -393,7 +393,7 @@ const NumberInputRootCSS = ({
     }
 `;
 NumberInput.defaultProps = {
-  delayOnChange: 500
+  delayOnChange: 1000
   // autoFocus: false,
   // className: '',
   // decimalDigit: Infinity,
@@ -483,10 +483,10 @@ NumberInput.propTypes = {
   style: PropTypes.object,
   /** Thousand separator character. */
   thousandSeparator: PropTypes.oneOfType([PropTypes.bool, PropTypes.oneOf(['.', ','])]),
-  /** Validation value, argument can:<br/>
-   * * string: the validation rule. Example required.<br/>
-   * * object: the validation rule insist name, property, message. Example {name: 'min', compareValue: 9, message: 'Error'} or {max: 99}<br/>
-   * * array: the validation rule list, insist object/string
+  /** Validation value, argument can:<br/>
+   * * string: the validation rule. Example required.<br/>
+   * * object: the validation rule insist name, property, message. Example {name: 'min', compareValue: 9, message: 'Error'} or {max: 99}<br/>
+   * * array: the validation rule list, insist object/string
    */
   validates: PropTypes.oneOfType([PropTypes.string, PropTypes.object, PropTypes.array, PropTypes.func]),
   /** The value of the input element, required for a controlled component. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diginet-core-ui",
-  "version": "1.4.52-beta.0",
+  "version": "1.4.52-beta.2",
   "description": "",
   "main": "index.js",
   "license": "UNLICENSED",