fixed react-select losing focus on clear, NafAutocomplete default values

gip-inclusion · Feb 4, 2025 · 4ca7548 · 4ca7548
1 parent 20f6e1d
commit 4ca7548
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/front/src/app/pages/search/SearchPage.tsx b/front/src/app/pages/search/SearchPage.tsx
@@ -208,7 +208,9 @@ export const SearchPage = ({
             : formValues.nafLabel,
         ]
       : [];
-    return [...appellationDisplayed, ...nafDisplayed].join(" - ");
+    return appellationDisplayed.length || nafDisplayed.length
+      ? [...appellationDisplayed, ...nafDisplayed].join(" - ")
+      : "Tous les métiers";
   };
   return (
     <HeaderFooterLayout>
@@ -419,7 +421,7 @@ export const SearchPage = ({
                           });
                         }}
                         className={fr.cx("fr-mt-2w")}
-                        initialInputValue={"initial value"}
+                        initialInputValue={formValues.nafLabel}
                       />
                     </>
                   ),

diff --git a/libs/react-design-system/src/immersionFacile/components/search-filter/SearchFilter.tsx b/libs/react-design-system/src/immersionFacile/components/search-filter/SearchFilter.tsx
@@ -46,7 +46,12 @@ export const SearchFilter = ({
   const hasValue = values && values.length > 0;
   const wrapperElement = useRef<ElementRef<"div">>(null);
   useLayoutEffect(() => {
-    if (isOpened && wrapperElement.current) {
+    if (
+      isOpened &&
+      wrapperElement.current &&
+      wrapperElement.current.querySelectorAll(".im-select__control--is-focused")
+        .length === 0
+    ) {
       wrapperElement.current.querySelector("input")?.focus();
     }
     document.body.addEventListener("click", handleClickOutside);