FIX: Avoid errors logged when opening settings menu (ISX-1721) (#1825)

graham-huws · web-flow · commit e58f59996dd0 · 2024-02-02T09:45:10.000Z
* FIX: Avoid errors logged when opening settings menu (ISX-1721)

* Address feedback: Consolidate root element for views and bugfix logic.

* Rename after merging develop branch.

* Fix scrollview access sometimes failing.

* Match existing styles, including having readonly element variables rather than accessed on demand.
diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -36,6 +36,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed missing name in window title for Input Action assets.
 - Fixed showing action properties view when there were no actions.
 - 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.
 - Fixed InputManager.asset file growing in size on each Reset call.
 
 ## [1.8.0-pre.2] - 2023-11-09
diff --git 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 = root.Q<ListView>("action-maps-list-view");
             m_ListView.selectionType = UIElements.SelectionType.Single;
 
             m_ListViewSelectionChangeFilter = new CollectionViewSelectionChangeFilter(m_ListView);
@@ -61,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 => m_Root?.Q<Button>("add-new-action-map-button");
-
         public override void RedrawUI(ViewState viewState)
         {
             m_ListView.itemsSource = viewState.actionMapNames?.ToList() ?? new List<string>();
@@ -81,7 +78,7 @@ public override void RedrawUI(ViewState viewState)
 
         public override void DestroyView()
         {
-            addActionMapButton.clicked -= AddActionMap;
+            m_AddActionMapButton.clicked -= AddActionMap;
         }
 
         private void RenameNewActionMaps()
@@ -183,8 +180,8 @@ private void OnValidateCommand(ValidateCommandEvent evt)
 
         private readonly CollectionViewSelectionChangeFilter m_ListViewSelectionChangeFilter;
         private bool m_EnterRenamingMode;
-        private readonly VisualElement m_Root;
-        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/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
@@ -16,9 +16,9 @@ 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 readonly ScrollView m_PropertiesScrollview;
 
         private bool m_RenameOnActionAdded;
         private readonly CollectionViewSelectionChangeFilter m_ActionsTreeViewSelectionChangeFilter;
@@ -27,11 +27,11 @@ 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 = 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>();
@@ -147,7 +147,7 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
                     };
                 });
 
-            addActionButton.clicked += AddAction;
+            m_AddActionButton.clicked += AddAction;
         }
 
         private int GetSelectedElementId(InputActionsEditorState state, List<TreeViewItemData<ActionOrBindingData>> treeData)
@@ -188,7 +188,7 @@ private int GetComponentOrBindingID(List<TreeViewItemData<ActionOrBindingData>>
 
         public override void DestroyView()
         {
-            addActionButton.clicked -= AddAction;
+            m_AddActionButton.clicked -= AddAction;
         }
 
         public override void RedrawUI(ViewState viewState)
@@ -202,10 +202,10 @@ 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);
 
             // Don't want to show action properties if there's no actions.
