react-native-maps 1.14.0 → 1.15.0

package/ios/AirMaps/AIRMapMarker.h

@@ -35,6 +35,9 @@
 @property (nonatomic, assign) NSInteger zIndex;
 @property (nonatomic, assign) double opacity;
 @property (nonatomic, assign) BOOL isPreselected;
+@property (nonatomic, assign) MKFeatureVisibility titleVisibility;
+@property (nonatomic, assign) MKFeatureVisibility subtitleVisibility;
+@property (nonatomic, assign) BOOL useLegacyPinView;
 
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 @property (nonatomic, copy) RCTDirectEventBlock onSelect;
@@ -51,6 +54,7 @@
 - (void)showCalloutView;
 - (void)hideCalloutView;
 - (void)addTapGestureRecognizer;
+- (void)setUseLegacyPinView:(BOOL)value;
 
 @end
 

package/ios/AirMaps/AIRMapMarker.m

@@ -23,9 +23,11 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 @implementation AIRMapMarker {
     BOOL _hasSetCalloutOffset;
     RCTImageLoaderCancellationBlock _reloadImageCancellationBlock;
+    MKMarkerAnnotationView *_markerView;
     MKPinAnnotationView *_pinView;
     BOOL _calloutIsOpen;
     NSInteger _zIndexBeforeOpen;
+    BOOL _useLegacyPinView;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
@@ -80,24 +82,39 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 - (MKAnnotationView *)getAnnotationView
 {
     if ([self shouldUsePinView]) {
-        // In this case, we want to render a platform "default" marker.
-        if (_pinView == nil) {
+        // In this case, we want to render a platform "default" legacy marker.
+
+        
+        if (_pinView == nil && _useLegacyPinView) {
             _pinView = [[MKPinAnnotationView alloc] initWithAnnotation:self reuseIdentifier: nil];
             [self addGestureRecognizerToView:_pinView];
             _pinView.annotation = self;
-        }
 
-        _pinView.draggable = self.draggable;
-        _pinView.layer.zPosition = self.zIndex;
+            if ([_pinView respondsToSelector:@selector(setPinTintColor:)]) {
+                _pinView.pinTintColor = self.pinColor;
+            }
 
-        // TODO(lmr): Looks like this API was introduces in iOS 8. We may want to handle differently for earlier
-        // versions. Right now it's just leaving it with the default color. People needing the colors are free to
-        // use their own custom markers.
-        if ([_pinView respondsToSelector:@selector(setPinTintColor:)]) {
-            _pinView.pinTintColor = self.pinColor;
+            _pinView.draggable = self.draggable;
+            _pinView.layer.zPosition = self.zIndex;
+
+            return _pinView;
         }
+    
+        
+
+        if (_markerView == nil && !_useLegacyPinView) {
+            _markerView = [[MKMarkerAnnotationView alloc] initWithAnnotation:self reuseIdentifier: nil];
+            [self addGestureRecognizerToView:_markerView];
+            _markerView.annotation = self;
 
-        return _pinView;
+        _markerView.draggable = self.draggable;
+        _markerView.layer.zPosition = self.zIndex;
+        _markerView.markerTintColor = self.pinColor;
+        _markerView.titleVisibility = self.titleVisibility ?: MKFeatureVisibilityHidden;
+        _markerView.subtitleVisibility = self.subtitleVisibility ?: MKFeatureVisibilityHidden;
+
+        }
+        return _markerView ?: _pinView;
     } else {
         // If it has subviews, it means we are wanting to render a custom marker with arbitrary react views.
         // if it has a non-null image, it means we want to render a custom marker with the image.
@@ -113,7 +130,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     // Set everything necessary on the calloutView before it becomes visible.
 
     // Apply the MKAnnotationView's desired calloutOffset (from the top-middle of the view)
-    if ([self shouldUsePinView] && !_hasSetCalloutOffset) {
+     if ([self shouldUsePinView] && !_hasSetCalloutOffset && _useLegacyPinView) {
         calloutView.calloutOffset = CGPointMake(-8,0);
     } else {
         calloutView.calloutOffset = self.calloutOffset;
@@ -336,8 +353,10 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 {
     _pinColor = pinColor;
 
-    if ([_pinView respondsToSelector:@selector(setPinTintColor:)]) {
+    if(_useLegacyPinView && [_pinView respondsToSelector:@selector(setPinTintColor:)]) {
         _pinView.pinTintColor = _pinColor;
+    } else {
+        _markerView.markerTintColor = _pinColor;
     }
 }
 
@@ -362,4 +381,8 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     }
 }
 
+- (void)setUseLegacyPinView:(BOOL)value {
+    _useLegacyPinView = value;
+}
+
 @end

package/ios/AirMaps/AIRMapMarkerManager.m

@@ -46,6 +46,9 @@ RCT_EXPORT_VIEW_PROPERTY(draggable, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(zIndex, NSInteger)
 RCT_EXPORT_VIEW_PROPERTY(opacity, double)
 RCT_EXPORT_VIEW_PROPERTY(isPreselected, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(titleVisibility, NSString)
+RCT_EXPORT_VIEW_PROPERTY(subtitleVisibility, NSString)
+RCT_EXPORT_VIEW_PROPERTY(useLegacyPinView, BOOL)
 
 RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onSelect, RCTDirectEventBlock)

package/lib/MapMarker.d.ts

@@ -4,6 +4,7 @@ import { MapManagerCommand, NativeComponent, ProviderContext, UIManagerCommand }
 import { MapMarkerNativeComponentType } from './MapMarkerNativeComponent';
 import { CalloutPressEvent, LatLng, MarkerDeselectEvent, MarkerDragEvent, MarkerDragStartEndEvent, MarkerPressEvent, MarkerSelectEvent, Point } from './sharedTypes';
 import { Modify } from './sharedTypesInternal';
+type AppleMarkerVisibility = 'hidden' | 'adaptive' | 'visible';
 export type MapMarkerProps = ViewProps & {
     /**
      * Sets the anchor point for the marker.
@@ -260,6 +261,25 @@ export type MapMarkerProps = ViewProps & {
      * @platform Android: Supported
      */
     zIndex?: number;
+    /**
+     * Visibility of the title text rendered beneath Marker balloon
+     * @platform iOS: Apple Maps only
+     * @platform Android: Not supported
+     */
+    titleVisibility?: AppleMarkerVisibility;
+    /**
+     * Visibility of the subtitle text rendered beneath Marker balloon
+     * @platform iOS: Apple Maps only
+     * @platform Android: Not supported
+     */
+    subtitleVisibility?: AppleMarkerVisibility;
+    /**
+     * Indicate type of default markers if it's true MKPinAnnotationView will be used and MKMarkerAnnotationView if it's false
+     * It doesn't change anything if you are using custom Markers
+     * @platform iOS: Apple Maps only
+     * @platform Android: Not supported
+     */
+    useLegacyPinView?: boolean;
 };
 type OmittedProps = Omit<MapMarkerProps, 'stopPropagation'>;
 export type NativeProps = Modify<OmittedProps, {

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",