From 7c9172cd0f6ab7d0286e83405a44edcae406a647 Mon Sep 17 00:00:00 2001
From: Harshit Mishra <hmishra@microsoft.com>
Date: Tue, 1 Oct 2024 18:34:42 +0530
Subject: [PATCH 1/4] Basic search box without navigation and pages

---
 .../WPFGallery/MainWindow.xaml                |  7 +++
 .../WPFGallery/MainWindow.xaml.cs             | 10 ++++
 .../ViewModels/MainWindowViewModel.cs         | 46 +++++++++++++++++++
 3 files changed, 63 insertions(+)

diff --git a/Sample Applications/WPFGallery/MainWindow.xaml b/Sample Applications/WPFGallery/MainWindow.xaml
index 5d0cf364..2959ba20 100644
--- a/Sample Applications/WPFGallery/MainWindow.xaml	
+++ b/Sample Applications/WPFGallery/MainWindow.xaml	
@@ -210,6 +210,13 @@
                     KeyUp="SearchBox_KeyUp"
                     LostFocus="SearchBox_LostFocus" />-->
 
+                <ComboBox x:Name="SearchBox"
+                    IsEditable="True"
+                    Text="{Binding ViewModel.SearchBoxText, UpdateSourceTrigger=PropertyChanged}"
+                    ItemsSource="{Binding ViewModel.FilteredSearchItems}"
+                    Margin="10"
+                    IsTextSearchEnabled="False"
+                    PreviewKeyDown="ComboBox_PreviewKeyDown" />
 
                 <TreeView
                     x:Name="ControlsList"
diff --git a/Sample Applications/WPFGallery/MainWindow.xaml.cs b/Sample Applications/WPFGallery/MainWindow.xaml.cs
index 524a64ad..a0b5c8de 100644
--- a/Sample Applications/WPFGallery/MainWindow.xaml.cs	
+++ b/Sample Applications/WPFGallery/MainWindow.xaml.cs	
@@ -250,4 +250,14 @@ private void ControlsList_Loaded(object sender, RoutedEventArgs e)
             }
         }
     }
+
+    private void ComboBox_PreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        var comboBox = sender as ComboBox;
+
+        if(!string.IsNullOrWhiteSpace(comboBox.Text))
+        {
+            comboBox.IsDropDownOpen = true;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Sample Applications/WPFGallery/ViewModels/MainWindowViewModel.cs b/Sample Applications/WPFGallery/ViewModels/MainWindowViewModel.cs
index 848a4387..c73c6de6 100644
--- a/Sample Applications/WPFGallery/ViewModels/MainWindowViewModel.cs	
+++ b/Sample Applications/WPFGallery/ViewModels/MainWindowViewModel.cs	
@@ -12,6 +12,38 @@ public partial class MainWindowViewModel : ObservableObject
     [ObservableProperty]
     private string _applicationTitle = "WPF Gallery Preview";
 
+    public ObservableCollection<string> FilteredSearchItems { get; set; }
+    public ObservableCollection<string> SearchItems { get; set; }
+
+    private string _searchBoxText;
+
+    public string SearchBoxText
+    {
+        get => _searchBoxText;
+        set
+        {
+            _searchBoxText = value;
+            OnPropertyChanged(nameof(SearchBoxText));
+            FilterItems();
+        }
+    }
+
+    private void FilterItems()
+    {
+        if (string.IsNullOrEmpty(SearchBoxText))
+        {
+            FilteredSearchItems = new ObservableCollection<string>(SearchItems);
+        }
+        else
+        {
+            FilteredSearchItems = new ObservableCollection<string>(
+                SearchItems.Where(item => item.ToLower().Contains(SearchBoxText.ToLower()))
+            );
+        }
+
+        OnPropertyChanged(nameof(FilteredSearchItems));
+    }
+
     private readonly DispatcherTimer _timer;
 
     private string _searchText = string.Empty;
@@ -56,6 +88,20 @@ public MainWindowViewModel(INavigationService navigationService)
         _timer = new DispatcherTimer();
         _timer.Interval = TimeSpan.FromMilliseconds(400);
         _timer.Tick += PerformSearchNavigation;
+
+        SearchItems = new ObservableCollection<string>
+        {
+            "Apple",
+            "Banana",
+            "Cherry",
+            "Cheese",
+            "Choix",
+            "Date",
+            "Dragon Fruit",
+            "Dairy"
+        };
+
+        FilteredSearchItems = new ObservableCollection<string>(SearchItems);
     }
 
     public void UpdateSearchText(string searchText)

