diginet-core-ui 1.4.63-beta.1 → 1.4.64

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

@@ -158,7 +158,7 @@ export const useDateField = (format, localize, date) => {
       minute,
       second
     } = dateField;
-    const date = new Date(year || 0, typeof month === 'number' ? month - 1 : 0,
+    const date = new Date(year || 0, typeof month === 'number' ? Math.max(0, month - 1) : 0,
     // The default day is 1 when the value is null, otherwise it becomes the last day of the month.
     day || 1, hour || 0, minute || 0, second || 0);
     if (typeof type === 'undefined' || typeof value === 'undefined') {

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

@@ -1,5 +1,6 @@
 /** @jsxRuntime classic */
 /** @jsx jsx */
+import { useEffect } from 'react';
 import { css, jsx } from '@emotion/core';
 import { HelperText, Label } from "../..";
 import { getGlobal } from "../../../global";
@@ -8,12 +9,19 @@ import PropTypes from 'prop-types';
 import { forwardRef, memo, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { cursorNotAllowed, displayBlock, positionRelative } from "../../../styles/general";
 import useThemeProps from "../../../theme/utils/useThemeProps";
-import { classNames, refType as ref, useControlled } from "../../../utils";
+import { classNames, refType as ref, useControlled, parseDateByFormat } from "../../../utils";
 import UncontrolledInputBase from "../input-base/UncontrolledInputBase";
 import useDateInputState from "./useDateInputState";
 import useIsFocused from "./useIsFocused";
 import useKeyboardInputEvent from "./useKeyboardInputEvent";
 import { getInputSelectedState, isFieldFullValue, useEventCallback, useInputSelection, validateDateTime } from "./utils";
+const usePrevious = value => {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = value;
+  }, [value]);
+  return ref.current;
+};
 const DateInput = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference) => {
   if (!reference) reference = useRef(null);
 
@@ -57,6 +65,7 @@ const DateInput = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference
     selectionStart: 0,
     selectionEnd: 0
   });
