From cbe5da6af96bd5bed340c97397ab9e4555a092f6 Mon Sep 17 00:00:00 2001 From: m1ga Date: Sat, 21 Oct 2023 13:03:32 +0200 Subject: [PATCH] fix(ios): make left/rightButton/View fire events again --- ios/Classes/TiMapView.m | 16 +++++++++++++++- ios/manifest | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ios/Classes/TiMapView.m b/ios/Classes/TiMapView.m index 610680e3..26cc39ba 100644 --- a/ios/Classes/TiMapView.m +++ b/ios/Classes/TiMapView.m @@ -1277,13 +1277,16 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap UIView *right = [ann rightViewAccessory]; [annView setHidden:[TiUtils boolValue:[ann valueForUndefinedKey:@"hidden"] def:NO]]; - if (left != nil) { annView.leftCalloutAccessoryView = left; + UITapGestureRecognizer *singleFingerTapLeft = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleSingleTapLeft:)]; + [left addGestureRecognizer:singleFingerTapLeft]; } if (right != nil) { annView.rightCalloutAccessoryView = right; + UITapGestureRecognizer *singleFingerTapRight = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleSingleTapRight:)]; + [right addGestureRecognizer:singleFingerTapRight]; } [annView setDraggable:[TiUtils boolValue:[ann valueForUndefinedKey:@"draggable"]]]; @@ -1313,6 +1316,17 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap } return annView; } + +- (void)handleSingleTapLeft:(UITapGestureRecognizer *)recognizer +{ + [self fireClickEvent:selectedAnnotation source:@"leftButton" deselected:NO]; +} + +- (void)handleSingleTapRight:(UITapGestureRecognizer *)recognizer +{ + [self fireClickEvent:selectedAnnotation source:@"rightButton" deselected:NO]; +} + - (void)animateAnnotation:(TiMapAnnotationProxy *)newAnnotation withLocation:(CLLocationCoordinate2D)newLocation { userNewLocation.latitude = newLocation.latitude; diff --git a/ios/manifest b/ios/manifest index 12ef5eb2..0a2873a5 100644 --- a/ios/manifest +++ b/ios/manifest @@ -3,7 +3,7 @@ # during compilation, packaging, distribution, etc. # -version: 7.3.1 +version: 7.3.2 apiversion: 2 architectures: arm64 x86_64 description: External version of Map module