From 191a318fcb4b2a1a2cdbc0815ac7625605b01ce0 Mon Sep 17 00:00:00 2001
From: Harshit Mishra <hmishra@microsoft.com>
Date: Thu, 3 Oct 2024 20:31:34 +0530
Subject: [PATCH 2/4] Raw searchbox implementation

---
 .../WPFGallery/MainWindow.xaml                |  8 ++-
 .../WPFGallery/MainWindow.xaml.cs             | 28 +++++----
 .../Navigation/NavigationService.cs           | 59 +++++++++++++++++++
 .../ViewModels/MainWindowViewModel.cs         | 21 +++----
 4 files changed, 93 insertions(+), 23 deletions(-)

diff --git a/Sample Applications/WPFGallery/MainWindow.xaml b/Sample Applications/WPFGallery/MainWindow.xaml
index 2959ba20..109e41ce 100644
--- a/Sample Applications/WPFGallery/MainWindow.xaml	
+++ b/Sample Applications/WPFGallery/MainWindow.xaml	
@@ -210,13 +210,17 @@
                     KeyUp="SearchBox_KeyUp"
                     LostFocus="SearchBox_LostFocus" />-->
 
+                <!--ItemsSource="{Binding ViewModel.FilteredSearchItems}"-->
+
                 <ComboBox x:Name="SearchBox"
                     IsEditable="True"
                     Text="{Binding ViewModel.SearchBoxText, UpdateSourceTrigger=PropertyChanged}"
-                    ItemsSource="{Binding ViewModel.FilteredSearchItems}"
+                    ItemsSource="{Binding ViewModel.FilteredSearchItems}" 
                     Margin="10"
                     IsTextSearchEnabled="False"
-                    PreviewKeyDown="ComboBox_PreviewKeyDown" />
+                    PreviewKeyDown="ComboBox_PreviewKeyDown"
+                    GotFocus="SearchBox_GotFocus"
+                    DropDownClosed="ComboBox_DropDownClosed" />
 
                 <TreeView
                     x:Name="ControlsList"
diff --git a/Sample Applications/WPFGallery/MainWindow.xaml.cs b/Sample Applications/WPFGallery/MainWindow.xaml.cs
index a0b5c8de..4df70db5 100644
--- a/Sample Applications/WPFGallery/MainWindow.xaml.cs	
+++ b/Sample Applications/WPFGallery/MainWindow.xaml.cs	
@@ -134,17 +134,6 @@ private void Toggle_TitleButtonVisibility()
         }
     }
 
-    //private void SearchBox_KeyUp(object sender, KeyEventArgs e)
-    //{
-    //    ViewModel.UpdateSearchText(SearchBox.Text);
-    //}
-
-    //private void SearchBox_LostFocus(object sender, RoutedEventArgs e)
-    //{
-    //    SearchBox.Text = "";
-    //    ViewModel.UpdateSearchText(SearchBox.Text);
-    //}
-
     private void MinimizeWindow(object sender, RoutedEventArgs e)
     {
         this.WindowState = WindowState.Minimized;
@@ -260,4 +249,21 @@ private void ComboBox_PreviewKeyDown(object sender, KeyEventArgs e)
             comboBox.IsDropDownOpen = true;
         }
     }
+
+    private void ComboBox_DropDownClosed(object sender, EventArgs e)
+    {
+        var comboBox = sender as ComboBox;
+
+        if (comboBox.SelectedItem != null)
+        {
+            _navigationService.Navigate(comboBox.SelectedItem.ToString());
+        }
+    }
+
+    private void SearchBox_GotFocus(object sender, RoutedEventArgs e)
+    {
+        var comboBox = sender as ComboBox;
+
+        comboBox.IsDropDownOpen = true;
+    }
 }
