diginet-core-ui 1.4.55-beta.8.5 → 1.4.56

package/components/form-control/calendar/function.js

@@ -652,7 +652,7 @@ const renderNavigator = (className, refs, dbLeftFn, leftFn, rightFn, dbRightFn,
     color: 'primary',
     type: 'h3',
     ref: refs.content,
-    format: ['sentence']
+    format: ['lowercase']
   }))), jsx("div", {
     className: className.navigator.around
   }, jsx(ButtonIcon, {

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

@@ -226,7 +226,7 @@ const Calendar = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
    * START EFFECT
    */
   useEffect(() => {
-    if (defaultValue && defaultValue !== '' && isValidDate(defaultValue) && !value) {
+    if (defaultValue && defaultValue !== '' && isValidDate(defaultValue)) {
       if (isBeforeLimit(min, defaultValue)) {
         onUpdate(min);
       } else if (isAfterLimit(max, defaultValue)) {

package/components/form-control/date-range-picker/index.js

@@ -752,7 +752,6 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
     }
     ipRef.current && ipRef.current.blur();
     updateTempValues([]);
-    setOpenState(false);
   };
   const onClickOutside = e => {
     if (ipConRef.current && !ipConRef.current.contains(e.target) && ipRef.current && !ipRef.current.contains(e.target) && pickerRef.current && !pickerRef.current.contains(e.target)) {

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

@@ -11,6 +11,7 @@ import { animation, bgColor, border, borderBottom, borderBottomColor, borderColo
 import { useTheme } from "../../../theme";
 import useThemeProps from "../../../theme/utils/useThemeProps";
 import { classNames, getProp, isMobile, randomString } from "../../../utils";
+import { isEmpty, typeOf } from "../../../utils/type";
 const currentValue = {},
   isSearch = {},
   allValue = {};
@@ -135,6 +136,7 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
   const loadMoreTimer = useRef(null);
   const dataChosen = useRef([]);
   const popupRef = useRef(null);
+  const valueObjectDefaultInit = useRef({});
   const filter = useRef({
     skip: skip || 0,
     limit: limit || 50
@@ -322,8 +324,9 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
     let text = '';
     let isReplace = true;
     if (data || data === 0) {
+      var _data$displayExpr;
       displayExpr = displayExpr || valueExpr;
-      let mask = data === null || data === void 0 ? void 0 : data[displayExpr];
+      let mask = typeOf(data === null || data === void 0 ? void 0 : data[displayExpr], 'array') ? ((_data$displayExpr = data[displayExpr]) === null || _data$displayExpr === void 0 ? void 0 : _data$displayExpr[0]) || '' : data === null || data === void 0 ? void 0 : data[displayExpr];
       // convert {id} - {name} to {<data[id]>} - {<data[name]>}
       if (selectAll && (data === null || data === void 0 ? void 0 : data[valueExpr]) === 'all') {
         isReplace = false;
@@ -342,6 +345,43 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
     var _dataSourceUsable2;
     const items = [];
     let dataSourceUsable = [...dataSourceState];
+    if (vlObjDefaultState && (vlObjDefaultState === null || vlObjDefaultState === void 0 ? void 0 : vlObjDefaultState.length) > 0 && isEmpty(txtSearch)) {
+      // Sẽ Xem Lại
+      // if (vlObjDefaultState && vlObjDefaultState?.length > 0) {
+      const length = vlObjDefaultState === null || vlObjDefaultState === void 0 ? void 0 : vlObjDefaultState.length;
+      let existItemQuantity = 0;
+      for (let index = length - 1; index >= 0; index--) {
+        if ((vlObjDefaultState[index][valueExpr] || vlObjDefaultState[index][valueExpr] === 0) && !dataSourceUsable.some(data => data[valueExpr] === vlObjDefaultState[index][valueExpr])) {
+          if (isMultipleVal(vlObjDefaultState[index])) {
+            if (isEmpty(valueObjectDefaultInit.current)) {
+              let dataCloneDeep = {};
+              for (const name in vlObjDefaultState[index]) {
+                var _vlObjDefaultState$in;
+                if (name) dataCloneDeep[name] = (((_vlObjDefaultState$in = vlObjDefaultState[index]) === null || _vlObjDefaultState$in === void 0 ? void 0 : _vlObjDefaultState$in[name]) || []).map(item => item);
+              }
+              if (!isEmpty(dataCloneDeep)) valueObjectDefaultInit.current = dataCloneDeep;
+              const valueObjectDefaultOrigin = {
+                ...valueObjectDefaultInit.current
+              } || {};
+              const arr = (valueObjectDefaultOrigin === null || valueObjectDefaultOrigin === void 0 ? void 0 : valueObjectDefaultOrigin[valueExpr]) || [];
+              for (let i = 0; i < arr.length; i++) {
+                let objData = {};
+                for (const name in valueObjectDefaultOrigin) {
+                  var _valueObjectDefaultOr;
+                  if (name) objData[name] = (valueObjectDefaultOrigin === null || valueObjectDefaultOrigin === void 0 ? void 0 : (_valueObjectDefaultOr = valueObjectDefaultOrigin[name]) === null || _valueObjectDefaultOr === void 0 ? void 0 : _valueObjectDefaultOr[i]) || '';
+                }
+                dataSourceUsable.unshift(objData);
+              }
+            }
+          } else dataSourceUsable.unshift(vlObjDefaultState[index]);
+        } else {
+          // Nếu số lượng phần tử của valueObjectDefault tồn tại trong dataSource nhiều hơn hoặc bằng limit thì không remove nữa
+          if (++existItemQuantity > limit) {
+            continue;
+          }
+        }
+      }
+    }
 
     // search dataSource dựa trên txtSearch
     if (!onInput) {
@@ -358,20 +398,6 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
         });
       }
     }
-    if (vlObjDefaultState && (vlObjDefaultState === null || vlObjDefaultState === void 0 ? void 0 : vlObjDefaultState.length) > 0) {
-      const length = vlObjDefaultState === null || vlObjDefaultState === void 0 ? void 0 : vlObjDefaultState.length;
-      let existItemQuantity = 0;
-      for (let index = length - 1; index >= 0; index--) {
-        if ((vlObjDefaultState[index][valueExpr] || vlObjDefaultState[index][valueExpr] === 0) && !dataSourceUsable.some(data => data[valueExpr] === vlObjDefaultState[index][valueExpr])) {
-          dataSourceUsable.unshift(vlObjDefaultState[index]);
-        } else {
-          // Nếu số lượng phần tử của valueObjectDefault tồn tại trong dataSource nhiều hơn hoặc bằng limit thì không remove nữa
-          if (++existItemQuantity > limit) {
-            continue;
-          }
-        }
-      }
-    }
     const length = (_dataSourceUsable2 = dataSourceUsable) === null || _dataSourceUsable2 === void 0 ? void 0 : _dataSourceUsable2.length;
     for (let index = 0; index < length; index++) {
       const data = dataSourceUsable[index];
@@ -402,7 +428,7 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
         type: 'p1'
       }, displayText);
       if (multiple && selectBox) {
-        let checked = valueMulti.includes(value);
+        let checked = typeOf(value, 'array') ? valueMulti.some(item => value.includes(item)) : valueMulti.includes(value);
         if (selectAll && value === 'all') checked = selectAll && value === 'all' && valueMulti.length > 0;
         const isMaximumSelection = maximumSelectionLength === (valueMulti === null || valueMulti === void 0 ? void 0 : valueMulti.length);
         itemDisabled = itemDisabled || isMaximumSelection && !checked;
@@ -486,7 +512,9 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
     const dataSourceUsable = [...dataSourceState];
     // Nếu có load more thì đẩy đội tượng mặc định lên đầu
     let notExistItem = 0;
-    if (onLoadMore && vlObjDefaultState !== null && vlObjDefaultState !== void 0 && vlObjDefaultState.length) {
+    if (onLoadMore && vlObjDefaultState !== null && vlObjDefaultState !== void 0 && vlObjDefaultState.length && isEmpty(txtSearch)) {
+      // Sẽ Xem Lại
+      // if (onLoadMore && vlObjDefaultState?.length) {
       const length = vlObjDefaultState.length;
       for (let index = length - 1; index >= 0; index--) {
         if (!dataSourceUsable.some(data => data[valueExpr] === vlObjDefaultState[index][valueExpr])) {
@@ -550,7 +578,7 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
       } else {
         item = jsx(Fragment, null, icon, text);
       }
-      if (!dropdownListRef.current) {
+      if (!dropdownListRef.current || isEmpty(txtSearch)) {
         return;
       }
       ReactDOM.render(item, dropdownListRef.current.appendChild(dropdownItem));
@@ -997,7 +1025,7 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
     if (valueProp !== undefined && (!dropdownListRef.current || children || JSON.stringify(valueProp) !== JSON.stringify(currentValue[unique]))) {
       setValueIntoInput(valueProp);
       if (oneLiner && multiple) {
-        const valueArray = sortMultiple(valueProp);
+        const valueArray = sortMultiple(valueProp, true);
         setValueMultiDisplay(valueArray === null || valueArray === void 0 ? void 0 : valueArray.display);
         setValueMultiOverflow(valueArray === null || valueArray === void 0 ? void 0 : valueArray.overflow);
         if ((valueArray === null || valueArray === void 0 ? void 0 : valueArray.overflow.length) === 0 && openMultipleOverflow) {
@@ -1098,9 +1126,34 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
     disabled: disabled,
     ...labelProps
   }, label) : null, [label, required, disabled, labelProps]);
+  const isMultipleVal = (objData = {}) => {
+    let status = false;
+    if (typeOf(objData === null || objData === void 0 ? void 0 : objData[valueExpr], 'array') && !isEmpty(objData === null || objData === void 0 ? void 0 : objData[valueExpr]) || typeOf(objData === null || objData === void 0 ? void 0 : objData[displayExpr], 'array') && !isEmpty(objData === null || objData === void 0 ? void 0 : objData[displayExpr])) {
+      status = true;
+    }
+    return status;
+  };
   const getData = () => {
+    var _valObjDefault;
     let dataFilter = JSON.parse(JSON.stringify(dataSourceState));
-    dataFilter = uniqBy([...vlObjDefaultState, ...dataFilter], data => data === null || data === void 0 ? void 0 : data[valueExpr]);
+    let valObjDefault = vlObjDefaultState;
+    if (isMultipleVal((_valObjDefault = valObjDefault) === null || _valObjDefault === void 0 ? void 0 : _valObjDefault[0])) {
+      var _vlObjDefaultState$;
+      valObjDefault = [];
+      const arr = (vlObjDefaultState === null || vlObjDefaultState === void 0 ? void 0 : (_vlObjDefaultState$ = vlObjDefaultState[0]) === null || _vlObjDefaultState$ === void 0 ? void 0 : _vlObjDefaultState$[valueExpr]) || [];
+      for (let i = 0; i < arr.length; i++) {
+        let objData = {};
+        for (const name in vlObjDefaultState[0]) {
+          var _vlObjDefaultState$2;
+          if (name) objData[name] = (_vlObjDefaultState$2 = vlObjDefaultState[0]) === null || _vlObjDefaultState$2 === void 0 ? void 0 : _vlObjDefaultState$2[name][i];
+        }
+        if (!isEmpty(objData)) valObjDefault.push(objData);
+      }
+    }
+    dataFilter = uniqBy([...valObjDefault, ...dataFilter], data => {
+      let result = data === null || data === void 0 ? void 0 : data[valueExpr];
+      return result;
+    });
     return dataFilter;
   };
   const getTextWidth = text => {
@@ -1127,8 +1180,8 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
     const inputWidth = inputElement === null || inputElement === void 0 ? void 0 : inputElement.clientWidth;
     const items = [];
     if ((valueMulti === null || valueMulti === void 0 ? void 0 : valueMulti.length) > 0) {
+      const dataFilter = getData();
       value.map((vl, index) => {
-        const dataFilter = getData();
         const data = dataFilter.find(v => v[valueExpr] === vl || v === vl);
         if (data) {
           const displayText = displayValue(data);
@@ -1181,8 +1234,8 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
   const renderMultipleItem = value => {
     const items = [];
     if ((valueMulti === null || valueMulti === void 0 ? void 0 : valueMulti.length) > 0) {
+      const dataFilter = getData();
       value.map((vl, index) => {
-        const dataFilter = getData();
         const data = dataFilter.find(v => v[valueExpr] === vl || v === vl);
         if (data) {
           const displayText = displayValue(data);
@@ -1251,8 +1304,8 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
   const renderOverflowPopover = value => {
     const items = [];
     if ((valueMulti === null || valueMulti === void 0 ? void 0 : valueMulti.length) > 0) {
+      const dataFilter = getData();
       value.map((vl, index) => {
-        const dataFilter = getData();
         const data = dataFilter.find(v => v[valueExpr] === vl || v === vl);
         if (data) {
           const displayText = displayValue(data);

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

@@ -1,15 +1,13 @@
 /** @jsxRuntime classic */
 /** @jsx jsx */
 import { css, jsx } from '@emotion/core';
-import { ButtonIcon, InputBase, Label, Popover, PopoverBody, HelperText } from "../..";
+import { ButtonIcon, InputBase, Label, Popover, PopoverBody } from "../..";
 import PropTypes from 'prop-types';
-import { Fragment, forwardRef, memo, useEffect, useImperativeHandle, useLayoutEffect, useRef, useState, useMemo } from 'react';
+import { Fragment, forwardRef, memo, useEffect, useImperativeHandle, useLayoutEffect, useRef, useState } from 'react';
 import { animation, borderColor, displayBlock, overflowHidden, parseHeight, parseMinWidth, positionRelative, scaleX } from "../../../styles/general";
 import { useTheme } from "../../../theme";
 import useThemeProps from "../../../theme/utils/useThemeProps";
 import { classNames, getProp } from "../../../utils";
-const regexBetween = /[^{}]+(?=})/g;
-const regexInclude = /{|}/g;
 const DropdownBox = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference) => {
   if (!reference) reference = useRef(null);
   const theme = useTheme();
@@ -24,14 +22,10 @@ const DropdownBox = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, referen
   });
   const {
     action = {},
-    allowInput,
     bgColor: bgColorProp,
     children,
     className,
     delayOnInput,
-    disabled,
-    displayExpr: displayExprProp,
-    error,
     endIcon,
     inputProps,
     inputRef,
@@ -45,19 +39,10 @@ const DropdownBox = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, referen
     placeholder,
     startIcon,
     style,
-    value: valueProps,
-    valueExpr,
-    viewType,
-    helperTextProps
+    value,
+    viewType
   } = props;
-  let displayExpr = displayExprProp;
   const bgColor = typeof bgColorProp === 'string' ? getProp(colors, bgColorProp, bgColorProp) : bgColorProp;
-  const ErrorView = useMemo(() => {
-    return error ? jsx(HelperText, {
-      ...helperTextProps,
-      disabled: disabled
-    }, error) : null;
-  }, [disabled, error, helperTextProps]);
   const ref = useRef(null);
   const dropdownBoxRef = useRef(null);
   const timer = useRef(null);
@@ -100,28 +85,6 @@ const DropdownBox = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, referen
       onClosed === null || onClosed === void 0 ? void 0 : onClosed();
     }
   };
-
-  /**
-   * Chuyển đổi data thành giá trị cần hiện thị dựa vào displayExpr [string, string object {field} - {field}], renderSelectedItem, displayExpr, valueExpr
-   * @param data {object} rowData of dataSource
-   * @return {string}
-   */
-  const displayValue = data => {
-    let text = '';
-    if (data || data === 0) {
-      displayExpr = displayExpr || valueExpr;
-      let mask = data === null || data === void 0 ? void 0 : data[displayExpr];
-      // convert {id} - {name} to {<data[id]>} - {<data[name]>}
-      if (!mask && regexBetween.test(displayExpr)) {
-        var _displayExpr;
-        mask = (_displayExpr = displayExpr) === null || _displayExpr === void 0 ? void 0 : _displayExpr.replace(regexBetween, _ => (data === null || data === void 0 ? void 0 : data[_]) || '');
-      } else if (!mask) {
-        mask = typeof data !== 'object' ? data : '';
-      }
-      text = mask.toString().replace(regexInclude, '');
-    }
-    return text;
-  };
   useLayoutEffect(() => {
     if (ref.current) {
       const {
@@ -167,17 +130,15 @@ const DropdownBox = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, referen
       onClick: openOnClickAt === 'icon' ? onTriggerDropdown : null
     }) : null;
   };
-  const value = displayValue(valueProps);
   return jsx(Fragment, null, jsx("div", {
     ref: ref,
     css: _DropdownBoxRootCSS,
-    className: classNames('DGN-UI-Dropdown-Box', className, error && 'error'),
+    className: classNames('DGN-UI-Dropdown-Box', className),
     style: style
   }, label ? jsx(Label, {
     ...labelProps
   }, label) : null, jsx(InputBase, {
     ...inputProps,
-    readOnly: !allowInput,
     style: inputStyle,
     viewType: viewType,
     inputRef: inputRef,
@@ -196,7 +157,7 @@ const DropdownBox = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, referen
     anchor: ref.current,
     width: popoverWidth,
     onClose: closeDropdownBox
-  }, jsx(PopoverBody, null, children)), ErrorView);
+  }, jsx(PopoverBody, null, children)));
 }));
 const DropdownBoxRootCSS = (bgColorProp, {
   colors
@@ -205,17 +166,6 @@ const DropdownBoxRootCSS = (bgColorProp, {
     ${positionRelative};
     ${parseMinWidth(150)};
     ${parseHeight('max-content')};
-    &.error {
-        .DGN-UI-InputBase {
-            ${borderColor(getProp(colors, 'semantic/danger'))};
-            &::before {
-                ${borderColor(getProp(colors, 'semantic/danger'))};
-            }
-            &::after {
-                ${borderColor(getProp(colors, 'semantic/danger'))};
-            }
-        }
-    }
     .DGN-UI-InputBase {
         background: ${bgColorProp ? bgColorProp === true ? getProp(colors, 'fill/disabled') : bgColorProp : 'inherit'} !important;
         ${openState && css`
@@ -233,6 +183,20 @@ const DropdownBoxCSS = ({
     margin-top: ${spacing([1])};
     ${overflowHidden};
 `;
+
+// DropdownBox.defaultProps = {
+//     className: '',
+//     label: '',
+//     placeholder: '',
+//     startIcon: 'Search',
+//     endIcon: 'ArrowDown',
+//     openOnClickAt: 'icon',
+//     viewType: 'underlined',
+//     inputProps: {},
+//     delayOnInput: 700,
+//     zIndex: zIndexCORE(1),
+// };
+
 DropdownBox.propTypes = {
   /** class for dropdown */
   className: PropTypes.string,
@@ -269,12 +233,6 @@ DropdownBox.propTypes = {
   /** the function will run after open */
   onOpened: PropTypes.func,
   /** the function will run after close */
-  onClosed: PropTypes.func,
-  /** Error message displayed below the input. */
-  error: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
-  /** If `true`, the component is disabled. */
-  disabled: PropTypes.bool,
-  /** If `true`, the input is enable. */
-  allowInput: PropTypes.bool
+  onClosed: PropTypes.func
 };
 export default DropdownBox;

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

@@ -49,7 +49,7 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
     labelProps,
     max: maxProp,
     maxDigit,
-    min: minProp,
+    min,
     nonStyle,
     onBlur,
     onChange,
@@ -69,12 +69,9 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
     viewType
   } = props;
   let max = maxProp;
-  let min = minProp;
   let thousandSymbol = thousandSeparator;
   let decimalSymbol = decimalSymbolProp;
   let valueProps = valueProp;
-  if (!min && min !== 0) min = -Infinity;
-  if (!max && max !== 0) max = Infinity;
   const pos = useRef(null);
   const ref = useRef(null);
   const globalRef = useRef({});
@@ -171,19 +168,18 @@ const NumberInput = /*#__PURE__*/forwardRef((inProps, reference) => {
   const _onInput = useCallback((e, flag) => {
     var _e$target$value;
     let valueT = (_e$target$value = e.target.value) !== null && _e$target$value !== void 0 ? _e$target$value : e.value;
-    if (disabledNegative && Number(valueT || 0) < 0) valueT = 0;
-    if ((min || min === 0) && Number(valueT) < min) valueT = min;
-    if ((max || max === 0) && Number(valueT) > max) valueT = max;
+    if (disabledNegative && eval(valueT || 0) <= 0 || valueT.includes('-')) valueT = 0;
+    if ((min || min === 0) && eval(valueT) <= min || min === 0 && valueT.includes('-')) valueT = min;
+    if ((max || max === 0) && eval(valueT) >= max) valueT = max;
     valueT = parseNumberToMoney(valueT);
     const returnValue = convertMoneyToNumber(valueT);
     e.value = globalRef.current.value = !isNaN(parseFloat(returnValue)) ? parseFloat(returnValue) : null;
     // e.target.value = globalRef.current.valueString = valueT || '';
     // globalRef.current.returnValue = returnValue || '';
     e.target.value = globalRef.current.valueString = valueT || '';
-    e.value = valueT;
     globalRef.current.returnValue = returnValue || '';
     onInput === null || onInput === void 0 ? void 0 : onInput(e);
-    setValue(eval(valueT));
+    setValue(valueT);
     if (flag) _onChange(e);
   }, [min, max, decimalDigit]);
   const _onBlur = useCallback(e => {

package/package.json

@@ -1,78 +1,44 @@
-{
-  "name": "diginet-core-ui",
-  "version": "1.4.55-beta.8.5",
-  "description": "",
-  "main": "index.js",
-  "license": "UNLICENSED",
-  "scripts": {
-    "start": "npm-run-all --parallel start-sb eslint-test",
-    "start-sb": "start-storybook -p 9050",
-    "build-storybook": "build-storybook -c .storybook -s src",
-    "build": "run-script-os",
-    "build:windows": "rimraf dist && mkdirp dist/components && npm run compile && sass --style=compressed src/scss:dist/css && xcopy src\\\\assets dist\\\\assets\\ /e /y",
-    "build:darwin:linux:default": "rm -rf dist && npm run compile && sass --style=compressed src/scss:dist/css && cp -rf src/assets dist/assets",
-    "compile": "babel src --out-dir dist --ignore **/*.stories.js",
-    "pack": "npm run build && cp *.md dist/ && npm run version:bump --silent && npm run version:add --silent && cd dist && npm pack",
-    "production-keep-version": "npm run build && cp *.md dist/ && cp package.json dist/ && cd dist && npm publish",
-    "beta": "npm run build && cp *.md dist/ && cp package.json dist/ && cd dist && npm publish --tag beta",
-    "production": "npm run build && cp *.md dist/ && npm run version:bump --silent && npm run version:add --silent && cd dist && npm publish",
-    "version:add": "run-script-os",
-    "version:add:windows": "cat package.json.tmp | sed \"s/0.0.0/%npm_package_version%/g\" > dist/package.json",
-    "version:add:darwin:linux:default": "VERSION=$(npm run version:extract --silent) && cat package.json.tmp | sed \"s/0.0.0/${VERSION}/g\" > dist/package.json",
-    "version:bump": "npm version patch --no-git-tag-version --silent",
-    "version:extract": "cat package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]'",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "lint": "eslint --fix --config .eslintrc.js \"**/*.js\"",
-    "eslint-test": "onchange \"src/**/*.{js,jsx,json}\" -- eslint . --fix",
-    "freshtall": "npm cache clean --force && rm -rf node_modules && rm -f package-lock.json && npm install",
-    "test-storybook": "test-storybook --url http://localhost:9050",
-    "preinstall": "echo {} > package-lock.json"
-  },
-  "dependencies": {
-    "@emotion/core": "^10.0.35",
-    "@emotion/css": "^11.11.0",
-    "@emotion/react": "^11.10.6",
-    "babel-plugin-module-resolver": "^4.1.0",
-    "date-fns": "^2.30.0",
-    "prop-types": "^15.7.2"
-  },
-  "lint-staged": {
-    "*/**/*.{js,jsx,json}": [
-      "prettier --write",
-      "git add"
-    ]
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.14.3",
-    "@babel/plugin-proposal-class-properties": "^7.13.0",
-    "@babel/plugin-proposal-logical-assignment-operators": "^7.16.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.14.2",
-    "@babel/plugin-proposal-private-methods": "^7.18.6",
-    "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
-    "@babel/preset-react": "^7.13.13",
-    "@storybook/addon-actions": "6.2.9",
-    "@storybook/addon-essentials": "6.2.9",
-    "@storybook/addon-links": "6.2.9",
-    "@storybook/addon-postcss": "^2.0.0",
-    "@storybook/react": "6.2.9",
-    "@storybook/test-runner": "^0.7.1",
-    "autoprefixer": "^10.3.1",
-    "babel-loader": "^8.2.2",
-    "eslint": "^8.4.1",
-    "eslint-plugin-react": "^7.27.1",
-    "eslint-plugin-regex": "^1.10.0",
-    "husky": "^7.0.4",
-    "jest": "^27.5.1",
-    "lint-staged": "^12.1.2",
-    "mkdirp": "^1.0.4",
-    "npm-run-all": "^4.1.5",
-    "onchange": "^7.1.0",
-    "postcss-flexbugs-fixes": "^5.0.2",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "rimraf": "^3.0.2",
-    "run-script-os": "^1.1.6",
-    "sass": "1.58.3"
-  }
-}
+{
+  "name": "diginet-core-ui",
+  "version": "1.4.56",
+  "description": "The DigiNet core ui",
+  "homepage": "https://diginet.com.vn",
+  "main": "index.js",
+  "scripts": {
+    "start-js": "react-scripts start --max_old_space_size=4096",
+    "start": "npx npm-run-all -p start-js",
+    "build": "GENERATE_SOURCEMAP=false && react-scripts build --env=production --max_old_space_size=8192",
+    "eject": "react-scripts eject",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "dependencies": {
+    "@emotion/core": "^10.0.35",
+    "prop-types": "^15.7.2",
+    "@emotion/css": "^11.11.0",
+    "@emotion/react": "^11.10.6"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://diginetvn@bitbucket.org/diginetvn/diginet-core-ui.git"
+  },
+  "keywords": [
+    "core ui",
+    "diginet"
+  ],
+  "author": "rocachien",
+  "contributors": [
+    {
+      "name": "Chien Do",
+      "email": "rocachien@gmail.com"
+    },
+    {
+      "name": "Nhat Tran",
+      "email": "tranminhnhat1005@gmail.com"
+    },
+    {
+      "name": "Thuan Nguyen",
+      "email": "nt.thuan.hutech@gmail.com"
+    }
+  ],
+  "license": "MIT"
+}

package/readme.md

@@ -42,6 +42,13 @@ npm test
 
 ## Changelog
 
+## 1.4.56
+- \[Added\]: Icon – Add IconMenu MHRP29N0033, MHRP29N0034
+- \[Added\]: Icon – Add Icon CelebrationColor
+- \[Fixed\]: Dropdown  - Fix valueObjectDefault bug in Dropdown.
+- \[Fixed\]: NumberInput  – Fix issue where NumberInput allowed pasting negative values even when disabledNegative prop was enabled.
+- \[Added\]: DateRangePicker  – Add a new mode to change the UI of DateRangePicker
+
 ## 1.4.55
 - \[Added\]: Icon – Add IconMenu MHRM09N1401, MHRM09N1402
 - \[Added\]: Icon – Add Icon Book

package/utils/type.js

@@ -33,6 +33,34 @@ const isNumeric = object => {
 const isObject = object => {
   return type(object) === 'object';
 };
+const typeOf = (value, type) => {
+  const result = Object.prototype.toString.call(value).slice(8, -1).toLowerCase();
+  return type ? result === String(type).toLowerCase() : result;
+};
+const isEmpty = (value, escapeZero = false) => {
+  switch (typeOf(value)) {
+    case 'object':
+      {
+        return value && Object.keys(value).length <= 0 || !value;
+      }
+    case 'array':
+      {
+        return value.length <= 0;
+      }
+    case 'string':
+      {
+        return !value;
+      }
+    case 'number':
+      {
+        if (!escapeZero) return value === 0 ? false : !value;else return !value;
+      }
+    default:
+      {
+        return !value;
+      }
+  }
+};
 const isEmptyObject = object => {
   let property;
   for (property in object) {
@@ -66,4 +94,4 @@ const isDeferred = object => {
 const isEvent = object => {
   return !!(object && object.preventDefault);
 };
-export { isBoolean, isExponential, isDate, isDefined, isFunction, isString, isNumeric, isObject, isEmptyObject, isPlainObject, isPrimitive, isWindow, isRenderer, isPromise, isDeferred, type, isEvent };
+export { isBoolean, isExponential, isDate, isDefined, isFunction, isString, isNumeric, isObject, isEmptyObject, isPlainObject, isPrimitive, isWindow, isRenderer, isPromise, isDeferred, type, isEvent, isEmpty, typeOf };