+  const selectedStateOld = usePrevious(selectedState) || {};
   const isError = !!error;
   const isEnabled = !readOnly && !disabled;
   useImperativeHandle(reference, () => {
@@ -124,15 +133,25 @@ const DateInput = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference
     setSelectionRange(state.selectionStart, state.selectionEnd);
   });
   const onSegmentValueChangeWithNumericKeys = useEventCallback(event => {
+    var _inputRef$current;
     const input = event.target;
     const key = event.key;
     const pattern = selectedState.selectedPattern;
     if (!pattern) {
       return;
     }
+    const displayDate = ((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.value) || '';
+    const dataDisplayVal = parseDateByFormat(displayDate, formatStr) || [];
+    const patternName = Object.keys(dataDisplayVal).find(name => name.includes(pattern));
+    const valDisplay = (dataDisplayVal === null || dataDisplayVal === void 0 ? void 0 : dataDisplayVal[patternName]) || '';
     const field = getDateField(pattern);
     const value = parseInt(key, 10);
-    const padValue = parseInt(`${field.value || ''}${key}`, 10);
+    // * If Date or Month ['DD', 'MM'];
+    // * If current display value has two number and first num is 0
+    // * If current value !== 0
+    // * And Already finish text month or date
+    // ===> Not chain the previous num
+    const padValue = ['DD', 'MM'].includes(patternName) && valDisplay.length === 2 && valDisplay[0] === '0' && key !== 0 && (selectedStateOld.selectedPattern || '').toUpperCase() !== pattern ? Number(key) : parseInt(`${field.value || ''}${key}`, 10);
     let newValue = value;
 
     // Check if the value entered by the user is a valid date

package/components/form-control/date-input/utils.js

@@ -217,7 +217,7 @@ export const modifyDate = (date, type, value) => {
     case 'year':
       return setYear(date, value);
     case 'month':
-      return setMonth(date, value - 1);
+      return setMonth(date, Math.max(0, value - 1));
     case 'day':
       return setDate(date, value);
     case 'hour':

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

@@ -106,19 +106,24 @@ const DatePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, referenc
     value: valueProp,
     viewType,
     onBlur,
+    delayOnChange: delayOnChangeProp,
     ...other
   } = props;
   const dateLocale = locale.get();
   const displayFormat = (_getDateFormats = getDateFormats(dateLocale, minZoom)) !== null && _getDateFormats !== void 0 ? _getDateFormats : displayFormatProp;
   const returnFormat = (_pickerReturnFormat$g = pickerReturnFormat.get(minZoom)) !== null && _pickerReturnFormat$g !== void 0 ? _pickerReturnFormat$g : returnFormatProp;
   const placeholder = placeholderProp !== null && placeholderProp !== void 0 ? placeholderProp : displayFormat;
+  const renderDateInputCondition = useDateInput && minZoom !== 'quarter' && !min && !max || true;
+  const delayOnChange = delayOnChangeProp || renderDateInputCondition ? typeof delayOnChangeProp === 'number' ? delayOnChangeProp : getGlobal('delayOnInput') : 0;
   const [value, setValue] = useControlled(parseValueToDate(valueProp), parseValueToDate(defaultValue));
   const [openPickerState, setOpenPickerState] = useState(false);
+  const defaultVal = useRef(valueProp);
   const ipRef = useRef(null);
   const ref = useRef(null);
   const focusedValue = useRef(null);
   const pickerRef = useRef(null);
   const buttonCarlendarRef = useRef(null);
+  const timer = useRef(null);
   const isError = !!error && (!value || !isValid(value));
   const _DatePickerRoot = DatePickerRoot();
   const _IconAreaCSS = IconAreaCSS();
@@ -140,9 +145,12 @@ const DatePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, referenc
     const vl = (e === null || e === void 0 ? void 0 : e.value) || e;
     closePicker();
     setValue(vl);
-    onChange === null || onChange === void 0 ? void 0 : onChange({
-      value: isValid(vl) ? formatValue(vl, returnFormat) : String(vl) === 'Invalid Date' ? 'Invalid Date' : vl
-    });
+    if (timer.current) clearTimeout(timer.current);
+    timer.current = setTimeout(() => {
+      onChange === null || onChange === void 0 ? void 0 : onChange({
+        value: isValid(vl) ? formatValue(vl, returnFormat) : String(vl) === 'Invalid Date' ? defaultVal.current : vl
+      });
+    }, delayOnChange);
   };
   const onCalendarClick = e => {
     !controls ? onChangeValue(e) : focusedValue.current = e === null || e === void 0 ? void 0 : e.value;
@@ -224,7 +232,6 @@ const DatePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, referenc
       return null;
     } else return parse(value, lowerCaseDayYear(returnFormat), new Date());
   }, [value]);
-  const renderDateInputCondition = useDateInput && minZoom !== 'quarter' && !min && !max || true;
   return jsx(Fragment, null, jsx("div", {
     ref: ref,
     css: _DatePickerRoot,
@@ -339,6 +346,8 @@ DatePicker.propTypes = {
   controls: PropTypes.bool,
   /** The default value of the component. */
   defaultValue: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.string, PropTypes.object]),
+  /** The number of milliseconds to wait before call onChange. */
+  delayOnChange: PropTypes.oneOfType([PropTypes.bool, PropTypes.number]),
   /** If `true`, the form control will be disabled. */
   disabled: PropTypes.bool,
   /** Format to display value. */

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-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({});

package/package.json

@@ -1,78 +1,44 @@
-{
-  "name": "diginet-core-ui",
-  "version": "1.4.63-beta.1",
-  "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.64",
+  "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

@@ -41,6 +41,9 @@ npm test
 ```
 
 ## Changelog
+## 1.4.64
+- \[Added\]: Icon – Add Icon BloodMinus
+- \[Changed\]: DatePicker - Allow manual input for the DatePicker (default value shows "Invalid Date" when typing) + add a "delayOnChange" prop.
 
 ## 1.4.63
 - \[Added\]: Icon – Add IconMenu MHRP39N0029

package/utils/date.js

@@ -398,4 +398,14 @@ const date = (value, formatInput = 'MM/DD/YYYY') => {
     relative
   };
 };
+export const parseDateByFormat = (dateStr, format) => {
+  const separators = /[-/]/;
+  const dateParts = dateStr.split(separators);
+  const formatParts = format.split(separators);
+  const result = {};
+  formatParts.forEach((part, index) => {
+    result[part] = dateParts[index] === part ? '' : dateParts[index];
+  });
+  return result;
+};
 export default date;