\ No newline at end of file
diff --git a/Sample Applications/WPFGallery/Navigation/NavigationService.cs b/Sample Applications/WPFGallery/Navigation/NavigationService.cs
index 29c961f2..a5f8f9eb 100644
--- a/Sample Applications/WPFGallery/Navigation/NavigationService.cs	
+++ b/Sample Applications/WPFGallery/Navigation/NavigationService.cs	
@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Windows.Navigation;
+using WPFGallery.Views;
 
 namespace WPFGallery.Navigation;
 
@@ -10,6 +11,8 @@ public interface INavigationService
 {
     void Navigate(Type type);
 
+    void Navigate(string str);
+
     void NavigateTo(Type type);
 
     void SetFrame(Frame frame);
@@ -40,12 +43,59 @@ public class NavigationService : INavigationService
 
     public event EventHandler<NavigatingEventArgs> Navigating;
 
+    private Dictionary<string, Type> pageNameToTypeMapping;
+
 
     public NavigationService(IServiceProvider serviceProvider)
     {
         _serviceProvider = serviceProvider;
         _history = new Stack<Type>();
         _future = new Stack<Type>();
+
+        initializeMapping();
+    }
+
+    private void initializeMapping()
+    {
+        pageNameToTypeMapping = new Dictionary<string, Type>()
+        {
+            { "home", typeof(DashboardPage) },
+            { "design guidance", typeof(DesignGuidancePage) },
+            { "colors", typeof(ColorsPage) },
+            { "typography", typeof(TypographyPage) },
+            { "icons", typeof(IconsPage) },
+            { "samples", typeof(SamplesPage) },
+            { "user dashboard", typeof(UserDashboardPage) },
+            { "all controls", typeof(AllSamplesPage) },
+            { "basic input", typeof(BasicInputPage) },
+            { "button", typeof(ButtonPage) },
+            { "checkbox", typeof(CheckBoxPage) },
+            { "radiobutton", typeof(RadioButtonPage) },
+            { "combobox", typeof(ComboBoxPage) },
+            { "slider", typeof(SliderPage) },
+            { "date & calendar", typeof(DateAndTimePage) },
+            { "calendar", typeof(CalendarPage) },
+            { "datepicker", typeof(DatePickerPage) },
+            { "layout", typeof(LayoutPage) },
+            { "expander", typeof(ExpanderPage) },
+            { "navigation", typeof(NavigationPage) },
+            { "menu", typeof(MenuPage) },
+            { "tabcontrol", typeof(TabControlPage) },
+            { "collections", typeof(CollectionsPage) },
+            { "datagrid", typeof(DataGridPage) },
+            { "listbox", typeof(ListBoxPage) },
+            { "listview", typeof(ListViewPage) },
+            { "treeview", typeof(TreeViewPage) },
+            { "status & info", typeof(StatusAndInfoPage) },
+            { "progressbar", typeof(ProgressBarPage) },
+            { "tooltip", typeof(ToolTipPage) },
+            { "text", typeof(TextPage) },
+            { "label", typeof(LabelPage) },
+            { "textbox", typeof(TextBoxPage) },
+            { "textblock", typeof(TextBlockPage) },
+            { "richtextedit", typeof(RichTextEditPage) },
+            { "passwordbox", typeof(PasswordBoxPage) }
+        };
     }
 
     public void SetFrame(Frame frame)
@@ -73,6 +123,15 @@ public void Navigate(Type type)
         }
     }
 
