diginet-core-ui 1.3.95-beta.5 → 1.3.96-beta.1

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

@@ -328,14 +328,14 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
   const displayValue = data => {
     let text = '';
     if (data || data === 0) {
-      var _ref, _data$displayExpr;
       displayExpr = typeof renderSelectedItem === 'string' ? renderSelectedItem : displayExpr || valueExpr;
-      let mask = (_ref = (_data$displayExpr = data === null || data === void 0 ? void 0 : data[displayExpr]) !== null && _data$displayExpr !== void 0 ? _data$displayExpr : data) !== null && _ref !== void 0 ? _ref : '';
-
+      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[_]);
+      } else if (!mask) {
+        mask = typeof data !== 'object' ? data : '';
       }
       text = mask.toString().replace(regexInclude, '');
     }
@@ -802,7 +802,7 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
   // };
 
   const onRemove = (e, value) => {
-    var _ref2;
+    var _ref;
     if (readOnly || disabled) return;
     const index = currentValue[unique].findIndex(v => JSON.stringify(v) === JSON.stringify(value));
     if (index !== -1) {
@@ -823,7 +823,7 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
     }
 
     // logic mới
-    const newValueArrState = ((_ref2 = [...valueMulti]) === null || _ref2 === void 0 ? void 0 : _ref2.filter(i => i !== value)) || [];
+    const newValueArrState = ((_ref = [...valueMulti]) === null || _ref === void 0 ? void 0 : _ref.filter(i => i !== value)) || [];
     setValueMulti(newValueArrState);
     !!onChange && onChange({
       value: newValueArrState,
@@ -1188,10 +1188,9 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
       }
     }, valueMulti.map((vl, index) => {
       let dataFilter = getData();
-      const data = dataFilter.find(v => v[valueExpr] === vl);
+      const data = dataFilter.find(v => v[valueExpr] === vl || v === vl);
       let text = '';
-      if (data) {
-        var _mask;
+      if (data || data === 0) {
         displayExpr = displayExpr || valueExpr;
         // displayExpr =
         //     typeof renderSelectedItem === 'string'
@@ -1203,8 +1202,10 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
         if (!mask && regexBetween.test(displayExpr)) {
           var _displayExpr3;
           mask = (_displayExpr3 = displayExpr) === null || _displayExpr3 === void 0 ? void 0 : _displayExpr3.replace(regexBetween, _ => data[_]);
+        } else if (!mask) {
+          mask = typeof data !== 'object' ? data : '';
         }
-        text = (_mask = mask) === null || _mask === void 0 ? void 0 : _mask.replace(regexInclude, '');
+        text = mask.toString().replace(regexInclude, '');
       }
       let item;
       if (typeof renderSelectedItem === 'function') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diginet-core-ui",
-  "version": "1.3.95-beta.5",
+  "version": "1.3.96-beta.1",
   "description": "",
   "main": "index.js",
   "license": "UNLICENSED",

package/readme.md

@@ -38,6 +38,14 @@ npm test
 ```
 
 ## Changelog
+## 1.3.96
+- \[Changed\]: Popover – Add prop onOpen
+- \[Changed\]: ButtonMore – Add tooltip for icon
+- \[Changed\]: Modal – Add onScroll to ModalBody
+- \[Changed\]: Colors – Add dynamic colors
+- \[Changed\]: Utils – Export hexToRGBA
+- \[Fixed\]: DateRangePicker – Fix UI min-width
+
 ## 1.3.95
 - \[Added\]: IconMenu – Add WEO76APP0001, WEO76APP0002, WEO76LIS0001, WEO76LIS0002, WEO76LIS0003, WEO76REQ0001, WEO76REQ0002, MHRP09N0033, MHRP29N0029, MHRM89N0002
 - \[Changed\]: Modal – Change logic of children and title in ModalHeader