-            m_Root.Q<VisualElement>("properties-scrollview").visible = m_ActionsTreeView.GetTreeCount() > 0;
+            m_PropertiesScrollview.visible = m_ActionsTreeView.GetTreeCount() > 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
@@ -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,15 +79,15 @@ 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)
             {
                 var checkbox = new Toggle(controlScheme.name)
                 {
                     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
@@ -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
@@ -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
@@ -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);
+            root.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
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/NameAndParametersListView.cs
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/PropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/PropertiesView.cs
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,9 @@ namespace UnityEngine.InputSystem.Editor`
`13`	`13`	`internal class ActionMapsView : ViewBase<ActionMapsView.ViewState>`
`14`	`14`	`{`
`15`	`15`	`public ActionMapsView(VisualElement root, StateContainer stateContainer)`
`16`		`- : base(stateContainer)`
	`16`	`+ : base(root, stateContainer)`
`17`	`17`	`{`
`18`		`- m_Root = root;`
`19`		`-`
`20`		`- m_ListView = m_Root?.Q<ListView>("action-maps-list-view");`
	`18`	`+ m_ListView = root.Q<ListView>("action-maps-list-view");`
`21`	`19`	`m_ListView.selectionType = UIElements.SelectionType.Single;`
`22`	`20`
`23`	`21`	`m_ListViewSelectionChangeFilter = new CollectionViewSelectionChangeFilter(m_ListView);`
`@@ -61,12 +59,11 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)`
`61`	`59`	`CreateSelector(s => new ViewStateCollection<string>(Selectors.GetActionMapNames(s)),`
`62`	`60`	`(actionMapNames, state) => new ViewState(Selectors.GetSelectedActionMap(state), actionMapNames));`
`63`	`61`
`64`		`- addActionMapButton.clicked += AddActionMap;`
	`62`	`+ m_AddActionMapButton = root.Q<Button>("add-new-action-map-button");`
	`63`	`+ m_AddActionMapButton.clicked += AddActionMap;`
`65`	`64`	`ContextMenu.GetContextMenuForActionMapListView(this, m_ListView.parent);`
`66`	`65`	`}`
`67`	`66`
`68`		`- private Button addActionMapButton => m_Root?.Q<Button>("add-new-action-map-button");`
`69`		`-`
`70`	`67`	`public override void RedrawUI(ViewState viewState)`
`71`	`68`	`{`
`72`	`69`	`m_ListView.itemsSource = viewState.actionMapNames?.ToList() ?? new List<string>();`
`@@ -81,7 +78,7 @@ public override void RedrawUI(ViewState viewState)`
`81`	`78`
`82`	`79`	`public override void DestroyView()`
`83`	`80`	`{`
`84`		`- addActionMapButton.clicked -= AddActionMap;`
	`81`	`+ m_AddActionMapButton.clicked -= AddActionMap;`
`85`	`82`	`}`
`86`	`83`
`87`	`84`	`private void RenameNewActionMaps()`
`@@ -183,8 +180,8 @@ private void OnValidateCommand(ValidateCommandEvent evt)`
`183`	`180`
`184`	`181`	`private readonly CollectionViewSelectionChangeFilter m_ListViewSelectionChangeFilter;`
`185`	`182`	`private bool m_EnterRenamingMode;`
`186`		`- private readonly VisualElement m_Root;`
`187`		`- private ListView m_ListView;`
	`183`	`+ private readonly ListView m_ListView;`
	`184`	`+ private readonly Button m_AddActionMapButton;`
`188`	`185`
`189`	`186`	`internal class ViewState`
`190`	`187`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,11 @@ namespace UnityEngine.InputSystem.Editor`
`10`	`10`	`{`
`11`	`11`	`internal class ActionPropertiesView : ViewBase<(SerializedInputAction?, List<string>)>`
`12`	`12`	`{`
`13`		`- private readonly VisualElement m_Root;`
`14`	`13`	`private readonly Foldout m_ParentFoldout;`
`15`	`14`
`16`	`15`	`public ActionPropertiesView(VisualElement root, Foldout foldout, StateContainer stateContainer)`
`17`		`- : base(stateContainer)`
	`16`	`+ : base(root, stateContainer)`
`18`	`17`	`{`
`19`		`- m_Root = root;`
`20`	`18`	`m_ParentFoldout = foldout;`
`21`	`19`
`22`	`20`	`// TODO: Consider IEquatable<T> and how to compare selector data`
`@@ -37,7 +35,7 @@ public override void RedrawUI((SerializedInputAction ? , List<string>) viewState`
`37`	`35`	`m_ParentFoldout.text = "Action";`
`38`	`36`	`var inputAction = viewState.Item1.Value;`
`39`	`37`
`40`		`- m_Root.Clear();`
	`38`	`+ rootElement.Clear();`
`41`	`39`
`42`	`40`	`var actionType = new EnumField("Action Type", inputAction.type)`
`43`	`41`	`{`
`@@ -47,7 +45,7 @@ public override void RedrawUI((SerializedInputAction ? , List<string>) viewState`
`47`	`45`	`{`
`48`	`46`	`Dispatch(Commands.ChangeActionType(inputAction, (InputActionType)evt.newValue));`
`49`	`47`	`});`
`50`		`- m_Root.Add(actionType);`
	`48`	`+ rootElement.Add(actionType);`
`51`	`49`
`52`	`50`	`if (inputAction.type != InputActionType.Button)`
`53`	`51`	`{`
`@@ -65,7 +63,7 @@ public override void RedrawUI((SerializedInputAction ? , List<string>) viewState`
`65`	`63`	`{`
`66`	`64`	`Dispatch(Commands.ChangeActionControlType(inputAction, controlType.index));`
`67`	`65`	`});`
`68`		`- m_Root.Add(controlType);`
	`66`	`+ rootElement.Add(controlType);`
`69`	`67`	`}`
`70`	`68`
`71`	`69`	`if (inputAction.type != InputActionType.Value)`
`@@ -79,7 +77,7 @@ public override void RedrawUI((SerializedInputAction ? , List<string>) viewState`
`79`	`77`	`{`
`80`	`78`	`Dispatch(Commands.ChangeInitialStateCheck(inputAction, evt.newValue));`
`81`	`79`	`});`
`82`		`- m_Root.Add(initialStateCheck);`
	`80`	`+ rootElement.Add(initialStateCheck);`
`83`	`81`	`}`
`84`	`82`	`}`
`85`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,13 @@ namespace UnityEngine.InputSystem.Editor`
`7`	`7`	`{`
`8`	`8`	`internal class BindingPropertiesView : ViewBase<BindingPropertiesView.ViewState>`
`9`	`9`	`{`
`10`		`- private readonly VisualElement m_Root;`
`11`	`10`	`private readonly Foldout m_ParentFoldout;`
`12`	`11`	`private CompositeBindingPropertiesView m_CompositeBindingPropertiesView;`
`13`	`12`	`private CompositePartBindingPropertiesView m_CompositePartBindingPropertiesView;`
`14`	`13`
`15`	`14`	`public BindingPropertiesView(VisualElement root, Foldout foldout, StateContainer stateContainer)`
`16`		`- : base(stateContainer)`
	`15`	`+ : base(root, stateContainer)`
`17`	`16`	`{`
`18`		`- m_Root = root;`
`19`	`17`	`m_ParentFoldout = foldout;`
`20`	`18`
`21`	`19`	`CreateSelector(state => state.selectedBindingIndex,`
`@@ -37,7 +35,7 @@ public override void RedrawUI(ViewState viewState)`
`37`	`35`	`if (selectedBindingIndex == -1)`
`38`	`36`	`return;`
`39`	`37`
`40`		`- m_Root.Clear();`
	`38`	`+ rootElement.Clear();`
`41`	`39`
`42`	`40`	`var binding = viewState.selectedBinding;`
`43`	`41`	`if (!binding.HasValue)`
`@@ -47,11 +45,11 @@ public override void RedrawUI(ViewState viewState)`
`47`	`45`	`if (binding.Value.isComposite)`
`48`	`46`	`{`
`49`	`47`	`m_ParentFoldout.text = "Composite";`
`50`		`- m_CompositeBindingPropertiesView = CreateChildView(new CompositeBindingPropertiesView(m_Root, stateContainer));`
	`48`	`+ m_CompositeBindingPropertiesView = CreateChildView(new CompositeBindingPropertiesView(rootElement, stateContainer));`
`51`	`49`	`}`
`52`	`50`	`else if (binding.Value.isPartOfComposite)`
`53`	`51`	`{`
`54`		`- m_CompositePartBindingPropertiesView = CreateChildView(new CompositePartBindingPropertiesView(m_Root, stateContainer));`
	`52`	`+ m_CompositePartBindingPropertiesView = CreateChildView(new CompositePartBindingPropertiesView(rootElement, stateContainer));`
`55`	`53`	`DrawControlSchemeToggles(viewState, binding.Value);`
`56`	`54`	`}`
`57`	`55`	`else`
`@@ -64,7 +62,7 @@ public override void RedrawUI(ViewState viewState)`
`64`	`62`	`controlPathEditor.SetExpectedControlLayout(inputAction?.expectedControlType ?? "");`
`65`	`63`
`66`	`64`	`var controlPathContainer = new IMGUIContainer(controlPathEditor.OnGUI);`
`67`		`- m_Root.Add(controlPathContainer);`
	`65`	`+ rootElement.Add(controlPathContainer);`
`68`	`66`
`69`	`67`	`DrawControlSchemeToggles(viewState, binding.Value);`
`70`	`68`	`}`
`@@ -81,15 +79,15 @@ private void DrawControlSchemeToggles(ViewState viewState, SerializedInputBindin`
`81`	`79`	`if (!viewState.controlSchemes.Any()) return;`
`82`	`80`
`83`	`81`	`var useInControlSchemeLabel = new Label("Use in control scheme");`
`84`		`- m_Root.Add(useInControlSchemeLabel);`
	`82`	`+ rootElement.Add(useInControlSchemeLabel);`
`85`	`83`
`86`	`84`	`foreach (var controlScheme in viewState.controlSchemes)`
`87`	`85`	`{`
`88`	`86`	`var checkbox = new Toggle(controlScheme.name)`
`89`	`87`	`{`
`90`	`88`	`value = binding.controlSchemes.Any(scheme => controlScheme.name == scheme)`
`91`	`89`	`};`
`92`		`- m_Root.Add(checkbox);`
	`90`	`+ rootElement.Add(checkbox);`
`93`	`91`	`checkbox.RegisterValueChangedCallback(changeEvent =>`
`94`	`92`	`{`
`95`	`93`	`Dispatch(ControlSchemeCommands.ChangeSelectedBindingsControlSchemes(controlScheme.name, changeEvent.newValue));`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ namespace UnityEngine.InputSystem.Editor`
`11`	`11`	`{`
`12`	`12`	`internal class CompositeBindingPropertiesView : ViewBase<CompositeBindingPropertiesView.ViewState>`
`13`	`13`	`{`
`14`		`- private readonly VisualElement m_Root;`
`15`	`14`	`private readonly DropdownField m_CompositeTypeField;`
`16`	`15`	`private EventCallback<ChangeEvent<string>> m_CompositeTypeFieldChangedHandler;`
`17`	`16`
`@@ -20,12 +19,11 @@ internal class CompositeBindingPropertiesView : ViewBase<CompositeBindingPropert`
`20`	`19`	`InputActionsEditorConstants.CompositeBindingPropertiesViewUxml;`
`21`	`20`
`22`	`21`	`public CompositeBindingPropertiesView(VisualElement root, StateContainer stateContainer)`
`23`		`- : base(stateContainer)`
	`22`	`+ : base(root, stateContainer)`
`24`	`23`	`{`
`25`		`- m_Root = root;`
`26`	`24`	`var visualTreeAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(UxmlName);`
`27`	`25`	`var container = visualTreeAsset.CloneTree();`
`28`		`- m_Root.Add(container);`
	`26`	`+ rootElement.Add(container);`
`29`	`27`
`30`	`28`	`m_CompositeTypeField = container.Q<DropdownField>("composite-type-dropdown");`
`31`	`29`
`@@ -46,7 +44,7 @@ public override void RedrawUI(ViewState viewState)`
`46`	`44`	`{`
`47`	`45`	`Dispatch(Commands.UpdatePathNameAndValues(viewState.parameterListView.GetParameters(), viewState.selectedBindingPath));`
`48`	`46`	`};`
`49`		`- viewState.parameterListView.OnDrawVisualElements(m_Root);`
	`47`	`+ viewState.parameterListView.OnDrawVisualElements(rootElement);`
`50`	`48`	`}`
`51`	`49`
`52`	`50`	`public override void DestroyView()`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ namespace UnityEngine.InputSystem.Editor`
`9`	`9`	`{`
`10`	`10`	`internal class CompositePartBindingPropertiesView : ViewBase<CompositePartBindingPropertiesView.ViewState>`
`11`	`11`	`{`
`12`		`- private readonly VisualElement m_Root;`
`13`	`12`	`private readonly DropdownField m_CompositePartField;`
`14`	`13`	`private readonly IMGUIContainer m_PathEditorContainer;`
`15`	`14`
`@@ -18,12 +17,11 @@ internal class CompositePartBindingPropertiesView : ViewBase<CompositePartBindin`
`18`	`17`	`InputActionsEditorConstants.CompositePartBindingPropertiesViewUxml;`
`19`	`18`
`20`	`19`	`public CompositePartBindingPropertiesView(VisualElement root, StateContainer stateContainer)`
`21`		`- : base(stateContainer)`
	`20`	`+ : base(root, stateContainer)`
`22`	`21`	`{`
`23`		`- m_Root = root;`
`24`	`22`	`var visualTreeAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(UxmlName);`
`25`	`23`	`var container = visualTreeAsset.CloneTree();`
`26`		`- m_Root.Add(container);`
	`24`	`+ rootElement.Add(container);`
`27`	`25`
`28`	`26`	`m_PathEditorContainer = container.Q<IMGUIContainer>("path-editor-container");`
`29`	`27`	`m_CompositePartField = container.Q<DropdownField>("composite-part-dropdown");`