FIX: OnScreenStick isolated dynamic origin hit detection. (#2341)

Co-authored-by: Rita Merkl <127492464+ritamerkl@users.noreply.github.com>

Author: AswinRajGopal

Assets/Tests/InputSystem/Plugins/OnScreenTests.cs

@@ -582,6 +582,40 @@ public IEnumerator Devices_OnScreenStickDoesNotReceivePointerUpEventsInIsolatedM
         Assert.That(stick.gameObject.GetComponent<RectTransform>().anchoredPosition, Is.Not.EqualTo(stickOriginPosition));
     }
 
+    [UnityTest]
+    [Category("Devices")]
+    public IEnumerator OnScreenStick_IsolateMode_ShouldCastRayToChild()
+    {
+        InputSystem.AddDevice<Touchscreen>();
+
+        var uiTestScene = new UITestScene(this);
+
+        var stickRect = uiTestScene.AddImage("StickParent");
+        var stick = stickRect.gameObject.AddComponent<OnScreenStick>();
+        stick.controlPath = "<Gamepad>/leftStick";
+        stick.useIsolatedInputActions = true;
+
+        var childGO = new GameObject("StickImage", typeof(RectTransform), typeof(Image));
+        var childRect = childGO.GetComponent<RectTransform>();
+        childRect.SetParent(stickRect, worldPositionStays: false);
+        childRect.anchorMin = Vector2.zero;
+        childRect.anchorMax = Vector2.one;
+        childRect.sizeDelta = Vector2.zero;
+        childGO.GetComponent<Image>().raycastTarget = true;
+
+        var stickOriginPosition = stickRect.anchoredPosition;
+
+        // Ensure that the OnScreenStick component has been started.
+        yield return null;
+
+        yield return uiTestScene.PressAndDrag(childRect, new Vector2(50, 0));
+
+        // Allow one more frame for queued events to be processed.
+        yield return null;
+
+        Assert.That(stickRect.anchoredPosition, Is.Not.EqualTo(stickOriginPosition));
+    }
+
     // https://fogbugz.unity3d.com/f/cases/1305016/
     [Test]
     [Category("Devices")]

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Align title font size with toolbar style in `Input Action` window.
 - Updated Action Properties headers to use colors consistent with GameObject component headers.
 - Fixed misaligned Virtual Cursor when changing resolution [ISXB-1119](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1119)
+- Fixed OnScreenStick ignoring dynamic-origin presses when isolated input actions were enabled. [ISXB-1027](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1027)
 - Fixed an issue where `IndexOutOfRangeException` was thrown from `InputManagerStateMonitors.AddStateChangeMonitor` when attempting to enable an action map from within an `InputAction.cancel` callback when using control schemes. (ISXB-1767).
 
 ### Added

Packages/com.unity.inputsystem/InputSystem/Plugins/OnScreen/OnScreenStick.cs

@@ -249,16 +249,9 @@ private void OnPointerDown(InputAction.CallbackContext ctx)
             if (m_RaycastResults.Count == 0)
                 return;
 
-            var stickSelected = false;
-            foreach (var result in m_RaycastResults)
-            {
-                if (result.gameObject != gameObject) continue;
-
-                stickSelected = true;
-                break;
-            }
-
-            if (!stickSelected)
+            // Only accept selection if the top-most UI hit is within this stick's hierarchy.
+            var topResult = m_RaycastResults[0];
+            if (!topResult.gameObject.transform.IsChildOf(transform))
                 return;
 
             BeginInteraction(screenPosition, GetCameraFromCanvas());