react-native-maps 1.0.0-beta.8 → 1.1.0-beta.1

package/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java

@@ -123,7 +123,7 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
 
   @ReactProp(name = "customMapStyleString")
   public void setMapStyle(AirMapView view, @Nullable String customMapStyleString) {
-    view.map.setMapStyle(new MapStyleOptions(customMapStyleString));
+    view.setMapStyle(customMapStyleString);
   }
 
   @ReactProp(name = "mapPadding")

package/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java

@@ -9,6 +9,7 @@ import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.os.Build;
 
+import androidx.annotation.Nullable;
 import androidx.core.content.PermissionChecker;
 import androidx.core.view.GestureDetectorCompat;
 import androidx.core.view.MotionEventCompat;
@@ -46,6 +47,7 @@ import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.GroundOverlay;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
+import com.google.android.gms.maps.model.MapStyleOptions;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 import com.google.android.gms.maps.model.PointOfInterest;
@@ -92,6 +94,8 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
   private boolean moveOnMarkerPress = true;
   private boolean cacheEnabled = false;
   private ReadableMap initialRegion;
+  private ReadableMap region;
+  private String customMapStyleString;
   private boolean initialRegionSet = false;
   private boolean initialCameraSet = false;
   private LatLngBounds cameraLastIdleBounds;
@@ -219,10 +223,8 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     this.map.setOnMarkerDragListener(this);
     this.map.setOnPoiClickListener(this);
     this.map.setOnIndoorStateChangeListener(this);
-    if(initialRegion != null) {
-      setRegion(initialRegion);
-      initialRegionSet = true;
-    }
+
+    applyBridgedProps();
 
     manager.pushEvent(context, this, "onMapReady", new WritableNativeMap());
 
@@ -465,9 +467,9 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
   public void setInitialRegion(ReadableMap initialRegion) {
     this.initialRegion = initialRegion;
     // Theoretically onMapReady might be called before setInitialRegion
-    // In that case, trigger setRegion manually
+    // In that case, trigger moveToRegion manually
     if (!initialRegionSet && map != null) {
-      setRegion(initialRegion);
+      moveToRegion(initialRegion);
       initialRegionSet = true;
     }
   }
@@ -479,16 +481,28 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     }
   }
 
-  public void setRegion(ReadableMap region) {
+  private void applyBridgedProps() {
+    if(initialRegion != null) {
+      moveToRegion(initialRegion);
+      initialRegionSet = true;
+    } else {
+      moveToRegion(region);
+    }
+    if(customMapStyleString != null) {
+      map.setMapStyle(new MapStyleOptions(customMapStyleString));
+    }
+  }
+
+  private void moveToRegion(ReadableMap region) {
     if (region == null) return;
 
-    Double lng = region.getDouble("longitude");
-    Double lat = region.getDouble("latitude");
-    Double lngDelta = region.getDouble("longitudeDelta");
-    Double latDelta = region.getDouble("latitudeDelta");
+    double lng = region.getDouble("longitude");
+    double lat = region.getDouble("latitude");
+    double lngDelta = region.getDouble("longitudeDelta");
+    double latDelta = region.getDouble("latitudeDelta");
     LatLngBounds bounds = new LatLngBounds(
-        new LatLng(lat - latDelta / 2, lng - lngDelta / 2), // southwest
-        new LatLng(lat + latDelta / 2, lng + lngDelta / 2)  // northeast
+            new LatLng(lat - latDelta / 2, lng - lngDelta / 2), // southwest
+            new LatLng(lat + latDelta / 2, lng + lngDelta / 2)  // northeast
     );
     if (super.getHeight() <= 0 || super.getWidth() <= 0) {
       // in this case, our map has not been laid out yet, so we save the bounds in a local
@@ -503,6 +517,13 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     }
   }
 
+  public void setRegion(ReadableMap region) {
+    this.region = region;
+    if(region != null && map != null) {
+      moveToRegion(region);
+    }
+  }
+
   public void setCamera(ReadableMap camera) {
     if (camera == null) return;
 
@@ -532,6 +553,13 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     }
   }
 
