diginet-core-ui 1.4.52-beta.6 → 1.4.52-beta.8

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;
@@ -153,13 +153,13 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
     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;
@@ -285,11 +285,18 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
   };
   const _onChange = e => {
     if (delayOnChange) {
+      var _e$target;
       if (inputTimer.current) clearTimeout(inputTimer.current);
+      const target = e.target;
+      target.value = globalRef.current.valueString;
+      target.valueString = globalRef.current.returnValue;
+      // eslint-disable-next-line no-extra-boolean-cast
+      if (!!((_e$target = e.target) !== null && _e$target !== void 0 && _e$target.valueString)) {
+        if (e.target.valueString.includes(decimalSymbol) && e.target.valueString.split(decimalSymbol)[1] === '') {
+          return;
+        }
+      }
       inputTimer.current = setTimeout(() => {
-        const target = e.target;
-        target.value = globalRef.current.valueString;
-        target.valueString = globalRef.current.returnValue;
         onChange({
           ...e,
           value: globalRef.current.value,
@@ -318,20 +325,19 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
       setError(errorProp);
     }
   }, [value]);
-
-  // useEffect(() => {
-  //     // if (typeof valueProps !== 'undefined')
-  //     //     if (disabledNegative && Number(valueProps || 0) < 0) {
-  //     if (!isNaN(valueProps) || !isNaN(value)) {
-  //         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);
-  //         }
-  //         // setValue(parseNumberToMoney(valueProps?.toString().replace(regexValidNumber, ''), true));
-  //         // setValue(parseNumberToMoney(valueProps?.toString().replace(regexValidNumber, ''), true));
-  //     }
-  // }, [valueProps, decimalDigit]);
-
+  useEffect(() => {
+    // 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);
+      }
+      // setValue(valueProps);
+      setValue(parseNumberToMoney((_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.toString().replace(regexValidNumber, ''), true));
+    }
+  }, [valueProps, decimalDigit]);
   useEffect(() => {
     setError(errorProp);
   }, [errorProp]);
@@ -487,10 +493,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.6",
+  "version": "1.4.52-beta.8",
   "description": "",
   "main": "index.js",
   "license": "UNLICENSED",