+    public void Navigate(string? pageName)
+    {
+        if(!string.IsNullOrEmpty(pageName) && pageNameToTypeMapping.ContainsKey(pageName.ToLower()))
+        {
+            Type currentPage = pageNameToTypeMapping[pageName.ToLower()];
+            Navigate(currentPage);
+        }
+    }
+
     public void NavigateBack()
     {
         if(_history.Count > 0)
diff --git a/Sample Applications/WPFGallery/ViewModels/MainWindowViewModel.cs b/Sample Applications/WPFGallery/ViewModels/MainWindowViewModel.cs
index c73c6de6..3231f67d 100644
--- a/Sample Applications/WPFGallery/ViewModels/MainWindowViewModel.cs	
+++ b/Sample Applications/WPFGallery/ViewModels/MainWindowViewModel.cs	
@@ -89,17 +89,18 @@ public MainWindowViewModel(INavigationService navigationService)
         _timer.Interval = TimeSpan.FromMilliseconds(400);
         _timer.Tick += PerformSearchNavigation;
 
-        SearchItems = new ObservableCollection<string>
+        SearchItems = new();
+        
+        foreach (var mainPage in Controls)
         {
-            "Apple",
-            "Banana",
-            "Cherry",
-            "Cheese",
-            "Choix",
-            "Date",
-            "Dragon Fruit",
-            "Dairy"
-        };
+
+            SearchItems.Add(mainPage.ToString());
+
+            foreach (ControlInfoDataItem controlsPage in mainPage.Items)
+            {
+                SearchItems.Add(controlsPage.ToString());
+            }
+        }
 
         FilteredSearchItems = new ObservableCollection<string>(SearchItems);
     }

From 04d0308366567702f898bd5ce3a567655eedd267 Mon Sep 17 00:00:00 2001
From: Harshit Mishra <hmishra@microsoft.com>
Date: Thu, 3 Oct 2024 20:39:25 +0530
Subject: [PATCH 3/4] Code Clean-up and Refactoring

---
 Sample Applications/WPFGallery/MainWindow.xaml              | 4 ++--
 Sample Applications/WPFGallery/MainWindow.xaml.cs           | 4 ++--
 .../WPFGallery/ViewModels/MainWindowViewModel.cs            | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Sample Applications/WPFGallery/MainWindow.xaml b/Sample Applications/WPFGallery/MainWindow.xaml
index 109e41ce..2a2b546a 100644
--- a/Sample Applications/WPFGallery/MainWindow.xaml	
+++ b/Sample Applications/WPFGallery/MainWindow.xaml	
@@ -218,9 +218,9 @@
                     ItemsSource="{Binding ViewModel.FilteredSearchItems}" 
                     Margin="10"
                     IsTextSearchEnabled="False"
-                    PreviewKeyDown="ComboBox_PreviewKeyDown"
+                    PreviewKeyDown="SearchBox_PreviewKeyDown"
                     GotFocus="SearchBox_GotFocus"
-                    DropDownClosed="ComboBox_DropDownClosed" />
+                    DropDownClosed="SearchBox_DropDownClosed" />
 
                 <TreeView
                     x:Name="ControlsList"
diff --git a/Sample Applications/WPFGallery/MainWindow.xaml.cs b/Sample Applications/WPFGallery/MainWindow.xaml.cs
index 4df70db5..542bba57 100644
--- a/Sample Applications/WPFGallery/MainWindow.xaml.cs	
+++ b/Sample Applications/WPFGallery/MainWindow.xaml.cs	
@@ -240,7 +240,7 @@ private void ControlsList_Loaded(object sender, RoutedEventArgs e)
         }
     }
 
-    private void ComboBox_PreviewKeyDown(object sender, KeyEventArgs e)
+    private void SearchBox_PreviewKeyDown(object sender, KeyEventArgs e)
     {
         var comboBox = sender as ComboBox;
 
@@ -250,7 +250,7 @@ private void ComboBox_PreviewKeyDown(object sender, KeyEventArgs e)
         }
     }
 
