From 762b5aa41c8b138b5c2962e036ab0e207646ccef Mon Sep 17 00:00:00 2001
From: Graham Huws <graham.huws@unity3d.com>
Date: Mon, 29 Jan 2024 18:19:57 +0000
Subject: [PATCH 1/5] FIX: Avoid errors logged when opening settings menu
 (ISX-1721)

---
 Packages/com.unity.inputsystem/CHANGELOG.md                | 1 +
 .../Editor/UITKAssetEditor/Views/ActionsTreeView.cs        | 7 +++++++
 .../Editor/UITKAssetEditor/Views/InputActionsEditorView.cs | 7 +++++++
 .../InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs   | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
index c8f9cac971..57717cb68c 100644
--- a/Packages/com.unity.inputsystem/CHANGELOG.md
+++ b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -35,6 +35,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed lingering highlight effect on Save Asset button after clicking.
 - Fixed missing name in window title for Input Action assets.
 - Fixed "Listen" functionality for selecting an input sometimes expecting the wrong input type.
+- Fixed console errors that can be produced when opening input package settings from the Inspector.
 
 ## [1.8.0-pre.2] - 2023-11-09
 
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 3d8b581725..56f4520bac 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -193,6 +193,13 @@ public override void DestroyView()
 
         public override void RedrawUI(ViewState viewState)
         {
+            // It's possible for RedrawUI to be called when m_Root is empty, throwing errors in the console.
+            // This can happen when the view is discarded immediately after being loaded, i.e. jumping to the input settings
+            // page in Preferences when the last window shown there was the main view, which the editor (briefly) loads first.
+            // Compare against the number of m_ChildViews as a cheap way to know we should skip redrawing. (ISX-1721)
+            if (m_Root.childCount != ChildViewCount())
+                return;
+
             m_ActionsTreeView.Clear();
             m_ActionsTreeView.SetRootItems(viewState.treeViewData);
             m_ActionsTreeView.Rebuild();
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs
index b6fa07dc77..91d6bb3c37 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs
@@ -98,6 +98,13 @@ private void OnAutoSaveToggle(ChangeEvent<bool> evt)
 
         public override void RedrawUI(ViewState viewState)
         {
+            // It's possible for RedrawUI to be called when m_Root is empty, throwing errors in the console.
+            // This can happen when the view is discarded immediately after being loaded, i.e. jumping to the input settings
+            // page in Preferences when the last window shown there was the main view, which the editor (briefly) loads first.
+            // Compare against the number of m_ChildViews as a cheap way to know we should skip redrawing. (ISX-1721)
+            if (m_Root.childCount != ChildViewCount())
+                return;
+
             var toolbarMenu = m_Root.Q<ToolbarMenu>("control-schemes-toolbar-menu");
             toolbarMenu.menu.MenuItems().Clear();
 
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs
index 97cb2bbeef..b518973e78 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs
@@ -65,6 +65,11 @@ public void DestroyChildView<TView>(TView view) where TView : IView
             view.DestroyView();
         }
 
+        public int ChildViewCount()
+        {
+            return m_ChildViews.Count;
+        }
+
         public void Dispatch(Command command)
         {
             stateContainer.Dispatch(command);

From 4d2c0c64d3d9bc2eb0d23e076ce50265bf4836a7 Mon Sep 17 00:00:00 2001
From: Graham Huws <graham.huws@unity3d.com>
Date: Thu, 1 Feb 2024 10:55:10 +0000
Subject: [PATCH 2/5] Address feedback: Consolidate root element for views and
 bugfix logic.

---
 .../UITKAssetEditor/Views/ActionMapsView.cs   |  9 ++--
 .../Views/ActionPropertiesView.cs             | 12 ++---
 .../UITKAssetEditor/Views/ActionsTreeView.cs  | 23 +++------
 .../Views/BindingPropertiesView.cs            | 16 +++----
 .../Views/CompositeBindingPropertiesView.cs   |  8 ++--
 .../CompositePartBindingPropertiesView.cs     |  6 +--
 .../Views/ControlSchemesView.cs               |  8 ++--
 .../Views/InputActionsEditorView.cs           | 48 ++++++++-----------
 .../Views/NameAndParametersListView.cs        | 14 +++---
 .../UITKAssetEditor/Views/PropertiesView.cs   | 15 +++---
 .../Editor/UITKAssetEditor/Views/ViewBase.cs  | 18 ++++---
 11 files changed, 72 insertions(+), 105 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
index ae13bced4f..7815762513 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
@@ -13,11 +13,9 @@ namespace UnityEngine.InputSystem.Editor
     internal class ActionMapsView : ViewBase<ActionMapsView.ViewState>
     {
         public ActionMapsView(VisualElement root, StateContainer stateContainer)
-            : base(stateContainer)
+            : base(root, stateContainer)
         {
-            m_Root = root;
-
-            m_ListView = m_Root?.Q<ListView>("action-maps-list-view");
+            m_ListView = rootElement?.Q<ListView>("action-maps-list-view");
             m_ListView.selectionType = UIElements.SelectionType.Single;
 
             m_ListViewSelectionChangeFilter = new CollectionViewSelectionChangeFilter(m_ListView);
@@ -65,7 +63,7 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
             ContextMenu.GetContextMenuForActionMapListView(this, m_ListView.parent);
         }
 
-        private Button addActionMapButton => m_Root?.Q<Button>("add-new-action-map-button");
+        private Button addActionMapButton => rootElement?.Q<Button>("add-new-action-map-button");
 
         public override void RedrawUI(ViewState viewState)
         {
@@ -183,7 +181,6 @@ private void OnValidateCommand(ValidateCommandEvent evt)
 
         private readonly CollectionViewSelectionChangeFilter m_ListViewSelectionChangeFilter;
         private bool m_EnterRenamingMode;
-        private readonly VisualElement m_Root;
         private ListView m_ListView;
 
         internal class ViewState
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs
index f800b92c91..e07a603424 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionPropertiesView.cs
@@ -10,13 +10,11 @@ namespace UnityEngine.InputSystem.Editor
 {
     internal class ActionPropertiesView : ViewBase<(SerializedInputAction?, List<string>)>
     {
-        private readonly VisualElement m_Root;
         private readonly Foldout m_ParentFoldout;
 
         public ActionPropertiesView(VisualElement root, Foldout foldout, StateContainer stateContainer)
-            : base(stateContainer)
+            : base(root, stateContainer)
         {
-            m_Root = root;
             m_ParentFoldout = foldout;
 
             // TODO: Consider IEquatable<T> and how to compare selector data
@@ -37,7 +35,7 @@ public override void RedrawUI((SerializedInputAction ? , List<string>) viewState
             m_ParentFoldout.text = "Action";
             var inputAction = viewState.Item1.Value;
 
-            m_Root.Clear();
+            rootElement.Clear();
 
             var actionType = new EnumField("Action Type", inputAction.type)
             {
@@ -47,7 +45,7 @@ public override void RedrawUI((SerializedInputAction ? , List<string>) viewState
             {
                 Dispatch(Commands.ChangeActionType(inputAction, (InputActionType)evt.newValue));
             });
-            m_Root.Add(actionType);
+            rootElement.Add(actionType);
 
             if (inputAction.type != InputActionType.Button)
             {
@@ -65,7 +63,7 @@ public override void RedrawUI((SerializedInputAction ? , List<string>) viewState
                 {
                     Dispatch(Commands.ChangeActionControlType(inputAction, controlType.index));
                 });
-                m_Root.Add(controlType);
+                rootElement.Add(controlType);
             }
 
             if (inputAction.type != InputActionType.Value)
@@ -79,7 +77,7 @@ public override void RedrawUI((SerializedInputAction ? , List<string>) viewState
                 {
                     Dispatch(Commands.ChangeInitialStateCheck(inputAction, evt.newValue));
                 });
-                m_Root.Add(initialStateCheck);
+                rootElement.Add(initialStateCheck);
             }
         }
     }
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 56f4520bac..e9e6b627dd 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -16,9 +16,8 @@ namespace UnityEngine.InputSystem.Editor
     /// </summary>
     internal class ActionsTreeView : ViewBase<ActionsTreeView.ViewState>
     {
-        private readonly VisualElement m_Root;
         private readonly TreeView m_ActionsTreeView;
-        private Button addActionButton => m_Root?.Q<Button>("add-new-action-button");
+        private readonly Button m_AddActionButton;
 
         private bool m_RenameOnActionAdded;
         private readonly CollectionViewSelectionChangeFilter m_ActionsTreeViewSelectionChangeFilter;
@@ -27,11 +26,10 @@ internal class ActionsTreeView : ViewBase<ActionsTreeView.ViewState>
         private Dictionary<Guid, int> m_GuidToTreeViewId;
 
         public ActionsTreeView(VisualElement root, StateContainer stateContainer)
-            : base(stateContainer)
+            : base(root, stateContainer)
         {
-            m_Root = root;
-
-            m_ActionsTreeView = m_Root.Q<TreeView>("actions-tree-view");
+            m_AddActionButton = rootElement.Q<Button>("add-new-action-button");
+            m_ActionsTreeView = rootElement.Q<TreeView>("actions-tree-view");
             //assign unique viewDataKey to store treeView states like expanded/collapsed items - make it unique to avoid conflicts with other TreeViews
             m_ActionsTreeView.viewDataKey = "InputActionTreeView " + stateContainer.GetState().serializedObject.targetObject.GetInstanceID();
             m_GuidToTreeViewId = new Dictionary<Guid, int>();
@@ -147,7 +145,7 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
                     };
                 });
 
-            addActionButton.clicked += AddAction;
+            m_AddActionButton.clicked += AddAction;
         }
 
         private int GetSelectedElementId(InputActionsEditorState state, List<TreeViewItemData<ActionOrBindingData>> treeData)
@@ -188,18 +186,11 @@ private int GetComponentOrBindingID(List<TreeViewItemData<ActionOrBindingData>>
 
         public override void DestroyView()
         {
-            addActionButton.clicked -= AddAction;
+            m_AddActionButton.clicked -= AddAction;
         }
 
         public override void RedrawUI(ViewState viewState)
         {
-            // It's possible for RedrawUI to be called when m_Root is empty, throwing errors in the console.
-            // This can happen when the view is discarded immediately after being loaded, i.e. jumping to the input settings
-            // page in Preferences when the last window shown there was the main view, which the editor (briefly) loads first.
-            // Compare against the number of m_ChildViews as a cheap way to know we should skip redrawing. (ISX-1721)
-            if (m_Root.childCount != ChildViewCount())
-                return;
-
             m_ActionsTreeView.Clear();
             m_ActionsTreeView.SetRootItems(viewState.treeViewData);
             m_ActionsTreeView.Rebuild();
@@ -209,7 +200,7 @@ public override void RedrawUI(ViewState viewState)
                 m_ActionsTreeView.ScrollToItemById(viewState.newElementID);
             }
             RenameNewAction(viewState.newElementID);;
-            addActionButton.SetEnabled(viewState.actionMapCount > 0);
+            m_AddActionButton.SetEnabled(viewState.actionMapCount > 0);
         }
 
         private void RenameNewAction(int id)
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs
index 9fbaf9d099..0bdcfedc00 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs
@@ -7,15 +7,13 @@ namespace UnityEngine.InputSystem.Editor
 {
     internal class BindingPropertiesView : ViewBase<BindingPropertiesView.ViewState>
     {
-        private readonly VisualElement m_Root;
         private readonly Foldout m_ParentFoldout;
         private CompositeBindingPropertiesView m_CompositeBindingPropertiesView;
         private CompositePartBindingPropertiesView m_CompositePartBindingPropertiesView;
 
         public BindingPropertiesView(VisualElement root, Foldout foldout, StateContainer stateContainer)
-            : base(stateContainer)
+            : base(root, stateContainer)
         {
-            m_Root = root;
             m_ParentFoldout = foldout;
 
             CreateSelector(state => state.selectedBindingIndex,
@@ -37,7 +35,7 @@ public override void RedrawUI(ViewState viewState)
             if (selectedBindingIndex == -1)
                 return;
 
-            m_Root.Clear();
+            rootElement.Clear();
 
             var binding = viewState.selectedBinding;
             if (!binding.HasValue)
@@ -47,11 +45,11 @@ public override void RedrawUI(ViewState viewState)
             if (binding.Value.isComposite)
             {
                 m_ParentFoldout.text = "Composite";
-                m_CompositeBindingPropertiesView = CreateChildView(new CompositeBindingPropertiesView(m_Root, stateContainer));
+                m_CompositeBindingPropertiesView = CreateChildView(new CompositeBindingPropertiesView(rootElement, stateContainer));
             }
             else if (binding.Value.isPartOfComposite)
             {
-                m_CompositePartBindingPropertiesView = CreateChildView(new CompositePartBindingPropertiesView(m_Root, stateContainer));
+                m_CompositePartBindingPropertiesView = CreateChildView(new CompositePartBindingPropertiesView(rootElement, stateContainer));
                 DrawControlSchemeToggles(viewState, binding.Value);
             }
             else
@@ -64,7 +62,7 @@ public override void RedrawUI(ViewState viewState)
                 controlPathEditor.SetExpectedControlLayout(inputAction?.expectedControlType ?? "");
 
                 var controlPathContainer = new IMGUIContainer(controlPathEditor.OnGUI);
-                m_Root.Add(controlPathContainer);
+                rootElement.Add(controlPathContainer);
 
                 DrawControlSchemeToggles(viewState, binding.Value);
             }
@@ -81,7 +79,7 @@ private void DrawControlSchemeToggles(ViewState viewState, SerializedInputBindin
             if (!viewState.controlSchemes.Any()) return;
 
             var useInControlSchemeLabel = new Label("Use in control scheme");
-            m_Root.Add(useInControlSchemeLabel);
+            rootElement.Add(useInControlSchemeLabel);
 
             foreach (var controlScheme in viewState.controlSchemes)
             {
@@ -89,7 +87,7 @@ private void DrawControlSchemeToggles(ViewState viewState, SerializedInputBindin
                 {
                     value = binding.controlSchemes.Any(scheme => controlScheme.name == scheme)
                 };
-                m_Root.Add(checkbox);
+                rootElement.Add(checkbox);
                 checkbox.RegisterValueChangedCallback(changeEvent =>
                 {
                     Dispatch(ControlSchemeCommands.ChangeSelectedBindingsControlSchemes(controlScheme.name, changeEvent.newValue));
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs
index d8af8b7abe..3a2e2f4484 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs
@@ -11,7 +11,6 @@ namespace UnityEngine.InputSystem.Editor
 {
     internal class CompositeBindingPropertiesView : ViewBase<CompositeBindingPropertiesView.ViewState>
     {
-        private readonly VisualElement m_Root;
         private readonly DropdownField m_CompositeTypeField;
         private EventCallback<ChangeEvent<string>> m_CompositeTypeFieldChangedHandler;
 
@@ -20,12 +19,11 @@ internal class CompositeBindingPropertiesView : ViewBase<CompositeBindingPropert
             InputActionsEditorConstants.CompositeBindingPropertiesViewUxml;
 
         public CompositeBindingPropertiesView(VisualElement root, StateContainer stateContainer)
-            : base(stateContainer)
+            : base(root, stateContainer)
         {
-            m_Root = root;
             var visualTreeAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(UxmlName);
             var container = visualTreeAsset.CloneTree();
-            m_Root.Add(container);
+            rootElement.Add(container);
 
             m_CompositeTypeField = container.Q<DropdownField>("composite-type-dropdown");
 
@@ -46,7 +44,7 @@ public override void RedrawUI(ViewState viewState)
             {
                 Dispatch(Commands.UpdatePathNameAndValues(viewState.parameterListView.GetParameters(), viewState.selectedBindingPath));
             };
-            viewState.parameterListView.OnDrawVisualElements(m_Root);
+            viewState.parameterListView.OnDrawVisualElements(rootElement);
         }
 
         public override void DestroyView()
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs
index 686fc5f936..014acce1f0 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs
@@ -9,7 +9,6 @@ namespace UnityEngine.InputSystem.Editor
 {
     internal class CompositePartBindingPropertiesView : ViewBase<CompositePartBindingPropertiesView.ViewState>
     {
-        private readonly VisualElement m_Root;
         private readonly DropdownField m_CompositePartField;
         private readonly IMGUIContainer m_PathEditorContainer;
 
@@ -18,12 +17,11 @@ internal class CompositePartBindingPropertiesView : ViewBase<CompositePartBindin
             InputActionsEditorConstants.CompositePartBindingPropertiesViewUxml;
 
         public CompositePartBindingPropertiesView(VisualElement root, StateContainer stateContainer)
-            : base(stateContainer)
+            : base(root, stateContainer)
         {
-            m_Root = root;
             var visualTreeAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(UxmlName);
             var container = visualTreeAsset.CloneTree();
-            m_Root.Add(container);
+            rootElement.Add(container);
 
             m_PathEditorContainer = container.Q<IMGUIContainer>("path-editor-container");
             m_CompositePartField = container.Q<DropdownField>("composite-part-dropdown");
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs
index 386df4c0d2..86d6bbe94b 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs
@@ -15,9 +15,8 @@ internal class ControlSchemesView : ViewBase<InputControlScheme>
         public event Action<ViewBase<InputControlScheme>> OnClosing;
 
         public ControlSchemesView(VisualElement root, StateContainer stateContainer, bool updateExisting = false)
-            : base(stateContainer)
+            : base(root, stateContainer)
         {
-            m_Root = root;
             m_UpdateExisting = updateExisting;
 
             var controlSchemeEditor = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
@@ -49,7 +48,7 @@ public ControlSchemesView(VisualElement root, StateContainer stateContainer, boo
             };
             popupWindow.contentContainer.Add(controlSchemeVisualElement);
             m_ModalWindow.Add(popupWindow);
-            m_Root.Add(m_ModalWindow);
+            rootElement.Add(m_ModalWindow);
             m_ModalWindow.StretchToParentSize();
             m_ModalWindow.RegisterCallback<ClickEvent>(evt => Close());
             popupWindow.RegisterCallback<ClickEvent>(evt => evt.StopPropagation());
@@ -96,7 +95,7 @@ private void RemoveDeviceRequirement()
 
         public override void RedrawUI(InputControlScheme viewState)
         {
-            m_Root.Q<TextField>(kControlSchemeNameTextField).value = viewState.name;
+            rootElement.Q<TextField>(kControlSchemeNameTextField).value = viewState.name;
 
             m_ListView.itemsSource?.Clear();
             m_ListView.itemsSource = viewState.deviceRequirements.Count > 0 ?
@@ -161,7 +160,6 @@ private void BindDeviceTypeCell(VisualElement visualElement, int rowIndex)
             ((Label)visualElement).text = (((string, bool))m_ListView.itemsSource[rowIndex]).Item1;
         }
 
-        private readonly VisualElement m_Root;
         private readonly bool m_UpdateExisting;
         private MultiColumnListView m_ListView;
         private VisualElement m_ModalWindow;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs
index 91d6bb3c37..3f0efaca45 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs
@@ -18,9 +18,8 @@ internal class InputActionsEditorView : ViewBase<InputActionsEditorView.ViewStat
         internal Action<InputActionAsset> postResetAction;
 
         public InputActionsEditorView(VisualElement root, StateContainer stateContainer)
-            : base(stateContainer)
+            : base(root, stateContainer)
         {
-            m_Root = root;
             BuildUI();
         }
 
@@ -31,29 +30,29 @@ public void BuildUI()
                 InputActionsEditorConstants.ResourcesPath +
                 InputActionsEditorConstants.MainEditorViewNameUxml);
 
-            mainEditorAsset.CloneTree(m_Root);
-            var actionsTreeView = new ActionsTreeView(m_Root, stateContainer);
-            CreateChildView(new ActionMapsView(m_Root, stateContainer));
+            mainEditorAsset.CloneTree(rootElement);
+            var actionsTreeView = new ActionsTreeView(rootElement, stateContainer);
+            CreateChildView(new ActionMapsView(rootElement, stateContainer));
             CreateChildView(actionsTreeView);
-            CreateChildView(new PropertiesView(m_Root, stateContainer));
-            InputActionViewsControlsHolder.Initialize(m_Root, actionsTreeView);
+            CreateChildView(new PropertiesView(rootElement, stateContainer));
+            InputActionViewsControlsHolder.Initialize(rootElement, actionsTreeView);
 
-            var menuButton = m_Root.Q<ToolbarMenu>("control-schemes-toolbar-menu");
-            menuButton.menu.AppendAction("Add Control Scheme...", _ => AddOrUpdateControlScheme(m_Root));
-            menuButton.menu.AppendAction("Edit Control Scheme...", _ => AddOrUpdateControlScheme(m_Root, true), DropdownMenuAction.Status.Disabled);
-            menuButton.menu.AppendAction("Duplicate Control Scheme...", _ => DuplicateControlScheme(m_Root), DropdownMenuAction.Status.Disabled);
+            var menuButton = rootElement.Q<ToolbarMenu>("control-schemes-toolbar-menu");
+            menuButton.menu.AppendAction("Add Control Scheme...", _ => AddOrUpdateControlScheme(rootElement));
+            menuButton.menu.AppendAction("Edit Control Scheme...", _ => AddOrUpdateControlScheme(rootElement, true), DropdownMenuAction.Status.Disabled);
+            menuButton.menu.AppendAction("Duplicate Control Scheme...", _ => DuplicateControlScheme(rootElement), DropdownMenuAction.Status.Disabled);
             menuButton.menu.AppendAction("Delete Control Scheme...", DeleteControlScheme, DropdownMenuAction.Status.Disabled);
 
-            var saveButton = m_Root.Q<ToolbarButton>(name: saveButtonId);
+            var saveButton = rootElement.Q<ToolbarButton>(name: saveButtonId);
             saveButton.SetEnabled(InputEditorUserSettings.autoSaveInputActionAssets == false);
             saveButton.clicked += OnSaveButton;
 
-            var autoSaveToggle = m_Root.Q<ToolbarToggle>(name: autoSaveToggleId);
+            var autoSaveToggle = rootElement.Q<ToolbarToggle>(name: autoSaveToggleId);
             autoSaveToggle.value = InputEditorUserSettings.autoSaveInputActionAssets;
             autoSaveToggle.RegisterValueChangedCallback(OnAutoSaveToggle);
 
 
-            var assetMenuButton = m_Root.Q<VisualElement>(name: menuButtonId);
+            var assetMenuButton = rootElement.Q<VisualElement>(name: menuButtonId);
             var isGlobalAsset = stateContainer.GetState().serializedObject.targetObject.name == "ProjectWideInputActions";
             assetMenuButton.visible = isGlobalAsset;
             assetMenuButton.AddToClassList(EditorGUIUtility.isProSkin ? "asset-menu-button-dark-theme" : "asset-menu-button");
@@ -88,7 +87,7 @@ private void OnSaveButton()
             // Don't let focus linger after clicking (ISX-1482). Ideally this would be only applied on mouse click,
             // rather than if the user is using tab to navigate UI, but there doesn't seem to be a way to differentiate
             // between those interactions at the moment.
-            m_Root.Q<ToolbarButton>(name: saveButtonId).Blur();
+            rootElement.Q<ToolbarButton>(name: saveButtonId).Blur();
         }
 
         private void OnAutoSaveToggle(ChangeEvent<bool> evt)
@@ -98,14 +97,7 @@ private void OnAutoSaveToggle(ChangeEvent<bool> evt)
 
         public override void RedrawUI(ViewState viewState)
         {
-            // It's possible for RedrawUI to be called when m_Root is empty, throwing errors in the console.
-            // This can happen when the view is discarded immediately after being loaded, i.e. jumping to the input settings
-            // page in Preferences when the last window shown there was the main view, which the editor (briefly) loads first.
-            // Compare against the number of m_ChildViews as a cheap way to know we should skip redrawing. (ISX-1721)
-            if (m_Root.childCount != ChildViewCount())
-                return;
-
-            var toolbarMenu = m_Root.Q<ToolbarMenu>("control-schemes-toolbar-menu");
+            var toolbarMenu = rootElement.Q<ToolbarMenu>("control-schemes-toolbar-menu");
             toolbarMenu.menu.MenuItems().Clear();
 
             if (viewState.controlSchemes.Any())
@@ -122,15 +114,15 @@ public override void RedrawUI(ViewState viewState)
                 toolbarMenu.menu.AppendSeparator();
             }
 
-            toolbarMenu.menu.AppendAction("Add Control Scheme...", _ => AddOrUpdateControlScheme(m_Root));
-            toolbarMenu.menu.AppendAction("Edit Control Scheme...", _ => AddOrUpdateControlScheme(m_Root, true),
+            toolbarMenu.menu.AppendAction("Add Control Scheme...", _ => AddOrUpdateControlScheme(rootElement));
+            toolbarMenu.menu.AppendAction("Edit Control Scheme...", _ => AddOrUpdateControlScheme(rootElement, true),
                 viewState.selectedControlSchemeIndex != -1 ? DropdownMenuAction.Status.Normal : DropdownMenuAction.Status.Disabled);
-            toolbarMenu.menu.AppendAction("Duplicate Control Scheme...", _ => DuplicateControlScheme(m_Root),
+            toolbarMenu.menu.AppendAction("Duplicate Control Scheme...", _ => DuplicateControlScheme(rootElement),
                 viewState.selectedControlSchemeIndex != -1 ? DropdownMenuAction.Status.Normal : DropdownMenuAction.Status.Disabled);
             toolbarMenu.menu.AppendAction("Delete Control Scheme...", DeleteControlScheme,
                 viewState.selectedControlSchemeIndex != -1 ? DropdownMenuAction.Status.Normal : DropdownMenuAction.Status.Disabled);
 
-            var saveButton = m_Root.Q<ToolbarButton>(name: saveButtonId);
+            var saveButton = rootElement.Q<ToolbarButton>(name: saveButtonId);
             saveButton.SetEnabled(InputEditorUserSettings.autoSaveInputActionAssets == false);
         }
 
@@ -166,8 +158,6 @@ private void SelectControlScheme(int controlSchemeIndex)
             Dispatch(ControlSchemeCommands.SelectControlScheme(controlSchemeIndex));
         }
 
-        private readonly VisualElement m_Root;
-
         public class ViewState
         {
             public IEnumerable<InputControlScheme> controlSchemes;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs
index 0c1a7ee04c..c3adeae38a 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs
@@ -11,7 +11,6 @@ namespace UnityEngine.InputSystem.Editor
 {
     internal class NameAndParametersListView : ViewBase<InputActionsEditorState>
     {
-        private readonly VisualElement m_Root;
         private readonly Func<InputActionsEditorState, IEnumerable<ParameterListView>> m_ParameterListViewSelector;
         private VisualElement m_ContentContainer;
 
@@ -19,9 +18,8 @@ internal class NameAndParametersListView : ViewBase<InputActionsEditorState>
 
         public NameAndParametersListView(VisualElement root, StateContainer stateContainer, SerializedProperty listProperty,
                                          Func<InputActionsEditorState, IEnumerable<ParameterListView>> parameterListViewSelector)
-            : base(stateContainer)
+            : base(root, stateContainer)
         {
-            m_Root = root;
             m_ListProperty = listProperty;
             m_ParameterListViewSelector = parameterListViewSelector;
 
@@ -93,19 +91,19 @@ private static string ToSerializableString(IEnumerable<NameAndParameters> parame
         public override void RedrawUI(InputActionsEditorState state)
         {
             if (m_ContentContainer != null)
-                m_Root.Remove(m_ContentContainer);
+                rootElement.Remove(m_ContentContainer);
 
             m_ContentContainer = new VisualElement();
-            m_Root.Add(m_ContentContainer);
+            rootElement.Add(m_ContentContainer);
 
             var parameterListViews = m_ParameterListViewSelector(state).ToList();
             if (parameterListViews.Count == 0)
             {
-                m_Root.Q<Label>("no-parameters-added-label").style.display = new StyleEnum<DisplayStyle>(DisplayStyle.Flex);
+                rootElement.Q<Label>("no-parameters-added-label").style.display = new StyleEnum<DisplayStyle>(DisplayStyle.Flex);
                 return;
             }
 
-            m_Root.Q<Label>("no-parameters-added-label").style.display = new StyleEnum<DisplayStyle>(DisplayStyle.None);
+            rootElement.Q<Label>("no-parameters-added-label").style.display = new StyleEnum<DisplayStyle>(DisplayStyle.None);
             m_ContentContainer.Clear();
             for (int i = 0; i < parameterListViews.Count; i++)
             {
@@ -127,7 +125,7 @@ public override void DestroyView()
         {
             if (m_ContentContainer != null)
             {
-                m_Root.Remove(m_ContentContainer);
+                rootElement.Remove(m_ContentContainer);
                 m_ContentContainer = null;
             }
         }
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/PropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/PropertiesView.cs
index f1bd92e6fe..c0d404d558 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/PropertiesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/PropertiesView.cs
@@ -8,23 +8,20 @@ namespace UnityEngine.InputSystem.Editor
 {
     internal class PropertiesView : ViewBase<PropertiesView.ViewState>
     {
-        private readonly VisualElement m_Root;
         private ActionPropertiesView m_ActionPropertyView;
         private BindingPropertiesView m_BindingPropertyView;
         private NameAndParametersListView m_InteractionsListView;
         private NameAndParametersListView m_ProcessorsListView;
 
-        private Foldout interactionsFoldout => m_Root.Q<Foldout>("interactions-foldout");
-        private Foldout processorsFoldout => m_Root.Q<Foldout>("processors-foldout");
+        private Foldout interactionsFoldout => rootElement.Q<Foldout>("interactions-foldout");
+        private Foldout processorsFoldout => rootElement.Q<Foldout>("processors-foldout");
 
         private TextElement addInteractionButton;
         private TextElement addProcessorButton;
 
         public PropertiesView(VisualElement root, StateContainer stateContainer)
-            : base(stateContainer)
+            : base(root, stateContainer)
         {
-            m_Root = root;
-
             CreateSelector(
                 Selectors.GetSelectedAction,
                 Selectors.GetSelectedBinding,
@@ -130,7 +127,7 @@ public override void RedrawUI(ViewState viewState)
             DestroyChildView(m_InteractionsListView);
             DestroyChildView(m_ProcessorsListView);
 
-            var propertiesContainer = m_Root.Q<VisualElement>("properties-container");
+            var propertiesContainer = rootElement.Q<VisualElement>("properties-container");
 
             var foldout = propertiesContainer.Q<Foldout>("properties-foldout");
             foldout.Clear();
@@ -145,12 +142,12 @@ public override void RedrawUI(ViewState viewState)
             switch (viewState.selectionType)
             {
                 case SelectionType.Action:
-                    m_Root.Q<Label>("properties-header-label").text = "Action Properties";
+                    rootElement.Q<Label>("properties-header-label").text = "Action Properties";
                     m_ActionPropertyView = CreateChildView(new ActionPropertiesView(visualElement, foldout, stateContainer));
                     break;
 
                 case SelectionType.Binding:
-                    m_Root.Q<Label>("properties-header-label").text = "Binding Properties";
+                    rootElement.Q<Label>("properties-header-label").text = "Binding Properties";
                     m_BindingPropertyView = CreateChildView(new BindingPropertiesView(visualElement, foldout, stateContainer));
                     inputAction = viewState.relatedInputAction;
                     inputActionOrBinding = viewState.inputBinding?.wrappedProperty;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs
index b518973e78..8919762365 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs
@@ -19,8 +19,9 @@ internal interface IView
 
     internal abstract class ViewBase<TViewState> : IView
     {
-        protected ViewBase(StateContainer stateContainer)
+        protected ViewBase(VisualElement root, StateContainer stateContainer)
         {
+            this.rootElement = root;
             this.stateContainer = stateContainer;
             m_ChildViews = new List<IView>();
         }
@@ -40,7 +41,14 @@ public void UpdateView(InputActionsEditorState state)
                 return;
             }
 
-            if (m_ViewStateSelector.HasStateChanged(state) || m_IsFirstUpdate)
+
+            // It's possible for RedrawUI to be called when rootElement is empty, throwing errors in the console.
+            // This can happen when the view is discarded immediately after being loaded, i.e. jumping to the input settings
+            // page in Preferences when the last window shown there was the main view, which the editor (briefly) loads first.
+            // Compare against the number of m_ChildViews as a cheap way to know we should skip redrawing. (ISX-1721)
+            var correctChildren = rootElement.childCount >= m_ChildViews.Count;
+
+            if (correctChildren && (m_ViewStateSelector.HasStateChanged(state) || m_IsFirstUpdate))
                 RedrawUI(m_ViewStateSelector.GetViewState(state));
 
             m_IsFirstUpdate = false;
@@ -65,11 +73,6 @@ public void DestroyChildView<TView>(TView view) where TView : IView
             view.DestroyView();
         }
 
-        public int ChildViewCount()
-        {
-            return m_ChildViews.Count;
-        }
-
         public void Dispatch(Command command)
         {
             stateContainer.Dispatch(command);
@@ -114,6 +117,7 @@ protected void CreateSelector<T1, T2, T3>(
             m_ViewStateSelector = new ViewStateSelector<T1, T2, T3, TViewState>(func1, func2, func3, selector);
         }
 
+        protected readonly VisualElement rootElement;
         protected readonly StateContainer stateContainer;
         protected IViewStateSelector<TViewState> ViewStateSelector => m_ViewStateSelector;
         private IViewStateSelector<TViewState> m_ViewStateSelector;

From ba14a8cbee38f6dcc62eaab1fb784eb2a1a9a80f Mon Sep 17 00:00:00 2001
From: Graham Huws <graham.huws@unity3d.com>
Date: Thu, 1 Feb 2024 11:13:29 +0000
Subject: [PATCH 3/5] Rename after merging develop branch.

---
 .../InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 9ee04e0c3f..e842ba8175 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -203,7 +203,7 @@ public override void RedrawUI(ViewState viewState)
             m_AddActionButton.SetEnabled(viewState.actionMapCount > 0);
 
             // Don't want to show action properties if there's no actions.
-            m_Root.Q<VisualElement>("properties-scrollview").visible = m_ActionsTreeView.GetTreeCount() > 0;
+            rootElement.Q<VisualElement>("properties-scrollview").visible = m_ActionsTreeView.GetTreeCount() > 0;
         }
 
         private void RenameNewAction(int id)

From 96fa3a29bace79c807fa2273fcd63a18ce4e0e24 Mon Sep 17 00:00:00 2001
From: Graham Huws <graham.huws@unity3d.com>
Date: Thu, 1 Feb 2024 12:35:35 +0000
Subject: [PATCH 4/5] Fix scrollview access sometimes failing.

---
 .../Editor/UITKAssetEditor/Views/ActionsTreeView.cs           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index e842ba8175..dcbeb573cb 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -18,6 +18,7 @@ internal class ActionsTreeView : ViewBase<ActionsTreeView.ViewState>
     {
         private readonly TreeView m_ActionsTreeView;
         private readonly Button m_AddActionButton;
+        private readonly ScrollView m_PropertiesScrollview;
 
         private bool m_RenameOnActionAdded;
         private readonly CollectionViewSelectionChangeFilter m_ActionsTreeViewSelectionChangeFilter;
@@ -29,6 +30,7 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
             : base(root, stateContainer)
         {
             m_AddActionButton = rootElement.Q<Button>("add-new-action-button");
+            m_PropertiesScrollview = rootElement.Q<ScrollView>("properties-scrollview");
             m_ActionsTreeView = rootElement.Q<TreeView>("actions-tree-view");
             //assign unique viewDataKey to store treeView states like expanded/collapsed items - make it unique to avoid conflicts with other TreeViews
             m_ActionsTreeView.viewDataKey = "InputActionTreeView " + stateContainer.GetState().serializedObject.targetObject.GetInstanceID();
@@ -203,7 +205,7 @@ public override void RedrawUI(ViewState viewState)
             m_AddActionButton.SetEnabled(viewState.actionMapCount > 0);
 
             // Don't want to show action properties if there's no actions.
-            rootElement.Q<VisualElement>("properties-scrollview").visible = m_ActionsTreeView.GetTreeCount() > 0;
+            m_PropertiesScrollview.visible = m_ActionsTreeView.GetTreeCount() > 0;
         }
 
         private void RenameNewAction(int id)

From 020f8373ca868197f29e8a846b6f81a4fec362c4 Mon Sep 17 00:00:00 2001
From: Graham Huws <graham.huws@unity3d.com>
Date: Thu, 1 Feb 2024 14:50:08 +0000
Subject: [PATCH 5/5] Match existing styles, including having readonly element
 variables rather than accessed on demand.

---
 .../UITKAssetEditor/Views/ActionMapsView.cs   | 12 ++--
 .../UITKAssetEditor/Views/ActionsTreeView.cs  |  6 +-
 .../Views/ControlSchemesView.cs               |  2 +-
 .../Views/InputActionsEditorView.cs           | 62 +++++++++----------
 .../Views/NameAndParametersListView.cs        |  6 +-
 5 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
index 7815762513..1bf2da589c 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
@@ -15,7 +15,7 @@ internal class ActionMapsView : ViewBase<ActionMapsView.ViewState>
         public ActionMapsView(VisualElement root, StateContainer stateContainer)
             : base(root, stateContainer)
         {
-            m_ListView = rootElement?.Q<ListView>("action-maps-list-view");
+            m_ListView = root.Q<ListView>("action-maps-list-view");
             m_ListView.selectionType = UIElements.SelectionType.Single;
 
             m_ListViewSelectionChangeFilter = new CollectionViewSelectionChangeFilter(m_ListView);
@@ -59,12 +59,11 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
             CreateSelector(s => new ViewStateCollection<string>(Selectors.GetActionMapNames(s)),
                 (actionMapNames, state) => new ViewState(Selectors.GetSelectedActionMap(state), actionMapNames));
 
-            addActionMapButton.clicked += AddActionMap;
+            m_AddActionMapButton = root.Q<Button>("add-new-action-map-button");
+            m_AddActionMapButton.clicked += AddActionMap;
             ContextMenu.GetContextMenuForActionMapListView(this, m_ListView.parent);
         }
 
-        private Button addActionMapButton => rootElement?.Q<Button>("add-new-action-map-button");
-
         public override void RedrawUI(ViewState viewState)
         {
             m_ListView.itemsSource = viewState.actionMapNames?.ToList() ?? new List<string>();
@@ -79,7 +78,7 @@ public override void RedrawUI(ViewState viewState)
 
         public override void DestroyView()
         {
-            addActionMapButton.clicked -= AddActionMap;
+            m_AddActionMapButton.clicked -= AddActionMap;
         }
 
         private void RenameNewActionMaps()
@@ -181,7 +180,8 @@ private void OnValidateCommand(ValidateCommandEvent evt)
 
         private readonly CollectionViewSelectionChangeFilter m_ListViewSelectionChangeFilter;
         private bool m_EnterRenamingMode;
-        private ListView m_ListView;
+        private readonly ListView m_ListView;
+        private readonly Button m_AddActionMapButton;
 
         internal class ViewState
         {
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index dcbeb573cb..ed4f5e6819 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -29,9 +29,9 @@ internal class ActionsTreeView : ViewBase<ActionsTreeView.ViewState>
         public ActionsTreeView(VisualElement root, StateContainer stateContainer)
             : base(root, stateContainer)
         {
-            m_AddActionButton = rootElement.Q<Button>("add-new-action-button");
-            m_PropertiesScrollview = rootElement.Q<ScrollView>("properties-scrollview");
-            m_ActionsTreeView = rootElement.Q<TreeView>("actions-tree-view");
+            m_AddActionButton = root.Q<Button>("add-new-action-button");
+            m_PropertiesScrollview = root.Q<ScrollView>("properties-scrollview");
+            m_ActionsTreeView = root.Q<TreeView>("actions-tree-view");
             //assign unique viewDataKey to store treeView states like expanded/collapsed items - make it unique to avoid conflicts with other TreeViews
             m_ActionsTreeView.viewDataKey = "InputActionTreeView " + stateContainer.GetState().serializedObject.targetObject.GetInstanceID();
             m_GuidToTreeViewId = new Dictionary<Guid, int>();
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs
index 86d6bbe94b..d9152d1375 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs
@@ -48,7 +48,7 @@ public ControlSchemesView(VisualElement root, StateContainer stateContainer, boo
             };
             popupWindow.contentContainer.Add(controlSchemeVisualElement);
             m_ModalWindow.Add(popupWindow);
-            rootElement.Add(m_ModalWindow);
+            root.Add(m_ModalWindow);
             m_ModalWindow.StretchToParentSize();
             m_ModalWindow.RegisterCallback<ClickEvent>(evt => Close());
             popupWindow.RegisterCallback<ClickEvent>(evt => evt.StopPropagation());
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs
index 3f0efaca45..c8d91fa9e6 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs
@@ -14,45 +14,43 @@ internal class InputActionsEditorView : ViewBase<InputActionsEditorView.ViewStat
         private const string autoSaveToggleId = "auto-save-toolbar-toggle";
         private const string menuButtonId = "asset-menu";
 
+        private readonly ToolbarMenu m_MenuButtonToolbar;
+        private readonly ToolbarButton m_SaveButton;
+
         internal Action postSaveAction;
         internal Action<InputActionAsset> postResetAction;
 
         public InputActionsEditorView(VisualElement root, StateContainer stateContainer)
             : base(root, stateContainer)
-        {
-            BuildUI();
-        }
-
-        public void BuildUI()
         {
             var mainEditorAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
                 InputActionsEditorConstants.PackagePath +
                 InputActionsEditorConstants.ResourcesPath +
                 InputActionsEditorConstants.MainEditorViewNameUxml);
 
-            mainEditorAsset.CloneTree(rootElement);
-            var actionsTreeView = new ActionsTreeView(rootElement, stateContainer);
-            CreateChildView(new ActionMapsView(rootElement, stateContainer));
+            mainEditorAsset.CloneTree(root);
+            var actionsTreeView = new ActionsTreeView(root, stateContainer);
+            CreateChildView(new ActionMapsView(root, stateContainer));
             CreateChildView(actionsTreeView);
-            CreateChildView(new PropertiesView(rootElement, stateContainer));
-            InputActionViewsControlsHolder.Initialize(rootElement, actionsTreeView);
+            CreateChildView(new PropertiesView(root, stateContainer));
+            InputActionViewsControlsHolder.Initialize(root, actionsTreeView);
 
-            var menuButton = rootElement.Q<ToolbarMenu>("control-schemes-toolbar-menu");
-            menuButton.menu.AppendAction("Add Control Scheme...", _ => AddOrUpdateControlScheme(rootElement));
-            menuButton.menu.AppendAction("Edit Control Scheme...", _ => AddOrUpdateControlScheme(rootElement, true), DropdownMenuAction.Status.Disabled);
-            menuButton.menu.AppendAction("Duplicate Control Scheme...", _ => DuplicateControlScheme(rootElement), DropdownMenuAction.Status.Disabled);
-            menuButton.menu.AppendAction("Delete Control Scheme...", DeleteControlScheme, DropdownMenuAction.Status.Disabled);
+            m_MenuButtonToolbar = root.Q<ToolbarMenu>("control-schemes-toolbar-menu");
+            m_MenuButtonToolbar.menu.AppendAction("Add Control Scheme...", _ => AddOrUpdateControlScheme(root));
+            m_MenuButtonToolbar.menu.AppendAction("Edit Control Scheme...", _ => AddOrUpdateControlScheme(root, true), DropdownMenuAction.Status.Disabled);
+            m_MenuButtonToolbar.menu.AppendAction("Duplicate Control Scheme...", _ => DuplicateControlScheme(root), DropdownMenuAction.Status.Disabled);
+            m_MenuButtonToolbar.menu.AppendAction("Delete Control Scheme...", DeleteControlScheme, DropdownMenuAction.Status.Disabled);
 
-            var saveButton = rootElement.Q<ToolbarButton>(name: saveButtonId);
-            saveButton.SetEnabled(InputEditorUserSettings.autoSaveInputActionAssets == false);
-            saveButton.clicked += OnSaveButton;
+            m_SaveButton = root.Q<ToolbarButton>(name: saveButtonId);
+            m_SaveButton.SetEnabled(InputEditorUserSettings.autoSaveInputActionAssets == false);
+            m_SaveButton.clicked += OnSaveButton;
 
-            var autoSaveToggle = rootElement.Q<ToolbarToggle>(name: autoSaveToggleId);
+            var autoSaveToggle = root.Q<ToolbarToggle>(name: autoSaveToggleId);
             autoSaveToggle.value = InputEditorUserSettings.autoSaveInputActionAssets;
             autoSaveToggle.RegisterValueChangedCallback(OnAutoSaveToggle);
 
 
-            var assetMenuButton = rootElement.Q<VisualElement>(name: menuButtonId);
+            var assetMenuButton = root.Q<VisualElement>(name: menuButtonId);
             var isGlobalAsset = stateContainer.GetState().serializedObject.targetObject.name == "ProjectWideInputActions";
             assetMenuButton.visible = isGlobalAsset;
             assetMenuButton.AddToClassList(EditorGUIUtility.isProSkin ? "asset-menu-button-dark-theme" : "asset-menu-button");
@@ -87,7 +85,7 @@ private void OnSaveButton()
             // Don't let focus linger after clicking (ISX-1482). Ideally this would be only applied on mouse click,
             // rather than if the user is using tab to navigate UI, but there doesn't seem to be a way to differentiate
             // between those interactions at the moment.
-            rootElement.Q<ToolbarButton>(name: saveButtonId).Blur();
+            m_SaveButton.Blur();
         }
 
         private void OnAutoSaveToggle(ChangeEvent<bool> evt)
@@ -97,33 +95,31 @@ private void OnAutoSaveToggle(ChangeEvent<bool> evt)
 
         public override void RedrawUI(ViewState viewState)
         {
-            var toolbarMenu = rootElement.Q<ToolbarMenu>("control-schemes-toolbar-menu");
-            toolbarMenu.menu.MenuItems().Clear();
+            m_MenuButtonToolbar.menu.MenuItems().Clear();
 
             if (viewState.controlSchemes.Any())
             {
-                toolbarMenu.text = viewState.selectedControlSchemeIndex == -1
+                m_MenuButtonToolbar.text = viewState.selectedControlSchemeIndex == -1
                     ? "All Control Schemes"
                     : viewState.controlSchemes.ElementAt(viewState.selectedControlSchemeIndex).name;
 
-                toolbarMenu.menu.AppendAction("All Control Schemes", _ => SelectControlScheme(-1),
+                m_MenuButtonToolbar.menu.AppendAction("All Control Schemes", _ => SelectControlScheme(-1),
                     viewState.selectedControlSchemeIndex == -1 ? DropdownMenuAction.Status.Checked : DropdownMenuAction.Status.Normal);
                 viewState.controlSchemes.ForEach((scheme, i) =>
-                    toolbarMenu.menu.AppendAction(scheme.name, _ => SelectControlScheme(i),
+                    m_MenuButtonToolbar.menu.AppendAction(scheme.name, _ => SelectControlScheme(i),
                         viewState.selectedControlSchemeIndex == i ? DropdownMenuAction.Status.Checked : DropdownMenuAction.Status.Normal));
-                toolbarMenu.menu.AppendSeparator();
+                m_MenuButtonToolbar.menu.AppendSeparator();
             }
 
-            toolbarMenu.menu.AppendAction("Add Control Scheme...", _ => AddOrUpdateControlScheme(rootElement));
-            toolbarMenu.menu.AppendAction("Edit Control Scheme...", _ => AddOrUpdateControlScheme(rootElement, true),
+            m_MenuButtonToolbar.menu.AppendAction("Add Control Scheme...", _ => AddOrUpdateControlScheme(rootElement));
+            m_MenuButtonToolbar.menu.AppendAction("Edit Control Scheme...", _ => AddOrUpdateControlScheme(rootElement, true),
                 viewState.selectedControlSchemeIndex != -1 ? DropdownMenuAction.Status.Normal : DropdownMenuAction.Status.Disabled);
-            toolbarMenu.menu.AppendAction("Duplicate Control Scheme...", _ => DuplicateControlScheme(rootElement),
+            m_MenuButtonToolbar.menu.AppendAction("Duplicate Control Scheme...", _ => DuplicateControlScheme(rootElement),
                 viewState.selectedControlSchemeIndex != -1 ? DropdownMenuAction.Status.Normal : DropdownMenuAction.Status.Disabled);
-            toolbarMenu.menu.AppendAction("Delete Control Scheme...", DeleteControlScheme,
+            m_MenuButtonToolbar.menu.AppendAction("Delete Control Scheme...", DeleteControlScheme,
                 viewState.selectedControlSchemeIndex != -1 ? DropdownMenuAction.Status.Normal : DropdownMenuAction.Status.Disabled);
 
-            var saveButton = rootElement.Q<ToolbarButton>(name: saveButtonId);
-            saveButton.SetEnabled(InputEditorUserSettings.autoSaveInputActionAssets == false);
+            m_SaveButton.SetEnabled(InputEditorUserSettings.autoSaveInputActionAssets == false);
         }
 
         private void AddOrUpdateControlScheme(VisualElement parent, bool updateExisting = false)
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs
index c3adeae38a..0ac6d90342 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs
@@ -13,6 +13,7 @@ internal class NameAndParametersListView : ViewBase<InputActionsEditorState>
     {
         private readonly Func<InputActionsEditorState, IEnumerable<ParameterListView>> m_ParameterListViewSelector;
         private VisualElement m_ContentContainer;
+        private readonly Label m_NoParamsLabel;
 
         private SerializedProperty m_ListProperty;
 
@@ -21,6 +22,7 @@ public NameAndParametersListView(VisualElement root, StateContainer stateContain
             : base(root, stateContainer)
         {
             m_ListProperty = listProperty;
+            m_NoParamsLabel = root.Q<Label>("no-parameters-added-label");
             m_ParameterListViewSelector = parameterListViewSelector;
 
             CreateSelector(state => state);
@@ -99,11 +101,11 @@ public override void RedrawUI(InputActionsEditorState state)
             var parameterListViews = m_ParameterListViewSelector(state).ToList();
             if (parameterListViews.Count == 0)
             {
-                rootElement.Q<Label>("no-parameters-added-label").style.display = new StyleEnum<DisplayStyle>(DisplayStyle.Flex);
+                m_NoParamsLabel.style.display = new StyleEnum<DisplayStyle>(DisplayStyle.Flex);
                 return;
             }
 
-            rootElement.Q<Label>("no-parameters-added-label").style.display = new StyleEnum<DisplayStyle>(DisplayStyle.None);
+            m_NoParamsLabel.style.display = new StyleEnum<DisplayStyle>(DisplayStyle.None);
             m_ContentContainer.Clear();
             for (int i = 0; i < parameterListViews.Count; i++)
             {