react-native-maps 1.21.0-alpha.4 → 1.21.0-alpha.41

package/lib/MapView.d.ts

@@ -11,7 +11,7 @@ export type MapViewProps = ViewProps & {
      * If `true` map will be cached and displayed as an image instead of being interactable, for performance usage.
      *
      * @default false
-     * @platform iOS: Apple maps only
+     * @platform iOS: Apple Maps only
      * @platform Android: Supported
      */
     cacheEnabled?: boolean;
@@ -92,7 +92,7 @@ export type MapViewProps = ViewProps & {
      */
     kmlSrc?: string;
     /**
-     * If set, changes the position of the "Legal" label link in Apple maps.
+     * If set, changes the position of the "Legal" label link in Apple Maps.
      *
      * @platform iOS: Apple Maps only
      * @platform Android: Not supported
@@ -426,7 +426,7 @@ export type MapViewProps = ViewProps & {
      * If `false` compass won't be displayed on the map.
      *
      * @default true
-     * @platform iOS: Supported
+     * @platform iOS: Supported (adaptive on Apple Maps, visible only if map is not pointing north)
      * @platform Android: Supported
      */
     showsCompass?: boolean;
@@ -454,32 +454,14 @@ export type MapViewProps = ViewProps & {
      * @platform Android: Supported
      */
     showsMyLocationButton?: boolean;
-    /**
-     * If `false` points of interest won't be displayed on the map.
-     * TODO: DEPRECATED? Doesn't seem to do anything
-     *
-     * @default true
-     * @platform iOS: Maybe Apple Maps?
-     * @platform Android: Not supported
-     */
-    showsPointsOfInterest?: boolean;
     /**
      * A Boolean indicating whether the map shows scale information.
      *
-     * @default true
+     * @default false
      * @platform iOS: Apple Maps only
      * @platform Android: Not supported
      */
     showsScale?: boolean;
-    /**
-     * A Boolean value indicating whether the map displays traffic information.
-     * TODO: Look into android support
-     *
-     * @default false
-     * @platform iOS: Supported
-     * @platform Android: Not supported?
-     */
-    showsTraffic?: boolean;
     /**
      * If `true` the users location will be displayed on the map.
      *
@@ -626,6 +608,7 @@ declare class MapView extends React.Component<MapViewProps, State> {
         duration?: number;
     }): void;
     animateToRegion(region: Region, duration?: number): void;
+    setRegion(region: Region): void;
     fitToElements(options?: FitToOptions): void;
     fitToSuppliedMarkers(markers: string[], options?: FitToOptions): void;
     fitToCoordinates(coordinates?: LatLng[], options?: FitToOptions): void;

package/lib/MapView.js

@@ -30,9 +30,12 @@ exports.AnimatedMapView = exports.MAP_TYPES = void 0;
 const React = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const decorateMapComponent_1 = require("./decorateMapComponent");
-const ProviderConstants = __importStar(require("./ProviderConstants"));
 const MapViewNativeComponent_1 = require("./MapViewNativeComponent");
-const FabricMapView_1 = __importDefault(require("./FabricMapView"));
+const NativeComponentMapView_1 = __importStar(require("./specs/NativeComponentMapView"));
+const NativeComponentGoogleMapView_1 = __importStar(require("./specs/NativeComponentGoogleMapView"));
+const createFabricMap_1 = __importDefault(require("./createFabricMap"));
+const FabricMap = (0, createFabricMap_1.default)(NativeComponentMapView_1.default, NativeComponentMapView_1.Commands);
+const FabricGoogleMap = (0, createFabricMap_1.default)(NativeComponentGoogleMapView_1.default, NativeComponentGoogleMapView_1.Commands);
 exports.MAP_TYPES = {
     STANDARD: 'standard',
     SATELLITE: 'satellite',
@@ -43,7 +46,6 @@ exports.MAP_TYPES = {
     SATELLITE_FLYOVER: 'satelliteFlyover',
     HYBRID_FLYOVER: 'hybridFlyover',
 };
-const GOOGLE_MAPS_ONLY_TYPES = [exports.MAP_TYPES.TERRAIN, exports.MAP_TYPES.NONE];
 class MapView extends React.Component {
     static Animated;
     map;
@@ -53,7 +55,7 @@ class MapView extends React.Component {
         this.map = React.createRef();
         this.fabricMap = React.createRef();
         this.state = {
-            isReady: react_native_1.Platform.OS === 'ios',
+            isReady: false,
         };
         this._onMapReady = this._onMapReady.bind(this);
         this._onChange = this._onChange.bind(this);
@@ -117,6 +119,12 @@ class MapView extends React.Component {
             MapViewNativeComponent_1.Commands.animateToRegion(this.map.current, region, duration);
         }
     }
+    setRegion(region) {
+        if (this.fabricMap.current) {
+            this.fabricMap.current.animateToRegion(region, 0);
+        }
+        //TODO fix for android
+    }
     fitToElements(options = {}) {
         const { edgePadding = { top: 0, right: 0, bottom: 0, left: 0 }, animated = true, } = options;
         if (this.fabricMap.current) {
@@ -343,12 +351,10 @@ class MapView extends React.Component {
         }
     };
     render() {
-        if (react_native_1.Platform.OS === 'ios' &&
-            this.props.provider === ProviderConstants.PROVIDER_DEFAULT) {
-            const AIRMap = FabricMapView_1.default;
+        if (react_native_1.Platform.OS === 'ios') {
             // Define props specifically for MapFabricNativeProps
             /* eslint-disable @typescript-eslint/no-unused-vars */
-            const { onCalloutPress, onIndoorBuildingFocused, onKmlReady, onLongPress, onMarkerDeselect, onMarkerPress, onMarkerSelect, onRegionChangeStart, onRegionChange, onRegionChangeComplete, onPress, region, ...restProps } = this.props;
+            const { onCalloutPress, onIndoorBuildingFocused, onKmlReady, onLongPress, onMarkerDeselect, onMarkerPress, onMarkerSelect, onRegionChangeStart, onRegionChange, onRegionChangeComplete, onPress, minZoomLevel, maxZoomLevel, region, provider, children, ...restProps } = this.props;
             /* eslint-enable @typescript-eslint/no-unused-vars */
             const userInterfaceStyle = this.props.userInterfaceStyle || 'system';
             const props = {
@@ -361,6 +367,8 @@ class MapView extends React.Component {
                 onMarkerSelect: this.handleMarkerSelect,
                 onMarkerDeselect: this.handleMarkerDeselect,
                 userInterfaceStyle: userInterfaceStyle,
+                minZoom: minZoomLevel,
+                maxZoom: maxZoomLevel,
                 onRegionChange: this.handleRegionChange,
                 ...restProps,
             };
@@ -373,9 +381,8 @@ class MapView extends React.Component {
                 };
             }
             if (this.state.isReady) {
-                if (props.mapType && GOOGLE_MAPS_ONLY_TYPES.includes(props.mapType)) {
-                    props.mapType = exports.MAP_TYPES.STANDARD;
-                    console.log('ready');
+                if (props.onPanDrag) {
+                    props.handlePanDrag = !!props.onPanDrag;
                 }
             }
             else {
@@ -383,10 +390,21 @@ class MapView extends React.Component {
                 props.initialCamera = this.props.initialCamera;
                 props.onLayout = this.props.onLayout;
             }
-            // Render AIRMap with MapFabricNativeProps
-            return (<decorateMapComponent_1.ProviderContext.Provider value={this.props.provider}>
-          <AIRMap {...props} ref={this.fabricMap}/>
-        </decorateMapComponent_1.ProviderContext.Provider>);
+            const childrenNodes = this.state.isReady ? children : null;
+            if (provider === 'google') {
+                return (<decorateMapComponent_1.ProviderContext.Provider value={this.props.provider}>
+            <FabricGoogleMap {...props} ref={this.fabricMap}>
+              {childrenNodes}
+            </FabricGoogleMap>
+          </decorateMapComponent_1.ProviderContext.Provider>);
+            }
+            else {
+                return (<decorateMapComponent_1.ProviderContext.Provider value={this.props.provider}>
+            <FabricMap {...props} ref={this.fabricMap}>
+              {childrenNodes}
+            </FabricMap>
+          </decorateMapComponent_1.ProviderContext.Provider>);
+            }
         }
         else {
             const AIRMap = getNativeMapComponent(this.props.provider);
@@ -405,12 +423,7 @@ class MapView extends React.Component {
                     : undefined,
                 ...this.props,
             };
-            if (this.state.isReady) {
-                if (props.onPanDrag) {
-                    props.handlePanDrag = !!props.onPanDrag;
-                }
-            }
-            else {
+            if (!this.state.isReady) {
                 props.style = this.props.style;
                 props.initialCamera = this.props.initialCamera;
                 props.onLayout = this.props.onLayout;

package/lib/{FabricMapView.d.ts → createFabricMap.d.ts}

@@ -1,8 +1,9 @@
 import React from 'react';
-import type { MapBoundaries } from './specs/NativeAirMapsModule';
-import type { MapFabricNativeProps, Camera, Point } from './specs/NativeComponentMapView';
-import { LatLng, Region } from './sharedTypes';
-import { Address, EdgePadding, SnapshotOptions } from './MapView.types';
+import type { LatLng, Point, Region } from './sharedTypes';
+import type { Address, Camera, EdgePadding, SnapshotOptions } from './MapView.types';
+import { MapBoundaries } from './specs/NativeAirMapsModule';
+import { MapFabricNativeProps } from './specs/NativeComponentMapView';
+export type FabricMapViewProps = MapFabricNativeProps;
 export interface FabricMapHandle {
     getCamera: () => Promise<Camera>;
     setCamera: (camera: Partial<Camera>) => void;
@@ -18,5 +19,5 @@ export interface FabricMapHandle {
     getPointForCoordinate: (coordinate: LatLng) => Promise<Point>;
     getCoordinateForPoint: (point: Point) => Promise<LatLng>;
 }
-export declare const FabricMap: React.ForwardRefExoticComponent<MapFabricNativeProps & React.RefAttributes<FabricMapHandle>>;
-export default FabricMap;
+declare const createFabricMap: (ViewComponent: React.ComponentType, Commands: any) => React.ForwardRefExoticComponent<MapFabricNativeProps & React.RefAttributes<FabricMapHandle>>;
+export default createFabricMap;

package/lib/createFabricMap.js

@@ -0,0 +1,175 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_1 = __importStar(require("react"));
+const react_native_1 = require("react-native");
+const NativeAirMapsModule_1 = __importDefault(require("./specs/NativeAirMapsModule"));
+const createFabricMap = (ViewComponent, Commands) => {
+    return (0, react_1.forwardRef)((props, ref) => {
+        const fabricRef = (0, react_1.useRef)(null);
+        (0, react_1.useImperativeHandle)(ref, () => ({
+            async getMarkersFrames(onlyVisible) {
+                if (fabricRef.current) {
+                    return NativeAirMapsModule_1.default.getMarkersFrames((0, react_native_1.findNodeHandle)(fabricRef.current) ?? -1, onlyVisible);
+                }
+                else {
+                    throw new Error('getMarkersFrames is only supported on iOS with Fabric.');
+                }
+            },
+            async getCoordinateForPoint(point) {
+                if (fabricRef.current) {
+                    return NativeAirMapsModule_1.default.getCoordinateForPoint((0, react_native_1.findNodeHandle)(fabricRef.current) ?? -1, point);
+                }
+                else {
+                    throw new Error('getCoordinateForPoint is only supported on iOS with Fabric.');
+                }
+            },
+            async getPointForCoordinate(coordinate) {
+                if (fabricRef.current) {
+                    return NativeAirMapsModule_1.default.getPointForCoordinate((0, react_native_1.findNodeHandle)(fabricRef.current) ?? -1, coordinate);
+                }
+                else {
+                    throw new Error('getPointForCoordinate is only supported on iOS with Fabric.');
+                }
+            },
+            async getAddressFromCoordinates(coordinate) {
+                if (fabricRef.current) {
+                    return NativeAirMapsModule_1.default.getAddressFromCoordinates((0, react_native_1.findNodeHandle)(fabricRef.current) ?? -1, coordinate);
+                }
+                else {
+                    throw new Error('getAddressFromCoordinates is only supported on iOS with Fabric.');
+                }
+            },
+            async takeSnapshot(config) {
+                if (fabricRef.current) {
+                    return NativeAirMapsModule_1.default.takeSnapshot((0, react_native_1.findNodeHandle)(fabricRef.current) ?? -1, JSON.stringify(config));
+                }
+                else {
+                    throw new Error('takeSnapshot is only supported on iOS with Fabric.');
+                }
+            },
+            async getCamera() {
+                if (fabricRef.current) {
+                    return NativeAirMapsModule_1.default.getCamera((0, react_native_1.findNodeHandle)(fabricRef.current) ?? -1);
+                }
+                else {
+                    throw new Error('getCamera is only supported on iOS with Fabric.');
+                }
+            },
+            async getMapBoundaries() {
+                if (fabricRef.current) {
+                    return NativeAirMapsModule_1.default.getMapBoundaries((0, react_native_1.findNodeHandle)(fabricRef.current) ?? -1);
+                }
+                else {
+                    throw new Error('getMapBoundaries is only supported on iOS with Fabric.');
+                }
+            },
+            animateToRegion(region, duration) {
+                if (fabricRef.current) {
+                    try {
+                        Commands.animateToRegion(fabricRef.current, JSON.stringify(region), duration);
+                    }
+                    catch (error) {
+                        throw new Error('Failed to animateToRegion');
+                    }
+                }
+                else {
+                    throw new Error('animateToRegion is only supported on iOS with Fabric.');
+                }
+            },
+            fitToElements(edgePadding, animated) {
+                if (fabricRef.current) {
+                    try {
+                        Commands.fitToElements(fabricRef.current, JSON.stringify(edgePadding), animated);
+                    }
+                    catch (error) {
+                        throw new Error('Failed to fitToElements');
+                    }
+                }
+                else {
+                    throw new Error('fitToElements is only supported on iOS with Fabric.');
+                }
+            },
+            fitToSuppliedMarkers(markers, edgePadding, animated) {
+                if (fabricRef.current) {
+                    try {
+                        Commands.fitToSuppliedMarkers(fabricRef.current, JSON.stringify(markers), JSON.stringify(edgePadding), animated);
+                    }
+                    catch (error) {
+                        throw new Error('Failed to fitToSuppliedMarkers');
+                    }
+                }
+                else {
+                    throw new Error('fitToSuppliedMarkers is only supported on iOS with Fabric.');
+                }
+            },
+            animateCamera(camera, duration) {
+                if (fabricRef.current) {
+                    try {
+                        Commands.animateCamera(fabricRef.current, JSON.stringify(camera), duration);
+                    }
+                    catch (error) {
+                        throw new Error('Failed to animateCamera');
+                    }
+                }
+                else {
+                    throw new Error('animateCamera is only supported on iOS with Fabric.');
+                }
+            },
+            fitToCoordinates(coordinates, edgePadding, animated) {
+                if (fabricRef.current) {
+                    try {
+                        Commands.fitToCoordinates(fabricRef.current, JSON.stringify(coordinates), JSON.stringify(edgePadding), animated);
+                    }
+                    catch (error) {
+                        throw new Error('Failed to fitToCoordinates');
+                    }
+                }
+                else {
+                    throw new Error('fitToCoordinates is only supported on iOS with Fabric.');
+                }
+            },
+            setCamera(camera) {
+                if (fabricRef.current) {
+                    try {
+                        Commands.setCamera(fabricRef.current, JSON.stringify(camera));
+                    }
+                    catch (error) {
+                        console.error('Failed to set camera:', error);
+                    }
+                }
+                else {
+                    console.warn('setCamera is only supported on iOS with Fabric.');
+                }
+            },
+        }));
+        // @ts-ignore
+        return <ViewComponent {...props} ref={fabricRef}/>;
+    });
+};
+exports.default = createFabricMap;

package/lib/decorateMapComponent.js

@@ -1,9 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.googleMapIsInstalled = exports.createNotSupportedComponent = exports.getNativeMapName = exports.ProviderContext = exports.NOT_SUPPORTED = exports.USES_DEFAULT_IMPLEMENTATION = exports.SUPPORTED = void 0;
 const react_1 = require("react");
 const react_native_1 = require("react-native");
 const ProviderConstants_1 = require("./ProviderConstants");
+const NativeComponentGooglePolygon_1 = __importDefault(require("./specs/NativeComponentGooglePolygon"));
+const NativeComponentMarker_1 = __importDefault(require("./specs/NativeComponentMarker"));
 exports.SUPPORTED = 'SUPPORTED';
 exports.USES_DEFAULT_IMPLEMENTATION = 'USES_DEFAULT_IMPLEMENTATION';
 exports.NOT_SUPPORTED = 'NOT_SUPPORTED';
@@ -34,6 +39,12 @@ function decorateMapComponent(Component, componentName, providers) {
     Component.prototype.getNativeComponent =
         function getNativeComponent() {
             const provider = this.context;
+            if (componentName === 'Marker' &&
+                provider !== ProviderConstants_1.PROVIDER_GOOGLE &&
+                react_native_1.Platform.OS === 'ios') {
+                // @ts-ignore
+                return NativeComponentMarker_1.default;
+            }
             const key = provider || 'default';
             if (components[key]) {
                 return components[key];
@@ -47,6 +58,13 @@ function decorateMapComponent(Component, componentName, providers) {
             if (react_native_1.Platform.OS !== 'android' && react_native_1.Platform.OS !== 'ios') {
                 throw new Error(`react-native-maps doesn't support ${react_native_1.Platform.OS}`);
             }
+            if (componentName === 'Polygon' &&
+                provider === ProviderConstants_1.PROVIDER_GOOGLE &&
+                react_native_1.Platform.OS === 'ios' &&
+                exports.googleMapIsInstalled) {
+                // @ts-ignore
+                return NativeComponentGooglePolygon_1.default;
+            }
             const platformSupport = providerInfo[react_native_1.Platform.OS];
             const nativeComponentName = getNativeComponentName(provider, componentName);
             if (platformSupport === exports.NOT_SUPPORTED) {

package/lib/specs/NativeAirMapsModule.d.ts

@@ -1,5 +1,5 @@
 import type { TurboModule } from 'react-native';
-import type { Double, UnsafeObject } from 'react-native/Libraries/Types/CodegenTypes';
+import type { Double } from 'react-native/Libraries/Types/CodegenTypes';
 import type { Camera } from './NativeComponentMapView';
 import { Address } from 'react-native-maps';
 type LatLng = {
@@ -22,7 +22,7 @@ export interface Spec extends TurboModule {
     getCamera(tag: Double): Promise<Camera>;
     getMarkersFrames(tag: Double, onlyVisible: boolean): Promise<unknown>;
     getMapBoundaries(tag: Double): Promise<MapBoundaries>;
-    takeSnapshot(tag: Double, config: UnsafeObject): Promise<string>;
+    takeSnapshot(tag: Double, config: string): Promise<string>;
     getAddressFromCoordinates(tag: Double, coordinate: LatLng): Promise<Address>;
     getPointForCoordinate(tag: Double, coordinate: LatLng): Promise<Point>;
     getCoordinateForPoint(tag: Double, point: Point): Promise<LatLng>;