fix: search bar shortcut block (#3153)

* feat: re-enable shortcuts when exiting explore panel

* fix: gitignore for addressables and user settings

* fix: clear focus / selected object when closing main menu

.gitignore

@@ -58,14 +58,7 @@ sysinfo.txt
 # Crashlytics generated file
 crashlytics-build.properties
 
-Explorer/UserSettings/Layouts
-
-# Addressables temporary data
-Explorer/Assets/AddressableAssetsData/Windows/**
-Explorer/Assets/AddressableAssetsData/Windows/*.meta
-Explorer/Assets/AddressableAssetsData/Windows.meta
-Explorer/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset
-Explorer/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta
+Explorer/UserSettings
 
 # OS generated
 .DS_Store

Explorer/.gitignore

@@ -69,8 +69,9 @@ crashlytics-build.properties
 # Sentry
 .sentryconfig.json
 
-# Addressables
-Assets/AddressableAssetsData/OSX/
-Assets/AddressableAssetsData/OSX.meta
-Assets/AddressableAssetsData/Windows/
-Assets/AddressableAssetsData/Windows.meta
+# Addressables temporary data
+Assets/AddressableAssetsData/Windows/**
+Assets/AddressableAssetsData/Windows/*.meta
+Assets/AddressableAssetsData/Windows.meta
+Assets/AddressableAssetsData/ProfileDataSourceSettings.asset
+Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta

Explorer/Assets/DCL/ExplorePanel/ExplorePanelController.cs

@@ -14,6 +14,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using UnityEngine.EventSystems;
 using UnityEngine.InputSystem;
 using Utility;
 
@@ -196,6 +197,10 @@ private void OnCameraReelHotkeyPressed(InputAction.CallbackContext ctx)
 
         private void OnCloseMainMenu(InputAction.CallbackContext obj)
         {
+            // Search bar could be focused when closing the menu, so we need to remove the focus,
+            // which will also re-enable shortcuts
+            EventSystem.current.SetSelectedGameObject(null);
+
             profileMenuController.HideViewAsync(CancellationToken.None).Forget();
             isControlClosing = true;
         }

Explorer/Assets/DCL/Navmap/NavmapSearchBarController.cs

@@ -23,7 +23,6 @@ public class NavmapSearchBarController : IDisposable
 
         private CancellationTokenSource? searchCancellationToken;
         private CancellationTokenSource? backCancellationToken;
-        private bool isAlreadySelected;
         private NavmapSearchPlaceFilter currentPlaceFilter = NavmapSearchPlaceFilter.All;
         private NavmapSearchPlaceSorting currentPlaceSorting = NavmapSearchPlaceSorting.MostActive;
         private string? currentCategory;
@@ -172,11 +171,6 @@ await navmapBus.SearchForPlaceAsync(INavmapBus.SearchPlaceParams.CreateWithDefau
 
         private void OnSearchBarSelected(bool isSelected)
         {
-            if (isSelected == isAlreadySelected)
-                return;
-
-            isAlreadySelected = isSelected;
-
             if (isSelected)
             {
                 inputBlock.Disable(InputMapComponent.Kind.SHORTCUTS, InputMapComponent.Kind.IN_WORLD_CAMERA);