Fix #21 - Authentication UI wasn't getting proper focus. (#23)

veler · Aug 23, 2020 · 1cbdfbd · 1cbdfbd
1 parent 03bb6b0
commit 1cbdfbd
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 0 deletions.
diff --git a/Windows/Impl/PaZword/Views/Other/AuthenticationPage.xaml b/Windows/Impl/PaZword/Views/Other/AuthenticationPage.xaml
@@ -53,6 +53,7 @@
                         Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"/>
                 </StackPanel>
                 <StackPanel
+                    x:Name="RetryWindowsHelloStackPanel"
                     TabFocusNavigation="Cycle"
                     Visibility="{x:Bind ViewModel.IsWindowsHelloAuthenticationInProgress, Converter={StaticResource InvertedBooleanToVisibilityConverter}, Mode=OneWay}">
                     <TextBlock
@@ -65,6 +66,7 @@
                         VerticalAlignment="Center"/>
                     <Button
                         x:Name="RetryWindowsHelloAuthenticationButton"
+                        TabIndex="0"
                         Margin="0,10,0,0"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Bottom"
@@ -76,6 +78,7 @@
 
             <!-- Two Factor Authentication -->
             <Grid
+                x:Name="TwoFactorAuthenticationGrid"
                 Visibility="{x:Bind ViewModel.AuthenticationStep, ConverterParameter='TwoFactorAuthentication', Converter={StaticResource EnumToVisibilityConverter}, Mode=OneWay}">
                 <StackPanel
                     TabFocusNavigation="Cycle"
@@ -90,17 +93,21 @@
                         HorizontalAlignment="Center"
                         TextTrimming="CharacterEllipsis"/>
                     <TextBox
+                        x:Name="TwoFactorAuthenticationTextBox"
+                        TabIndex="0"
                         Margin="0,10,0,0"
                         PlaceholderText="{x:Bind ViewModel.Strings.CodeGenerated}"
                         Text="{x:Bind ViewModel.TwoFactorVerificationCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                     <HyperlinkButton
+                        TabIndex="1"
                         Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
                         Content="{x:Bind ViewModel.Strings.TwoFactorUseEmail}"
                         IsEnabled="{x:Bind ViewModel.IsInternetAccess}"
                         HorizontalAlignment="Center"
                         Command="{x:Bind ViewModel.SendRecoveryKeyByEmailCommand}"/>
                 </StackPanel>
                 <StackPanel
+                    x:Name="TwoFactorAuthenticationEmailAddressStackPanel"
                     TabFocusNavigation="Cycle"
                     Visibility="{x:Bind ViewModel.IsTwoFactorAuthenticationByEmailInProgress, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}">
                     <FontIcon
@@ -120,6 +127,8 @@
                         TextWrapping="WrapWholeWords"
                         TextTrimming="CharacterEllipsis"/>
                     <TextBox
+                        x:Name="TwoFactorAuthenticationEmailAddressTextBox"
+                        TabIndex="0"
                         Margin="0,10,0,0"
                         PlaceholderText="{x:Bind ViewModel.Strings.CodeGeneratedEmail}"
                         Text="{x:Bind ViewModel.TwoFactorVerificationCodeEmail, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
@@ -128,6 +137,7 @@
 
             <!-- Recovery Key -->
             <StackPanel
+                x:Name="RecoveryKeyStackPanel"
                 TabFocusNavigation="Cycle"
                 Visibility="{x:Bind ViewModel.AuthenticationStep, ConverterParameter='RecoveryKey', Converter={StaticResource EnumToVisibilityConverter}, Mode=OneWay}">
                 <FontIcon
@@ -147,6 +157,8 @@
                     TextWrapping="WrapWholeWords"
                     TextTrimming="CharacterEllipsis"/>
                 <TextBox
+                    x:Name="RecoveryKeyTextBox"
+                    TabIndex="0"
                     Margin="0,10,0,0"
                     PlaceholderText="{x:Bind ViewModel.Strings.EnterSecretKeyTextBox}"
                     Text="{x:Bind ViewModel.RecoveryKey, Converter={StaticResource SecureStringToStringConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">

diff --git a/Windows/Impl/PaZword/Views/Other/AuthenticationPage.xaml.cs b/Windows/Impl/PaZword/Views/Other/AuthenticationPage.xaml.cs
@@ -1,4 +1,9 @@
 using PaZword.ViewModels.Other;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Windows.UI.Core;
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
 namespace PaZword.Views.Other
@@ -21,6 +26,45 @@ public AuthenticationPage()
             InitializeComponent();
 
             ViewModel.Initialize();
+
+            RecoveryKeyStackPanel.RegisterPropertyChangedCallback(UIElement.VisibilityProperty, VisibilityChanged);
+            RetryWindowsHelloStackPanel.RegisterPropertyChangedCallback(UIElement.VisibilityProperty, VisibilityChanged);
+            TwoFactorAuthenticationEmailAddressStackPanel.RegisterPropertyChangedCallback(UIElement.VisibilityProperty, VisibilityChanged);
+            TwoFactorAuthenticationGrid.RegisterPropertyChangedCallback(UIElement.VisibilityProperty, VisibilityChanged);
+        }
+
+        private void VisibilityChanged(DependencyObject sender, DependencyProperty dp)
+        {
+            if (sender is Panel control
+                && control.Visibility == Visibility.Visible)
+            {
+                // Slightly delay setting focus
+                Task.Factory.StartNew(async () =>
+                {
+                    await Dispatcher.RunAsync(CoreDispatcherPriority.Low, () =>
+                    {
+                        if (control == RecoveryKeyStackPanel)
+                        {
+                            RecoveryKeyTextBox.Focus(FocusState.Keyboard);
+                        }
+                        else if (control == RetryWindowsHelloStackPanel)
+                        {
+                            RetryWindowsHelloAuthenticationButton.Focus(FocusState.Keyboard);
+                        }
+                        else if (control == TwoFactorAuthenticationGrid)
+                        {
+                            TwoFactorAuthenticationTextBox.Focus(FocusState.Keyboard);
+                        }
+                        else if (control == TwoFactorAuthenticationEmailAddressStackPanel)
+                        {
+                            TwoFactorAuthenticationEmailAddressTextBox.Focus(FocusState.Keyboard);
+                        }
+                    });
+                },
+                CancellationToken.None,
+                TaskCreationOptions.None,
+                TaskScheduler.Default);
+            }
         }
     }
 }