Fix Accessibility Bug

Author: wang563681252

AIDevGallery/Controls/ModelPicker/ModelOrApiPicker.xaml.cs

@@ -10,6 +10,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -24,6 +25,7 @@ internal sealed partial class ModelOrApiPicker : UserControl
 
     public delegate void SelectedModelsChangedEventHandler(object sender, List<ModelDetails?> modelDetails);
     public event SelectedModelsChangedEventHandler? SelectedModelsChanged;
+    public event EventHandler? Closed;
 
     public ModelOrApiPicker()
     {
@@ -53,6 +55,12 @@ public void Show(List<ModelDetails?>? selectedModels = null)
     public void Hide()
     {
         this.Visibility = Visibility.Collapsed;
+        OnClosed();
+    }
+
+    private void OnClosed()
+    {
+        Closed?.Invoke(this, EventArgs.Empty);
     }
 
     public async Task<List<ModelDetails?>> Load(List<List<ModelType>> modelOrApiTypes, ModelDetails? initialModelToLoad = null)

AIDevGallery/Controls/ModelPicker/ModelPickerViews/OnnxPickerView.xaml

@@ -104,6 +104,7 @@
                                 CornerRadius="{StaticResource ControlCornerRadius}"
                                 GotFocus="ItemContainer_GotFocus"
                                 PointerEntered="ItemContainer_PointerEntered"
+                                AutomationProperties.Name="{x:Bind ModelDetails.Name, Mode=OneWay}"
                                 Tag="{x:Bind}">
                                 <ItemContainer.Resources>
                                     <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent" />

AIDevGallery/Pages/Scenarios/ScenarioPage.xaml.cs

@@ -415,6 +415,14 @@ private void ActionButtonsGrid_SizeChanged(object sender, SizeChangedEventArgs e
 
     private void ModelBtn_Click(object sender, RoutedEventArgs e)
     {
+        var button = sender as Button;
+
+        var picker = App.MainWindow.ModelPicker;
+        picker.Closed += (s, args) =>
+        {
+            button?.Focus(FocusState.Programmatic);
+        };
+
         App.MainWindow.ModelPicker.Show(modelDetails.ToList());
     }