next-helios-fe 1.4.33 → 1.4.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-helios-fe",
-  "version": "1.4.33",
+  "version": "1.4.35",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/components/content-container/modal/index.tsx

@@ -30,12 +30,14 @@ export const Modal: React.FC<ModalProps> = ({
 }) => {
   useEffect(() => {
     if (!options?.disableClose) {
-      document.addEventListener("keydown", (e) => {
-        if (e.key === "Escape") {
-          e.preventDefault();
-          onClose && onClose();
-        }
-      });
+      if (open) {
+        document.addEventListener("keydown", (e) => {
+          if (e.key === "Escape") {
+            e.preventDefault();
+            onClose && onClose();
+          }
+        });
+      }
     }
   }, []);
 

package/src/components/form/other/autocomplete.tsx

@@ -26,6 +26,7 @@ export const Autocomplete: React.FC<AutocompleteProps> = ({
   ...rest
 }) => {
   const [tempValue, setTempValue] = useState("");
+  const [tempFilter, setTempFilter] = useState("");
   const [openDropdown, setOpenDropdown] = useState(false);
   const [position, setPosition] = useState<{
     top: number;
@@ -89,10 +90,10 @@ export const Autocomplete: React.FC<AutocompleteProps> = ({
   }, [openDropdown, tempValue]);
 
   useEffect(() => {
-    if (rest.value) {
+    if (rest.value || rest.value === "") {
       setTempValue(rest.value as string);
       return;
-    } else if (rest.defaultValue) {
+    } else if (rest.defaultValue || rest.defaultValue === "") {
       setTempValue(rest.defaultValue as string);
       return;
     }
@@ -129,17 +130,14 @@ export const Autocomplete: React.FC<AutocompleteProps> = ({
             placeholder={placeholder}
             required={rest.required}
             disabled={rest.disabled}
-            value={
-              menus.find((item) => item.value === tempValue)
-                ? menus.find((item) => item.value === tempValue)?.label
-                : tempValue
-            }
+            value={tempFilter}
             onChange={(e) => {
-              setTempValue(e.target.value);
+              setTempFilter(e.target.value);
             }}
             onClick={() => {
               setOpenDropdown(true);
               setTempValue("");
+              setTempFilter("");
             }}
           />
           <div className="absolute right-4 text-xl text-slate-400 pointer-events-none">
@@ -159,7 +157,7 @@ export const Autocomplete: React.FC<AutocompleteProps> = ({
               }}
             >
               {menus.filter((item) =>
-                item.label.toLowerCase().includes(tempValue.toLowerCase())
+                item.label.toLowerCase().includes(tempFilter.toLowerCase())
               ).length === 0 ? (
                 <div className="flex justify-center">
                   <span className="px-4 py-1">No data found</span>
@@ -167,7 +165,7 @@ export const Autocomplete: React.FC<AutocompleteProps> = ({
               ) : (
                 menus
                   .filter((item) =>
-                    item.label.toLowerCase().includes(tempValue.toLowerCase())
+                    item.label.toLowerCase().includes(tempFilter.toLowerCase())
                   )
                   .map((item, index) => (
                     <button
@@ -177,6 +175,7 @@ export const Autocomplete: React.FC<AutocompleteProps> = ({
                       disabled={tempValue === item.value}
                       onMouseDown={() => {
                         setTempValue(item.value);
+                        setTempFilter(item.label);
                         setOpenDropdown(false);
                       }}
                     >

package/src/components/form/other/select.tsx

@@ -89,10 +89,10 @@ export const Select: React.FC<SelectProps> = ({
   }, [openDropdown]);
 
   useEffect(() => {
-    if (rest.value) {
+    if (rest.value || rest.value === "") {
       setTempValue(rest.value as string);
       return;
-    } else if (rest.defaultValue) {
+    } else if (rest.defaultValue || rest.defaultValue === "") {
       setTempValue(rest.defaultValue as string);
       return;
     }
@@ -129,7 +129,11 @@ export const Select: React.FC<SelectProps> = ({
             placeholder={placeholder}
             required={rest.required}
             disabled={rest.disabled}
-            value={menus.find((item) => item.value === tempValue)?.label}
+            value={
+              tempValue
+                ? menus.find((item) => item.value === tempValue)?.label
+                : ""
+            }
             onClick={() => setOpenDropdown(true)}
           />
           <div className="absolute right-4 text-xl text-slate-400 pointer-events-none">