From cc9637bcb9b04ab82ab2d8657613ccda59bc26a1 Mon Sep 17 00:00:00 2001
From: capdiem <capdiem@live.com>
Date: Mon, 13 May 2024 14:07:13 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(GlobalNavigation):=20entered?=
 =?UTF-8?q?=20text=20cannot=20be=20displayed=20during=20searching=20(#693)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GlobalNavigations/GlobalNavigation.razor  |  2 +-
 .../GlobalNavigation.razor.cs                 | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Masa.Stack.Components/Shared/GlobalNavigations/GlobalNavigation.razor b/src/Masa.Stack.Components/Shared/GlobalNavigations/GlobalNavigation.razor
index b6d11d6c..56e81425 100644
--- a/src/Masa.Stack.Components/Shared/GlobalNavigations/GlobalNavigation.razor
+++ b/src/Masa.Stack.Components/Shared/GlobalNavigations/GlobalNavigation.razor
@@ -81,7 +81,7 @@
                         <div class="d-flex">
                             <span class="global-nav-header__title">@T("GlobalNavigation")</span>
                             <MSpacer />
-                            <SSearch Dense Class="mr-6" ValueChanged="SearchChanged" />
+                            <SSearch Dense Class="mr-6" Value="@_search" ValueChanged="SearchChanged" />
                             <MButton Icon OnClick="() => _visible = false">
                                 <MIcon>mdi-close</MIcon>
                             </MButton>
diff --git a/src/Masa.Stack.Components/Shared/GlobalNavigations/GlobalNavigation.razor.cs b/src/Masa.Stack.Components/Shared/GlobalNavigations/GlobalNavigation.razor.cs
index 260c2445..20486bd4 100644
--- a/src/Masa.Stack.Components/Shared/GlobalNavigations/GlobalNavigation.razor.cs
+++ b/src/Masa.Stack.Components/Shared/GlobalNavigations/GlobalNavigation.razor.cs
@@ -13,11 +13,12 @@ public partial class GlobalNavigation : MasaComponentBase
     [Parameter]
     public Func<string, Task>? OnFavoriteRemove { get; set; }
 
-    bool _visible;
+    private bool _visible;
     private List<(string name, string url)>? _recentVisits;
     private List<KeyValuePair<string, string>>? _recommendApps;
     private List<ExpansionMenu>? _favorites;
-    ExpansionMenu? _menu;
+    private ExpansionMenu? _menu;
+    private string? _search;
 
     private async Task GetMenuAndFavorites()
     {
@@ -50,11 +51,16 @@ private async Task GetRecommendApps()
 
     private void VisibleChanged(bool visible)
     {
-        if (visible && _menu == null)
+        if (visible)
         {
-            _ = GetRecommendApps();
-            _ = GetRecentVisits();
-            _ = GetMenuAndFavorites();
+            SearchChanged(null);
+
+            if (_menu == null)
+            {
+                _ = GetRecommendApps();
+                _ = GetRecentVisits();
+                _ = GetMenuAndFavorites();
+            }
         }
 
         _visible = visible;
@@ -62,6 +68,7 @@ private void VisibleChanged(bool visible)
 
     private void SearchChanged(string? search)
     {
+        _search = search;
         _menu?.SetHiddenBySearch(search, TranslateProvider);
     }