react-native-google-maps-plus 1.7.0-dev.8 → 1.7.0-dev.9
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 +2 -2
- package/ios/GoogleMapViewImpl.swift +2 -2
- package/lib/module/types.js.map +1 -1
- package/lib/typescript/src/types.d.ts +2 -0
- package/lib/typescript/src/types.d.ts.map +1 -1
- package/nitrogen/generated/android/c++/JRNMapUiSettings.hpp +11 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNMapUiSettings.kt +9 -3
- package/nitrogen/generated/ios/swift/RNMapUiSettings.swift +61 -1
- package/nitrogen/generated/shared/c++/RNMapUiSettings.hpp +10 -2
- package/package.json +1 -1
- package/src/types.ts +2 -0
|
@@ -876,7 +876,7 @@ class GoogleMapsViewImpl(
|
|
|
876
876
|
marker.showInfoWindow()
|
|
877
877
|
onMarkerPress?.invoke(marker.tag?.toString())
|
|
878
878
|
}
|
|
879
|
-
return false
|
|
879
|
+
return uiSettings?.consumeOnMarkerPress ?: false
|
|
880
880
|
}
|
|
881
881
|
|
|
882
882
|
override fun onPolylineClick(polyline: Polyline) =
|
|
@@ -963,6 +963,6 @@ class GoogleMapsViewImpl(
|
|
|
963
963
|
onUi {
|
|
964
964
|
onMyLocationButtonPress?.invoke(true)
|
|
965
965
|
}
|
|
966
|
-
return false
|
|
966
|
+
return uiSettings?.consumeOnMyLocationButtonPress ?: false
|
|
967
967
|
}
|
|
968
968
|
}
|
|
@@ -781,7 +781,7 @@ GMSIndoorDisplayDelegate {
|
|
|
781
781
|
mapView.selectedMarker = marker
|
|
782
782
|
self.onMarkerPress?(marker.userData as? String, )
|
|
783
783
|
}
|
|
784
|
-
return false
|
|
784
|
+
return uiSettings?.consumeOnMarkerPress ?? false
|
|
785
785
|
}
|
|
786
786
|
|
|
787
787
|
func mapView(_ mapView: GMSMapView, didTap overlay: GMSOverlay) {
|
|
@@ -891,6 +891,6 @@ GMSIndoorDisplayDelegate {
|
|
|
891
891
|
onMain {
|
|
892
892
|
self.onMyLocationButtonPress?(true)
|
|
893
893
|
}
|
|
894
|
-
return false
|
|
894
|
+
return uiSettings?.consumeOnMyLocationButtonPress ?? false
|
|
895
895
|
}
|
|
896
896
|
}
|
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":";;AAkEA;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;;AAwKA,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":[]}
|
|
@@ -18,6 +18,8 @@ export type RNMapUiSettings = {
|
|
|
18
18
|
tiltEnabled?: boolean;
|
|
19
19
|
zoomControlsEnabled?: boolean;
|
|
20
20
|
zoomGesturesEnabled?: boolean;
|
|
21
|
+
consumeOnMarkerPress?: boolean;
|
|
22
|
+
consumeOnMyLocationButtonPress?: boolean;
|
|
21
23
|
};
|
|
22
24
|
export type RNLatLng = {
|
|
23
25
|
latitude: number;
|
|
@@ -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;CACnB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,+BAA+B,CAAC,EAAE,OAAO,CAAC;IAC1C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,mBAAmB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,6 +53,10 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
53
53
|
jni::local_ref<jni::JBoolean> zoomControlsEnabled = this->getFieldValue(fieldZoomControlsEnabled);
|
|
54
54
|
static const auto fieldZoomGesturesEnabled = clazz->getField<jni::JBoolean>("zoomGesturesEnabled");
|
|
55
55
|
jni::local_ref<jni::JBoolean> zoomGesturesEnabled = this->getFieldValue(fieldZoomGesturesEnabled);
|
|
56
|
+
static const auto fieldConsumeOnMarkerPress = clazz->getField<jni::JBoolean>("consumeOnMarkerPress");
|
|
57
|
+
jni::local_ref<jni::JBoolean> consumeOnMarkerPress = this->getFieldValue(fieldConsumeOnMarkerPress);
|
|
58
|
+
static const auto fieldConsumeOnMyLocationButtonPress = clazz->getField<jni::JBoolean>("consumeOnMyLocationButtonPress");
|
|
59
|
+
jni::local_ref<jni::JBoolean> consumeOnMyLocationButtonPress = this->getFieldValue(fieldConsumeOnMyLocationButtonPress);
|
|
56
60
|
return RNMapUiSettings(
|
|
57
61
|
allGesturesEnabled != nullptr ? std::make_optional(static_cast<bool>(allGesturesEnabled->value())) : std::nullopt,
|
|
58
62
|
compassEnabled != nullptr ? std::make_optional(static_cast<bool>(compassEnabled->value())) : std::nullopt,
|
|
@@ -64,7 +68,9 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
64
68
|
scrollDuringRotateOrZoomEnabled != nullptr ? std::make_optional(static_cast<bool>(scrollDuringRotateOrZoomEnabled->value())) : std::nullopt,
|
|
65
69
|
tiltEnabled != nullptr ? std::make_optional(static_cast<bool>(tiltEnabled->value())) : std::nullopt,
|
|
66
70
|
zoomControlsEnabled != nullptr ? std::make_optional(static_cast<bool>(zoomControlsEnabled->value())) : std::nullopt,
|
|
67
|
-
zoomGesturesEnabled != nullptr ? std::make_optional(static_cast<bool>(zoomGesturesEnabled->value())) : std::nullopt
|
|
71
|
+
zoomGesturesEnabled != nullptr ? std::make_optional(static_cast<bool>(zoomGesturesEnabled->value())) : std::nullopt,
|
|
72
|
+
consumeOnMarkerPress != nullptr ? std::make_optional(static_cast<bool>(consumeOnMarkerPress->value())) : std::nullopt,
|
|
73
|
+
consumeOnMyLocationButtonPress != nullptr ? std::make_optional(static_cast<bool>(consumeOnMyLocationButtonPress->value())) : std::nullopt
|
|
68
74
|
);
|
|
69
75
|
}
|
|
70
76
|
|
|
@@ -74,7 +80,7 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
74
80
|
*/
|
|
75
81
|
[[maybe_unused]]
|
|
76
82
|
static jni::local_ref<JRNMapUiSettings::javaobject> fromCpp(const RNMapUiSettings& value) {
|
|
77
|
-
using JSignature = JRNMapUiSettings(jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>);
|
|
83
|
+
using JSignature = JRNMapUiSettings(jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>);
|
|
78
84
|
static const auto clazz = javaClassStatic();
|
|
79
85
|
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
|
|
80
86
|
return create(
|
|
@@ -89,7 +95,9 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
89
95
|
value.scrollDuringRotateOrZoomEnabled.has_value() ? jni::JBoolean::valueOf(value.scrollDuringRotateOrZoomEnabled.value()) : nullptr,
|
|
90
96
|
value.tiltEnabled.has_value() ? jni::JBoolean::valueOf(value.tiltEnabled.value()) : nullptr,
|
|
91
97
|
value.zoomControlsEnabled.has_value() ? jni::JBoolean::valueOf(value.zoomControlsEnabled.value()) : nullptr,
|
|
92
|
-
value.zoomGesturesEnabled.has_value() ? jni::JBoolean::valueOf(value.zoomGesturesEnabled.value()) : nullptr
|
|
98
|
+
value.zoomGesturesEnabled.has_value() ? jni::JBoolean::valueOf(value.zoomGesturesEnabled.value()) : nullptr,
|
|
99
|
+
value.consumeOnMarkerPress.has_value() ? jni::JBoolean::valueOf(value.consumeOnMarkerPress.value()) : nullptr,
|
|
100
|
+
value.consumeOnMyLocationButtonPress.has_value() ? jni::JBoolean::valueOf(value.consumeOnMyLocationButtonPress.value()) : nullptr
|
|
93
101
|
);
|
|
94
102
|
}
|
|
95
103
|
};
|
package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNMapUiSettings.kt
CHANGED
|
@@ -50,7 +50,13 @@ data class RNMapUiSettings(
|
|
|
50
50
|
val zoomControlsEnabled: Boolean?,
|
|
51
51
|
@DoNotStrip
|
|
52
52
|
@Keep
|
|
53
|
-
val zoomGesturesEnabled: Boolean
|
|
53
|
+
val zoomGesturesEnabled: Boolean?,
|
|
54
|
+
@DoNotStrip
|
|
55
|
+
@Keep
|
|
56
|
+
val consumeOnMarkerPress: Boolean?,
|
|
57
|
+
@DoNotStrip
|
|
58
|
+
@Keep
|
|
59
|
+
val consumeOnMyLocationButtonPress: Boolean?
|
|
54
60
|
) {
|
|
55
61
|
private companion object {
|
|
56
62
|
/**
|
|
@@ -60,8 +66,8 @@ data class RNMapUiSettings(
|
|
|
60
66
|
@Keep
|
|
61
67
|
@Suppress("unused")
|
|
62
68
|
@JvmStatic
|
|
63
|
-
private fun fromCpp(allGesturesEnabled: Boolean?, compassEnabled: Boolean?, indoorLevelPickerEnabled: Boolean?, mapToolbarEnabled: Boolean?, myLocationButtonEnabled: Boolean?, rotateEnabled: Boolean?, scrollEnabled: Boolean?, scrollDuringRotateOrZoomEnabled: Boolean?, tiltEnabled: Boolean?, zoomControlsEnabled: Boolean?, zoomGesturesEnabled: Boolean?): RNMapUiSettings {
|
|
64
|
-
return RNMapUiSettings(allGesturesEnabled, compassEnabled, indoorLevelPickerEnabled, mapToolbarEnabled, myLocationButtonEnabled, rotateEnabled, scrollEnabled, scrollDuringRotateOrZoomEnabled, tiltEnabled, zoomControlsEnabled, zoomGesturesEnabled)
|
|
69
|
+
private fun fromCpp(allGesturesEnabled: Boolean?, compassEnabled: Boolean?, indoorLevelPickerEnabled: Boolean?, mapToolbarEnabled: Boolean?, myLocationButtonEnabled: Boolean?, rotateEnabled: Boolean?, scrollEnabled: Boolean?, scrollDuringRotateOrZoomEnabled: Boolean?, tiltEnabled: Boolean?, zoomControlsEnabled: Boolean?, zoomGesturesEnabled: Boolean?, consumeOnMarkerPress: Boolean?, consumeOnMyLocationButtonPress: Boolean?): RNMapUiSettings {
|
|
70
|
+
return RNMapUiSettings(allGesturesEnabled, compassEnabled, indoorLevelPickerEnabled, mapToolbarEnabled, myLocationButtonEnabled, rotateEnabled, scrollEnabled, scrollDuringRotateOrZoomEnabled, tiltEnabled, zoomControlsEnabled, zoomGesturesEnabled, consumeOnMarkerPress, consumeOnMyLocationButtonPress)
|
|
65
71
|
}
|
|
66
72
|
}
|
|
67
73
|
}
|
|
@@ -18,7 +18,7 @@ public extension RNMapUiSettings {
|
|
|
18
18
|
/**
|
|
19
19
|
* Create a new instance of `RNMapUiSettings`.
|
|
20
20
|
*/
|
|
21
|
-
init(allGesturesEnabled: Bool?, compassEnabled: Bool?, indoorLevelPickerEnabled: Bool?, mapToolbarEnabled: Bool?, myLocationButtonEnabled: Bool?, rotateEnabled: Bool?, scrollEnabled: Bool?, scrollDuringRotateOrZoomEnabled: Bool?, tiltEnabled: Bool?, zoomControlsEnabled: Bool?, zoomGesturesEnabled: Bool?) {
|
|
21
|
+
init(allGesturesEnabled: Bool?, compassEnabled: Bool?, indoorLevelPickerEnabled: Bool?, mapToolbarEnabled: Bool?, myLocationButtonEnabled: Bool?, rotateEnabled: Bool?, scrollEnabled: Bool?, scrollDuringRotateOrZoomEnabled: Bool?, tiltEnabled: Bool?, zoomControlsEnabled: Bool?, zoomGesturesEnabled: Bool?, consumeOnMarkerPress: Bool?, consumeOnMyLocationButtonPress: Bool?) {
|
|
22
22
|
self.init({ () -> bridge.std__optional_bool_ in
|
|
23
23
|
if let __unwrappedValue = allGesturesEnabled {
|
|
24
24
|
return bridge.create_std__optional_bool_(__unwrappedValue)
|
|
@@ -85,6 +85,18 @@ public extension RNMapUiSettings {
|
|
|
85
85
|
} else {
|
|
86
86
|
return .init()
|
|
87
87
|
}
|
|
88
|
+
}(), { () -> bridge.std__optional_bool_ in
|
|
89
|
+
if let __unwrappedValue = consumeOnMarkerPress {
|
|
90
|
+
return bridge.create_std__optional_bool_(__unwrappedValue)
|
|
91
|
+
} else {
|
|
92
|
+
return .init()
|
|
93
|
+
}
|
|
94
|
+
}(), { () -> bridge.std__optional_bool_ in
|
|
95
|
+
if let __unwrappedValue = consumeOnMyLocationButtonPress {
|
|
96
|
+
return bridge.create_std__optional_bool_(__unwrappedValue)
|
|
97
|
+
} else {
|
|
98
|
+
return .init()
|
|
99
|
+
}
|
|
88
100
|
}())
|
|
89
101
|
}
|
|
90
102
|
|
|
@@ -351,4 +363,52 @@ public extension RNMapUiSettings {
|
|
|
351
363
|
}()
|
|
352
364
|
}
|
|
353
365
|
}
|
|
366
|
+
|
|
367
|
+
var consumeOnMarkerPress: Bool? {
|
|
368
|
+
@inline(__always)
|
|
369
|
+
get {
|
|
370
|
+
return { () -> Bool? in
|
|
371
|
+
if bridge.has_value_std__optional_bool_(self.__consumeOnMarkerPress) {
|
|
372
|
+
let __unwrapped = bridge.get_std__optional_bool_(self.__consumeOnMarkerPress)
|
|
373
|
+
return __unwrapped
|
|
374
|
+
} else {
|
|
375
|
+
return nil
|
|
376
|
+
}
|
|
377
|
+
}()
|
|
378
|
+
}
|
|
379
|
+
@inline(__always)
|
|
380
|
+
set {
|
|
381
|
+
self.__consumeOnMarkerPress = { () -> bridge.std__optional_bool_ in
|
|
382
|
+
if let __unwrappedValue = newValue {
|
|
383
|
+
return bridge.create_std__optional_bool_(__unwrappedValue)
|
|
384
|
+
} else {
|
|
385
|
+
return .init()
|
|
386
|
+
}
|
|
387
|
+
}()
|
|
388
|
+
}
|
|
389
|
+
}
|
|
390
|
+
|
|
391
|
+
var consumeOnMyLocationButtonPress: Bool? {
|
|
392
|
+
@inline(__always)
|
|
393
|
+
get {
|
|
394
|
+
return { () -> Bool? in
|
|
395
|
+
if bridge.has_value_std__optional_bool_(self.__consumeOnMyLocationButtonPress) {
|
|
396
|
+
let __unwrapped = bridge.get_std__optional_bool_(self.__consumeOnMyLocationButtonPress)
|
|
397
|
+
return __unwrapped
|
|
398
|
+
} else {
|
|
399
|
+
return nil
|
|
400
|
+
}
|
|
401
|
+
}()
|
|
402
|
+
}
|
|
403
|
+
@inline(__always)
|
|
404
|
+
set {
|
|
405
|
+
self.__consumeOnMyLocationButtonPress = { () -> bridge.std__optional_bool_ in
|
|
406
|
+
if let __unwrappedValue = newValue {
|
|
407
|
+
return bridge.create_std__optional_bool_(__unwrappedValue)
|
|
408
|
+
} else {
|
|
409
|
+
return .init()
|
|
410
|
+
}
|
|
411
|
+
}()
|
|
412
|
+
}
|
|
413
|
+
}
|
|
354
414
|
}
|
|
@@ -45,10 +45,12 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
45
45
|
std::optional<bool> tiltEnabled SWIFT_PRIVATE;
|
|
46
46
|
std::optional<bool> zoomControlsEnabled SWIFT_PRIVATE;
|
|
47
47
|
std::optional<bool> zoomGesturesEnabled SWIFT_PRIVATE;
|
|
48
|
+
std::optional<bool> consumeOnMarkerPress SWIFT_PRIVATE;
|
|
49
|
+
std::optional<bool> consumeOnMyLocationButtonPress SWIFT_PRIVATE;
|
|
48
50
|
|
|
49
51
|
public:
|
|
50
52
|
RNMapUiSettings() = default;
|
|
51
|
-
explicit RNMapUiSettings(std::optional<bool> allGesturesEnabled, std::optional<bool> compassEnabled, std::optional<bool> indoorLevelPickerEnabled, std::optional<bool> mapToolbarEnabled, std::optional<bool> myLocationButtonEnabled, std::optional<bool> rotateEnabled, std::optional<bool> scrollEnabled, std::optional<bool> scrollDuringRotateOrZoomEnabled, std::optional<bool> tiltEnabled, std::optional<bool> zoomControlsEnabled, std::optional<bool> zoomGesturesEnabled): allGesturesEnabled(allGesturesEnabled), compassEnabled(compassEnabled), indoorLevelPickerEnabled(indoorLevelPickerEnabled), mapToolbarEnabled(mapToolbarEnabled), myLocationButtonEnabled(myLocationButtonEnabled), rotateEnabled(rotateEnabled), scrollEnabled(scrollEnabled), scrollDuringRotateOrZoomEnabled(scrollDuringRotateOrZoomEnabled), tiltEnabled(tiltEnabled), zoomControlsEnabled(zoomControlsEnabled), zoomGesturesEnabled(zoomGesturesEnabled) {}
|
|
53
|
+
explicit RNMapUiSettings(std::optional<bool> allGesturesEnabled, std::optional<bool> compassEnabled, std::optional<bool> indoorLevelPickerEnabled, std::optional<bool> mapToolbarEnabled, std::optional<bool> myLocationButtonEnabled, std::optional<bool> rotateEnabled, std::optional<bool> scrollEnabled, std::optional<bool> scrollDuringRotateOrZoomEnabled, std::optional<bool> tiltEnabled, std::optional<bool> zoomControlsEnabled, std::optional<bool> zoomGesturesEnabled, std::optional<bool> consumeOnMarkerPress, std::optional<bool> consumeOnMyLocationButtonPress): allGesturesEnabled(allGesturesEnabled), compassEnabled(compassEnabled), indoorLevelPickerEnabled(indoorLevelPickerEnabled), mapToolbarEnabled(mapToolbarEnabled), myLocationButtonEnabled(myLocationButtonEnabled), rotateEnabled(rotateEnabled), scrollEnabled(scrollEnabled), scrollDuringRotateOrZoomEnabled(scrollDuringRotateOrZoomEnabled), tiltEnabled(tiltEnabled), zoomControlsEnabled(zoomControlsEnabled), zoomGesturesEnabled(zoomGesturesEnabled), consumeOnMarkerPress(consumeOnMarkerPress), consumeOnMyLocationButtonPress(consumeOnMyLocationButtonPress) {}
|
|
52
54
|
};
|
|
53
55
|
|
|
54
56
|
} // namespace margelo::nitro::rngooglemapsplus
|
|
@@ -71,7 +73,9 @@ namespace margelo::nitro {
|
|
|
71
73
|
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "scrollDuringRotateOrZoomEnabled")),
|
|
72
74
|
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "tiltEnabled")),
|
|
73
75
|
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "zoomControlsEnabled")),
|
|
74
|
-
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "zoomGesturesEnabled"))
|
|
76
|
+
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "zoomGesturesEnabled")),
|
|
77
|
+
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "consumeOnMarkerPress")),
|
|
78
|
+
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "consumeOnMyLocationButtonPress"))
|
|
75
79
|
);
|
|
76
80
|
}
|
|
77
81
|
static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNMapUiSettings& arg) {
|
|
@@ -87,6 +91,8 @@ namespace margelo::nitro {
|
|
|
87
91
|
obj.setProperty(runtime, "tiltEnabled", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.tiltEnabled));
|
|
88
92
|
obj.setProperty(runtime, "zoomControlsEnabled", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.zoomControlsEnabled));
|
|
89
93
|
obj.setProperty(runtime, "zoomGesturesEnabled", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.zoomGesturesEnabled));
|
|
94
|
+
obj.setProperty(runtime, "consumeOnMarkerPress", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.consumeOnMarkerPress));
|
|
95
|
+
obj.setProperty(runtime, "consumeOnMyLocationButtonPress", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.consumeOnMyLocationButtonPress));
|
|
90
96
|
return obj;
|
|
91
97
|
}
|
|
92
98
|
static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
|
|
@@ -108,6 +114,8 @@ namespace margelo::nitro {
|
|
|
108
114
|
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "tiltEnabled"))) return false;
|
|
109
115
|
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "zoomControlsEnabled"))) return false;
|
|
110
116
|
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "zoomGesturesEnabled"))) return false;
|
|
117
|
+
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "consumeOnMarkerPress"))) return false;
|
|
118
|
+
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "consumeOnMyLocationButtonPress"))) return false;
|
|
111
119
|
return true;
|
|
112
120
|
}
|
|
113
121
|
};
|
package/package.json
CHANGED
package/src/types.ts
CHANGED