Fix #419: Adding a new key should focus the new item.

Author: tom-englert

src/ResXManager.View/Tools/AddNewKeyCommand.cs

@@ -4,6 +4,8 @@
     using System.Composition;
     using System.Linq;
     using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Threading;
 
     using ResXManager.View.Properties;
     using ResXManager.View.Visuals;
@@ -12,7 +14,7 @@
     using TomsToolbox.Wpf;
 
     [Export, Shared]
-    internal class AddNewKeyCommand : DelegateCommand<DependencyObject>
+    internal class AddNewKeyCommand : DelegateCommand<DataGrid>
     {
         private readonly ResourceViewModel _resourceViewModel;
         private readonly IExportProvider _exportProvider;
@@ -26,7 +28,7 @@ public AddNewKeyCommand(ResourceViewModel resourceViewModel, IExportProvider exp
             ExecuteCallback = InternalExecute;
         }
 
-        private void InternalExecute(DependencyObject? parameter)
+        private void InternalExecute(DataGrid? dataGrid)
         {
             if (_resourceViewModel.SelectedEntities.Count != 1)
             {
@@ -47,7 +49,7 @@ private void InternalExecute(DependencyObject? parameter)
 
             var application = Application.Current;
 
-            var owner = parameter != null ? Window.GetWindow(parameter) : application.MainWindow;
+            var owner = dataGrid != null ? Window.GetWindow(dataGrid) : application.MainWindow;
 
             var inputBox = new InputBox(_exportProvider)
             {
@@ -76,6 +78,29 @@ private void InternalExecute(DependencyObject? parameter)
             try
             {
                 _resourceViewModel.AddNewKey(resourceFile, key);
+
+                dataGrid?.BeginInvoke(() =>
+                {
+                    var selectedItem = dataGrid.SelectedItem;
+                    dataGrid.ScrollIntoView(selectedItem);
+                    dataGrid?.BeginInvoke(DispatcherPriority.Background, () =>
+                    {
+                        var container = dataGrid.ItemContainerGenerator.ContainerFromItem(selectedItem);
+                        if (container == null)
+                            return;
+
+                        dataGrid?.BeginInvoke(DispatcherPriority.Background, () =>
+                        {
+                            var element = container
+                                .VisualDescendantsAndSelf()
+                                .OfType<UIElement>()
+                                .FirstOrDefault(item => item.Focusable);
+
+                            element?.Focus();
+                        });
+                    });
+                });
+
             }
             catch (Exception ex)
             {

src/ResXManager.View/Visuals/ResourceView.xaml

@@ -18,7 +18,6 @@
              xmlns:themes="clr-namespace:ResXManager.View.Themes"
              xmlns:composition="urn:TomsToolbox.Composition"
              xmlns:Interactions="http://schemas.microsoft.com/xaml/behaviors"
-             x:Name="LayoutRoot"
              d:DataContext="{d:DesignInstance visuals:ResourceViewModel}"
              Padding="4">
   <UserControl.Resources>
@@ -78,11 +77,6 @@
 
   </UserControl.Resources>
 
-  <UserControl.InputBindings>
-    <KeyBinding Key="N" Modifiers="Control" Command="{composition:Import tools:AddNewKeyCommand}" CommandParameter="{Binding ElementName=LayoutRoot}" />
-    <KeyBinding Key="Insert" Modifiers="Shift" Command="{composition:Import tools:AddNewKeyCommand}" CommandParameter="{Binding ElementName=LayoutRoot}" />
-  </UserControl.InputBindings>
-
   <Grid FocusManager.FocusedElement="{Binding ElementName=DataGrid}">
 
     <Grid.ColumnDefinitions>
@@ -283,7 +277,7 @@
             </Button>
             <Button ToolTip="{x:Static properties:Resources.AddKeyToolTip}"
                     Style="{StaticResource ToolbarCommandButtonStyle}"
-                    Command="{composition:Import tools:AddNewKeyCommand}" CommandParameter="{Binding ElementName=LayoutRoot}">
+                    Command="{composition:Import tools:AddNewKeyCommand}" CommandParameter="{Binding ElementName=DataGrid}">
               <Image SnapsToDevicePixels="True" Source="/ResXManager.View;component/Assets/add.png" />
             </Button>
             <Separator />
@@ -697,6 +691,11 @@
 
   </Grid>
 
+  <UserControl.InputBindings>
+    <KeyBinding Key="N" Modifiers="Control" Command="{composition:Import tools:AddNewKeyCommand}" CommandParameter="{Binding ElementName=DataGrid}" />
+    <KeyBinding Key="Insert" Modifiers="Shift" Command="{composition:Import tools:AddNewKeyCommand}" CommandParameter="{Binding ElementName=DataGrid}" />
+  </UserControl.InputBindings>
+
   <Interactions:Interaction.Behaviors>
     <composition:CommandRoutingBehavior CommandSource="view:DeleteCommand"
                                         CommandTarget="{Binding DeleteCommand, Converter={StaticResource DeleteCommandConverter}}"