+  public void setMapStyle(@Nullable String customMapStyleString) {
+    this.customMapStyleString = customMapStyleString;
+    if(map != null && customMapStyleString != null) {
+      map.setMapStyle(new MapStyleOptions(customMapStyleString));
+    }
+  }
+
   public void setShowsUserLocation(boolean showUserLocation) {
     this.showUserLocation = showUserLocation; // hold onto this for lifecycle handling
     if (hasPermissions()) {

package/ios/AirMaps/AIRMapManager.m

@@ -671,12 +671,11 @@ RCT_EXPORT_METHOD(getAddressFromCoordinates:(nonnull NSNumber *)reactTag
     }
 
     if (nearestDistance <= maxMeters) {
-        AIRMapCoordinate *firstCoord = nearestPolyline.coordinates.firstObject;
         id event = @{
                    @"action": @"polyline-press",
                    @"coordinate": @{
-                       @"latitude": @(firstCoord.coordinate.latitude),
-                       @"longitude": @(firstCoord.coordinate.longitude)
+                       @"latitude": @(tapCoordinate.latitude),
+                       @"longitude": @(tapCoordinate.longitude)
                    }
                    };
         nearestPolyline.onPress(event);

package/lib/MapView.d.ts

@@ -568,20 +568,12 @@ declare type NativeProps = Omit<ModifiedProps, 'customMapStyle' | 'onRegionChang
 declare type State = {
     isReady: boolean;
 };
-declare type SnapShot = Region | null;
-declare class MapView extends React.Component<MapViewProps, State, SnapShot> {
+declare class MapView extends React.Component<MapViewProps, State> {
     static Animated: Animated.AnimatedComponent<typeof MapView>;
     private map;
-    private __lastRegion;
-    private __layoutCalled;
     constructor(props: MapViewProps);
     setNativeProps(props: Partial<NativeProps>): void;
-    getSnapshotBeforeUpdate(prevProps: MapViewProps): Region | null;
-    componentDidUpdate(_prevProps: MapViewProps, _prevState: State, region: SnapShot): void;
-    componentDidMount(): void;
-    private _updateStyle;
     private _onMapReady;
-    private _onLayout;
     private _onChange;
     getCamera(): Promise<Camera>;
     setCamera(camera: Partial<Camera>): void;

package/lib/MapView.js

@@ -40,8 +40,6 @@ const GOOGLE_MAPS_ONLY_TYPES = [exports.MAP_TYPES.TERRAIN, exports.MAP_TYPES.NON
 class MapView extends React.Component {
     static Animated;
     map;
-    __lastRegion;
-    __layoutCalled;
     constructor(props) {
         super(props);
         this.map = React.createRef();
@@ -50,79 +48,19 @@ class MapView extends React.Component {
         };
         this._onMapReady = this._onMapReady.bind(this);
         this._onChange = this._onChange.bind(this);
-        this._onLayout = this._onLayout.bind(this);
     }
     setNativeProps(props) {
         this.map.current?.setNativeProps(props);
     }
-    getSnapshotBeforeUpdate(prevProps) {
-        if (this.state.isReady &&
-            this.props.customMapStyle !== prevProps.customMapStyle) {
-            this._updateStyle(this.props.customMapStyle);
-        }
-        return this.props.region || null;
-    }
-    componentDidUpdate(_prevProps, _prevState, region) {
-        const a = this.__lastRegion;
-        const b = region;
-        if (!a || !b) {
-            return;
-        }
-        if (a.latitude !== b.latitude ||
-            a.longitude !== b.longitude ||
-            a.latitudeDelta !== b.latitudeDelta ||
-            a.longitudeDelta !== b.longitudeDelta) {
-            this.map.current?.setNativeProps({ region: b });
-        }
-    }
-    componentDidMount() {
-        const { isReady } = this.state;
-        if (isReady) {
-            this._updateStyle(this.props.customMapStyle);
-        }
-    }
-    _updateStyle(customMapStyle) {
-        this.map.current?.setNativeProps({
-            customMapStyleString: JSON.stringify(customMapStyle),
-        });
-    }
     _onMapReady() {
-        const { region, initialRegion, onMapReady } = this.props;
-        if (region) {
-            this.map.current?.setNativeProps({ region });
-        }
-        else if (initialRegion) {
-            this.map.current?.setNativeProps({ initialRegion });
-        }
-        this._updateStyle(this.props.customMapStyle);
+        const { onMapReady } = this.props;
         this.setState({ isReady: true }, () => {
             if (onMapReady) {
                 onMapReady();
             }
         });
     }
-    _onLayout(e) {
-        const { layout } = e.nativeEvent;
-        if (!layout.width || !layout.height) {
-            return;
-        }
-        if (this.state.isReady && !this.__layoutCalled) {
-            const { region, initialRegion } = this.props;
-            if (region) {
-                this.__layoutCalled = true;
-                this.map.current?.setNativeProps({ region });
-            }
-            else if (initialRegion) {
-                this.__layoutCalled = true;
-                this.map.current?.setNativeProps({ initialRegion });
-            }
-        }
-        if (this.props.onLayout) {
-            this.props.onLayout(e);
-        }
-    }
     _onChange({ nativeEvent }) {
-        this.__lastRegion = nativeEvent.region;
         const isGesture = nativeEvent.isGesture;
         const details = { isGesture };
         if (nativeEvent.continuous) {
@@ -354,8 +292,10 @@ class MapView extends React.Component {
                 initialRegion: null,
                 onChange: this._onChange,
                 onMapReady: this._onMapReady,
-                onLayout: this._onLayout,
                 ref: this.map,
+                customMapStyleString: this.props.customMapStyle
+                    ? JSON.stringify(this.props.customMapStyle)
+                    : undefined,
                 ...this.props,
             };
             if (react_native_1.Platform.OS === 'ios' &&
@@ -376,7 +316,9 @@ class MapView extends React.Component {
                 ref: this.map,
                 onChange: this._onChange,
                 onMapReady: this._onMapReady,
-                onLayout: this._onLayout,
+                customMapStyleString: this.props.customMapStyle
+                    ? JSON.stringify(this.props.customMapStyle)
+                    : undefined,
             };
         }
         if (react_native_1.Platform.OS === 'android' && this.props.liteMode) {

package/package.json

@@ -1,17 +1,20 @@
 {
   "name": "react-native-maps",
   "description": "React Native Mapview component for iOS + Android",
+  "source": "src/index",
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
-  "version": "1.0.0-beta.8",
+  "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
+  "version": "1.1.0-beta.1",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",
     "tscheck": "tsc --noEmit",
-    "build": "tsc",
+    "build": "tsc --project tsconfig.build.json",
     "test": "jest",
     "prepare": "husky install",
-    "release": "semantic-release"
+    "release": "semantic-release",
+    "bootstrap": "yarn --cwd example && yarn && (cd example && cd ios && pod install)"
   },
   "files": [
     "lib",
@@ -49,17 +52,17 @@
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "17.0.2",
-    "@commitlint/config-conventional": "17.0.2",
-    "@react-native-community/eslint-config": "^3.0.2",
-    "@types/react-native": "0.68.0",
+    "@commitlint/cli": "17.0.3",
+    "@commitlint/config-conventional": "17.0.3",
+    "@react-native-community/eslint-config": "3.0.3",
+    "@types/react-native": "0.69.2",
     "babel-jest": "^27.3.1",
-    "eslint": "7.32.0",
+    "eslint": "^7.32.0",
     "husky": "8.0.1",
     "jest": "^27.3.1",
     "prettier": "2.7.1",
-    "react": "17.0.2",
-    "react-native": "0.68.2",
+    "react": "18.0.0",
+    "react-native": "0.69.1",
     "semantic-release": "19.0.3",
     "typescript": "4.7.4"
   },

package/react-native-google-maps.podspec

@@ -5,11 +5,10 @@ package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 Pod::Spec.new do |s|
   s.name         = "react-native-google-maps"
   s.version      = package['version']
-  s.summary      = "React Native Mapview component for iOS + Android"
-
-  s.authors      = { "intelligibabble" => "leland.m.richardson@gmail.com" }
-  s.homepage     = "https://github.com/react-native-maps/react-native-maps#readme"
-  s.license      = "MIT"
+  s.summary      = package["description"]
+  s.authors      = package["author"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
   s.platform     = :ios, "13.0"
 
   s.source       = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }

package/react-native-maps.podspec

@@ -5,11 +5,10 @@ package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 Pod::Spec.new do |s|
   s.name         = "react-native-maps"
   s.version      = package['version']
-  s.summary      = "React Native Mapview component for iOS + Android"
-
-  s.authors      = { "intelligibabble" => "leland.m.richardson@gmail.com" }
-  s.homepage     = "https://github.com/react-native-maps/react-native-maps#readme"
-  s.license      = "MIT"
+  s.summary      = package["description"]
+  s.authors      = package["author"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
   s.platform     = :ios, "11.0"
 
   s.source       = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }