Fixed UUM-77364. Requires trunk PR (same branch name).

Author: benoitalain

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

@@ -3,10 +3,17 @@
 
 namespace UnityEngine.InputSystem.UI
 {
-    // AxisEventData has no ToString. But that's the only thing we add so keeping
-    // it internal.
-    internal class ExtendedAxisEventData : AxisEventData
+    // AxisEventData has no ToString. Also added device info. Keeping
+    // it internal for now.
+    internal class ExtendedAxisEventData : AxisEventData, INavigationEventData
     {
+        /// <summary>
+        /// The <see cref="InputDevice"/> that generated the axis input.
+        /// </summary>
+        /// <seealso cref="Keyboard"/>
+        /// <seealso cref="Gamepad"/>
+        public InputDevice device { get; set; }
+
         public ExtendedAxisEventData(EventSystem eventSystem)
             : base(eventSystem)
         {

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

@@ -0,0 +1,20 @@
+#if PACKAGE_DOCS_GENERATION || UNITY_INPUT_SYSTEM_ENABLE_UI
+using UnityEngine.EventSystems;
+
+namespace UnityEngine.InputSystem.UI
+{
+    // A BaseEventData with added device info.
+    internal class ExtendedSubmitCancelEventData : BaseEventData, INavigationEventData
+    {
+        /// <summary>
+        /// The <see cref="InputDevice"/> that generated the axis input.
+        /// </summary>
+        public InputDevice device { get; set; }
+
+        public ExtendedSubmitCancelEventData(EventSystem eventSystem)
+            : base(eventSystem)
+        {
+        }
+    }
+}
+#endif

Packages/com.unity.inputsystem/InputSystem/Plugins/UI/ExtendedSubmitCancelEventData.cs.meta

@@ -0,0 +1,13 @@
+#if PACKAGE_DOCS_GENERATION || UNITY_INPUT_SYSTEM_ENABLE_UI
+
+namespace UnityEngine.InputSystem.UI
+{
+    internal interface INavigationEventData
+    {
+        /// <summary>
+        /// The <see cref="InputDevice"/> that generated the axis input.
+        /// </summary>
+        public InputDevice device { get; }
+    }
+}
+#endif

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

@@ -861,7 +861,7 @@ internal void ProcessNavigation(ref NavigationModel navigationState)
 
                     if (allow)
                     {
-                        var eventData = m_NavigationState.eventData;
+                        var eventData = m_NavigationState.eventData as ExtendedAxisEventData;
                         if (eventData == null)
                         {
                             eventData = new ExtendedAxisEventData(eventSystem);
@@ -871,6 +871,7 @@ internal void ProcessNavigation(ref NavigationModel navigationState)
 
                         eventData.moveVector = moveVector;
                         eventData.moveDir = moveDirection;
+                        eventData.device = navigationState.device;
 
                         if (IsMoveAllowed(eventData))
                         {
@@ -903,7 +904,16 @@ internal void ProcessNavigation(ref NavigationModel navigationState)
                 var submitAction = m_SubmitAction?.action;
                 var cancelAction = m_CancelAction?.action;
 
-                var data = GetBaseEventData();
+                var data = m_SubmitCancelState.eventData as ExtendedSubmitCancelEventData;
+                if (data == null)
+                {
+                    data = new ExtendedSubmitCancelEventData(eventSystem);
+                    m_SubmitCancelState.eventData = data;
+                }
+                data.Reset();
+
+                data.device = m_SubmitCancelState.device;
+
                 if (cancelAction != null && cancelAction.WasPerformedThisFrame())
                     ExecuteEvents.Execute(eventSystem.currentSelectedGameObject, data, ExecuteEvents.cancelHandler);
                 if (!data.used && submitAction != null && submitAction.WasPerformedThisFrame())
@@ -1393,7 +1403,7 @@ public InputActionReference move
         public InputActionReference submit
         {
             get => m_SubmitAction;
-            set => SwapAction(ref m_SubmitAction, value, m_ActionsHooked, null);
+            set => SwapAction(ref m_SubmitAction, value, m_ActionsHooked, m_OnSubmitCancelDelegate);
         }
 
         /// <summary>
@@ -1433,7 +1443,7 @@ public InputActionReference submit
         public InputActionReference cancel
         {
             get => m_CancelAction;
-            set => SwapAction(ref m_CancelAction, value, m_ActionsHooked, null);
+            set => SwapAction(ref m_CancelAction, value, m_ActionsHooked, m_OnSubmitCancelDelegate);
         }
 
         /// <summary>
@@ -2245,6 +2255,12 @@ private void OnMoveCallback(InputAction.CallbackContext context)
         {
             ////REVIEW: should we poll this? or set the action to not be pass-through? (ps4 controller is spamming this action)
             m_NavigationState.move = context.ReadValue<Vector2>();
+            m_NavigationState.device = context.control.device;
+        }
+
+        private void OnSubmitCancelCallback(InputAction.CallbackContext context)
+        {
+            m_SubmitCancelState.device = context.control.device;
         }
 
         private void OnTrackedDeviceOrientationCallback(InputAction.CallbackContext context)
@@ -2441,6 +2457,13 @@ public override Vector2 ConvertPointerEventScrollDeltaToTicks(Vector2 scrollDelt
 
 #endif
 
+#if UNITY_INPUT_SYSTEM_INPUT_MODULE_NON_KEYBOARD
+        public override bool IsNonKeyboardNavigationEvent(BaseEventData eventData)
+        {
+            return eventData is INavigationEventData eed && eed.device is not Keyboard;
+        }
+#endif
+
         private void HookActions()
         {
             if (m_ActionsHooked)
@@ -2458,6 +2481,8 @@ private void HookActions()
                 m_OnScrollWheelDelegate = OnScrollCallback;
             if (m_OnMoveDelegate == null)
                 m_OnMoveDelegate = OnMoveCallback;
+            if (m_OnSubmitCancelDelegate == null)
+                m_OnSubmitCancelDelegate = OnSubmitCancelCallback;
             if (m_OnTrackedDeviceOrientationDelegate == null)
                 m_OnTrackedDeviceOrientationDelegate = OnTrackedDeviceOrientationCallback;
             if (m_OnTrackedDevicePositionDelegate == null)
@@ -2479,6 +2504,8 @@ private void SetActionCallbacks(bool install)
             m_ActionsHooked = install;
             SetActionCallback(m_PointAction, m_OnPointDelegate, install);
             SetActionCallback(m_MoveAction, m_OnMoveDelegate, install);
+            SetActionCallback(m_SubmitAction, m_OnSubmitCancelDelegate, install);
+            SetActionCallback(m_CancelAction, m_OnSubmitCancelDelegate, install);
             SetActionCallback(m_LeftClickAction, m_OnLeftClickDelegate, install);
             SetActionCallback(m_RightClickAction, m_OnRightClickDelegate, install);
             SetActionCallback(m_MiddleClickAction, m_OnMiddleClickDelegate, install);
@@ -2594,6 +2621,7 @@ private struct InputActionReferenceState
 
         private Action<InputAction.CallbackContext> m_OnPointDelegate;
         private Action<InputAction.CallbackContext> m_OnMoveDelegate;
+        private Action<InputAction.CallbackContext> m_OnSubmitCancelDelegate;
         private Action<InputAction.CallbackContext> m_OnLeftClickDelegate;
         private Action<InputAction.CallbackContext> m_OnRightClickDelegate;
         private Action<InputAction.CallbackContext> m_OnMiddleClickDelegate;
@@ -2611,6 +2639,7 @@ private struct InputActionReferenceState
 
         // Navigation-type input.
         private NavigationModel m_NavigationState;
+        private SubmitCancelModel m_SubmitCancelState;
 
         [NonSerialized] private GameObject m_LocalMultiPlayerRoot;
 

Packages/com.unity.inputsystem/InputSystem/Plugins/UI/INavigationEventData.cs.meta

@@ -10,11 +10,18 @@ internal struct NavigationModel
         public MoveDirection lastMoveDirection;
         public float lastMoveTime;
         public AxisEventData eventData;
+        public InputDevice device;
 
         public void Reset()
         {
             move = Vector2.zero;
         }
     }
+
+    internal struct SubmitCancelModel
+    {
+        public BaseEventData eventData;
+        public InputDevice device;
+    }
 }
 #endif

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

@@ -92,6 +92,11 @@
             "expression": "6000.0.11",
             "define": "UNITY_INPUT_SYSTEM_INPUT_MODULE_SCROLL_DELTA"
         },
+        {
+            "name": "Unity",
+            "expression": "6000.1.0b2",
+            "define": "UNITY_INPUT_SYSTEM_INPUT_MODULE_NON_KEYBOARD"
+        },
         {
             "name": "Unity",
             "expression": "6000.0.15",