-    private void ComboBox_DropDownClosed(object sender, EventArgs e)
+    private void SearchBox_DropDownClosed(object sender, EventArgs e)
     {
         var comboBox = sender as ComboBox;
 
diff --git a/Sample Applications/WPFGallery/ViewModels/MainWindowViewModel.cs b/Sample Applications/WPFGallery/ViewModels/MainWindowViewModel.cs
index 3231f67d..9b81abdf 100644
--- a/Sample Applications/WPFGallery/ViewModels/MainWindowViewModel.cs	
+++ b/Sample Applications/WPFGallery/ViewModels/MainWindowViewModel.cs	
@@ -12,8 +12,9 @@ public partial class MainWindowViewModel : ObservableObject
     [ObservableProperty]
     private string _applicationTitle = "WPF Gallery Preview";
 
+    private ObservableCollection<string> SearchItems { get; set; }
+
     public ObservableCollection<string> FilteredSearchItems { get; set; }
-    public ObservableCollection<string> SearchItems { get; set; }
 
     private string _searchBoxText;
 
@@ -91,9 +92,8 @@ public MainWindowViewModel(INavigationService navigationService)
 
         SearchItems = new();
         
-        foreach (var mainPage in Controls)
+        foreach (ControlInfoDataItem mainPage in Controls)
         {
-
             SearchItems.Add(mainPage.ToString());
 
             foreach (ControlInfoDataItem controlsPage in mainPage.Items)

From b0a048087b3021f38fbe1d0ceedb59ef994186e6 Mon Sep 17 00:00:00 2001
From: Harshit Mishra <hmishra@microsoft.com>
Date: Fri, 4 Oct 2024 15:12:38 +0530
Subject: [PATCH 4/4] Addressing PR Comments 1

---
 .../WPFGallery/MainWindow.xaml.cs             |  7 ++
 .../Models/ControlsInfoDataSource.cs          | 20 ++++++
 .../Navigation/NavigationService.cs           | 64 ++++++-------------
 3 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/Sample Applications/WPFGallery/MainWindow.xaml.cs b/Sample Applications/WPFGallery/MainWindow.xaml.cs
index 542bba57..093bffe5 100644
--- a/Sample Applications/WPFGallery/MainWindow.xaml.cs	
+++ b/Sample Applications/WPFGallery/MainWindow.xaml.cs	
@@ -47,6 +47,13 @@ public MainWindow(MainWindowViewModel viewModel, IServiceProvider serviceProvide
 
         SystemEvents.UserPreferenceChanged += SystemEvents_UserPreferenceChanged;
         this.StateChanged += MainWindow_StateChanged;
+
+        ChangeSearchBoxStyle();
+    }
+
+    private void ChangeSearchBoxStyle()
+    {
+        var template = SearchBox.Template;
     }
 
     private void SystemEvents_UserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
diff --git a/Sample Applications/WPFGallery/Models/ControlsInfoDataSource.cs b/Sample Applications/WPFGallery/Models/ControlsInfoDataSource.cs
index 116b08bc..de7fa7fd 100644
--- a/Sample Applications/WPFGallery/Models/ControlsInfoDataSource.cs	
+++ b/Sample Applications/WPFGallery/Models/ControlsInfoDataSource.cs	
@@ -115,5 +115,25 @@ public ICollection<ControlInfoDataItem> GetGroupedControlsInfo()
         {
             return ControlsInfo.Where(x => x.IsGroup == true && x.UniqueId != "Design Guidance" && x.UniqueId != "Samples").ToList();
         }
+    
+        public ObservableCollection<string> GetAllPagesForSearch()
+        {
+            ObservableCollection<string> allPagesForSearch = new ObservableCollection<string>();
+
+            ICollection<ControlInfoDataItem> allPages = ControlsInfoDataSource.Instance.ControlsInfo;
+
+            foreach (ControlInfoDataItem item in allPages)
+            {
+                allPagesForSearch.Add(item.Title);
+
+                foreach (ControlInfoDataItem individualItem in item.Items)
+                {
+                    allPagesForSearch.Add(individualItem.Title);
+                }
+            }
+
+            return allPagesForSearch;
+
+        }
     }
 }
diff --git a/Sample Applications/WPFGallery/Navigation/NavigationService.cs b/Sample Applications/WPFGallery/Navigation/NavigationService.cs
index a5f8f9eb..8441ccfb 100644
--- a/Sample Applications/WPFGallery/Navigation/NavigationService.cs	
+++ b/Sample Applications/WPFGallery/Navigation/NavigationService.cs	
@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Windows.Navigation;
-using WPFGallery.Views;
+using WPFGallery.Models;
 
 namespace WPFGallery.Navigation;
 
