Fix broken input clear in POI search mode (LLM)

Author: RZR-UA

map/src/map/layers/SearchLayer.js

@@ -197,7 +197,7 @@ export default function SearchLayer() {
         if (oldPoiLayer) {
             map.removeLayer(oldPoiLayer);
         }
-        if (ctx.searchQuery) {
+        if (ctx.searchQuery?.query || ctx.searchQuery?.type) {
             ctx.setShowPoiCategories([]);
             if (ctx.searchQuery.type) {
                 searchByCategory(ctx.searchQuery);

map/src/menu/search/search/CustomInput.jsx

@@ -39,26 +39,7 @@ export default function CustomInput({
     useEffect(() => {
         if (!isInitialRender) {
             if (value === EMPTY_SEARCH) {
-                if (spatialSearchTimerRef.current) {
-                    clearTimeout(spatialSearchTimerRef.current);
-                    spatialSearchTimerRef.current = null;
-                }
-                ctx.setSearchResult((prevResult) => {
-                    return {
-                        ...prevResult,
-                        features: [],
-                    };
-                });
-                if (setSearchValue) {
-                    setSearchValue(null);
-                } else {
-                    ctx.setSearchQuery((prev) => ({
-                        ...prev,
-                        query: '',
-                        type: null,
-                    }));
-                    navigateToSearchResults({ query: '', type: null });
-                }
+                clearSearch();
             }
         } else {
             setIsInitialRender(false);
@@ -114,6 +95,23 @@ export default function CustomInput({
         navigateToSearchResults({ query: value });
     }
 
+    function clearSearch() {
+        if (spatialSearchTimerRef.current) {
+            clearTimeout(spatialSearchTimerRef.current);
+            spatialSearchTimerRef.current = null;
+        }
+        ctx.setSearchResult((prevResult) => ({
+            ...prevResult,
+            features: [],
+        }));
+        if (setSearchValue) {
+            setSearchValue(null);
+        } else {
+            ctx.setSearchQuery({ query: '', type: null });
+            navigateToSearchResults({ query: '', type: null });
+        }
+    }
+
     const handleKeyPress = (e) => {
         if (e.key === 'Enter') {
             e.preventDefault();
@@ -173,6 +171,7 @@ export default function CustomInput({
                                 className={`${gStyles.icon} ${styles.searchInputIcon} ${isFocused ? styles.focusedIcon : ''}`}
                                 onClick={() => {
                                     setValue(EMPTY_SEARCH);
+                                    inputRef.current?.focus();
                                 }}
                             >
                                 <CancelIcon />

map/src/menu/search/search/SearchResults.jsx

@@ -385,7 +385,7 @@ export default function SearchResults() {
             <CustomInput
                 menuButton={<MenuButton needBackButton={true} backToPrevScreen={backToMainSearch} />}
                 defaultSearchValue={
-                    ctx.searchQuery?.query ||
+                    ctx.searchQuery?.query ??
                     (params?.type
                         ? (() => {
                               const brandInfo = parseBrandType(params.type);