react-native-maps 1.3.0-beta.1 → 1.3.0-beta.2

package/ios/AirGoogleMaps/AIRGoogleMapCircle.h

@@ -14,9 +14,9 @@
 @property (nonatomic, strong) GMSCircle *circle;
 @property (nonatomic, assign) double radius;
 @property (nonatomic, assign) CLLocationCoordinate2D centerCoordinate;
-@property (nonatomic, assign) UIColor *strokeColor;
+@property (nonatomic, strong) UIColor *strokeColor;
 @property (nonatomic, assign) double strokeWidth;
-@property (nonatomic, assign) UIColor *fillColor;
+@property (nonatomic, strong) UIColor *fillColor;
 @property (nonatomic, assign) int zIndex;
 
 @end

package/ios/AirGoogleMaps/AIRGoogleMapCircle.m

@@ -11,15 +11,34 @@
 #import <React/RCTUtils.h>
 
 @implementation AIRGoogleMapCircle
+{
+  BOOL _didMoveToWindow;
+}
 
 - (instancetype)init
 {
   if (self = [super init]) {
+    _didMoveToWindow = false;
     _circle = [[GMSCircle alloc] init];
   }
   return self;
 }
 
+- (void)didMoveToWindow {
+  [super didMoveToWindow];
+  if(_didMoveToWindow) return;
+  _didMoveToWindow = true;
+  if(_fillColor) {
+    _circle.fillColor = _fillColor;
+  }
+  if(_strokeColor) {
+    _circle.strokeColor = _strokeColor;
+  }
+  if(_strokeWidth) {
+    _circle.strokeWidth = _strokeWidth;
+  }
+}
+
 - (void)setRadius:(double)radius
 {
   _radius = radius;
@@ -35,19 +54,25 @@
 -(void)setStrokeColor:(UIColor *)strokeColor
 {
   _strokeColor = strokeColor;
-  _circle.strokeColor = strokeColor;
+  if(_didMoveToWindow) {
+    _circle.strokeColor = strokeColor;
+  }
 }
 
 -(void)setStrokeWidth:(double)strokeWidth
 {
   _strokeWidth = strokeWidth;
-  _circle.strokeWidth = strokeWidth;
+  if(_didMoveToWindow) {
+    _circle.strokeWidth = strokeWidth;
+  }
 }
 
 -(void)setFillColor:(UIColor *)fillColor
 {
   _fillColor = fillColor;
-  _circle.fillColor = fillColor;
+  if(_didMoveToWindow) {
+    _circle.fillColor = fillColor;
+  }
 }
 
 -(void)setZIndex:(int)zIndex

package/ios/AirGoogleMaps/AIRGoogleMapPolygon.h

@@ -20,9 +20,9 @@
 @property (nonatomic, strong) NSArray<NSArray<AIRMapCoordinate *> *> *holes;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 
-@property (nonatomic, assign) UIColor *fillColor;
+@property (nonatomic, strong) UIColor *fillColor;
 @property (nonatomic, assign) double strokeWidth;
-@property (nonatomic, assign) UIColor *strokeColor;
+@property (nonatomic, strong) UIColor *strokeColor;
 @property (nonatomic, assign) BOOL geodesic;
 @property (nonatomic, assign) int zIndex;
 @property (nonatomic, assign) BOOL tappable;

package/ios/AirGoogleMaps/AIRGoogleMapPolygon.m

@@ -11,16 +11,35 @@
 #import <GoogleMaps/GoogleMaps.h>
 
 @implementation AIRGoogleMapPolygon
+{
+  BOOL _didMoveToWindow;
+}
 
 - (instancetype)init
 {
   if (self = [super init]) {
+    _didMoveToWindow = false;
     _polygon = [[AIRGMSPolygon alloc] init];
   }
 
   return self;
 }
 
+- (void)didMoveToWindow {
+  [super didMoveToWindow];
+  if(_didMoveToWindow) return;
+  _didMoveToWindow = true;
+  if(_fillColor) {
+    _polygon.fillColor = _fillColor;
+  }
+  if(_strokeColor) {
+    _polygon.strokeColor = _strokeColor;
+  }
+  if(_strokeWidth) {
+    _polygon.strokeWidth = _strokeWidth;
+  }
+}
+
 - (void)setCoordinates:(NSArray<AIRMapCoordinate *> *)coordinates
 {
   _coordinates = coordinates;
@@ -58,19 +77,25 @@
 -(void)setFillColor:(UIColor *)fillColor
 {
   _fillColor = fillColor;
-  _polygon.fillColor = fillColor;
+  if(_didMoveToWindow) {
+    _polygon.fillColor = fillColor;
+  }
 }
 
 -(void)setStrokeWidth:(double)strokeWidth
 {
   _strokeWidth = strokeWidth;
-  _polygon.strokeWidth = strokeWidth;
+  if(_didMoveToWindow) {
+    _polygon.strokeWidth = strokeWidth;
+  }
 }
 
 -(void)setStrokeColor:(UIColor *) strokeColor
 {
   _strokeColor = strokeColor;
-  _polygon.strokeColor = strokeColor;
+  if(_didMoveToWindow) {
+    _polygon.strokeColor = strokeColor;
+  }
 }
 
 -(void)setGeodesic:(BOOL)geodesic

package/lib/MapMarker.d.ts

@@ -286,7 +286,6 @@ export declare class MapMarker extends React.Component<MapMarkerProps> {
     redrawCallout(): void;
     animateMarkerToCoordinate(coordinate: LatLng, duration?: number): void;
     redraw(): void;
-    _getHandle(): number | null;
     render(): JSX.Element;
 }
 declare const _default: typeof MapMarker;

package/lib/MapMarker.js

@@ -76,9 +76,6 @@ class MapMarker extends React.Component {
             MapMarkerNativeComponent_1.Commands.redraw(this.marker.current);
         }
     }
-    _getHandle() {
-        return (0, react_native_1.findNodeHandle)(this.marker.current);
-    }
     render() {
         const { stopPropagation = false } = this.props;
         let image;

package/lib/MapMarkerNativeComponent.d.ts

@@ -4,11 +4,11 @@ import { NativeProps } from './MapMarker';
 import { LatLng } from './sharedTypes';
 export declare type MapMarkerNativeComponentType = HostComponent<NativeProps>;
 interface NativeCommands {
-    showCallout: (viewRef: React.RefObject<MapMarkerNativeComponentType>['current']) => void;
-    hideCallout: (viewRef: React.RefObject<MapMarkerNativeComponentType>['current']) => void;
-    redrawCallout: (viewRef: React.RefObject<MapMarkerNativeComponentType>['current']) => void;
-    animateMarkerToCoordinate: (viewRef: React.RefObject<MapMarkerNativeComponentType>['current'], coordinate: LatLng, duration: number) => void;
-    redraw: (viewRef: React.RefObject<MapMarkerNativeComponentType>['current']) => void;
+    showCallout: (viewRef: NonNullable<React.RefObject<MapMarkerNativeComponentType>['current']>) => void;
+    hideCallout: (viewRef: NonNullable<React.RefObject<MapMarkerNativeComponentType>['current']>) => void;
+    redrawCallout: (viewRef: NonNullable<React.RefObject<MapMarkerNativeComponentType>['current']>) => void;
+    animateMarkerToCoordinate: (viewRef: NonNullable<React.RefObject<MapMarkerNativeComponentType>['current']>, coordinate: LatLng, duration: number) => void;
+    redraw: (viewRef: NonNullable<React.RefObject<MapMarkerNativeComponentType>['current']>) => void;
 }
 export declare const Commands: NativeCommands;
 export {};

package/lib/MapPolygon.d.ts

@@ -133,7 +133,6 @@ export declare class MapPolygon extends React.Component<MapPolygonProps> {
     private polygon;
     constructor(props: MapPolygonProps);
     setNativeProps(props: Partial<MapPolygonProps>): void;
-    updateNativeProps(): () => void;
     render(): JSX.Element;
 }
 declare const _default: typeof MapPolygon;

package/lib/MapPolygon.js

@@ -26,7 +26,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MapPolygon = void 0;
 const React = __importStar(require("react"));
 const decorateMapComponent_1 = __importStar(require("./decorateMapComponent"));
-const ProviderConstants = __importStar(require("./ProviderConstants"));
 class MapPolygon extends React.Component {
     getNativeComponent;
     getMapManagerCommand;
@@ -39,30 +38,10 @@ class MapPolygon extends React.Component {
     setNativeProps(props) {
         this.polygon.current?.setNativeProps(props);
     }
-    updateNativeProps() {
-        return () => {
-            const { fillColor, strokeColor, strokeWidth } = this.props;
-            let polygonNativeProps = {};
-            if (fillColor) {
-                polygonNativeProps.fillColor = fillColor;
-            }
-            if (strokeColor) {
-                polygonNativeProps.strokeColor = strokeColor;
-            }
-            if (strokeWidth) {
-                polygonNativeProps.strokeWidth = strokeWidth;
-            }
-            if (polygonNativeProps) {
-                this.setNativeProps(polygonNativeProps);
-            }
-        };
-    }
     render() {
         const { strokeColor = '#000', strokeWidth = 1 } = this.props;
         const AIRMapPolygon = this.getNativeComponent();
-        return (<AIRMapPolygon {...this.props} strokeColor={strokeColor} strokeWidth={strokeWidth} ref={this.polygon} onLayout={this.context === ProviderConstants.PROVIDER_GOOGLE
-                ? this.updateNativeProps()
-                : undefined}/>);
+        return (<AIRMapPolygon {...this.props} strokeColor={strokeColor} strokeWidth={strokeWidth} ref={this.polygon}/>);
     }
 }
 exports.MapPolygon = MapPolygon;

package/lib/MapView.d.ts

@@ -664,7 +664,6 @@ declare class MapView extends React.Component<MapViewProps, State> {
      */
     boundingBoxForRegion(region: Region): BoundingBox;
     private _mapManagerCommand;
-    private _getHandle;
     private _runCommand;
     render(): JSX.Element;
 }

package/lib/MapView.js

@@ -81,7 +81,7 @@ class MapView extends React.Component {
     }
     getCamera() {
         if (react_native_1.Platform.OS === 'android') {
-            return react_native_1.NativeModules.AirMapModule.getCamera(this._getHandle());
+            return react_native_1.NativeModules.AirMapModule.getCamera(this.map.current);
         }
         else if (react_native_1.Platform.OS === 'ios') {
             return this._runCommand('getCamera', []);
@@ -128,7 +128,7 @@ class MapView extends React.Component {
      */
     async getMapBoundaries() {
         if (react_native_1.Platform.OS === 'android') {
-            return await react_native_1.NativeModules.AirMapModule.getMapBoundaries(this._getHandle());
+            return await react_native_1.NativeModules.AirMapModule.getMapBoundaries(this.map.current);
         }
         else if (react_native_1.Platform.OS === 'ios') {
             return await this._runCommand('getMapBoundaries', []);
@@ -177,7 +177,7 @@ class MapView extends React.Component {
         }
         // Call native function
         if (react_native_1.Platform.OS === 'android') {
-            return react_native_1.NativeModules.AirMapModule.takeSnapshot(this._getHandle(), config);
+            return react_native_1.NativeModules.AirMapModule.takeSnapshot(this.map.current, config);
         }
         else if (react_native_1.Platform.OS === 'ios') {
             return new Promise((resolve, reject) => {
@@ -212,7 +212,7 @@ class MapView extends React.Component {
      */
     addressForCoordinate(coordinate) {
         if (react_native_1.Platform.OS === 'android') {
-            return react_native_1.NativeModules.AirMapModule.getAddressFromCoordinates(this._getHandle(), coordinate);
+            return react_native_1.NativeModules.AirMapModule.getAddressFromCoordinates(this.map.current, coordinate);
         }
         else if (react_native_1.Platform.OS === 'ios') {
             return this._runCommand('getAddressFromCoordinates', [coordinate]);
@@ -230,7 +230,7 @@ class MapView extends React.Component {
      */
     pointForCoordinate(coordinate) {
         if (react_native_1.Platform.OS === 'android') {
-            return react_native_1.NativeModules.AirMapModule.pointForCoordinate(this._getHandle(), coordinate);
+            return react_native_1.NativeModules.AirMapModule.pointForCoordinate(this.map.current, coordinate);
         }
         else if (react_native_1.Platform.OS === 'ios') {
             return this._runCommand('pointForCoordinate', [coordinate]);
@@ -248,7 +248,7 @@ class MapView extends React.Component {
      */
     coordinateForPoint(point) {
         if (react_native_1.Platform.OS === 'android') {
-            return react_native_1.NativeModules.AirMapModule.coordinateForPoint(this._getHandle(), point);
+            return react_native_1.NativeModules.AirMapModule.coordinateForPoint(this.map.current, point);
         }
         else if (react_native_1.Platform.OS === 'ios') {
             return this._runCommand('coordinateForPoint', [point]);
@@ -290,12 +290,9 @@ class MapView extends React.Component {
     _mapManagerCommand(name) {
         return react_native_1.NativeModules[`${(0, decorateMapComponent_1.getNativeMapName)(this.props.provider)}Manager`][name];
     }
-    _getHandle() {
-        return (0, react_native_1.findNodeHandle)(this.map.current);
-    }
     _runCommand(name, args) {
         if (react_native_1.Platform.OS === 'ios') {
-            return this._mapManagerCommand(name)(this._getHandle(), ...args);
+            return this._mapManagerCommand(name)(this.map.current, ...args);
         }
         else {
             return Promise.reject(`Invalid platform was passed: ${react_native_1.Platform.OS}`);

package/lib/MapViewNativeComponent.d.ts

@@ -5,14 +5,14 @@ import { Camera, EdgePadding } from './MapView.types';
 import { LatLng, Region } from './sharedTypes';
 export declare type MapViewNativeComponentType = HostComponent<NativeProps>;
 interface NativeCommands {
-    animateToRegion: (viewRef: React.RefObject<MapViewNativeComponentType>['current'], region: Region, duration: number) => void;
-    setCamera: (viewRef: React.RefObject<MapViewNativeComponentType>['current'], camera: Partial<Camera>) => void;
-    animateCamera: (viewRef: React.RefObject<MapViewNativeComponentType>['current'], camera: Partial<Camera>, duration: number) => void;
-    fitToElements: (viewRef: React.RefObject<MapViewNativeComponentType>['current'], edgePadding: EdgePadding, animated: boolean) => void;
-    fitToSuppliedMarkers: (viewRef: React.RefObject<MapViewNativeComponentType>['current'], markers: string[], edgePadding: EdgePadding, animated: boolean) => void;
-    fitToCoordinates: (viewRef: React.RefObject<MapViewNativeComponentType>['current'], coordinates: LatLng[], edgePadding: EdgePadding, animated: boolean) => void;
-    setMapBoundaries: (viewRef: React.RefObject<MapViewNativeComponentType>['current'], northEast: LatLng, southWest: LatLng) => void;
-    setIndoorActiveLevelIndex: (viewRef: React.RefObject<MapViewNativeComponentType>['current'], activeLevelIndex: number) => void;
+    animateToRegion: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, region: Region, duration: number) => void;
+    setCamera: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, camera: Partial<Camera>) => void;
+    animateCamera: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, camera: Partial<Camera>, duration: number) => void;
+    fitToElements: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, edgePadding: EdgePadding, animated: boolean) => void;
+    fitToSuppliedMarkers: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, markers: string[], edgePadding: EdgePadding, animated: boolean) => void;
+    fitToCoordinates: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, coordinates: LatLng[], edgePadding: EdgePadding, animated: boolean) => void;
+    setMapBoundaries: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, northEast: LatLng, southWest: LatLng) => void;
+    setIndoorActiveLevelIndex: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, activeLevelIndex: number) => void;
 }
 export declare const Commands: NativeCommands;
 export {};

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.3.0-beta.1",
+  "version": "1.3.0-beta.2",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",