react-native-maps 1.21.0-alpha.81 → 1.21.0-alpha.83

package/ios/generated/RNMapsSpecs/RCTComponentViewHelpers.h

@@ -13,6 +13,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@protocol RCTRNMapsCircleViewProtocol <NSObject>
+
+@end
+
 @protocol RCTRNMapsGoogleMapViewViewProtocol <NSObject>
 - (void)animateToRegion:(NSString *)regionJSON duration:(NSInteger)duration;
 - (void)setCamera:(NSString *)cameraJSON;
@@ -588,6 +592,10 @@ if ([commandName isEqualToString:@"redraw"]) {
 #endif
 }
 
+@protocol RCTRNMapsOverlayViewProtocol <NSObject>
+
+@end
+
 @protocol RCTRNMapsPolylineViewProtocol <NSObject>
 
 @end

package/ios/generated/RNMapsSpecs/ShadowNodes.cpp

@@ -13,10 +13,12 @@
 namespace facebook::react {
 
 extern const char RNMapsCalloutComponentName[] = "RNMapsCallout";
+extern const char RNMapsCircleComponentName[] = "RNMapsCircle";
 extern const char RNMapsGoogleMapViewComponentName[] = "RNMapsGoogleMapView";
 extern const char RNMapsGooglePolygonComponentName[] = "RNMapsGooglePolygon";
 extern const char RNMapsMapViewComponentName[] = "RNMapsMapView";
 extern const char RNMapsMarkerComponentName[] = "RNMapsMarker";
+extern const char RNMapsOverlayComponentName[] = "RNMapsOverlay";
 extern const char RNMapsPolylineComponentName[] = "RNMapsPolyline";
 
 } // namespace facebook::react

package/ios/generated/RNMapsSpecs/ShadowNodes.h

@@ -29,6 +29,17 @@ using RNMapsCalloutShadowNode = ConcreteViewShadowNode<
     RNMapsCalloutEventEmitter,
     RNMapsCalloutState>;
 
