FIX: Autosave closes add control scheme ui element on save. (ISXB-1713)

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs

@@ -245,7 +245,7 @@
             if (hasAsset)
             {
                 m_StateContainer = new StateContainer(m_State, AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(asset)));
-                m_View = new InputActionsEditorView(m_RootVisualElement, m_StateContainer, true, null);
+                m_View = new InputActionsEditorView(m_RootVisualElement, m_StateContainer, true, SaveAssetOnFocusLost);
                 m_StateContainer.Initialize(m_RootVisualElement.Q("action-editor"));
             }
         }

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs

@@ -180,7 +180,9 @@
             finally
             {
                 if (existingWorkingCopy != null)
+                {
                     DestroyImmediate(existingWorkingCopy);
+                }
             }
         }
 
@@ -256,7 +258,6 @@
             if (!rootVisualElement.styleSheets.Contains(InputActionsEditorWindowUtils.theme))
                 rootVisualElement.styleSheets.Add(InputActionsEditorWindowUtils.theme);
             m_View = new InputActionsEditorView(rootVisualElement, m_StateContainer, false, () => Save(isAutoSave: false));
-
             m_StateContainer.Initialize(rootVisualElement.Q("action-editor"));
         }
 
@@ -335,7 +336,9 @@
                 // Since at that point it stops being a separate window that steals focus.
                 // (See case ISXB-1221)
                 if (!InputControlPathEditor.IsShowingDropdown)
+                {
                     Save(isAutoSave: true);
+                }
             }
 
             analytics.RegisterEditorFocusOut();
@@ -415,8 +418,7 @@
             var assetPath = AssetDatabase.GUIDToAssetPath(m_AssetGUID);
             if (assetPath == null)
             {
-                Debug.LogWarning(
-                    $"Failed to open InputActionAsset with GUID {m_AssetGUID}. The asset might have been deleted.");
+                Debug.LogWarning($"Failed to open InputActionAsset with GUID {m_AssetGUID}. The asset might have been deleted.");
                 return false;
             }
 

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

@@ -14,9 +14,16 @@
         private string m_NewName;
         public event Action<ViewBase<InputControlScheme>> OnClosing;
 
+        /// <summary>
+        /// This property is only set from this class in order to communicate that we're showing the control schemes view at the moment
+        /// It's employed to skip auto-saving, because that complicates the save causing this window to close when adding a new device type.
+        /// </summary>
+        internal static bool IsShowingControlSchemeView { get; private set; }
+
         public ControlSchemesView(VisualElement root, StateContainer stateContainer, bool updateExisting = false)
             : base(root, stateContainer)
         {
+            IsShowingControlSchemeView = true;
             m_UpdateExisting = updateExisting;
 
             var controlSchemeEditor = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
@@ -118,6 +125,7 @@
 
         public override void DestroyView()
         {
+            IsShowingControlSchemeView = false;
             m_ModalWindow.RemoveFromHierarchy();
         }
 
@@ -137,6 +145,8 @@
 
         private void CloseView()
         {
+            IsShowingControlSchemeView = false;
+
             // Closing the View without explicitly selecting "Save" or "Cancel" holds the values in the
             // current UI state but won't persist them; the Asset Editor state isn't dirtied.
             //

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

@@ -228,10 +228,19 @@
 
         private void ShowControlSchemeEditor(VisualElement parent, bool updateExisting = false)
         {
-            var controlSchemesView = CreateChildView(new ControlSchemesView(parent, stateContainer, updateExisting));
-            controlSchemesView.UpdateView(stateContainer.GetState());
+            m_SaveAction?.Invoke();
 
-            controlSchemesView.OnClosing += _ => DestroyChildView(controlSchemesView);
+            rootElement.schedule.Execute(() =>
+            {
+                var controlSchemesView =
+                    CreateChildView(new ControlSchemesView(parent, stateContainer, updateExisting));
+                controlSchemesView.UpdateView(stateContainer.GetState());
+
+                controlSchemesView.OnClosing += _ =>
+                {
+                    DestroyChildView(controlSchemesView);
+                };
+            }).ExecuteLater(50);
         }
 
         private void SelectControlScheme(int controlSchemeIndex)