react-native-maps 1.21.0-alpha.50 → 1.21.0-alpha.52

package/lib/MapView.js

@@ -35,7 +35,10 @@ const NativeComponentMapView_1 = __importStar(require("./specs/NativeComponentMa
 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);
+var FabricGoogleMap = null;
+if (react_native_1.Platform.OS === 'ios') {
+    FabricGoogleMap = (0, createFabricMap_1.default)(NativeComponentGoogleMapView_1.default, NativeComponentGoogleMapView_1.Commands);
+}
 exports.MAP_TYPES = {
     STANDARD: 'standard',
     SATELLITE: 'satellite',
@@ -351,86 +354,57 @@ class MapView extends React.Component {
         }
     };
     render() {
-        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, minZoomLevel, maxZoomLevel, region, provider, children, ...restProps } = this.props;
-            /* eslint-enable @typescript-eslint/no-unused-vars */
-            const userInterfaceStyle = this.props.userInterfaceStyle || 'system';
-            const props = {
-                onMapReady: this._onMapReady,
-                liteMode: this.props.liteMode,
-                googleMapId: this.props.googleMapId,
-                googleRenderer: this.props.googleRenderer,
-                onPress: this.handleMapPress,
-                onMarkerPress: this.handleMarkerPress,
-                onMarkerSelect: this.handleMarkerSelect,
-                onMarkerDeselect: this.handleMarkerDeselect,
-                userInterfaceStyle: userInterfaceStyle,
-                minZoom: minZoomLevel,
-                maxZoom: maxZoomLevel,
-                onRegionChange: this.handleRegionChange,
-                ...restProps,
+        // Define props specifically for MapFabricNativeProps
+        /* eslint-disable @typescript-eslint/no-unused-vars */
+        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 = {
+            onMapReady: this._onMapReady,
+            liteMode: this.props.liteMode,
+            googleMapId: this.props.googleMapId,
+            googleRenderer: this.props.googleRenderer,
+            onPress: this.handleMapPress,
+            onMarkerPress: this.handleMarkerPress,
+            onMarkerSelect: this.handleMarkerSelect,
+            onMarkerDeselect: this.handleMarkerDeselect,
+            userInterfaceStyle: userInterfaceStyle,
+            minZoom: minZoomLevel,
+            maxZoom: maxZoomLevel,
+            onRegionChange: this.handleRegionChange,
+            ...restProps,
+        };
+        if (this.props.region) {
+            props.region = {
+                latitude: this.props.region.latitude,
+                longitude: this.props.region.longitude,
+                latitudeDelta: this.props.region.latitudeDelta,
+                longitudeDelta: this.props.region.longitudeDelta,
             };
-            if (this.props.region) {
-                props.region = {
-                    latitude: this.props.region.latitude,
-                    longitude: this.props.region.longitude,
-                    latitudeDelta: this.props.region.latitudeDelta,
-                    longitudeDelta: this.props.region.longitudeDelta,
-                };
-            }
-            if (this.state.isReady) {
-                if (props.onPanDrag) {
-                    props.handlePanDrag = !!props.onPanDrag;
-                }
-            }
-            else {
-                props.style = this.props.style;
-                props.initialCamera = this.props.initialCamera;
-                props.onLayout = this.props.onLayout;
-            }
-            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>);
+        }
+        if (this.state.isReady) {
+            if (props.onPanDrag) {
+                props.handlePanDrag = !!props.onPanDrag;
             }
         }
         else {
-            const AIRMap = getNativeMapComponent(this.props.provider);
-            // Define props specifically for NativeProps
-            const props = {
-                region: null,
-                initialRegion: null,
-                onChange: this._onChange,
-                onMapReady: this._onMapReady,
-                liteMode: this.props.liteMode,
-                googleMapId: this.props.googleMapId,
-                googleRenderer: this.props.googleRenderer,
-                ref: this.map,
-                customMapStyleString: this.props.customMapStyle
-                    ? JSON.stringify(this.props.customMapStyle)
-                    : undefined,
-                ...this.props,
-            };
-            if (!this.state.isReady) {
-                props.style = this.props.style;
-                props.initialCamera = this.props.initialCamera;
-                props.onLayout = this.props.onLayout;
-            }
-            // Render AIRMap with NativeProps
+            props.style = this.props.style;
+            props.initialCamera = this.props.initialCamera;
+            props.onLayout = this.props.onLayout;
+        }
+        const childrenNodes = this.state.isReady ? children : null;
+        if (provider === 'google' && react_native_1.Platform.OS === 'ios') {
+            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}>
-          <AIRMap {...props}/>
+          <FabricMap {...props} ref={this.fabricMap}>
+            {childrenNodes}
+          </FabricMap>
         </decorateMapComponent_1.ProviderContext.Provider>);
         }
     }
@@ -447,7 +421,6 @@ else {
         ? (0, react_native_1.requireNativeComponent)('AIRGoogleMap')
         : (0, decorateMapComponent_1.createNotSupportedComponent)('react-native-maps: AirGoogleMaps dir must be added to your xCode project to support GoogleMaps on iOS.');
 }
-const getNativeMapComponent = (provider) => airMaps[provider || 'default'];
 exports.AnimatedMapView = react_native_1.Animated.createAnimatedComponent(MapView);
 MapView.Animated = exports.AnimatedMapView;
 exports.default = MapView;

package/lib/specs/NativeComponentMapView.js

@@ -16,6 +16,4 @@ exports.Commands = (0, codegenNativeCommands_1.default)({
         'fitToCoordinates',
     ],
 });
-exports.default = (0, codegenNativeComponent_1.default)('RNMapsMapView', {
-    excludedPlatforms: ['android'],
-});
+exports.default = (0, codegenNativeComponent_1.default)('RNMapsMapView', {});

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