react-native-maps 1.21.0-alpha.11 → 1.21.0-alpha.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ios/AirGoogleMaps/AIRGMSMarker.h +1 -1
- package/ios/AirGoogleMaps/AIRGoogleMap.m +10 -6
- package/ios/AirGoogleMaps/AIRGoogleMapMarker.h +2 -0
- package/ios/AirGoogleMaps/AIRGoogleMapMarker.m +344 -243
- package/ios/AirGoogleMaps/AIRGoogleMapPolygon.h +2 -1
- package/ios/AirGoogleMaps/AIRGoogleMapPolygon.m +27 -0
- package/ios/AirGoogleMaps/RCTConvert+GMSMapViewType.m +2 -0
- package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm +30 -19
- package/ios/AirMaps/AIRMap.h +1 -0
- package/ios/AirMaps/AIRMap.m +8 -0
- package/ios/AirMaps/AIRMapManager.m +3 -0
- package/ios/AirMaps/RNMapsMapView.mm +351 -338
- package/lib/MapView.js +9 -4
- package/package.json +1 -1
- package/react-native-maps.podspec +1 -1
package/lib/MapView.js
CHANGED
|
@@ -55,7 +55,7 @@ class MapView extends React.Component {
|
|
|
55
55
|
this.map = React.createRef();
|
|
56
56
|
this.fabricMap = React.createRef();
|
|
57
57
|
this.state = {
|
|
58
|
-
isReady:
|
|
58
|
+
isReady: false,
|
|
59
59
|
};
|
|
60
60
|
this._onMapReady = this._onMapReady.bind(this);
|
|
61
61
|
this._onChange = this._onChange.bind(this);
|
|
@@ -348,7 +348,7 @@ class MapView extends React.Component {
|
|
|
348
348
|
if (react_native_1.Platform.OS === 'ios') {
|
|
349
349
|
// Define props specifically for MapFabricNativeProps
|
|
350
350
|
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
351
|
-
const { onCalloutPress, onIndoorBuildingFocused, onKmlReady, onLongPress, onMarkerDeselect, onMarkerPress, onMarkerSelect, onRegionChangeStart, onRegionChange, onRegionChangeComplete, onPress, minZoomLevel, maxZoomLevel, region, provider, ...restProps } = this.props;
|
|
351
|
+
const { onCalloutPress, onIndoorBuildingFocused, onKmlReady, onLongPress, onMarkerDeselect, onMarkerPress, onMarkerSelect, onRegionChangeStart, onRegionChange, onRegionChangeComplete, onPress, minZoomLevel, maxZoomLevel, region, provider, children, ...restProps } = this.props;
|
|
352
352
|
/* eslint-enable @typescript-eslint/no-unused-vars */
|
|
353
353
|
const userInterfaceStyle = this.props.userInterfaceStyle || 'system';
|
|
354
354
|
const props = {
|
|
@@ -379,14 +379,19 @@ class MapView extends React.Component {
|
|
|
379
379
|
props.initialCamera = this.props.initialCamera;
|
|
380
380
|
props.onLayout = this.props.onLayout;
|
|
381
381
|
}
|
|
382
|
+
const childrenNodes = this.state.isReady ? children : null;
|
|
382
383
|
if (provider === 'google') {
|
|
383
384
|
return (<decorateMapComponent_1.ProviderContext.Provider value={this.props.provider}>
|
|
384
|
-
<FabricGoogleMap {...props} ref={this.fabricMap}
|
|
385
|
+
<FabricGoogleMap {...props} ref={this.fabricMap}>
|
|
386
|
+
{childrenNodes}
|
|
387
|
+
</FabricGoogleMap>
|
|
385
388
|
</decorateMapComponent_1.ProviderContext.Provider>);
|
|
386
389
|
}
|
|
387
390
|
else {
|
|
388
391
|
return (<decorateMapComponent_1.ProviderContext.Provider value={this.props.provider}>
|
|
389
|
-
<FabricMap {...props} ref={this.fabricMap}
|
|
392
|
+
<FabricMap {...props} ref={this.fabricMap}>
|
|
393
|
+
{childrenNodes}
|
|
394
|
+
</FabricMap>
|
|
390
395
|
</decorateMapComponent_1.ProviderContext.Provider>);
|
|
391
396
|
}
|
|
392
397
|
}
|
package/package.json
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"author": "Leland Richardson <leland.m.richardson@gmail.com>",
|
|
7
7
|
"homepage": "https://github.com/react-native-maps/react-native-maps#readme",
|
|
8
|
-
"version": "1.21.0-alpha.
|
|
8
|
+
"version": "1.21.0-alpha.13",
|
|
9
9
|
"license": "MIT",
|
|
10
10
|
"scripts": {
|
|
11
11
|
"lint": "eslint . --max-warnings 0",
|
|
@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
|
|
|
9
9
|
s.authors = package["author"]
|
|
10
10
|
s.homepage = package["homepage"]
|
|
11
11
|
s.license = package["license"]
|
|
12
|
-
s.platform = :ios, "
|
|
12
|
+
s.platform = :ios, "12.0"
|
|
13
13
|
|
|
14
14
|
s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
|
|
15
15
|
s.source_files = "ios/AirMaps/**/*.{h,m,mm,swift}"
|