Fix test helpers

Author: tspiller

Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs

@@ -63,7 +63,7 @@ IEnumerator WaitForActionRename(int index, bool isActive, double timeoutSecs = 5
         return WaitUntil(() =>
         {
             var actionItems = m_Window.rootVisualElement.Q("actions-container").Query<InputActionsTreeViewItem>().ToList();
-            if (actionItems.Count > index && actionItems[index].IsFocused == isActive)
+            if (actionItems.Count > index && actionItems[index].IsTextFieldFocused == isActive)
             {
                 return true;
             }
@@ -211,7 +211,7 @@ public IEnumerator CanRenameAction()
         // Click twice to start the rename
         SimulateClickOn(actionItem[1]);
         // If the item is already focused, don't click again
-        if (!actionItem[1].IsFocused)
+        if (!actionItem[1].IsTextFieldFocused)
         {
             SimulateClickOn(actionItem[1]);
         }

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

@@ -18,7 +18,7 @@ internal class InputActionsTreeViewItem : VisualElement
         public event EventCallback<string> EditTextFinished;
 
         // for testing purposes to know if the item is focused to accept input
-        internal bool IsFocused { get; private set; } = false;
+        internal bool IsTextFieldFocused { get; private set; } = false;
 
         private bool m_IsEditing;
         private static InputActionsTreeViewItem s_EditingItem = null;
@@ -38,11 +38,11 @@ public InputActionsTreeViewItem()
             renameTextfield.selectAllOnMouseUp = false;
 
             RegisterCallback<MouseDownEvent>(OnMouseDownEventForRename);
-            renameTextfield.RegisterCallback<FocusInEvent>(e => IsFocused = true);
+            renameTextfield.RegisterCallback<FocusInEvent>(e => IsTextFieldFocused = true);
             renameTextfield.RegisterCallback<FocusOutEvent>(e =>
             {
                 OnEditTextFinished();
-                IsFocused = false;
+                IsTextFieldFocused = false;
             });
         }
 
@@ -116,6 +116,7 @@ public void FocusOnRenameFinish()
             //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();
+            IsTextFieldFocused = false;
         }
 
         async void DelayCall()