Merge branch 'fix-package-focus' of https://github.com/tkohlmeier/UniGetUI into pr/3360

Author: marticliment

src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml

@@ -12,8 +12,7 @@
     mc:Ignorable="d"
     Name="ABSTRACT_PAGE"
     NavigationCacheMode="Required"
-    xmlns:animations="using:CommunityToolkit.WinUI.Animations" xmlns:pkgClasses="using:UniGetUI.PackageEngine.PackageClasses"
-    CharacterReceived="{x:Bind PackageList_CharacterReceived}">
+    xmlns:animations="using:CommunityToolkit.WinUI.Animations" xmlns:pkgClasses="using:UniGetUI.PackageEngine.PackageClasses">
     <!-- PreviewKeyDown="{x:Bind PackageList_PreviewKeyDown}" -->
 
     <animations:Implicit.ShowAnimations>
@@ -908,7 +907,8 @@
                 <ItemsView x:Name="PackageList" x:FieldModifier="protected" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.Row="1"
                     ItemsSource="{x:Bind FilteredPackages, Mode=OneWay}"
                     ItemTemplate="{StaticResource PackageTemplate}" Padding="4,0,4,0"
-                    CanBeScrollAnchor="False">
+                    CanBeScrollAnchor="False"
+                    CharacterReceived="{x:Bind PackageList_CharacterReceived}">
                     <ItemsView.Layout>
                         <StackLayout Spacing="3"/>
                     </ItemsView.Layout>

src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml.cs

@@ -17,6 +17,7 @@
 using UniGetUI.Interface.Pages;
 using UniGetUI.Interface.Telemetry;
 using UniGetUI.Pages.DialogPages;
+using DispatcherQueuePriority = Microsoft.UI.Dispatching.DispatcherQueuePriority;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -481,18 +482,61 @@ protected async Task LoadPackages(ReloadReason reason)
             Loader_PackagesChanged(this, EventArgs.Empty);
         }
 
-        private void SelectAndScrollTo(int index)
+        private void SelectAndScrollTo(int index, bool focus)
         {
-            PackageWrapper packageWrapper = FilteredPackages[index];
+            if (index < 0 || index >= FilteredPackages.Count)
+                return;
+
             PackageList.Select(index);
-            PackageList.StartBringItemIntoView(FilteredPackages.IndexOf(packageWrapper), new BringIntoViewOptions());
 
-            PackageItemContainer? packageToSelect = PackageList.FindDescendant<PackageItemContainer>(c => c.Wrapper == packageWrapper);
-            if (packageToSelect != null)
+            if (PackageList.ScrollView?.VerticalOffset > index * 39)
             {
-                packageToSelect.IsSelected = true;
-                packageToSelect.Focus(FocusState.Programmatic);
+                PackageList.ScrollView.ScrollTo(0, index * 39, new ScrollingScrollOptions(
+                    ScrollingAnimationMode.Disabled,
+                    ScrollingSnapPointsMode.Ignore
+                ));
             }
+            else if (PackageList.ScrollView?.VerticalOffset + PackageList.ScrollView?.ViewportHeight < (index + 1) * 39)
+            {
+                PackageList.ScrollView?.ScrollTo(0, (index + 1) * 39 - PackageList.ScrollView.ViewportHeight, new ScrollingScrollOptions(
+                    ScrollingAnimationMode.Disabled,
+                    ScrollingSnapPointsMode.Ignore
+                ));
+            }
+
+            if (focus)
+                Focus(FilteredPackages[index].Package);
+        }
+
+        private void Focus(IPackage packageToFocus, int retryCount = 0)
+        {
+            if (retryCount > 20)
+                return;
+
+            DispatcherQueue.TryEnqueue(
+                DispatcherQueuePriority.Low,
+                () =>
+                {
+                    PackageItemContainer? containerToFocus = PackageList.FindDescendant<PackageItemContainer>(c => c.Package?.Equals(packageToFocus) == true);
+                    if (containerToFocus == null)
+                    {
+                        Focus(packageToFocus, ++retryCount);
+                        return;
+                    }
+
+                    if (!containerToFocus.IsSelected)
+                    {
+                        PackageItemContainer? selectedContainer = PackageList.FindDescendant<PackageItemContainer>(c => c.IsSelected);
+                        if (selectedContainer?.Package?.Equals(packageToFocus) == true)
+                            containerToFocus = selectedContainer;
+                        else
+                        {
+                            Focus(packageToFocus, ++retryCount);
+                            return;
+                        }
+                    }
+                    containerToFocus.Focus(FocusState.Keyboard);
+                });
         }
 
         public void PackageList_CharacterReceived(object sender, CharacterReceivedRoutedEventArgs e)
