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

package/components/form-control/dropdown/index.js

@@ -459,8 +459,7 @@ const Dropdown = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((inProps, reference)
       parentID: treeViewParentID,
       value: typeof currentValue[unique] === 'string' ? [currentValue[unique]] : currentValue[unique],
       onChange: (e, value) => onChangeValue(e, '', multiple ? value : e.value),
-      renderItem: renderItem,
-      isInDropdown: true
+      renderItem: renderItem
     }) : EmptyDataText);
   };
 

package/components/form-control/money-input/index.js

@@ -116,6 +116,7 @@ const MoneyInput = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((inProps, reference
     viewType,
     defaultValue,
     value,
+    fixedDecimalDigit,
     ...other
   } = props;
   const ref = useRef(null);
@@ -332,11 +333,24 @@ const MoneyInput = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((inProps, reference
       if (value === null) {
         inputRef.current.value = '';
       } else {
-        const v = getValueWithDecimal(value.toString().replace('.', decimalSymbol));
+        let number = value;
+        if (fixedDecimalDigit && !!decimalDigit) {
+          var _strVal$split;
+          const strVal = String(value);
+          const isDecimalNum = strVal.indexOf('.') > -1 && (((_strVal$split = strVal.split('.')) === null || _strVal$split === void 0 ? void 0 : _strVal$split[1]) || '').length >= decimalDigit;
+          if (isDecimalNum) {
+            const coreToFixed = (num, precision) => {
+              return (+(Math.round(+(num + 'e' + precision)) + 'e' + -precision)).toFixed(precision);
+            };
+            const val = coreToFixed(Number(String(value).replace(thousandSeparator, '')), decimalDigit);
+            number = String(val);
+          }
+        }
+        const v = getValueWithDecimal(number.toString().replace('.', decimalSymbol));
         if (convertToWords && !decimalDigit && (disabled || readOnly)) {
           let valueConverted = getGlobal('helperInvalid');
-          if (Number.isInteger(value)) {
-            valueConverted = locale.get() === 'vi' ? num2WordsVi.convert(value) : num2WordsEn(value);
+          if (Number.isInteger(number)) {
+            valueConverted = locale.get() === 'vi' ? num2WordsVi.convert(number) : num2WordsEn(number);
           }
           inputRef.current.value = parseValueWithFix(valueConverted);
         } else {
@@ -508,6 +522,8 @@ MoneyInput.propTypes = {
   /**  [Props](https://core.diginet.com.vn/ui/?path=/docs/form-control-text-label) of label. */
   labelProps: PropTypes.object,
   /**  [Props](https://core.diginet.com.vn/ui/?path=/story/form-control-text-helpertext) of helper text. */
-  helperTextProps: PropTypes.object
+  helperTextProps: PropTypes.object,
+  /** If `true`, decimal digit is fixed. */
+  fixedDecimalDigit: PropTypes.bool
 };
 export default MoneyInput;

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;
@@ -115,6 +115,18 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
       }
     } = inputRef;
     let number = convertMoneyToNumber(vl, isNumber);
+    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 coreToFixed = (num, precision) => {
+          return (+(Math.round(+(num + 'e' + precision)) + 'e' + -precision)).toFixed(precision);
+        };
+        const val = coreToFixed(Number(String(vl).replace(thousandSymbol, '')), decimalDigit);
+        number = String(val);
+      }
+    }
 
     // if (disabledNegative && Number(number || 0) < 0) number = clamp(number, min, max);
     // if (typeof max !== 'undefined' && Number(number) > max) number = Math.min(number, max);
@@ -138,25 +150,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 +284,26 @@ 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) {
+      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(() => {
+        onChange({
+          ...e,
+          value: globalRef.current.value,
+          target
+        });
+      }, delayOnChange);
+    }
   };
   const validateResult = validates && onValidate(Number(convertMoneyToNumber(value) || 0), validates, true);
   useEffect(() => {
@@ -314,18 +329,13 @@ 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?.toString().replace(regexValidNumber, ''), true));
+      // setValue(valueProps);
+      setValue(parseNumberToMoney((_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.toString().replace(regexValidNumber, ''), true));
     }
   }, [valueProps, decimalDigit]);
   useEffect(() => {
@@ -483,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/components/tree-view/index.js

@@ -37,7 +37,6 @@ const TreeView = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((inProps, reference)
     expand,
     expandIcon,
     id,
-    isInDropdown,
     multiple,
     multipleValueMode,
     onChange,
@@ -70,7 +69,7 @@ const TreeView = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((inProps, reference)
     allowNumber: false,
     allowSymbol: false
   }));
-  const _TreeViewRootCSS = TreeViewRootCSS(theme, isInDropdown);
+  const _TreeViewRootCSS = TreeViewRootCSS(theme);
   const determinateCheckbox = (input, determinate) => {
     if (multipleValueMode === 'multiple' || disabledRelevantValue) {
       input.classList[determinate ? 'add' : 'remove']('determinate');
@@ -794,7 +793,7 @@ const TreeView = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((inProps, reference)
 const TreeViewRootCSS = ({
   colors,
   spacing
-}, isInDropdown) => css`
+}) => css`
     ${displayBlock};
     ${positionRelative};
     .DGN-UI-Accordion {
@@ -834,7 +833,7 @@ const TreeViewRootCSS = ({
     .TreeView-Content {
         ${displayBlock};
         ${positionRelative};
-        ${isInDropdown && parseMaxHeight(240)};
+        ${parseMaxHeight(240)};
         ${overflowYScroll};
         &::-webkit-scrollbar {
             ${borderRadius(4)};

package/package.json

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