react-native-google-maps-plus 1.7.0-dev.12 → 1.7.0-dev.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/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt +29 -24
- package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt +2 -0
- package/ios/GoogleMapViewImpl.swift +14 -3
- package/ios/MapMarkerBuilder.swift +5 -1
- package/ios/RNGoogleMapsPlusView.swift +3 -0
- package/lib/module/types.js.map +1 -1
- package/lib/typescript/src/types.d.ts +1 -0
- package/lib/typescript/src/types.d.ts.map +1 -1
- package/nitrogen/generated/android/c++/JRNInitialProps.hpp +7 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNInitialProps.kt +6 -3
- package/nitrogen/generated/ios/swift/RNInitialProps.swift +31 -1
- package/nitrogen/generated/shared/c++/RNInitialProps.hpp +6 -2
- package/package.json +1 -1
- package/src/types.ts +1 -0
|
@@ -10,7 +10,6 @@ import android.location.Location
|
|
|
10
10
|
import android.util.Size
|
|
11
11
|
import android.view.View
|
|
12
12
|
import android.widget.FrameLayout
|
|
13
|
-
import androidx.core.graphics.scale
|
|
14
13
|
import com.facebook.react.bridge.LifecycleEventListener
|
|
15
14
|
import com.facebook.react.uimanager.PixelUtil.dpToPx
|
|
16
15
|
import com.facebook.react.uimanager.ThemedReactContext
|
|
@@ -224,31 +223,31 @@ class GoogleMapsViewImpl(
|
|
|
224
223
|
locationConfig = locationConfig
|
|
225
224
|
|
|
226
225
|
if (pendingMarkers.isNotEmpty()) {
|
|
227
|
-
pendingMarkers.forEach { (id, opts, markerTag) ->
|
|
226
|
+
pendingMarkers.forEach { (id, opts, markerTag) -> addMarkerInternal(id, opts, markerTag) }
|
|
228
227
|
pendingMarkers.clear()
|
|
229
228
|
}
|
|
230
229
|
if (pendingPolylines.isNotEmpty()) {
|
|
231
|
-
pendingPolylines.forEach { (id, opts) ->
|
|
230
|
+
pendingPolylines.forEach { (id, opts) -> addPolylineInternal(id, opts) }
|
|
232
231
|
pendingPolylines.clear()
|
|
233
232
|
}
|
|
234
233
|
if (pendingPolygons.isNotEmpty()) {
|
|
235
|
-
pendingPolygons.forEach { (id, opts) ->
|
|
234
|
+
pendingPolygons.forEach { (id, opts) -> addPolygonInternal(id, opts) }
|
|
236
235
|
pendingPolygons.clear()
|
|
237
236
|
}
|
|
238
237
|
if (pendingCircles.isNotEmpty()) {
|
|
239
|
-
pendingCircles.forEach { (id, opts) ->
|
|
238
|
+
pendingCircles.forEach { (id, opts) -> addCircleInternal(id, opts) }
|
|
240
239
|
pendingCircles.clear()
|
|
241
240
|
}
|
|
242
241
|
if (pendingHeatmaps.isNotEmpty()) {
|
|
243
|
-
pendingHeatmaps.forEach { (id, opts) ->
|
|
242
|
+
pendingHeatmaps.forEach { (id, opts) -> addHeatmapInternal(id, opts) }
|
|
244
243
|
pendingHeatmaps.clear()
|
|
245
244
|
}
|
|
246
245
|
if (pendingKmlLayers.isNotEmpty()) {
|
|
247
|
-
pendingKmlLayers.forEach { (id, str) ->
|
|
246
|
+
pendingKmlLayers.forEach { (id, str) -> addKmlLayerInternal(id, str) }
|
|
248
247
|
pendingKmlLayers.clear()
|
|
249
248
|
}
|
|
250
249
|
if (pendingUrlTilesOverlays.isNotEmpty()) {
|
|
251
|
-
pendingUrlTilesOverlays.forEach { (id, opts) ->
|
|
250
|
+
pendingUrlTilesOverlays.forEach { (id, opts) -> addUrlTileOverlayInternal(id, opts) }
|
|
252
251
|
pendingUrlTilesOverlays.clear()
|
|
253
252
|
}
|
|
254
253
|
}
|
|
@@ -496,10 +495,10 @@ class GoogleMapsViewImpl(
|
|
|
496
495
|
}
|
|
497
496
|
|
|
498
497
|
markersById.remove(id)?.remove()
|
|
499
|
-
|
|
498
|
+
addMarkerInternal(id, opts, markerTag)
|
|
500
499
|
}
|
|
501
500
|
|
|
502
|
-
private fun
|
|
501
|
+
private fun addMarkerInternal(
|
|
503
502
|
id: String,
|
|
504
503
|
opts: MarkerOptions,
|
|
505
504
|
markerTag: MarkerTag,
|
|
@@ -547,10 +546,10 @@ class GoogleMapsViewImpl(
|
|
|
547
546
|
return@onUi
|
|
548
547
|
}
|
|
549
548
|
polylinesById.remove(id)?.remove()
|
|
550
|
-
|
|
549
|
+
addPolylineInternal(id, opts)
|
|
551
550
|
}
|
|
552
551
|
|
|
553
|
-
private fun
|
|
552
|
+
private fun addPolylineInternal(
|
|
554
553
|
id: String,
|
|
555
554
|
opts: PolylineOptions,
|
|
556
555
|
) = onUi {
|
|
@@ -590,10 +589,10 @@ class GoogleMapsViewImpl(
|
|
|
590
589
|
return@onUi
|
|
591
590
|
}
|
|
592
591
|
polygonsById.remove(id)?.remove()
|
|
593
|
-
|
|
592
|
+
addPolygonInternal(id, opts)
|
|
594
593
|
}
|
|
595
594
|
|
|
596
|
-
private fun
|
|
595
|
+
private fun addPolygonInternal(
|
|
597
596
|
id: String,
|
|
598
597
|
opts: PolygonOptions,
|
|
599
598
|
) = onUi {
|
|
@@ -633,10 +632,10 @@ class GoogleMapsViewImpl(
|
|
|
633
632
|
return@onUi
|
|
634
633
|
}
|
|
635
634
|
circlesById.remove(id)?.remove()
|
|
636
|
-
|
|
635
|
+
addCircleInternal(id, opts)
|
|
637
636
|
}
|
|
638
637
|
|
|
639
|
-
private fun
|
|
638
|
+
private fun addCircleInternal(
|
|
640
639
|
id: String,
|
|
641
640
|
opts: CircleOptions,
|
|
642
641
|
) = onUi {
|
|
@@ -676,10 +675,10 @@ class GoogleMapsViewImpl(
|
|
|
676
675
|
return@onUi
|
|
677
676
|
}
|
|
678
677
|
heatmapsById.remove(id)?.remove()
|
|
679
|
-
|
|
678
|
+
addHeatmapInternal(id, opts)
|
|
680
679
|
}
|
|
681
680
|
|
|
682
|
-
private fun
|
|
681
|
+
private fun addHeatmapInternal(
|
|
683
682
|
id: String,
|
|
684
683
|
opts: TileOverlayOptions,
|
|
685
684
|
) = onUi {
|
|
@@ -697,7 +696,10 @@ class GoogleMapsViewImpl(
|
|
|
697
696
|
|
|
698
697
|
fun clearHeatmaps() =
|
|
699
698
|
onUi {
|
|
700
|
-
heatmapsById.values.forEach {
|
|
699
|
+
heatmapsById.values.forEach {
|
|
700
|
+
it.clearTileCache()
|
|
701
|
+
it.remove()
|
|
702
|
+
}
|
|
701
703
|
heatmapsById.clear()
|
|
702
704
|
pendingHeatmaps.clear()
|
|
703
705
|
}
|
|
@@ -711,10 +713,10 @@ class GoogleMapsViewImpl(
|
|
|
711
713
|
return@onUi
|
|
712
714
|
}
|
|
713
715
|
kmlLayersById.remove(id)?.removeLayerFromMap()
|
|
714
|
-
|
|
716
|
+
addKmlLayerInternal(id, kmlString)
|
|
715
717
|
}
|
|
716
718
|
|
|
717
|
-
private fun
|
|
719
|
+
private fun addKmlLayerInternal(
|
|
718
720
|
id: String,
|
|
719
721
|
kmlString: String,
|
|
720
722
|
) = onUi {
|
|
@@ -749,10 +751,10 @@ class GoogleMapsViewImpl(
|
|
|
749
751
|
return@onUi
|
|
750
752
|
}
|
|
751
753
|
urlTileOverlaysById.remove(id)?.remove()
|
|
752
|
-
|
|
754
|
+
addUrlTileOverlayInternal(id, opts)
|
|
753
755
|
}
|
|
754
756
|
|
|
755
|
-
private fun
|
|
757
|
+
private fun addUrlTileOverlayInternal(
|
|
756
758
|
id: String,
|
|
757
759
|
opts: TileOverlayOptions,
|
|
758
760
|
) = onUi {
|
|
@@ -770,7 +772,10 @@ class GoogleMapsViewImpl(
|
|
|
770
772
|
|
|
771
773
|
fun clearUrlTileOverlays() =
|
|
772
774
|
onUi {
|
|
773
|
-
urlTileOverlaysById.values.forEach {
|
|
775
|
+
urlTileOverlaysById.values.forEach {
|
|
776
|
+
it.clearTileCache()
|
|
777
|
+
it.remove()
|
|
778
|
+
}
|
|
774
779
|
urlTileOverlaysById.clear()
|
|
775
780
|
pendingUrlTilesOverlays.clear()
|
|
776
781
|
}
|
|
@@ -12,6 +12,7 @@ import com.rngooglemapsplus.extensions.markerEquals
|
|
|
12
12
|
import com.rngooglemapsplus.extensions.polygonEquals
|
|
13
13
|
import com.rngooglemapsplus.extensions.polylineEquals
|
|
14
14
|
import com.rngooglemapsplus.extensions.toCameraPosition
|
|
15
|
+
import com.rngooglemapsplus.extensions.toColor
|
|
15
16
|
import com.rngooglemapsplus.extensions.toCompressFormat
|
|
16
17
|
import com.rngooglemapsplus.extensions.toFileExtension
|
|
17
18
|
import com.rngooglemapsplus.extensions.toGoogleMapType
|
|
@@ -48,6 +49,7 @@ class RNGoogleMapsPlusView(
|
|
|
48
49
|
initialProps?.mapId?.let { mapId(it) }
|
|
49
50
|
initialProps?.liteMode?.let { liteMode(it) }
|
|
50
51
|
initialProps?.camera?.let { camera(it.toCameraPosition(current = null)) }
|
|
52
|
+
initialProps?.backgroundColor?.let { backgroundColor(it.toColor()) }
|
|
51
53
|
}
|
|
52
54
|
view.initMapView(options)
|
|
53
55
|
}
|
|
@@ -574,7 +574,10 @@ GMSIndoorDisplayDelegate {
|
|
|
574
574
|
|
|
575
575
|
@MainActor
|
|
576
576
|
func removeHeatmap(id: String) {
|
|
577
|
-
heatmapsById.removeValue(forKey: id).map {
|
|
577
|
+
heatmapsById.removeValue(forKey: id).map {
|
|
578
|
+
$0.clearTileCache()
|
|
579
|
+
$0.map = nil
|
|
580
|
+
}
|
|
578
581
|
}
|
|
579
582
|
|
|
580
583
|
@MainActor
|
|
@@ -608,6 +611,7 @@ GMSIndoorDisplayDelegate {
|
|
|
608
611
|
geometries: parser.placemarks
|
|
609
612
|
)
|
|
610
613
|
renderer.render()
|
|
614
|
+
kmlLayerById[id] = renderer
|
|
611
615
|
}
|
|
612
616
|
}
|
|
613
617
|
|
|
@@ -639,16 +643,23 @@ GMSIndoorDisplayDelegate {
|
|
|
639
643
|
urlTileOverlay: GMSURLTileLayer
|
|
640
644
|
) {
|
|
641
645
|
urlTileOverlay.map = mapView
|
|
646
|
+
urlTileOverlays[id] = urlTileOverlay
|
|
642
647
|
}
|
|
643
648
|
|
|
644
649
|
@MainActor
|
|
645
650
|
func removeUrlTileOverlay(id: String) {
|
|
646
|
-
urlTileOverlays.removeValue(forKey: id).map {
|
|
651
|
+
urlTileOverlays.removeValue(forKey: id).map {
|
|
652
|
+
$0.clearTileCache()
|
|
653
|
+
$0.map = nil
|
|
654
|
+
}
|
|
647
655
|
}
|
|
648
656
|
|
|
649
657
|
@MainActor
|
|
650
658
|
func clearUrlTileOverlay() {
|
|
651
|
-
urlTileOverlays.values.forEach {
|
|
659
|
+
urlTileOverlays.values.forEach {
|
|
660
|
+
$0.clearTileCache()
|
|
661
|
+
$0.map = nil
|
|
662
|
+
}
|
|
652
663
|
urlTileOverlays.removeAll()
|
|
653
664
|
pendingUrlTileOverlays.removeAll()
|
|
654
665
|
}
|
|
@@ -19,7 +19,10 @@ final class MapMarkerBuilder {
|
|
|
19
19
|
marker.icon = icon
|
|
20
20
|
m.title.map { marker.title = $0 }
|
|
21
21
|
m.snippet.map { marker.snippet = $0 }
|
|
22
|
-
m.opacity.map {
|
|
22
|
+
m.opacity.map {
|
|
23
|
+
marker.opacity = Float($0)
|
|
24
|
+
marker.iconView?.alpha = CGFloat($0)
|
|
25
|
+
}
|
|
23
26
|
m.flat.map { marker.isFlat = $0 }
|
|
24
27
|
m.draggable.map { marker.isDraggable = $0 }
|
|
25
28
|
m.rotation.map { marker.rotation = $0 }
|
|
@@ -187,6 +190,7 @@ final class MapMarkerBuilder {
|
|
|
187
190
|
iconCache.removeAllObjects()
|
|
188
191
|
}
|
|
189
192
|
|
|
193
|
+
@MainActor
|
|
190
194
|
func buildInfoWindow(iconSvg: RNMarkerSvg?) -> UIImageView? {
|
|
191
195
|
guard let iconSvg = iconSvg else {
|
|
192
196
|
return nil
|
|
@@ -41,6 +41,9 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
41
41
|
initialProps?.camera.map {
|
|
42
42
|
options.camera = $0.toGMSCameraPosition(current: nil)
|
|
43
43
|
}
|
|
44
|
+
initialProps?.backgroundColor.map {
|
|
45
|
+
options.backgroundColor = $0.toUIColor()
|
|
46
|
+
}
|
|
44
47
|
impl.initMapView(googleMapOptions: options)
|
|
45
48
|
}
|
|
46
49
|
}
|
package/lib/module/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["RNAndroidLocationPriority","RNIOSLocationAccuracy","RNAndroidLocationPermissionResult","RNIOSPermissionResult","RNLocationErrorCode","RNMapErrorCode"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;
|
|
1
|
+
{"version":3,"names":["RNAndroidLocationPriority","RNIOSLocationAccuracy","RNAndroidLocationPermissionResult","RNIOSPermissionResult","RNLocationErrorCode","RNMapErrorCode"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;AAmEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;;AAyKA,WAAYA,yBAAyB,0BAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAA,OAAzBA,yBAAyB;AAAA;AAYrC,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAYjC,WAAYC,iCAAiC,0BAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAA,OAAjCA,iCAAiC;AAAA;AAM7C,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAoCjC,WAAYC,mBAAmB,0BAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA;AAS/B,WAAYC,cAAc,0BAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,2BAA2B,CAAC,CAAC;AAExE,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,10 +42,13 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
42
42
|
jni::local_ref<jni::JBoolean> liteMode = this->getFieldValue(fieldLiteMode);
|
|
43
43
|
static const auto fieldCamera = clazz->getField<JRNCamera>("camera");
|
|
44
44
|
jni::local_ref<JRNCamera> camera = this->getFieldValue(fieldCamera);
|
|
45
|
+
static const auto fieldBackgroundColor = clazz->getField<jni::JString>("backgroundColor");
|
|
46
|
+
jni::local_ref<jni::JString> backgroundColor = this->getFieldValue(fieldBackgroundColor);
|
|
45
47
|
return RNInitialProps(
|
|
46
48
|
mapId != nullptr ? std::make_optional(mapId->toStdString()) : std::nullopt,
|
|
47
49
|
liteMode != nullptr ? std::make_optional(static_cast<bool>(liteMode->value())) : std::nullopt,
|
|
48
|
-
camera != nullptr ? std::make_optional(camera->toCpp()) : std::nullopt
|
|
50
|
+
camera != nullptr ? std::make_optional(camera->toCpp()) : std::nullopt,
|
|
51
|
+
backgroundColor != nullptr ? std::make_optional(backgroundColor->toStdString()) : std::nullopt
|
|
49
52
|
);
|
|
50
53
|
}
|
|
51
54
|
|
|
@@ -55,14 +58,15 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
55
58
|
*/
|
|
56
59
|
[[maybe_unused]]
|
|
57
60
|
static jni::local_ref<JRNInitialProps::javaobject> fromCpp(const RNInitialProps& value) {
|
|
58
|
-
using JSignature = JRNInitialProps(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JRNCamera>);
|
|
61
|
+
using JSignature = JRNInitialProps(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JRNCamera>, jni::alias_ref<jni::JString>);
|
|
59
62
|
static const auto clazz = javaClassStatic();
|
|
60
63
|
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
|
|
61
64
|
return create(
|
|
62
65
|
clazz,
|
|
63
66
|
value.mapId.has_value() ? jni::make_jstring(value.mapId.value()) : nullptr,
|
|
64
67
|
value.liteMode.has_value() ? jni::JBoolean::valueOf(value.liteMode.value()) : nullptr,
|
|
65
|
-
value.camera.has_value() ? JRNCamera::fromCpp(value.camera.value()) : nullptr
|
|
68
|
+
value.camera.has_value() ? JRNCamera::fromCpp(value.camera.value()) : nullptr,
|
|
69
|
+
value.backgroundColor.has_value() ? jni::make_jstring(value.backgroundColor.value()) : nullptr
|
|
66
70
|
);
|
|
67
71
|
}
|
|
68
72
|
};
|
package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNInitialProps.kt
CHANGED
|
@@ -26,7 +26,10 @@ data class RNInitialProps(
|
|
|
26
26
|
val liteMode: Boolean?,
|
|
27
27
|
@DoNotStrip
|
|
28
28
|
@Keep
|
|
29
|
-
val camera: RNCamera
|
|
29
|
+
val camera: RNCamera?,
|
|
30
|
+
@DoNotStrip
|
|
31
|
+
@Keep
|
|
32
|
+
val backgroundColor: String?
|
|
30
33
|
) {
|
|
31
34
|
private companion object {
|
|
32
35
|
/**
|
|
@@ -36,8 +39,8 @@ data class RNInitialProps(
|
|
|
36
39
|
@Keep
|
|
37
40
|
@Suppress("unused")
|
|
38
41
|
@JvmStatic
|
|
39
|
-
private fun fromCpp(mapId: String?, liteMode: Boolean?, camera: RNCamera?): RNInitialProps {
|
|
40
|
-
return RNInitialProps(mapId, liteMode, camera)
|
|
42
|
+
private fun fromCpp(mapId: String?, liteMode: Boolean?, camera: RNCamera?, backgroundColor: String?): RNInitialProps {
|
|
43
|
+
return RNInitialProps(mapId, liteMode, camera, backgroundColor)
|
|
41
44
|
}
|
|
42
45
|
}
|
|
43
46
|
}
|
|
@@ -18,7 +18,7 @@ public extension RNInitialProps {
|
|
|
18
18
|
/**
|
|
19
19
|
* Create a new instance of `RNInitialProps`.
|
|
20
20
|
*/
|
|
21
|
-
init(mapId: String?, liteMode: Bool?, camera: RNCamera?) {
|
|
21
|
+
init(mapId: String?, liteMode: Bool?, camera: RNCamera?, backgroundColor: String?) {
|
|
22
22
|
self.init({ () -> bridge.std__optional_std__string_ in
|
|
23
23
|
if let __unwrappedValue = mapId {
|
|
24
24
|
return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
|
|
@@ -37,6 +37,12 @@ public extension RNInitialProps {
|
|
|
37
37
|
} else {
|
|
38
38
|
return .init()
|
|
39
39
|
}
|
|
40
|
+
}(), { () -> bridge.std__optional_std__string_ in
|
|
41
|
+
if let __unwrappedValue = backgroundColor {
|
|
42
|
+
return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
|
|
43
|
+
} else {
|
|
44
|
+
return .init()
|
|
45
|
+
}
|
|
40
46
|
}())
|
|
41
47
|
}
|
|
42
48
|
|
|
@@ -104,4 +110,28 @@ public extension RNInitialProps {
|
|
|
104
110
|
}()
|
|
105
111
|
}
|
|
106
112
|
}
|
|
113
|
+
|
|
114
|
+
var backgroundColor: String? {
|
|
115
|
+
@inline(__always)
|
|
116
|
+
get {
|
|
117
|
+
return { () -> String? in
|
|
118
|
+
if bridge.has_value_std__optional_std__string_(self.__backgroundColor) {
|
|
119
|
+
let __unwrapped = bridge.get_std__optional_std__string_(self.__backgroundColor)
|
|
120
|
+
return String(__unwrapped)
|
|
121
|
+
} else {
|
|
122
|
+
return nil
|
|
123
|
+
}
|
|
124
|
+
}()
|
|
125
|
+
}
|
|
126
|
+
@inline(__always)
|
|
127
|
+
set {
|
|
128
|
+
self.__backgroundColor = { () -> bridge.std__optional_std__string_ in
|
|
129
|
+
if let __unwrappedValue = newValue {
|
|
130
|
+
return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
|
|
131
|
+
} else {
|
|
132
|
+
return .init()
|
|
133
|
+
}
|
|
134
|
+
}()
|
|
135
|
+
}
|
|
136
|
+
}
|
|
107
137
|
}
|
|
@@ -40,10 +40,11 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
40
40
|
std::optional<std::string> mapId SWIFT_PRIVATE;
|
|
41
41
|
std::optional<bool> liteMode SWIFT_PRIVATE;
|
|
42
42
|
std::optional<RNCamera> camera SWIFT_PRIVATE;
|
|
43
|
+
std::optional<std::string> backgroundColor SWIFT_PRIVATE;
|
|
43
44
|
|
|
44
45
|
public:
|
|
45
46
|
RNInitialProps() = default;
|
|
46
|
-
explicit RNInitialProps(std::optional<std::string> mapId, std::optional<bool> liteMode, std::optional<RNCamera> camera): mapId(mapId), liteMode(liteMode), camera(camera) {}
|
|
47
|
+
explicit RNInitialProps(std::optional<std::string> mapId, std::optional<bool> liteMode, std::optional<RNCamera> camera, std::optional<std::string> backgroundColor): mapId(mapId), liteMode(liteMode), camera(camera), backgroundColor(backgroundColor) {}
|
|
47
48
|
};
|
|
48
49
|
|
|
49
50
|
} // namespace margelo::nitro::rngooglemapsplus
|
|
@@ -58,7 +59,8 @@ namespace margelo::nitro {
|
|
|
58
59
|
return margelo::nitro::rngooglemapsplus::RNInitialProps(
|
|
59
60
|
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "mapId")),
|
|
60
61
|
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "liteMode")),
|
|
61
|
-
JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNCamera>>::fromJSI(runtime, obj.getProperty(runtime, "camera"))
|
|
62
|
+
JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNCamera>>::fromJSI(runtime, obj.getProperty(runtime, "camera")),
|
|
63
|
+
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "backgroundColor"))
|
|
62
64
|
);
|
|
63
65
|
}
|
|
64
66
|
static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNInitialProps& arg) {
|
|
@@ -66,6 +68,7 @@ namespace margelo::nitro {
|
|
|
66
68
|
obj.setProperty(runtime, "mapId", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.mapId));
|
|
67
69
|
obj.setProperty(runtime, "liteMode", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.liteMode));
|
|
68
70
|
obj.setProperty(runtime, "camera", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNCamera>>::toJSI(runtime, arg.camera));
|
|
71
|
+
obj.setProperty(runtime, "backgroundColor", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.backgroundColor));
|
|
69
72
|
return obj;
|
|
70
73
|
}
|
|
71
74
|
static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
|
|
@@ -79,6 +82,7 @@ namespace margelo::nitro {
|
|
|
79
82
|
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "mapId"))) return false;
|
|
80
83
|
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "liteMode"))) return false;
|
|
81
84
|
if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNCamera>>::canConvert(runtime, obj.getProperty(runtime, "camera"))) return false;
|
|
85
|
+
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "backgroundColor"))) return false;
|
|
82
86
|
return true;
|
|
83
87
|
}
|
|
84
88
|
};
|
package/package.json
CHANGED