Fix issue when searching on icons page with item being selected (#1515)

## Description  Closes #1500
microsoft · Jul 15, 2024 · 96b7a4a · 96b7a4a
1 parent 8e98723
commit 96b7a4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml b/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml
@@ -17,7 +17,6 @@
     xmlns:controls="using:WinUIGallery.Controls"
     xmlns:controls1="using:WinUIGallery.DesktopWap.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:WinUIGallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">

diff --git a/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml.cs b/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml.cs
@@ -136,9 +136,13 @@ public void Filter(string search)
 
         private void IconsItemsView_SelectionChanged(ItemsView sender, ItemsViewSelectionChangedEventArgs args)
         {
-            if (IconsItemsView.CurrentItemIndex != -1)
+            if (IconsItemsView.ItemsSource is IList<IconData> currentItems)
             {
-                SelectedItem = (IconsItemsView.ItemsSource as IList<IconData>)[IconsItemsView.CurrentItemIndex];
+                if (IconsItemsView.CurrentItemIndex != -1 && IconsItemsView.CurrentItemIndex < currentItems.Count)
+                {
+                    SelectedItem = currentItems[IconsItemsView.CurrentItemIndex];
+                }
+
             }
         }
     }