+JSI_EXPORT extern const char RNMapsCircleComponentName[];
+
+/*
+ * `ShadowNode` for <RNMapsCircle> component.
+ */
+using RNMapsCircleShadowNode = ConcreteViewShadowNode<
+    RNMapsCircleComponentName,
+    RNMapsCircleProps,
+    RNMapsCircleEventEmitter,
+    RNMapsCircleState>;
+
 JSI_EXPORT extern const char RNMapsGoogleMapViewComponentName[];
 
 /*
@@ -73,6 +84,17 @@ using RNMapsMarkerShadowNode = ConcreteViewShadowNode<
     RNMapsMarkerEventEmitter,
     RNMapsMarkerState>;
 
+JSI_EXPORT extern const char RNMapsOverlayComponentName[];
+
+/*
+ * `ShadowNode` for <RNMapsOverlay> component.
+ */
+using RNMapsOverlayShadowNode = ConcreteViewShadowNode<
+    RNMapsOverlayComponentName,
+    RNMapsOverlayProps,
+    RNMapsOverlayEventEmitter,
+    RNMapsOverlayState>;
+
 JSI_EXPORT extern const char RNMapsPolylineComponentName[];
 
 /*

package/ios/generated/RNMapsSpecs/States.h

@@ -26,6 +26,18 @@ public:
 #endif
 };
 
+class RNMapsCircleState {
+public:
+  RNMapsCircleState() = default;
+
+#ifdef ANDROID
+  RNMapsCircleState(RNMapsCircleState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+#endif
+};
+
 class RNMapsGoogleMapViewState {
 public:
   RNMapsGoogleMapViewState() = default;
@@ -74,6 +86,18 @@ public:
 #endif
 };
 
+class RNMapsOverlayState {
+public:
+  RNMapsOverlayState() = default;
+
+#ifdef ANDROID
+  RNMapsOverlayState(RNMapsOverlayState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+#endif
+};
+
 class RNMapsPolylineState {
 public:
   RNMapsPolylineState() = default;

package/lib/MapMarker.js

@@ -127,7 +127,12 @@ class MapMarker extends React.Component {
         let image;
         if (this.props.image) {
             if (this.fabricMarker) {
-                image = this.props.image;
+                if (typeof this.props.image === 'string') {
+                    image = { uri: this.props.image };
+                }
+                else {
+                    image = this.props.image;
+                }
             }
             else {
                 const resolvedImage = react_native_1.Image.resolveAssetSource(this.props.image) || {};

package/lib/MapOverlay.d.ts

@@ -60,6 +60,7 @@ export declare class MapOverlay extends React.Component<MapOverlayProps> {
     getMapManagerCommand: (name: string) => MapManagerCommand;
     getUIManagerCommand: (name: string) => UIManagerCommand;
     static Animated: Animated.AnimatedComponent<typeof MapOverlay>;
+    private fabricOverlay?;
     render(): React.JSX.Element;
 }
 type Coordinate = [number, number];

package/lib/MapOverlay.js

@@ -32,13 +32,32 @@ class MapOverlay extends React.Component {
     getMapManagerCommand;
     getUIManagerCommand;
     static Animated;
+    fabricOverlay = undefined;
     render() {
         const { opacity = 1.0 } = this.props;
-        let image;
-        const resolvedImage = react_native_1.Image.resolveAssetSource(this.props.image) || {};
-        image = resolvedImage.uri || this.props.image;
+        if (this.fabricOverlay === undefined) {
+            this.fabricOverlay = react_native_1.Platform.OS === 'android';
+        }
         const AIRMapOverlay = this.getNativeComponent();
-        return (<AIRMapOverlay {...this.props} opacity={opacity} image={image} style={[styles.overlay, this.props.style]}/>);
+        let image;
+        if (this.props.image) {
+            if (this.fabricOverlay) {
+                if (typeof this.props.image === 'string') {
+                    image = { uri: this.props.image };
+                }
+                else {
+                    image = this.props.image;
+                }
+            }
+            else {
+                const resolvedImage = react_native_1.Image.resolveAssetSource(this.props.image) || {};
+                image = resolvedImage.uri || this.props.image;
+            }
+        }
+        console.log('MapOverlay image: ' + image);
+        return (<AIRMapOverlay {...this.props} opacity={opacity} 
+        // @ts-ignore
+        image={image} style={[styles.overlay, this.props.style]}/>);
     }
 }
 exports.MapOverlay = MapOverlay;

package/lib/decorateMapComponent.js

@@ -11,6 +11,8 @@ const NativeComponentGooglePolygon_1 = __importDefault(require("./specs/NativeCo
 const NativeComponentMarker_1 = __importDefault(require("./specs/NativeComponentMarker"));
 const NativeComponentCallout_1 = __importDefault(require("./specs/NativeComponentCallout"));
 const NativeComponentPolyline_1 = __importDefault(require("./specs/NativeComponentPolyline"));
+const NativeComponentCircle_1 = __importDefault(require("./specs/NativeComponentCircle"));
+const NativeComponentOverlay_1 = __importDefault(require("./specs/NativeComponentOverlay"));
 exports.SUPPORTED = 'SUPPORTED';
 exports.USES_DEFAULT_IMPLEMENTATION = 'USES_DEFAULT_IMPLEMENTATION';
 exports.NOT_SUPPORTED = 'NOT_SUPPORTED';
@@ -63,6 +65,14 @@ function decorateMapComponent(Component, componentName, providers) {
                     // @ts-ignore
                     return NativeComponentPolyline_1.default;
                 }
+                else if (componentName === 'Circle') {
+                    // @ts-ignore
+                    return NativeComponentCircle_1.default;
+                }
+                else if (componentName === 'Overlay') {
+                    // @ts-ignore
+                    return NativeComponentOverlay_1.default;
+                }
             }
             const key = provider || 'default';
             if (components[key]) {

package/lib/specs/NativeComponentCircle.d.ts

@@ -0,0 +1,74 @@
+import type { HostComponent, ViewProps, ColorValue } from 'react-native';
+import { Double, Float, BubblingEventHandler } from 'react-native/Libraries/Types/CodegenTypes';
+export type LatLng = Readonly<{
+    latitude: Double;
+    longitude: Double;
+}>;
+export type CirclePressEventHandler = BubblingEventHandler<Readonly<{
+    action?: string;
+    id: string;
+    coordinate: {
+        latitude: Double;
+        longitude: Double;
+    };
+    position?: {
+        x: Double;
+        y: Double;
+    };
+}>>;
+export interface CircleFabricNativeProps extends ViewProps {
+    /**
+     * The coordinates of the center of the circle.
+     *
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    center: LatLng;
+    /**
+     * The stroke color to use for the path.
+     *
+     * @default `#000`, `rgba(r,g,b,0.5)`
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    fillColor?: ColorValue;
+    /**
+     * The radius of the circle to be drawn (in meters)
+     *
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    radius: Double;
+    /**
+     * The stroke color to use for the path.
+     *
+     * @default `#000`, `rgba(r,g,b,0.5)`
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    strokeColor?: ColorValue;
+    /**
+     * Callback that is called when user taps on the map.
+     *
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    onPress?: CirclePressEventHandler;
+    /**
+     * The stroke width to use for the path.
+     *
+     * @default 1
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    strokeWidth?: Float;
+    /**
+     * Boolean to allow a polygon to be tappable and use the onPress function.
+     *
+     * @platform iOS: Google Maps only
+     * @platform Android: Supported
+     */
+    tappable?: boolean;
+}
+declare const _default: HostComponent<CircleFabricNativeProps>;
+export default _default;

