From 80618c6a40b139a9a32c8f288a266b1ad8f3ccfc Mon Sep 17 00:00:00 2001 From: Aaqibhafeez Khan Date: Fri, 20 Nov 2026 06:10:23 +0530 Subject: [PATCH] fix(ios): suppress map long press on marker drags Signed-off-by: Aaqibhafeez Khan --- package/ios/HybridMapViewDelegate.swift | 28 +++++++++++++-- .../iosTests/HybridMapViewDelegateTests.swift | 36 +++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 package/iosTests/HybridMapViewDelegateTests.swift diff --git a/package/ios/HybridMapViewDelegate.swift b/package/ios/HybridMapViewDelegate.swift index 7e68e233..f929a3f0 100644 --- a/package/ios/HybridMapViewDelegate.swift +++ b/package/ios/HybridMapViewDelegate.swift @@ -7,6 +7,15 @@ final class HybridMapViewDelegate: NSObject, MKMapViewDelegate, UIGestureRecogni private var handledMapFeatureSelections = Set() private var shouldSuppressNextBackgroundPress = false + private let hitTest: (UIView, CGPoint) -> UIView? + + init(hitTest: @escaping (UIView, CGPoint) -> UIView? = { view, point in + view.hitTest(point, with: nil) + }) { + self.hitTest = hitTest + super.init() + } + func installGestureRecognizers(on mapView: MKMapView) { let tapRecognizer = UITapGestureRecognizer( target: self, @@ -61,6 +70,21 @@ final class HybridMapViewDelegate: NSObject, MKMapViewDelegate, UIGestureRecogni parent.notifyLongPress(at: point) } + func gestureRecognizer( + _ gestureRecognizer: UIGestureRecognizer, + shouldReceive touch: UITouch + ) -> Bool { + guard gestureRecognizer is UILongPressGestureRecognizer, let parent else { + return true + } + + return shouldReceiveLongPress(at: touch.location(in: parent.view), in: parent.view) + } + + func shouldReceiveLongPress(at point: CGPoint, in view: UIView) -> Bool { + !isAnnotationView(at: point, in: view) + } + func gestureRecognizer( _ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer @@ -68,8 +92,8 @@ final class HybridMapViewDelegate: NSObject, MKMapViewDelegate, UIGestureRecogni true } - private func isAnnotationView(at point: CGPoint, in mapView: MKMapView) -> Bool { - var view: UIView? = mapView.hitTest(point, with: nil) + private func isAnnotationView(at point: CGPoint, in view: UIView) -> Bool { + var view: UIView? = hitTest(view, point) while let current = view { if current is MKAnnotationView { return true diff --git a/package/iosTests/HybridMapViewDelegateTests.swift b/package/iosTests/HybridMapViewDelegateTests.swift new file mode 100644 index 00000000..00e8c648 --- /dev/null +++ b/package/iosTests/HybridMapViewDelegateTests.swift @@ -0,0 +1,36 @@ +import MapKit +import UIKit +import XCTest + +@testable import NitroMaps + +final class HybridMapViewDelegateTests: XCTestCase { + func testRejectsLongPressWhenTouchHitsAnAnnotationView() { + let annotationView = MKAnnotationView(annotation: nil, reuseIdentifier: nil) + let delegate = HybridMapViewDelegate(hitTest: { _, _ in annotationView }) + + XCTAssertFalse(delegate.shouldReceiveLongPress(at: .zero, in: UIView())) + } + + func testRejectsLongPressWhenTouchHitsSubviewInsideAnnotationView() { + let annotationView = MKAnnotationView(annotation: nil, reuseIdentifier: nil) + let nestedView = UIView() + annotationView.addSubview(nestedView) + let delegate = HybridMapViewDelegate(hitTest: { _, _ in nestedView }) + + XCTAssertFalse(delegate.shouldReceiveLongPress(at: .zero, in: UIView())) + } + + func testAllowsLongPressWhenTouchHitsOrdinaryView() { + let backgroundView = UIView() + let delegate = HybridMapViewDelegate(hitTest: { _, _ in backgroundView }) + + XCTAssertTrue(delegate.shouldReceiveLongPress(at: .zero, in: UIView())) + } + + func testAllowsLongPressWhenHitTestReturnsNoView() { + let delegate = HybridMapViewDelegate(hitTest: { _, _ in nil }) + + XCTAssertTrue(delegate.shouldReceiveLongPress(at: .zero, in: UIView())) + } +}