From 91a936f67eff94fd267541d952d96e7399b4bd1a Mon Sep 17 00:00:00 2001
From: 7PH <benjamin.raymond@sonarsource.com>
Date: Thu, 15 Jun 2023 10:59:41 +0200
Subject: [PATCH] SONAR-19236 Fix hotspot assignee selection dropdown which
 resets the search after a click inside the popup

---
 .../src/components/SearchSelectDropdown.tsx   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/server/sonar-web/design-system/src/components/SearchSelectDropdown.tsx b/server/sonar-web/design-system/src/components/SearchSelectDropdown.tsx
index 96480ed7d7e..f44bff6484d 100644
--- a/server/sonar-web/design-system/src/components/SearchSelectDropdown.tsx
+++ b/server/sonar-web/design-system/src/components/SearchSelectDropdown.tsx
@@ -78,6 +78,8 @@ export function SearchSelectDropdown<
     minLength,
     controlAriaLabel,
     menuIsOpen,
+    onChange,
+    onInputChange,
     zLevel = PopupZLevel.Global,
     ...rest
   } = props;
@@ -102,9 +104,9 @@ export function SearchSelectDropdown<
   const handleChange = React.useCallback(
     (newValue: OnChangeValue<Option, IsMulti>, actionMeta: ActionMeta<Option>) => {
       toggleDropdown(false);
-      props.onChange?.(newValue, actionMeta);
+      onChange?.(newValue, actionMeta);
     },
-    [toggleDropdown, props.onChange]
+    [toggleDropdown, onChange]
   );
 
   const handleLoadOptions = React.useCallback(
@@ -117,11 +119,16 @@ export function SearchSelectDropdown<
 
   const handleInputChange = React.useCallback(
     (newValue: string, actionMeta: InputActionMeta) => {
-      const value = actionMeta.action === 'menu-close' ? actionMeta.prevInputValue : newValue;
-      setInputValue(value);
-      props.onInputChange?.(value, actionMeta);
+      if (actionMeta.action === 'menu-close') {
+        setInputValue(actionMeta.prevInputValue);
+        return actionMeta.prevInputValue;
+      }
+
+      setInputValue(newValue);
+      onInputChange?.(newValue, actionMeta);
+      return newValue;
     },
-    [props.onInputChange]
+    [onInputChange]
   );
 
   React.useEffect(() => {
-- 
2.39.5