react-native-maps 1.28.2 → 1.29.1

package/ios/generated/RNMapsSpecs/RCTComponentViewHelpers.h

@@ -229,6 +229,145 @@ if ([commandName isEqualToString:@"setIndoorActiveLevelIndex"]) {
 #endif
 }
 
+@protocol RCTRNMapsGoogleMarkerViewProtocol <NSObject>
+- (void)animateToCoordinates:(double)latitude longitude:(double)longitude duration:(NSInteger)duration;
+- (void)setCoordinates:(double)latitude longitude:(double)longitude;
+- (void)showCallout;
+- (void)hideCallout;
+- (void)redrawCallout;
+- (void)redraw;
+@end
+
+RCT_EXTERN inline void RCTRNMapsGoogleMarkerHandleCommand(
+  id<RCTRNMapsGoogleMarkerViewProtocol> componentView,
+  NSString const *commandName,
+  NSArray const *args)
+{
+  if ([commandName isEqualToString:@"animateToCoordinates"]) {
+#if RCT_DEBUG
+  if ([args count] != 3) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"RNMapsGoogleMarker", commandName, (int)[args count], 3);
+    return;
+  }
+#endif
+
+  NSObject *arg0 = args[0];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"double", @"RNMapsGoogleMarker", commandName, @"1st")) {
+    return;
+  }
+#endif
+  double latitude = [(NSNumber *)arg0 doubleValue];
+
+NSObject *arg1 = args[1];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg1, [NSNumber class], @"double", @"RNMapsGoogleMarker", commandName, @"2nd")) {
+    return;
+  }
+#endif
+  double longitude = [(NSNumber *)arg1 doubleValue];
+
+NSObject *arg2 = args[2];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg2, [NSNumber class], @"number", @"RNMapsGoogleMarker", commandName, @"3rd")) {
+    return;
+  }
+#endif
+  NSInteger duration = [(NSNumber *)arg2 intValue];
+
+  [componentView animateToCoordinates:latitude longitude:longitude duration:duration];
+  return;
+}
+
+if ([commandName isEqualToString:@"setCoordinates"]) {
+#if RCT_DEBUG
+  if ([args count] != 2) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"RNMapsGoogleMarker", commandName, (int)[args count], 2);
+    return;
+  }
+#endif
+
+  NSObject *arg0 = args[0];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"double", @"RNMapsGoogleMarker", commandName, @"1st")) {
+    return;
+  }
+#endif
+  double latitude = [(NSNumber *)arg0 doubleValue];
+
+NSObject *arg1 = args[1];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg1, [NSNumber class], @"double", @"RNMapsGoogleMarker", commandName, @"2nd")) {
+    return;
+  }
+#endif
+  double longitude = [(NSNumber *)arg1 doubleValue];
+
+  [componentView setCoordinates:latitude longitude:longitude];
+  return;
+}
+
+if ([commandName isEqualToString:@"showCallout"]) {
+#if RCT_DEBUG
+  if ([args count] != 0) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"RNMapsGoogleMarker", commandName, (int)[args count], 0);
+    return;
+  }
+#endif
+
+  
+
+  [componentView showCallout];
+  return;
+}
+
+if ([commandName isEqualToString:@"hideCallout"]) {
+#if RCT_DEBUG
+  if ([args count] != 0) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"RNMapsGoogleMarker", commandName, (int)[args count], 0);
+    return;
+  }
+#endif
+
+  
+
+  [componentView hideCallout];
+  return;
+}
+
+if ([commandName isEqualToString:@"redrawCallout"]) {
+#if RCT_DEBUG
+  if ([args count] != 0) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"RNMapsGoogleMarker", commandName, (int)[args count], 0);
+    return;
+  }
+#endif
+
+  
+
+  [componentView redrawCallout];
+  return;
+}
+
+if ([commandName isEqualToString:@"redraw"]) {
+#if RCT_DEBUG
+  if ([args count] != 0) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"RNMapsGoogleMarker", commandName, (int)[args count], 0);
+    return;
+  }
+#endif
+
+  
+
+  [componentView redraw];
+  return;
+}
+
+#if RCT_DEBUG
+  RCTLogError(@"%@ received command %@, which is not a supported command.", @"RNMapsGoogleMarker", commandName);
+#endif
+}
+
 @protocol RCTRNMapsGooglePolygonViewProtocol <NSObject>
 
 @end
@@ -588,4 +727,8 @@ if ([commandName isEqualToString:@"redraw"]) {
 #endif
 }
 
+@protocol RCTRNMapsPolygonViewProtocol <NSObject>
+
+@end
+
 NS_ASSUME_NONNULL_END

package/ios/generated/RNMapsSpecs/ShadowNodes.cpp

