Fixed delete dialog primary button focus issue (#7882)

Author: puppetsw

src/Files/Dialogs/FilesystemOperationDialog.xaml

@@ -21,12 +21,6 @@
     SecondaryButtonText="{x:Bind ViewModel.SecondaryButtonText, Mode=OneWay}"
     Style="{StaticResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
-    <i:Interaction.Behaviors>
-        <!--  No need to specify CommandParameter - `e` is passed by default  -->
-        <icore:EventTriggerBehavior EventName="Loaded">
-            <icore:InvokeCommandAction Command="{x:Bind ViewModel.LoadedCommand, Mode=OneWay}" />
-        </icore:EventTriggerBehavior>
-    </i:Interaction.Behaviors>
 
     <ContentDialog.Resources>
         <ResourceDictionary>
@@ -68,13 +62,14 @@
                 x:Load="{x:Bind ViewModel.PermanentlyDeleteLoad, Mode=OneWay}"
                 Content="Permanently delete"
                 IsChecked="{x:Bind ViewModel.PermanentlyDelete, Mode=TwoWay}"
-                IsEnabled="{x:Bind ViewModel.PermanentlyDeleteEnabled, Mode=OneWay}" />
+                IsEnabled="False" />
 
             <Grid>
                 <ListView
                     x:Name="DetailsGrid"
                     Grid.Row="1"
                     MaxHeight="200"
+                    IsEnabled="False"
                     IsItemClickEnabled="False"
                     ItemsSource="{x:Bind ViewModel.Items}"
                     SelectionMode="{x:Bind ViewModel.ItemsSelectionMode, Mode=OneWay}">
@@ -213,9 +208,7 @@
                                                 x:Uid="ConflictingItemsDialogItemOptionReplaceExisting"
                                                 Command="{Binding ReplaceExistingCommand}"
                                                 Text="Replace" />
-                                            <MenuFlyoutItem
-                                                Command="{Binding SkipCommand}"
-                                                Text="{helpers:ResourceString Name=Skip}" />
+                                            <MenuFlyoutItem Command="{Binding SkipCommand}" Text="{helpers:ResourceString Name=Skip}" />
                                         </MenuFlyout>
                                     </muxc:SplitButton.Flyout>
                                 </muxc:SplitButton>

src/Files/Dialogs/FilesystemOperationDialog.xaml.cs

@@ -3,6 +3,7 @@
 using Microsoft.Toolkit.Uwp.UI;
 using System.Collections.Generic;
 using System.Linq;
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
 // The Content Dialog item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
@@ -25,6 +26,24 @@ public FilesystemOperationDialog(FilesystemOperationDialogViewModel viewModel)
 
             ViewModel = viewModel;
             ViewModel.View = this;
+            ViewModel.LoadedCommand.Execute(null);
+        }
+
+        protected override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            var primaryButton = this.FindDescendant("PrimaryButton") as Button;
+            if (primaryButton != null)
+            {
+                primaryButton.GotFocus += PrimaryButton_GotFocus;
+            }
+        }
+
+        private void PrimaryButton_GotFocus(object sender, RoutedEventArgs e)
+        {
+            (sender as Button).GotFocus -= PrimaryButton_GotFocus;
+            chkPermanentlyDelete.IsEnabled = ViewModel.PermanentlyDeleteEnabled;
+            DetailsGrid.IsEnabled = true;
         }
 
         private void MenuFlyoutItem_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)