fix some event handlers that required a selectable

Author: KurtGokhan

Runtime/EventHandlers/CancelHandler.cs

@@ -1,9 +1,11 @@
 using System;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.UI;
 
 namespace ReactUnity.EventHandlers
 {
+    [RequireComponent(typeof(Selectable))]
     public class CancelHandler : MonoBehaviour, ICancelHandler, IEventHandler
     {
         public event Action<BaseEventData> OnEvent = default;

Runtime/EventHandlers/KeyDownHandler.cs

@@ -2,6 +2,9 @@
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
+#if REACT_INPUT_SYSTEM
+using UnityEngine.InputSystem;
+#endif
 
 namespace ReactUnity.EventHandlers
 {
@@ -12,18 +15,37 @@ public class KeyDownHandler : MonoBehaviour, ISelectHandler, IDeselectHandler, I
 
         private bool selected = false;
 
-        public void ClearListeners()
+#if REACT_INPUT_SYSTEM
+        private InputAction action;
+
+        private void OnEnable()
         {
-            OnEvent = null;
+            if (action == null)
+            {
+                action = new InputAction(binding: "/*/<button>");
+                action.performed += (ctx) =>
+                {
+                    if (selected) OnEvent(new KeyEventData(EventSystem.current, ctx));
+                };
+            }
+            action.Enable();
         }
 
+        private void OnDisable()
+        {
+            action?.Disable();
+        }
+#endif
+
+#if !REACT_INPUT_SYSTEM
         private void Update()
         {
             if (selected && Input.anyKeyDown)
             {
                 OnEvent(new KeyEventData(EventSystem.current));
             }
         }
+#endif
 
         public void OnSelect(BaseEventData eventData)
         {
@@ -34,17 +56,38 @@ public void OnDeselect(BaseEventData eventData)
         {
             selected = false;
         }
+
+        public void ClearListeners()
+        {
+            OnEvent = null;
+        }
     }
 
     public class KeyEventData : BaseEventData
     {
         public string key;
         public Type input;
+        public bool inputSystem;
+
+        public InputAction.CallbackContext ctx;
+
+
+        public KeyEventData(EventSystem eventSystem, bool inputSystem = false) : base(eventSystem)
+        {
+            this.inputSystem = inputSystem;
+
+            if (!inputSystem)
+            {
+                input = typeof(Input);
+                key = Input.inputString;
+            }
+        }
 
-        public KeyEventData(EventSystem eventSystem) : base(eventSystem)
+        public KeyEventData(EventSystem eventSystem, InputAction.CallbackContext ctx) : base(eventSystem)
         {
-            input = typeof(Input);
-            key = Input.inputString;
+            this.inputSystem = true;
+            this.ctx = ctx;
+            key = ctx.control.name;
         }
     }
 }

Runtime/EventHandlers/MoveHandler.cs

@@ -1,9 +1,11 @@
 using System;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.UI;
 
 namespace ReactUnity.EventHandlers
 {
+    [RequireComponent(typeof(Selectable))]
     public class MoveHandler : MonoBehaviour, IMoveHandler, IEventHandler
     {
         public event Action<BaseEventData> OnEvent = default;

Runtime/EventHandlers/SubmitHandler.cs

@@ -1,9 +1,11 @@
 using System;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.UI;
 
 namespace ReactUnity.EventHandlers
 {
+    [RequireComponent(typeof(Selectable))]
     public class SubmitHandler : MonoBehaviour, ISubmitHandler, IEventHandler
     {
         public event Action<BaseEventData> OnEvent = default;

Runtime/ReactUnity.asmdef

@@ -1,8 +1,10 @@
 {
     "name": "ReactUnity",
+    "rootNamespace": "",
     "references": [
         "GUID:6055be8ebefd69e48b49212b09b47b2f",
-        "GUID:68550284b645f4b9894995579f34290a"
+        "GUID:68550284b645f4b9894995579f34290a",
+        "GUID:75469ad4d38634e559750d17036d5f7c"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
@@ -16,6 +18,11 @@
             "name": "com.unity.vectorgraphics",
             "expression": "",
             "define": "REACT_VECTOR_GRAPHICS"
+        },
+        {
+            "name": "com.unity.inputsystem",
+            "expression": "",
+            "define": "REACT_INPUT_SYSTEM"
         }
     ],
     "noEngineReferences": false