Restore iOS multitouch tests (JetBrains#2635)

ASalavei · web-flow · commit 1e9d19543b6c · 2025-12-12T17:40:59.000+01:00
Restore tests that verify multitouch event handling: https://youtrack.jetbrains.com/issue/CMP-9028/iOS-Multiple-scrollable-components-with-CupertinoOverscrollEffectFactory-crash-when-scrolling-and-releasing-fingers-at-the-same Fixes: https://youtrack.jetbrains.com/issue/CMP-9082 ## Release Notes N/A
diff --git a/compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/interaction/BasicInteractionTest.kt b/compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/interaction/BasicInteractionTest.kt
@@ -9,12 +9,14 @@ import androidx.compose.foundation.ComposeFoundationFlags
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.awaitEachGesture
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.foundation.verticalScroll
@@ -26,6 +28,10 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.changedToDown
+import androidx.compose.ui.input.pointer.changedToUp
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.boundsInWindow
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.testTag
@@ -48,6 +54,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.seconds
 import kotlinx.cinterop.ExperimentalForeignApi
 import org.jetbrains.skiko.OS
 import org.jetbrains.skiko.OSVersion
@@ -236,10 +243,70 @@ class BasicInteractionTest {
         }
     }
 
+    @Test
+    fun testTapsCountingWithMultiTouch() = repeat(10) {
+        runUIKitInstrumentedTest {
+            var touchesDown = 0
+            var touchesUp = 0
+
+            setContent {
+                Column {
+                    Box(
+                        modifier = Modifier
+                            .size(250.dp)
+                            .testTag("Box 1")
+                            .pointerInput(Unit) {
+                                awaitEachGesture {
+                                    while (true) {
+                                        val event = awaitPointerEvent(pass = PointerEventPass.Initial)
+                                        event.changes.forEach { change ->
+                                            if (change.changedToDown()) {
+                                                touchesDown++
+                                            } else if (change.changedToUp()) {
+                                                touchesUp++
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                    )
+                    Box(
+                        modifier = Modifier
+                            .size(250.dp)
+                            .testTag("Box 2")
+                            .pointerInput(Unit) {
+                                awaitEachGesture {
+                                    while (true) {
+                                        awaitPointerEvent(pass = PointerEventPass.Initial)
+                                    }
+                                }
+                            }
+                    )
+                }
+            }
+
+            val tap1 = findNodeWithTag("Box 1").touchDown()
+            val tap2 = findNodeWithTag("Box 2").touchDown()
+
+            assertEquals(1, touchesDown)
+            assertEquals(0, touchesUp)
+
+            tap1.dragBy(dx = 20.dp, duration = 0.1.seconds)
+            tap2.dragBy(dx = 20.dp, duration = 0.1.seconds)
+
+            tap1.up()
+            tap2.up()
+            waitForIdle()
+
+            assertEquals(1, touchesDown)
+            assertEquals(1, touchesUp)
+        }
+    }
+
     private fun UIKitInstrumentedTest.openToolbar(textFieldTag: String) {
-        findNodeWithTag("TextField").tap()
+        findNodeWithTag(textFieldTag).tap()
         delay(500)
-        findNodeWithTag("TextField").doubleTap()
+        findNodeWithTag(textFieldTag).doubleTap()
         waitForContextMenu()
     }
 
diff --git a/compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/scroll/ScrollTest.kt b/compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/scroll/ScrollTest.kt
@@ -18,8 +18,10 @@ package androidx.compose.ui.scroll
 
 import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.background
+import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -972,6 +974,47 @@ internal class ScrollTest {
         assertEquals(DpRect(DpOffset(x = 0.dp, y = 100.dp), DpSize(screenSize.width, 200.dp)), uiKitViewRect())
         assertEquals(DpOffset.Zero, contentOffset())
     }
+
+    @Test
+    fun testMultiTouchScroll() = repeat(10) {
+        runUIKitInstrumentedTest {
+            val state1 = ScrollState(0)
+            val state2 = ScrollState(0)
+            setContent {
+                Column(modifier = Modifier.fillMaxSize()) {
+                    Row(modifier = Modifier.testTag("Row 1").horizontalScroll(state1)) {
+                        repeat(20) {
+                            Box(modifier = Modifier.size(200.dp))
+                        }
+                    }
+                    Row(modifier = Modifier.testTag("Row 2").horizontalScroll(state2)) {
+                        repeat(20) {
+                            Box(modifier = Modifier.size(200.dp))
+                        }
+                    }
+                }
+            }
+
+            val tap1 = findNodeWithTag("Row 1").touchDown()
+            val tap2 = findNodeWithTag("Row 2").touchDown()
+
+            waitForIdle()
+
+            // Simulate simultaneous drag of two fingers
+            repeat(2) {
+                tap1.dragBy(dx = (-25).dp, duration = (0.5).seconds)
+                tap2.dragBy(dx = (-50).dp, duration = (0.5).seconds)
+            }
+
+            tap1.up()
+            tap2.up()
+
+            waitForIdle()
+
+            assertEquals((50 - CUPERTINO_TOUCH_SLOP) * density.density, state1.value.toFloat())
+            assertEquals((100 - CUPERTINO_TOUCH_SLOP) * density.density, state2.value.toFloat())
+        }
+    }
 }
 
 @Composable
diff --git a/compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/test/UIKitInstrumentedTest.kt b/compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/test/UIKitInstrumentedTest.kt
@@ -23,6 +23,7 @@ import androidx.compose.ui.scene.ComposeHostingViewController
 import androidx.compose.ui.test.utils.center
 import androidx.compose.ui.test.utils.getTouchesEvent
 import androidx.compose.ui.test.utils.moveToLocationOnWindow
+import androidx.compose.ui.test.utils.resetTouches
 import androidx.compose.ui.test.utils.toCGPoint
 import androidx.compose.ui.test.utils.touchDown
 import androidx.compose.ui.test.utils.up
@@ -249,19 +250,19 @@ internal class UIKitInstrumentedTest {
      *
      * @param position The position on the root hosting controller.
      */
-    fun tap(position: DpOffset): UITouch {
+    fun tap(position: DpOffset) {
         return touchDown(position).up()
     }
 
     /**
      * Simulates a tap gesture for a given AccessibilityTestNode.
      */
-    fun AccessibilityTestNode.tap(): UITouch {
+    fun AccessibilityTestNode.tap() {
         val frame = frame ?: error("Internal error. Frame is missing.")
         return tap(frame.center())
     }
 
-    fun AccessibilityTestNode.doubleTap(): UITouch {
+    fun AccessibilityTestNode.doubleTap() {
         val frame = frame ?: error("Internal error. Frame is missing.")
         tap(frame.center())
         delay(50)
@@ -366,6 +367,7 @@ internal class MockAppDelegate: NSObject(), UIApplicationDelegateProtocol {
             window.resignKeyWindow()
         }
 
+        _window?.resetTouches()
         _window?.resignKeyWindow()
         _window?.windowScene = null
         _window?.rootViewController = UIViewController()
@@ -418,8 +420,8 @@ internal fun UIKitInstrumentedTest.findFocusedUITextInput(): UITextInputProtocol
         if (view.isFirstResponder) {
             return view
         }
-        view.subviews.forEach {
-            findFirstResponder(it as UIView)?.let { return it }
+        view.subviews.forEach { view ->
+            findFirstResponder(view as UIView)?.let { return it }
         }
         return null
     }
diff --git a/compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/test/utils/UITouch+Utils.kt b/compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/test/utils/UITouch+Utils.kt
@@ -16,6 +16,8 @@
 
 package androidx.compose.ui.test.utils
 
+import androidx.compose.test.utils.endAllTouches
+import androidx.compose.test.utils.endTouch
 import androidx.compose.test.utils.getTouchesEvent
 import androidx.compose.test.utils.send
 import androidx.compose.test.utils.setLocationInWindow
@@ -40,10 +42,16 @@ internal fun UIWindow.touchDown(location: DpOffset): UITouch {
     }
 }
 
+@OptIn(ExperimentalForeignApi::class)
 internal fun UIWindow.getTouchesEvent(): UIEvent {
     return UITouch.getTouchesEvent()
 }
 
+@OptIn(ExperimentalForeignApi::class)
+internal fun UIWindow.resetTouches() {
+    UITouch.endAllTouches()
+}
+
 @OptIn(ExperimentalForeignApi::class)
 internal fun UITouch.moveToLocationOnWindow(location: DpOffset) {
     setLocationInWindow(location.toCGPoint())
@@ -59,8 +67,8 @@ internal fun UITouch.hold(): UITouch {
 }
 
 @OptIn(ExperimentalForeignApi::class)
-internal fun UITouch.up(): UITouch {
+internal fun UITouch.up() {
     setPhase(UITouchPhase.UITouchPhaseEnded)
     send()
-    return this
+    endTouch()
 }
diff --git a/testutils/testutils-xctest/src/iosMain/objc/CMPTestUtils/UITouch+Test.h b/testutils/testutils-xctest/src/iosMain/objc/CMPTestUtils/UITouch+Test.h
@@ -26,12 +26,14 @@ NS_ASSUME_NONNULL_BEGIN
                     fromEdge:(BOOL)fromEdge;
 
 + (UIEvent *)getTouchesEvent;
++ (void)endAllTouches;
 
 @property (assign) UITouchPhase phase;
 @property (assign) CGPoint locationInWindow;
 
 - (void)send;
 - (void)updateTimestamp;
+- (void)endTouch;
 
 @end
 
diff --git a/testutils/testutils-xctest/src/iosMain/objc/CMPTestUtils/UITouch+Test.m b/testutils/testutils-xctest/src/iosMain/objc/CMPTestUtils/UITouch+Test.m
@@ -18,6 +18,7 @@
 #import <objc/runtime.h>
 #import "HIDEvent.h"
 
+#pragma mark - UIEvent private methods
 @interface UIEvent (CMPTestPrivate)
 
 - (void)_addTouch:(UITouch *)touch forDelayedDelivery:(BOOL)arg2;
@@ -26,6 +27,7 @@ - (void)_setHIDEvent:(IOHIDEventPtr)event;
 
 @end
 
+#pragma mark - UIApplication private methods
 @interface UIApplication (CMPTestPrivate)
 
 - (UIEvent *)_touchesEvent;
@@ -40,6 +42,39 @@ - (UIEvent *)_touchesEvent;
     unsigned int _abandonForwardingRecord:1;
 } UITouchFlags;
 
+#pragma mark - ActiveTouchesHolder
+
+@interface CMPActiveTouchesHolder : NSObject
+
+@property (strong, nonatomic) NSMutableArray<UITouch *> *touches;
+
++ (instancetype)shared;
+
+@end
+
+@implementation CMPActiveTouchesHolder
+
++ (instancetype)shared {
+    static CMPActiveTouchesHolder *sharedInstance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [[self alloc] init];
+    });
+    return sharedInstance;
+}
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        _touches = [NSMutableArray new];
+    }
+    return self;
+}
+
+@end
+
+#pragma mark - UITouch extension
+
 @interface UITouch (CMPTestPrivate)
 
 - (void)setWindow:(UIWindow *)window;
@@ -73,6 +108,10 @@ + (UIEvent *)getTouchesEvent {
     return [UIApplication.sharedApplication _touchesEvent];
 }
 
++ (void)endAllTouches {
+    [CMPActiveTouchesHolder.shared.touches removeAllObjects];
+}
+
 - (id)initAtPoint:(CGPoint)point inWindow:(UIWindow *)window tapCount:(NSInteger)tapCount fromEdge:(BOOL)fromEdge {
 	self = [super init];
     if (self) {
@@ -95,6 +134,8 @@ - (id)initAtPoint:(CGPoint)point inWindow:(UIWindow *)window tapCount:(NSInteger
         IOHIDEventPtr event = HIDEventWithTouches(@[self]);
         [self _setHidEvent:event];
         CFRelease(event);
+
+        [CMPActiveTouchesHolder.shared.touches addObject:self];
     }
     
 	return self;
@@ -113,8 +154,13 @@ - (void)updateTimestamp {
 }
 
 - (void)send {
+    if (![CMPActiveTouchesHolder.shared.touches containsObject:self]) {
+        [CMPActiveTouchesHolder.shared.touches addObject:self];
+    }
+
     UIEvent *event = [[UIApplication sharedApplication] _touchesEvent];
-    IOHIDEventPtr hidEvent = HIDEventWithTouches(@[self]);
+    [event _clearTouches];
+    IOHIDEventPtr hidEvent = HIDEventWithTouches(CMPActiveTouchesHolder.shared.touches);
     [event _setHIDEvent:hidEvent];
 
     [self updateTimestamp];
@@ -123,4 +169,8 @@ - (void)send {
     [[UIApplication sharedApplication] sendEvent:event];
 }
 
+- (void)endTouch {
+    [CMPActiveTouchesHolder.shared.touches removeObject:self];
+}
+
 @end