@@ -519,7 +563,7 @@ public void PackageList_CharacterReceived(object sender, CharacterReceivedRouted
                 {
                     if (FilteredPackages[i].Package.Name.ToLower().StartsWith(TypeQuery))
                     {
-                        SelectAndScrollTo(i);
+                        SelectAndScrollTo(i, true);
                         SelectedPackage = true;
                         break;
                     }
@@ -571,11 +615,11 @@ public void PackageList_CharacterReceived(object sender, CharacterReceivedRouted
                             }
                         }
 
-                        SelectAndScrollTo(FirstIdx + (IndexOffset % (LastIdx - FirstIdx + 1)));
+                        SelectAndScrollTo(FirstIdx + (IndexOffset % (LastIdx - FirstIdx + 1)), true);
                     }
                     else if (QueryIndex > -1)
                     {
-                        SelectAndScrollTo(QueryIndex);
+                        SelectAndScrollTo(QueryIndex, true);
                     }
                 }
             }
@@ -701,12 +745,7 @@ public void FilterPackages()
                 {
                     if (FilteredPackages[i].Package.Equals(previousSelection.Package))
                     {
-                        PackageList.Select(i);
-                        PackageList.ScrollView?.ScrollTo(0, Math.Max(0, (i - 3) * 39), new ScrollingScrollOptions
-                        (
-                            ScrollingAnimationMode.Disabled,
-                            ScrollingSnapPointsMode.Ignore
-                        ));
+                        SelectAndScrollTo(i, false);
                         break;
                     }
                 }
@@ -892,6 +931,7 @@ private void PackageItemContainer_RightTapped(object sender, RightTappedRoutedEv
             if (sender is PackageItemContainer container && container.Package is not null)
             {
                 PackageList.Select(container.Wrapper.Index);
+                container.Focus(FocusState.Keyboard);
                 WhenShowingContextMenu(container.Package);
             }
         }
@@ -901,6 +941,7 @@ private void PackageItemContainer_DoubleTapped(object sender, DoubleTappedRouted
             if (sender is PackageItemContainer container && container.Package is not null)
             {
                 PackageList.Select(container.Wrapper.Index);
+                container.Focus(FocusState.Keyboard);
 
                 TEL_InstallReferral referral = TEL_InstallReferral.ALREADY_INSTALLED;
                 if (PAGE_NAME == "Bundles") referral = TEL_InstallReferral.FROM_BUNDLE;
@@ -1087,13 +1128,13 @@ private void PackageItemContainer_PreviewKeyDown(object sender, KeyRoutedEventAr
             switch (e.Key)
             {
                 case VirtualKey.Up when index > 0:
-                    SelectAndScrollTo(index - 1); break;
+                    SelectAndScrollTo(index - 1, true); break;
                 case VirtualKey.Down when index < FilteredPackages.Count - 1:
-                    SelectAndScrollTo(index + 1); break;
+                    SelectAndScrollTo(index + 1, true); break;
                 case VirtualKey.Home when index > 0:
-                    SelectAndScrollTo(0); break;
+                    SelectAndScrollTo(0, true); break;
                 case VirtualKey.End when index < FilteredPackages.Count - 1:
-                    SelectAndScrollTo(FilteredPackages.Count - 1); break;
+                    SelectAndScrollTo(FilteredPackages.Count - 1, true); break;
             }
             e.Handled = true;
         }