Refocus after Action rename

Author: tspiller

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs

@@ -24,6 +24,7 @@ internal class ActionsTreeView : ViewBase<ActionsTreeView.ViewState>
         private readonly ScrollView m_PropertiesScrollview;
 
         private bool m_RenameOnActionAdded;
+        private bool m_FocusOnRenameActionFinish;
         private readonly CollectionViewSelectionChangeFilter m_ActionsTreeViewSelectionChangeFilter;
 
         //save TreeView element id's of individual input actions and bindings to ensure saving of expanded state
@@ -215,6 +216,8 @@ public override void RedrawUI(ViewState viewState)
 
             // Don't want to show action properties if there's no actions.
             m_PropertiesScrollview.visible = m_ActionsTreeView.GetTreeCount() > 0;
+            
+            FinishActionRename(viewState.newElementID);
         }
 
         private void OnDraggedItem(DragPerformEvent evt)
@@ -307,6 +310,17 @@ internal void RenameActionItem(int index)
             m_ActionsTreeView.ScrollToItem(index);
             m_ActionsTreeView.GetRootElementForIndex(index)?.Q<InputActionsTreeViewItem>()?.FocusOnRenameTextField();
         }
+        
+        private void FinishActionRename(int id)
+        {
+            if (!m_FocusOnRenameActionFinish || id == -1)
+                return;
+            m_ActionsTreeView.ScrollToItemById(id);
+            var treeViewItem = m_ActionsTreeView.GetRootElementForId(id)?.Q<InputActionsTreeViewItem>();
+            treeViewItem?.FocusOnRenameFinish();
+
+            m_FocusOnRenameActionFinish = false;
+        }
 
         internal void AddAction()
         {
@@ -369,6 +383,8 @@ private void ChangeActionOrCompositName(ActionOrBindingData data, string newName
                 Dispatch(Commands.ChangeActionName(data.actionMapIndex, data.name, newName));
             else if (data.isComposite)
                 Dispatch(Commands.ChangeCompositeName(data.actionMapIndex, data.bindingIndex, newName));
+
+            m_FocusOnRenameActionFinish = true;
         }
 
         internal int GetMapCount()

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs

@@ -105,6 +105,18 @@ public static void CancelRename()
         {
             s_EditingItem?.OnEditTextFinished();
         }
+        
+        public void FocusOnRenameFinish()
+        {
+            if (m_IsEditing)
+                return;
+
+            //FocusOnRenameTextField() changes the focus to the renameTextfield explicitly, the focus needs to
+            //get moved again using a similar workaround when finished editing text
+            //Everything else has already been taken restored in OnEditTextFinished() but this has to happen after
+            //listView/treeView reclaims the focus in RedrawUI
+            label.Q<Label>().Focus();
+        }
 
         async void DelayCall()
         {