moved to top

ohcnetwork · Feb 26, 2025 · 332ce75 · 332ce75
1 parent fae10e3
commit 332ce75
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/components/Common/SearchByMultipleFields.tsx b/src/components/Common/SearchByMultipleFields.tsx
@@ -137,6 +137,12 @@ const SearchByMultipleFields: React.FC<SearchByMultipleFieldsProps> = ({
     }
   }, [open]);
 
+  useEffect(() => {
+    if (autoFocus) {
+      inputRef.current?.focus();
+    }
+  }, [autoFocus, open, selectedOptionIndex]);
+
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
       if (e.key === "k" && (e.metaKey || e.ctrlKey)) {
@@ -154,9 +160,11 @@ const SearchByMultipleFields: React.FC<SearchByMultipleFieldsProps> = ({
           setSearchValue("");
         }
       }
+
       if (e.key === "Backspace" && searchValue.length === 0) {
         e.preventDefault();
       }
+
       if (open) {
         if (e.key === "ArrowDown") {
           setFocusedIndex((prevIndex) =>
@@ -179,12 +187,6 @@ const SearchByMultipleFields: React.FC<SearchByMultipleFieldsProps> = ({
     return () => document.removeEventListener("keydown", handleKeyDown);
   }, [focusedIndex, open, handleOptionChange, options, searchValue]);
 
-  useEffect(() => {
-    if (autoFocus) {
-      inputRef.current?.focus();
-    }
-  }, [autoFocus, open, selectedOptionIndex]);
-
   useEffect(() => {
     if (selectedOption.value !== searchValue) {
       setSearchValue(selectedOption.value || "");