FIX: Broken UI input when switching between assets (case 1371332, #1462).

Author: Rene Damm

Assets/Tests/InputSystem/CoreTests_Editor.cs

@@ -3116,6 +3116,7 @@ public StubInputControlPickerDropdown(InputControlPickerState state, Action<stri
         {
         }
 
+        #pragma warning disable CS0114
         public UnityEngine.InputSystem.Editor.AdvancedDropdownItem BuildRoot()
         {
             return base.BuildRoot();

Assets/Tests/InputSystem/Plugins/UITests.cs

@@ -2887,6 +2887,59 @@ public void UI_WhenDisablingInputModule_ActionsAreNotDisabledIfTheyWereNotEnable
         Assert.That(pointAction.enabled, Is.True);
     }
 
+    // https://fogbugz.unity3d.com/f/cases/1371332/
+    [UnityTest]
+    [Category("UI")]
+    public IEnumerator UI_WhenAssigningInputModuleActionAsset_OldInputsAreDisconnected_AndNewInputsAreConnected()
+    {
+        var mouse1 = InputSystem.AddDevice<Mouse>();
+        var mouse2 = InputSystem.AddDevice<Mouse>();
+
+        var eventSystemGO = new GameObject();
+        eventSystemGO.AddComponent<EventSystem>();
+        var inputModule = eventSystemGO.AddComponent<InputSystemUIInputModule>();
+
+        yield return null;
+
+        var actions1 = new DefaultInputActions();
+        actions1.devices = new[] { mouse1 };
+
+        inputModule.actionsAsset = actions1.asset;
+
+        Assert.That(actions1.UI.enabled, Is.True);
+
+        Set(mouse1.position, new Vector2(123, 234));
+        Set(mouse2.position, new Vector2(234, 345));
+
+        yield return null;
+
+        Assert.That(inputModule.m_CurrentPointerType, Is.EqualTo(UIPointerType.MouseOrPen));
+        Assert.That(inputModule.m_PointerStates[0].screenPosition, Is.EqualTo(new Vector2(123, 234)));
+        Assert.That(inputModule.m_PointerStates[0].eventData.device, Is.SameAs(mouse1));
+
+        var actions2 = new DefaultInputActions();
+        actions2.devices = new[] { mouse2 };
+
+        actions1.Disable();
+
+        inputModule.actionsAsset = actions2.asset;
+
+        Assert.That(actions1.UI.enabled, Is.False);
+        Assert.That(actions2.UI.enabled, Is.False);
+
+        actions1.Enable();
+        actions2.Enable();
+
+        Set(mouse1.position, new Vector2(234, 345));
+        Set(mouse2.position, new Vector2(345, 456));
+
+        yield return null;
+
+        Assert.That(inputModule.m_CurrentPointerType, Is.EqualTo(UIPointerType.MouseOrPen));
+        Assert.That(inputModule.m_PointerStates[0].screenPosition, Is.EqualTo(new Vector2(345, 456)));
+        Assert.That(inputModule.m_PointerStates[0].eventData.device, Is.SameAs(mouse2));
+    }
+
     [UnityTest]
     [Category("UI")]
     [PrebuildSetup(typeof(InputSystemUIInputModuleTestScene_Setup))]

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -24,6 +24,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed writing values into the half-axis controls of sticks (such as `Gamepad.leftStick.left`) producing incorrect values on the stick ([case 1336240](https://issuetracker.unity3d.com/issues/inputtestfixture-tests-return-inverted-values-when-pressing-gamepads-left-or-down-joystick-buttons)).
 - Fixed setting size of event trace in input debugger always growing back to largest size set before.
 - Fixed successive clicks not getting triggered with `TouchSimulation` on when not moving the mouse in-between clicks ([case 1330014](https://issuetracker.unity3d.com/issues/onclick-isnt-triggered-on-the-second-click-when-the-mouse-isnt-moved-and-simulate-touch-input-from-mouse-or-pen-is-enabled)).
+- Fixed `InputSystemUIInputModule` stopping to listen for input when swapping `InputActionAsset` instances while input was disabled ([case 1371332](https://issuetracker.unity3d.com/issues/ui-navigation-stops-working-after-adding-two-input-devices-to-a-scene)).
 - Fixed `InputSystemUIInputModule` showing incorrect bindings after pressing the 'Fix UI Input Module' button in PlayerInput component([case 1319968](https://issuetracker.unity3d.com/product/unity/issues/guid/1319968/)).
 - Fixed an issue where UI button clicks could be ignored by `InputSystemUIInputModule` if modifying on-screen devices from Update() callbacks ([case 1365070](https://issuetracker.unity3d.com/product/unity/issues/guid/1365070)).
 - Fixed an issue with `InputSystemUIInputModule` that would cause UI to stop responding during play mode after changing a script file while Recompile and Continue mode is active, or by forcing a script recompile using `RequestScriptCompilation`([case 1324215](https://issuetracker.unity3d.com/product/unity/issues/guid/1324215/)).

Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs

@@ -1415,20 +1415,6 @@ private bool HasNoActions()
                 && m_TrackedDevicePositionAction?.action == null;
         }
 
-        private bool IsAnyActionEnabled()
-        {
-            return (m_PointAction?.action?.enabled ?? true) &&
-                (m_LeftClickAction?.action?.enabled ?? true) &&
-                (m_RightClickAction?.action?.enabled ?? true) &&
-                (m_MiddleClickAction?.action?.enabled ?? true) &&
-                (m_MoveAction?.action?.enabled ?? true) &&
-                (m_SubmitAction?.action?.enabled ?? true) &&
-                (m_CancelAction?.action?.enabled ?? true) &&
-                (m_ScrollWheelAction?.action?.enabled ?? true) &&
-                (m_TrackedDeviceOrientationAction?.action?.enabled ?? true) &&
-                (m_TrackedDevicePositionAction?.action?.enabled ?? true);
-        }
-
         private void EnableAllActions()
         {
             EnableInputAction(m_PointAction);
@@ -2144,6 +2130,10 @@ private InputActionReference UpdateReferenceForNewAsset(InputActionReference act
             if (oldAction == null)
                 return null;
 
+            var oldActionEnabled = oldAction.enabled;
+            if (oldActionEnabled)
+                DisableInputAction(actionReference);
+
             var oldActionMap = oldAction.actionMap;
             Debug.Assert(oldActionMap != null, "Not expected to end up with a singleton action here");
 
@@ -2155,7 +2145,11 @@ private InputActionReference UpdateReferenceForNewAsset(InputActionReference act
             if (newAction == null)
                 return null;
 
-            return InputActionReference.Create(newAction);
+            var reference = InputActionReference.Create(newAction);
+            if (oldActionEnabled)
+                EnableInputAction(reference);
+
+            return reference;
         }
 
         public InputActionAsset actionsAsset
@@ -2165,9 +2159,6 @@ public InputActionAsset actionsAsset
             {
                 if (value != m_ActionsAsset)
                 {
-                    var wasEnabled = IsAnyActionEnabled();
-
-                    DisableAllActions();
                     UnhookActions();
 
                     m_ActionsAsset = value;
@@ -2180,12 +2171,10 @@ public InputActionAsset actionsAsset
                     scrollWheel = UpdateReferenceForNewAsset(scrollWheel);
                     submit = UpdateReferenceForNewAsset(submit);
                     cancel = UpdateReferenceForNewAsset(cancel);
+                    trackedDeviceOrientation = UpdateReferenceForNewAsset(trackedDeviceOrientation);
+                    trackedDevicePosition = UpdateReferenceForNewAsset(trackedDevicePosition);
 
-                    if (wasEnabled)
-                    {
-                        HookActions();
-                        EnableAllActions();
-                    }
+                    HookActions();
                 }
             }
         }