diginet-core-ui 1.3.49 → 1.3.50

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

@@ -455,13 +455,15 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
         items.push(jsx("div", {
           key: index,
           css: !itemDisabled ? _DropdownItemCSS : [DisabledCSS, _DropdownItemCSS],
-          onClick: e => {
-            if (itemDisabled) return;
-            onChangeValueWithCheckbox(e) & onChangeValue(displayText, value, icon, data, index);
+          onClick: () => {
+            if (itemDisabled) return; // onChangeValueWithCheckbox(e) & onChangeValue(displayText, value, icon, data, index);
+
+            onChangeValue(displayText, value, icon, data, index);
           },
           onKeyPress: e => {
-            if (itemDisabled) return;
-            if (e.key === 'Enter') e.currentTarget.firstChild.click();
+            if (itemDisabled) return; // if (e.key === 'Enter') e.currentTarget.firstChild.click();
+
+            if (e.key === 'Enter') onChangeValue(displayText, value, icon, data, index);
           },
           tabIndex: -1
         }, jsx(Checkbox, {
@@ -472,7 +474,8 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
             padding: '0 16px'
           },
           value: value,
-          disabled: itemDisabled
+          disabled: itemDisabled,
+          onChange: () => onChangeValue(displayText, value, icon, data, index)
         }, icon && jsx("div", {
           css: DropdownIconCSS
         }, icon), jsx("div", {
@@ -759,9 +762,8 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
     if (searchRef.current) lastSearchRef.current = searchRef.current.value;
 
     if (onInput) {
-      isSearch[unique] = true;
-      const valueInput = e.target.value;
-      const text = (valueInput || e.target.textContent).normalize();
+      isSearch[unique] = true; // const valueInput = e.target.value;
+      // const text = (valueInput || e.target.textContent).normalize();
 
       if (timeout.current) {
         if (timing[unique]) {
@@ -769,14 +771,12 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
         }
 
         timing[unique] = setTimeout(() => {
-          e.target.value = text;
-          onInput(e);
-          e.target.value = valueInput;
-        }, timeout.current);
+          // e.target.value = text;
+          onInput(e); // e.target.value = valueInput;
+        }, timeout.current || searchDelayTime);
       } else {
-        e.target.value = text;
-        onInput(e);
-        e.target.value = valueInput;
+        // e.target.value = text;
+        onInput(e); // e.target.value = valueInput;
       }
 
       return;
@@ -798,7 +798,7 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
       }
 
       renderDropdown(new RegExp(value.normalize(), 'gim'));
-    }, timeout.current || 700);
+    }, timeout.current || searchDelayTime);
   };
 
   const onChangeValue = (displayText, value, icon, data, index) => {
@@ -894,15 +894,13 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
     if (closeAfterSelect === true || closeAfterSelect === undefined && !multiple) {
       closeDropdown();
     }
-  };
-
-  const onChangeValueWithCheckbox = e => {
-    const firstChild = e.currentTarget.firstChild;
+  }; // const onChangeValueWithCheckbox = e => {
+  //     const firstChild = e.currentTarget.firstChild;
+  //     if (!firstChild.contains(e.target)) {
+  //         firstChild.click();
+  //     }
+  // };
 
-    if (!firstChild.contains(e.target)) {
-      firstChild.click();
-    }
-  };
 
   const onRemove = (e, value) => {
     const index = currentValue[unique].findIndex(v => JSON.stringify(v) === JSON.stringify(value));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diginet-core-ui",
-  "version": "1.3.49",
+  "version": "1.3.50",
   "description": "The DigiNet core ui",
   "homepage": "https://diginet.com.vn",
   "main": "index.js",

package/readme.md

@@ -38,6 +38,9 @@ npm test
 ```
 
 ## Changelog
+## 1.3.50
+- \[Fixed\]: Dropdown – Fix dropdown onInput search
+
 ## 1.3.49
 - \[Added\]: MenuIcon – WA3F0100, WA3F1025, WA3F2000, WA3F2020, WA3F2030, WA3F2040, WA3F2100
 - \[Changed\]: Grid – Phát triển component Grid