@@ -15,10 +15,12 @@ namespace facebook::react {
 extern const char RNMapsCalloutComponentName[] = "RNMapsCallout";
 extern const char RNMapsCircleComponentName[] = "RNMapsCircle";
 extern const char RNMapsGoogleMapViewComponentName[] = "RNMapsGoogleMapView";
+extern const char RNMapsGoogleMarkerComponentName[] = "RNMapsGoogleMarker";
 extern const char RNMapsGooglePolygonComponentName[] = "RNMapsGooglePolygon";
 extern const char RNMapsMapViewComponentName[] = "RNMapsMapView";
 extern const char RNMapsMarkerComponentName[] = "RNMapsMarker";
 extern const char RNMapsOverlayComponentName[] = "RNMapsOverlay";
+extern const char RNMapsPolygonComponentName[] = "RNMapsPolygon";
 extern const char RNMapsPolylineComponentName[] = "RNMapsPolyline";
 extern const char RNMapsUrlTileComponentName[] = "RNMapsUrlTile";
 extern const char RNMapsWMSTileComponentName[] = "RNMapsWMSTile";

package/ios/generated/RNMapsSpecs/ShadowNodes.h

@@ -51,6 +51,17 @@ using RNMapsGoogleMapViewShadowNode = ConcreteViewShadowNode<
     RNMapsGoogleMapViewEventEmitter,
     RNMapsGoogleMapViewState>;
 
+JSI_EXPORT extern const char RNMapsGoogleMarkerComponentName[];
+
+/*
+ * `ShadowNode` for <RNMapsGoogleMarker> component.
+ */
+using RNMapsGoogleMarkerShadowNode = ConcreteViewShadowNode<
+    RNMapsGoogleMarkerComponentName,
+    RNMapsGoogleMarkerProps,
+    RNMapsGoogleMarkerEventEmitter,
+    RNMapsGoogleMarkerState>;
+
 JSI_EXPORT extern const char RNMapsGooglePolygonComponentName[];
 
 /*
@@ -95,6 +106,17 @@ using RNMapsOverlayShadowNode = ConcreteViewShadowNode<
     RNMapsOverlayEventEmitter,
     RNMapsOverlayState>;
 
+JSI_EXPORT extern const char RNMapsPolygonComponentName[];
+
+/*
+ * `ShadowNode` for <RNMapsPolygon> component.
+ */
+using RNMapsPolygonShadowNode = ConcreteViewShadowNode<
+    RNMapsPolygonComponentName,
+    RNMapsPolygonProps,
+    RNMapsPolygonEventEmitter,
+    RNMapsPolygonState>;
+
 JSI_EXPORT extern const char RNMapsPolylineComponentName[];
 
 /*

package/ios/generated/RNMapsSpecs/States.h

@@ -21,6 +21,8 @@ using RNMapsCircleState = StateData;
 
 using RNMapsGoogleMapViewState = StateData;
 
+using RNMapsGoogleMarkerState = StateData;
+
 using RNMapsGooglePolygonState = StateData;
 
 using RNMapsMapViewState = StateData;
@@ -29,6 +31,8 @@ using RNMapsMarkerState = StateData;
 
 using RNMapsOverlayState = StateData;
 
+using RNMapsPolygonState = StateData;
+
 using RNMapsPolylineState = StateData;
 
 using RNMapsUrlTileState = StateData;

package/package.json

@@ -7,7 +7,7 @@
   "types": "dist/src/index.d.ts",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.28.2",
+  "version": "1.29.1",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",
@@ -117,8 +117,10 @@
       "componentProvider": {
         "RNMapsGoogleMapView": "RNMapsGoogleMapView",
         "RNMapsGooglePolygon": "RNMapsGooglePolygonView",
+        "RNMapsGoogleMarker": "RNMapsGoogleMarkerView",
         "RNMapsMapView": "RNMapsMapView",
-        "RNMapsMarker": "RNMapsMarkerView"
+        "RNMapsMarker": "RNMapsMarkerView",
+        "RNMapsPolygon": "RNMapsPolygonView"
       }
     }
   },

package/src/MapMarker.tsx

@@ -12,6 +12,7 @@ import decorateMapComponent, {
   ProviderContext,
   SUPPORTED,
   USES_DEFAULT_IMPLEMENTATION,
+  googleMapIsInstalled,
   type MapManagerCommand,
   type NativeComponent,
   type UIManagerCommand,
@@ -481,9 +482,9 @@ export class MapMarker extends React.Component<MapMarkerProps> {
     const {stopPropagation = false} = this.props;
     if (this.fabricMarker === undefined) {
       const provider = this.context;
-      this.fabricMarker = !(
-        Platform.OS === 'ios' && provider === PROVIDER_GOOGLE
-      );
+      this.fabricMarker =
+        !(Platform.OS === 'ios' && provider === PROVIDER_GOOGLE) ||
+        googleMapIsInstalled;
     }
 
     let icon: any = this.props.icon;

package/src/decorateMapComponent.ts

@@ -21,7 +21,9 @@ import {MapUrlTile} from './MapUrlTile';
 import {MapWMSTile} from './MapWMSTile';
 import {Commands} from './MapViewNativeComponent';
 import GooglePolygon from './specs/NativeComponentGooglePolygon';
+import ApplePolygon from './specs/NativeComponentPolygon';
 import FabricMarker from './specs/NativeComponentMarker';
+import FabricGoogleMarker from './specs/NativeComponentGoogleMarker';
 import FabricUrlTile from './specs/NativeComponentUrlTile';
 import FabricWMSTile from './specs/NativeComponentWMSTile';
 import FabricCallout from './specs/NativeComponentCallout';
@@ -79,22 +81,34 @@ export default function decorateMapComponent<Type extends Component>(
   Component.prototype.getNativeComponent =
     function getNativeComponent(): NativeComponent {
       const provider = this.context;
-      if (
-        componentName === 'Marker' &&
-        (Platform.OS !== 'ios' || provider !== PROVIDER_GOOGLE)
-      ) {
-        // @ts-ignore
-        return FabricMarker;
+      if (componentName === 'Marker') {
+        if (Platform.OS === 'ios' && provider === PROVIDER_GOOGLE) {
+          if (googleMapIsInstalled) {
+            // @ts-ignore
+            return FabricGoogleMarker;
+          }
+        } else {
+          // @ts-ignore
+          return FabricMarker;
+        }
       }
-      if (
-        componentName === 'Polygon' &&
-        ((provider === PROVIDER_GOOGLE &&
-          Platform.OS === 'ios' &&
-          googleMapIsInstalled) ||
-          Platform.OS === 'android')
-      ) {
-        // @ts-ignore
-        return GooglePolygon;
+      if (componentName === 'Polygon') {
+        if (Platform.OS === 'android') {
+          // @ts-ignore
+          return GooglePolygon;
+        }
+        if (Platform.OS === 'ios') {
+          if (provider === PROVIDER_GOOGLE) {
+            if (googleMapIsInstalled) {
+              // @ts-ignore
+              return GooglePolygon;
+            }
+            // Google Maps not installed: fall through to provider resolution below.
+          } else {
+            // @ts-ignore
+            return ApplePolygon;
+          }
+        }
       }
       if (Platform.OS === 'android') {
         if (componentName === 'Callout') {

package/src/specs/NativeComponentGoogleMarker.ts

@@ -0,0 +1,327 @@
+// @ts-nocheck
+import type {HostComponent} from 'react-native';
+import type {
+  ViewProps,
+  ColorValue,
+  ImageSourcePropType as ImageSource,
+} from 'react-native';
+
+import {codegenNativeComponent, codegenNativeCommands} from 'react-native';
+import type {
+  Int32,
+  Double,
+  Float,
+  BubblingEventHandler,
+  DirectEventHandler,
+  WithDefault,
+} from 'react-native/Libraries/Types/CodegenTypes';
+
+export type LatLng = Readonly<{
+  latitude: Double; // Non-nullable Double for latitude
+  longitude: Double; // Non-nullable Double for longitude
+}>;
+
+export type MarkerPressEventHandler = BubblingEventHandler<
+  Readonly<{
+    action: string;
+    id?: string;
+    coordinate?: {
+      latitude: Double; // Inlined LatLng
+      longitude: Double;
+    };
+    position?: {
+      x: Double;
+      y: Double;
+    };
+  }>
+>;
+
+export type MarkerDragEventHandler = DirectEventHandler<
+  Readonly<{
+    id?: string;
+    coordinate?: {
+      latitude: Double; // Inlined LatLng
+      longitude: Double;
+    };
+    position?: {
+      x: Double;
+      y: Double;
+    };
+  }>
+>;
+
+export type MarkerSelectEventHandler = DirectEventHandler<
+  Readonly<{
+    action?: string;
+    id?: string;
+    coordinate?: {
+      latitude: Double; // Inlined LatLng
+      longitude: Double;
+    };
+    position?: {
+      x: Double;
+      y: Double;
+    };
+  }>
+>;
+
+export type CalloutPressEventHandler = BubblingEventHandler<
+  Readonly<{
+    action: string;
+    id?: string;
+    frame?: {
+      x: Double; // Inlined LatLng
+      y: Double;
+      width: Double; // Inlined LatLng
+      height: Double;
+    };
+    point?: {
+      x: Double;
+      y: Double;
+    };
+  }>
+>;
+
+export type Point = Readonly<{
+  x: Double; // Non-nullable Double for x
+  y: Double; // Non-nullable Double for y
+}>;
+
+export interface GoogleMarkerFabricNativeProps extends ViewProps {
+  /**
+   * Sets the anchor point for the marker.
+   * The anchor specifies the point in the icon image that is anchored to the
+   * marker's position on the Earth's surface.
+   *
+   * @default {x: 0.5, y: 1.0}
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  anchor?: Point;
+
+  /**
+   * Specifies the point in the marker image at which to anchor the callout when
+   * it is displayed.
+   *
+   * @default {x: 0.5, y: 0.0}
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  calloutAnchor?: Point;
+
+  /**
+   * A custom image to be used as the marker's icon. Only local image resources
+   * are allowed to be used.
+   *
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+  image?: ImageSource | null;
+
+  /**
+   * A custom image to be used as the marker's icon (Google Maps icon source).
+   *
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  icon?: ImageSource | null;
+
+  /**
+   * The coordinate for the marker.
+   *
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+  coordinate: LatLng;
+
+  /**
+   * The description of the marker, shown in the default callout.
+   *
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+  description?: string;
+
+  /**
+   * if `true` allows the marker to be draggable (re-positioned).
+   *
+   * @default false
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+  draggable?: boolean;
+
+  /**
+   * The title of the marker, shown in the default callout.
+   *
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+  title?: string;
+
+  /**
+   * Sets whether this marker should track view changes.
+   * Turn it off whenever possible to improve custom marker performance.
+   *
+   * @default true
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  tracksViewChanges?: WithDefault<boolean, true>;
+
+  /**
+   * Sets whether this marker's info window should track view changes.
+   *
+   * @default false
+   * @platform iOS: Google Maps only
+   * @platform Android: Not supported
+   */
+  tracksInfoWindowChanges?: WithDefault<boolean, false>;
+
+  /**
+   * Sets whether this marker should be flat against the map (true) or a
+   * billboard facing the camera (false).
+   *
+   * @default false
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  flat?: WithDefault<boolean, false>;
+
+  /**
+   * The rotation of the marker in degrees clockwise from the default position.
+   *
+   * @default 0
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  rotation?: WithDefault<Float, 0>;
+
+  /**
+   * A string that can be used to identify this marker.
+   *
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+  identifier?: string;
+
+  /**
+   * Whether the marker is tappable.
+   *
+   * @default true
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  tappable?: WithDefault<boolean, true>;
+
+  /**
+   * Callback that is called when the user taps the callout view.
+   *
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  onCalloutPress?: CalloutPressEventHandler;
+
+  /**
+   * Callback called continuously as the marker is dragged.
+   *
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  onDrag?: MarkerDragEventHandler;
+
+  /**
+   * Callback that is called when a drag on the marker finishes.
+   *
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  onDragEnd?: MarkerDragEventHandler;
+
+  /**
+   * Callback that is called when the user initiates a drag on the marker.
+   *
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  onDragStart?: MarkerDragEventHandler;
+
+  /**
+   * Callback that is called when the marker is tapped by the user.
+   *
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+  onPress?: MarkerPressEventHandler;
+
+  /**
+   * Callback that is called when the marker becomes selected.
+   *
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  onSelect?: MarkerSelectEventHandler;
+
+  /**
+   * Callback that is called when the marker is deselected.
+   *
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  onDeselect?: MarkerSelectEventHandler;
+
+  /**
+   * The marker's opacity between 0.0 and 1.0.
+   *
+   * @default 1.0
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+  opacity?: WithDefault<Double, 1.0>;
+
+  /**
+   * If no custom marker view or custom image is provided, the platform default
+   * pin will be used, which can be customized by this color.
+   *
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+  pinColor?: ColorValue;
+}
+
+export interface NativeCommands {
+  animateToCoordinates: (
+    viewRef: React.ElementRef<React.ComponentType>,
+    latitude: Double,
+    longitude: Double,
+    duration: Int32,
+  ) => void;
+  setCoordinates: (
+    viewRef: React.ElementRef<React.ComponentType>,
+    latitude: Double,
+    longitude: Double,
+  ) => void;
+  showCallout: (viewRef: React.ElementRef<React.ComponentType>) => void;
+  hideCallout: (viewRef: React.ElementRef<React.ComponentType>) => void;
+  redrawCallout: (viewRef: React.ElementRef<React.ComponentType>) => void;
+  redraw: (viewRef: React.ElementRef<React.ComponentType>) => void;
+}
+
+export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
+  supportedCommands: [
+    'setCoordinates',
+    'animateToCoordinates',
+    'showCallout',
+    'hideCallout',
+    'redrawCallout',
+    'redraw',
+  ],
+});
+
+export default codegenNativeComponent<GoogleMarkerFabricNativeProps>(
+  'RNMapsGoogleMarker',
+  {
+    // iOS-only: on Android, markers use the shared `RNMapsMarker` component.
+    excludedPlatforms: ['android'],
+  },
+) as HostComponent<GoogleMarkerFabricNativeProps>;