@@ -43,7 +41,7 @@ public class NavigationService : INavigationService
 
     public event EventHandler<NavigatingEventArgs> Navigating;
 
-    private Dictionary<string, Type> pageNameToTypeMapping;
+    private Dictionary<string, Type> _pageNameToTypeMapping;
 
 
     public NavigationService(IServiceProvider serviceProvider)
@@ -52,50 +50,24 @@ public NavigationService(IServiceProvider serviceProvider)
         _history = new Stack<Type>();
         _future = new Stack<Type>();
 
-        initializeMapping();
+        InitializeMapping();
     }
 
-    private void initializeMapping()
+    private void InitializeMapping()
     {
-        pageNameToTypeMapping = new Dictionary<string, Type>()
+        ICollection<ControlInfoDataItem> allPages = ControlsInfoDataSource.Instance.ControlsInfo;
+
+        _pageNameToTypeMapping = new();
+
+        foreach (ControlInfoDataItem item in allPages)
         {
-            { "home", typeof(DashboardPage) },
-            { "design guidance", typeof(DesignGuidancePage) },
-            { "colors", typeof(ColorsPage) },
-            { "typography", typeof(TypographyPage) },
-            { "icons", typeof(IconsPage) },
-            { "samples", typeof(SamplesPage) },
-            { "user dashboard", typeof(UserDashboardPage) },
-            { "all controls", typeof(AllSamplesPage) },
-            { "basic input", typeof(BasicInputPage) },
-            { "button", typeof(ButtonPage) },
-            { "checkbox", typeof(CheckBoxPage) },
-            { "radiobutton", typeof(RadioButtonPage) },
-            { "combobox", typeof(ComboBoxPage) },
-            { "slider", typeof(SliderPage) },
-            { "date & calendar", typeof(DateAndTimePage) },
-            { "calendar", typeof(CalendarPage) },
-            { "datepicker", typeof(DatePickerPage) },
-            { "layout", typeof(LayoutPage) },
-            { "expander", typeof(ExpanderPage) },
-            { "navigation", typeof(NavigationPage) },
-            { "menu", typeof(MenuPage) },
-            { "tabcontrol", typeof(TabControlPage) },
-            { "collections", typeof(CollectionsPage) },
-            { "datagrid", typeof(DataGridPage) },
-            { "listbox", typeof(ListBoxPage) },
-            { "listview", typeof(ListViewPage) },
-            { "treeview", typeof(TreeViewPage) },
-            { "status & info", typeof(StatusAndInfoPage) },
-            { "progressbar", typeof(ProgressBarPage) },
-            { "tooltip", typeof(ToolTipPage) },
-            { "text", typeof(TextPage) },
-            { "label", typeof(LabelPage) },
-            { "textbox", typeof(TextBoxPage) },
-            { "textblock", typeof(TextBlockPage) },
-            { "richtextedit", typeof(RichTextEditPage) },
-            { "passwordbox", typeof(PasswordBoxPage) }
-        };
+            _pageNameToTypeMapping[item.Title] = item.PageType;
+
+            foreach (ControlInfoDataItem individualItem in item.Items)
+            {
+                _pageNameToTypeMapping[individualItem.Title] = individualItem.PageType;
+            }
+        }        
     }
 
     public void SetFrame(Frame frame)
@@ -125,9 +97,9 @@ public void Navigate(Type type)
 
     public void Navigate(string? pageName)
     {
-        if(!string.IsNullOrEmpty(pageName) && pageNameToTypeMapping.ContainsKey(pageName.ToLower()))
+        if (!string.IsNullOrEmpty(pageName) && _pageNameToTypeMapping.ContainsKey(pageName))
         {
-            Type currentPage = pageNameToTypeMapping[pageName.ToLower()];
+            Type currentPage = _pageNameToTypeMapping[pageName];
             Navigate(currentPage);
         }
     }