diginet-core-ui 1.3.73-beta.4 → 1.3.73-beta.6

package/components/avatar/index.js

@@ -232,7 +232,7 @@ const Avatar = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
         img.alt = '';
 
         img.onerror = () => {
-          setSrcState(null);
+          setSrcState(defaultSrc);
           existed[unique] = false;
         };
 

package/components/chip/index.js

@@ -6,9 +6,9 @@ import PropTypes from 'prop-types';
 import { jsx, css } from '@emotion/core';
 import { ButtonIcon, Typography } from '../';
 import Icon from '../../icons';
-import { alignCenter, border, borderBox, flexRow, inlineFlex, justifyCenter, positionRelative, userSelectNone, whiteSpaceNoWrap, cursorNotAllowed, positionAbsolute, overflowHidden } from '../../styles/general';
+import { alignCenter, border, borderBox, flexRow, inlineFlex, justifyCenter, positionRelative, userSelectNone, cursorNotAllowed, positionAbsolute, overflowHidden } from '../../styles/general';
 import { hexToRGBA } from '../../styles/color-helper';
-import { useTheme } from '../../theme';
+import { useTheme, useColor as colors } from '../../theme';
 const {
   colors: {
     danger,
@@ -52,9 +52,10 @@ const Chip = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
   const ref = useRef(null);
   const IconRef = useRef(null);
   if (!onDbClick && onDoubleClick) onDbClick = onDoubleClick;
-  const color = colorMap.get(colorProps) || colorProps;
+  let color = colorMap.get(colorProps) || colorProps;
+  if (colors[color]) color = colors[color];
   const infoChip = {
-    color: colorMap.get(colorProps) || colorProps,
+    color: color,
     contentColor: viewType !== 'filled' ? color : white,
     backgroundColor: viewType !== 'filled' ? white : color,
     iconSize: iconSizeMap.get(size),
@@ -160,7 +161,6 @@ const ChipLabelCSS = css`
     ${alignCenter};
     ${positionRelative};
     ${userSelectNone};
-    ${whiteSpaceNoWrap};
 `;
 
 const ChipRootCSS = (onClick, onDbClick, colorProps, info) => css`
@@ -268,7 +268,7 @@ Chip.propTypes = {
   viewType: PropTypes.oneOf(['ghost', 'outlined', 'filled']),
 
   /** color for text or background of Chip */
-  color: PropTypes.oneOf(['default', 'primary', 'info', 'success', 'warning', 'danger']),
+  color: PropTypes.oneOfType([PropTypes.oneOf(['default', 'primary', 'info', 'success', 'warning', 'danger']), PropTypes.string]),
 
   /** size of Chip */
   size: PropTypes.oneOf(['small', 'medium', 'large']),

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

@@ -431,11 +431,11 @@ const DateRangePickerV2 = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
       }
     }
 
-    const trueWidth = width > 320 ? width < 633 ? 633 : width : 320;
+    const pickerWidth = window.innerWidth <= 633 ? 300 : 633;
 
-    if (left + trueWidth > innerWidth) {
-      if (innerWidth > trueWidth) {
-        style.left = (innerWidth - trueWidth) / 2;
+    if (left + pickerWidth > innerWidth) {
+      if (innerWidth > pickerWidth) {
+        style.left = (innerWidth - pickerWidth) / 2;
       }
     }
 
@@ -1047,8 +1047,10 @@ const DateRangePickerV2 = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
     disabled: disabled,
     required: required
   }, label), jsx(InputBase, {
-    placeholder: placeholder,
-    ...inputProps,
+    inputProps: {
+      placeholder: !readOnly && !disabled ? placeholder : '',
+      ...inputProps
+    },
     readOnly: true,
     ref: ipConRef,
     inputRef: ipRef,

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

@@ -894,6 +894,9 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
           value,
           data
         });
+      } else {
+        // Fix lost icon when select same value
+        triggerBlur(false);
       }
     }
 
@@ -1086,7 +1089,7 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
   };
 
   const setSingleValueHandler = (data, keyArr) => {
-    const text = keyArr ? renderData(data, keyArr) : typeof renderSelectedItem === 'string' ? data[renderSelectedItem] : data[displayExpr || valueExpr] || data;
+    const text = keyArr ? renderData(data, keyArr) : typeof renderSelectedItem === 'string' ? data[renderSelectedItem] : data[displayExpr] || data[valueExpr] || data;
 
     if (typeof renderSelectedItem === 'function') {
       inputRef.current.innerHTML = '';
@@ -1157,8 +1160,8 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
     return currentRef;
   });
   useEffect(() => {
-    setShowClear(clearAble && checkHasValue(valueProp) && !disabled && !readOnly && !loading);
-  }, [clearAble, valueProp, disabled, readOnly, loading]);
+    setShowClear(clearAble && checkHasValue(valueProp || defaultValue) && !disabled && !readOnly && !loading);
+  }, [clearAble, valueProp, defaultValue, disabled, readOnly, loading]);
   useEffect(() => {
     if (valueObjectDefault) {
       if (Array.isArray(valueObjectDefault)) {
@@ -1369,7 +1372,7 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
       if (data) {
         var _displayExpr4;
 
-        const mask = (_displayExpr4 = displayExpr) === null || _displayExpr4 === void 0 ? void 0 : _displayExpr4.replace(regexBetween, _ => data[_]);
+        const mask = (data === null || data === void 0 ? void 0 : data[displayExpr]) || ((_displayExpr4 = displayExpr) === null || _displayExpr4 === void 0 ? void 0 : _displayExpr4.replace(regexBetween, _ => data[_]));
         text = mask === null || mask === void 0 ? void 0 : mask.replace(regexInclude, '');
       }
 
@@ -1570,6 +1573,9 @@ const DropdownFormCSS = (viewType, multiple, disabled, placeholder, DropdownInpu
               span:empty:before {
                   content: '${placeholder}';
                   color: ${sub};
+                  height: 100%;
+                  ${flexRow};
+                  ${alignCenter};
               }
               &::placeholder {
                   color: ${sub};
@@ -1619,6 +1625,13 @@ const DropdownFormCSS = (viewType, multiple, disabled, placeholder, DropdownInpu
                       transform: rotateX(180deg);
                   }
               }
+              span:empty:before {
+                  content: '${placeholder}';
+                  color: ${sub};
+                  height: 100%;
+                  ${flexRow};
+                  ${alignCenter};
+              }
               &::placeholder {
                   color: ${sub};
               }