DetailPage 검색어 유지 및 엔터 기능 동작 추가

yourtablecloth · Oct 15, 2023 · 79dca77 · 79dca77
1 parent 8361d35
commit 79dca77
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/src/TableCloth/Models/DetailPageArgumentModel.cs b/src/TableCloth/Models/DetailPageArgumentModel.cs
@@ -66,6 +66,8 @@ public DetailPageArgumentModel(
 
         public bool ShowCommandLineHelp { get; private set; }
 
+        public string CurrentSearchString { get; set; }
+
         public TableClothConfiguration GetTableClothConfiguration()
         {
             var certPublicKeyData = new byte[] { };

diff --git a/src/TableCloth/Pages/CatalogPage.xaml.cs b/src/TableCloth/Pages/CatalogPage.xaml.cs
@@ -212,7 +212,7 @@ private void SiteCatalog_KeyDown(object sender, KeyEventArgs e)
                 {
                     NavigationService.Navigate(
                         new Uri("Pages/DetailPage.xaml", UriKind.Relative),
-                        new DetailPageArgumentModel(data, builtFromCommandLine: false));
+                        new DetailPageArgumentModel(data, builtFromCommandLine: false) { CurrentSearchString = SiteCatalogFilter.Text });
                 }
             }
         }
@@ -234,7 +234,7 @@ private void SiteCatalog_MouseDoubleClick(object sender, MouseButtonEventArgs e)
             {
                 NavigationService.Navigate(
                     new Uri("Pages/DetailPage.xaml", UriKind.Relative),
-                    new DetailPageArgumentModel(data, builtFromCommandLine: false));
+                    new DetailPageArgumentModel(data, builtFromCommandLine: false) { CurrentSearchString = SiteCatalogFilter.Text });
             }
         }
 

diff --git a/src/TableCloth/Pages/DetailPage.xaml b/src/TableCloth/Pages/DetailPage.xaml
@@ -48,8 +48,8 @@
                         <Image Source="{StaticResource BackButtonImage}" />
                     </Button.Content>
                 </Button>
-                <TextBox Grid.Row="0" Grid.Column="2" x:Name="SiteCatalogFilter" Width="Auto" Margin="8" VerticalContentAlignment="Center" GotKeyboardFocus="SiteCatalogFilter_GotKeyboardFocus" LostFocus="SiteCatalogFilter_LostFocus">
-                    <TextBox.Style>
+            <TextBox Grid.Row="0" Grid.Column="2" x:Name="SiteCatalogFilter" Width="Auto" Margin="8" VerticalContentAlignment="Center" GotKeyboardFocus="SiteCatalogFilter_GotKeyboardFocus" LostFocus="SiteCatalogFilter_LostFocus" PreviewKeyUp="SiteCatalogFilter_PreviewKeyUp">
+                <TextBox.Style>
                         <Style TargetType="TextBox" xmlns:sys="clr-namespace:System;assembly=mscorlib">
                             <Style.Resources>
                                 <VisualBrush x:Key="CueBannerBrush" AlignmentX="Left" AlignmentY="Center" Stretch="None">

diff --git a/src/TableCloth/Pages/DetailPage.xaml.cs b/src/TableCloth/Pages/DetailPage.xaml.cs
@@ -134,6 +134,11 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
 
             if (Arguments.BuiltFromCommandLine)
                 RunSandbox(Arguments.GetTableClothConfiguration());
+
+            if (!string.IsNullOrEmpty(Arguments.CurrentSearchString))
+            {
+                SiteCatalogFilter.Text = Arguments.CurrentSearchString;
+            }
         }
 
         private void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -322,7 +327,7 @@ private void Hyperlink_Click(object sender, RoutedEventArgs e)
 
         private void SiteCatalogFilter_LostFocus(object sender, RoutedEventArgs e)
         {
-            NavigationService.Navigate(
+            NavigationService?.Navigate(
                 new Uri("Pages/CatalogPage.xaml", UriKind.Relative),
                 new CatalogPageArgumentModel(SiteCatalogFilter.Text));
         }
@@ -349,5 +354,15 @@ private void CopyCommandLineButton_Click(object sender, RoutedEventArgs e)
 {expression}",
                 MessageBoxButton.OK);
         }
+
+        private void SiteCatalogFilter_PreviewKeyUp(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter || e.Key == Key.Escape || e.Key == Key.Tab)
+            {
+                NavigationService.Navigate(
+                    new Uri("Pages/CatalogPage.xaml", UriKind.Relative),
+                    new CatalogPageArgumentModel(SiteCatalogFilter.Text));
+            }
+        }
     }
 }