diginet-core-ui 1.4.52-beta.7 → 1.4.52-beta.9

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/number-input/index2.js

@@ -65,15 +65,14 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
     style,
     thousandSeparator,
     validates,
-    // value: valueProp,
+    value: valueProp,
     viewType
   } = props;
   let max = maxProp;
   let min = minProp;
   let thousandSymbol = thousandSeparator;
   let decimalSymbol = decimalSymbolProp;
-  // let valueProps = valueProp;
-
+  let valueProps = valueProp;
   if (!min && min !== 0) min = -Infinity;
   if (!max && max !== 0) max = Infinity;
   const pos = useRef(null);
@@ -286,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,
@@ -319,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]);

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.7",
+  "version": "1.4.52-beta.9",
   "description": "",
   "main": "index.js",
   "license": "UNLICENSED",