package/lib/specs/NativeComponentCircle.js

@@ -0,0 +1,7 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const codegenNativeComponent_1 = __importDefault(require("react-native/Libraries/Utilities/codegenNativeComponent"));
+exports.default = (0, codegenNativeComponent_1.default)('RNMapsCircle', {});

package/lib/specs/NativeComponentOverlay.d.ts

@@ -0,0 +1,67 @@
+import { Double, Float, BubblingEventHandler, WithDefault } from 'react-native/Libraries/Types/CodegenTypes';
+import type { ViewProps, HostComponent, ImageSourcePropType as ImageSource } from 'react-native';
+export type LatLng = Readonly<{
+    latitude: Double;
+    longitude: Double;
+}>;
+export type OverlayPressEventHandler = BubblingEventHandler<Readonly<{
+    action?: string;
+    id: string;
+    coordinate: {
+        latitude: Double;
+        longitude: Double;
+    };
+    position?: {
+        x: Double;
+        y: Double;
+    };
+}>>;
+export interface OverlayFabricNativeProps extends ViewProps {
+    /**
+     * The bearing in degrees clockwise from north. Values outside the range [0, 360) will be normalized.
+     *
+     * @default 0
+     * @platform iOS: Google Maps only
+     * @platform Android: Supported
+     */
+    bearing?: Float;
+    /**
+     * The coordinates for the image (left-top corner, right-bottom corner). ie.```[[lat, long], [lat, long]]```
+     *
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    bounds: ReadonlyArray<LatLng>;
+    /**
+     * A custom image to be used as the overlay.
+     * Only required local image resources and uri (as for images located in the net) are allowed to be used.
+     *
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    image?: ImageSource | null;
+    /**
+     * Callback that is called when user taps on the map.
+     *
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    onPress?: OverlayPressEventHandler;
+    /**
+     * The overlay's opacity between 0.0 and 1.0.
+     *
+     * @default 1.0
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    opacity?: WithDefault<Float, 1.0>;
+    /**
+     * Boolean to allow a polygon to be tappable and use the onPress function.
+     *
+     * @platform iOS: Google Maps only
+     * @platform Android: Supported
+     */
+    tappable?: boolean;
+}
+declare const _default: HostComponent<OverlayFabricNativeProps>;
+export default _default;

package/lib/specs/NativeComponentOverlay.js

@@ -0,0 +1,7 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const codegenNativeComponent_1 = __importDefault(require("react-native/Libraries/Utilities/codegenNativeComponent"));
+exports.default = (0, codegenNativeComponent_1.default)('RNMapsOverlay', {});

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.21.0-alpha.81",
+  "version": "1.21.0-alpha.83",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",