@rnmapbox/maps 10.1.0-rc.0 → 10.1.0-rc.2
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/README.md +1 -1
- package/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt +2 -0
- package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerView.kt +3 -0
- package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewContent.kt +23 -0
- package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewContentManager.kt +23 -0
- package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXVectorSource.kt +1 -1
- package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXModule.kt +18 -1
- package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/MapboxMap.kt +11 -0
- package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/Annotation.kt +2 -1
- package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/MapboxMap.kt +5 -0
- package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewContentManagerDelegate.java +25 -0
- package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewContentManagerInterface.java +16 -0
- package/ios/RNMBX/RNMBXMarkerViewContentComponentView.h +15 -0
- package/ios/RNMBX/RNMBXMarkerViewContentComponentView.mm +41 -0
- package/ios/RNMBX/RNMBXMarkerViewContentManager.m +6 -0
- package/ios/RNMBX/RNMBXMarkerViewContentManager.swift +14 -0
- package/ios/RNMBX/RNMBXModule.m +1 -1
- package/ios/RNMBX/RNMBXModule.swift +24 -0
- package/ios/RNMBX/RNMBXStyleValue.swift +22 -1
- package/lib/commonjs/RNMBXModule.js +3 -1
- package/lib/commonjs/RNMBXModule.js.map +1 -1
- package/lib/commonjs/components/MarkerView.js +3 -3
- package/lib/commonjs/components/MarkerView.js.map +1 -1
- package/lib/commonjs/specs/RNMBXMarkerViewContentNativeComponent.js +11 -0
- package/lib/commonjs/specs/RNMBXMarkerViewContentNativeComponent.js.map +1 -0
- package/lib/module/RNMBXModule.js +1 -0
- package/lib/module/RNMBXModule.js.map +1 -1
- package/lib/module/components/MarkerView.js +3 -3
- package/lib/module/components/MarkerView.js.map +1 -1
- package/lib/module/specs/RNMBXMarkerViewContentNativeComponent.js +6 -0
- package/lib/module/specs/RNMBXMarkerViewContentNativeComponent.js.map +1 -0
- package/lib/typescript/src/RNMBXModule.d.ts +1 -1
- package/lib/typescript/src/RNMBXModule.d.ts.map +1 -1
- package/lib/typescript/src/components/MarkerView.d.ts +0 -1
- package/lib/typescript/src/components/MarkerView.d.ts.map +1 -1
- package/lib/typescript/src/specs/RNMBXMarkerViewContentNativeComponent.d.ts +6 -0
- package/lib/typescript/src/specs/RNMBXMarkerViewContentNativeComponent.d.ts.map +1 -0
- package/package.json +1 -1
- package/setup-jest.js +1 -0
- package/src/RNMBXModule.ts +2 -0
- package/src/components/MarkerView.tsx +4 -5
- package/src/specs/RNMBXMarkerViewContentNativeComponent.ts +9 -0
package/README.md
CHANGED
|
@@ -8,6 +8,7 @@ import com.facebook.react.module.model.ReactModuleInfo
|
|
|
8
8
|
import com.facebook.react.module.model.ReactModuleInfoProvider
|
|
9
9
|
import com.facebook.react.uimanager.ViewManager
|
|
10
10
|
import com.rnmapbox.rnmbx.components.annotation.RNMBXCalloutManager
|
|
11
|
+
import com.rnmapbox.rnmbx.components.annotation.RNMBXMarkerViewContentManager
|
|
11
12
|
import com.rnmapbox.rnmbx.components.annotation.RNMBXMarkerViewManager
|
|
12
13
|
import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotationManager
|
|
13
14
|
import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotationModule
|
|
@@ -117,6 +118,7 @@ class RNMBXPackage : TurboReactPackage() {
|
|
|
117
118
|
|
|
118
119
|
// annotations
|
|
119
120
|
managers.add(RNMBXMarkerViewManager(reactApplicationContext))
|
|
121
|
+
managers.add(RNMBXMarkerViewContentManager(reactApplicationContext))
|
|
120
122
|
managers.add(RNMBXPointAnnotationManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXPointAnnotationManager")))
|
|
121
123
|
managers.add(RNMBXCalloutManager())
|
|
122
124
|
managers.add(RNMBXNativeUserLocationManager())
|
|
@@ -116,11 +116,13 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
|
|
|
116
116
|
|
|
117
117
|
val options = getOptions()
|
|
118
118
|
|
|
119
|
+
|
|
119
120
|
val annotation = mMapView?.viewAnnotationManager?.addViewAnnotation(
|
|
120
121
|
view,
|
|
121
122
|
options
|
|
122
123
|
)
|
|
123
124
|
didAddToMap = true
|
|
125
|
+
|
|
124
126
|
}
|
|
125
127
|
|
|
126
128
|
fun update() {
|
|
@@ -176,6 +178,7 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
|
|
|
176
178
|
allowOverlap(mAllowOverlap)
|
|
177
179
|
offsets(offset.dx, offset.dy)
|
|
178
180
|
selected(mIsSelected)
|
|
181
|
+
|
|
179
182
|
}
|
|
180
183
|
return options
|
|
181
184
|
}
|
package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewContent.kt
ADDED
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
package com.rnmapbox.rnmbx.components.annotation
|
|
2
|
+
|
|
3
|
+
import android.content.Context
|
|
4
|
+
import com.facebook.react.uimanager.MeasureSpecAssertions
|
|
5
|
+
import com.facebook.react.views.view.ReactViewGroup
|
|
6
|
+
|
|
7
|
+
class RNMBXMarkerViewContent(context: Context): ReactViewGroup(context) {
|
|
8
|
+
// see https://github.com/rnmapbox/maps/pull/3235
|
|
9
|
+
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
|
|
10
|
+
try {
|
|
11
|
+
super.onMeasure(widthMeasureSpec, heightMeasureSpec)
|
|
12
|
+
} catch(e: IllegalStateException) {
|
|
13
|
+
val w = MeasureSpec.getSize(widthMeasureSpec)
|
|
14
|
+
val h = MeasureSpec.getSize(heightMeasureSpec)
|
|
15
|
+
setMeasuredDimension(
|
|
16
|
+
if (w == 0) measuredWidth else w,
|
|
17
|
+
if (h == 0) measuredHeight else h
|
|
18
|
+
)
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
}
|
|
23
|
+
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
package com.rnmapbox.rnmbx.components.annotation
|
|
2
|
+
|
|
3
|
+
import com.facebook.react.bridge.ReactApplicationContext
|
|
4
|
+
import com.facebook.react.uimanager.ThemedReactContext
|
|
5
|
+
import com.facebook.react.uimanager.ViewGroupManager
|
|
6
|
+
import com.facebook.react.viewmanagers.RNMBXMarkerViewContentManagerInterface
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
class RNMBXMarkerViewContentManager(reactApplicationContext: ReactApplicationContext) :
|
|
10
|
+
ViewGroupManager<RNMBXMarkerViewContent>(),
|
|
11
|
+
RNMBXMarkerViewContentManagerInterface<RNMBXMarkerView> {
|
|
12
|
+
override fun getName(): String {
|
|
13
|
+
return REACT_CLASS
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
override fun createViewInstance(context: ThemedReactContext): RNMBXMarkerViewContent {
|
|
17
|
+
return RNMBXMarkerViewContent(context)
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
companion object {
|
|
21
|
+
const val REACT_CLASS = "RNMBXMarkerViewContent"
|
|
22
|
+
}
|
|
23
|
+
}
|
package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXVectorSource.kt
CHANGED
|
@@ -23,7 +23,7 @@ class RNMBXVectorSource(context: Context?, private val mManager: RNMBXVectorSour
|
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
override fun hasNoDataSoRefersToExisting(): Boolean {
|
|
26
|
-
return uRL == null;
|
|
26
|
+
return uRL == null && tileUrlTemplates == null;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
override fun makeSource(): VectorSource {
|
|
@@ -14,12 +14,15 @@ import com.facebook.react.bridge.ReactMethod
|
|
|
14
14
|
import com.facebook.react.common.MapBuilder
|
|
15
15
|
import com.mapbox.common.*
|
|
16
16
|
import com.mapbox.maps.MapView
|
|
17
|
+
import com.mapbox.maps.MapboxMap
|
|
17
18
|
import com.mapbox.maps.Style
|
|
18
19
|
import com.mapbox.maps.plugin.attribution.attribution
|
|
19
20
|
import com.rnmapbox.rnmbx.components.camera.constants.CameraMode
|
|
21
|
+
import com.rnmapbox.rnmbx.utils.Logger
|
|
20
22
|
import java.util.HashMap
|
|
21
23
|
|
|
22
24
|
import com.rnmapbox.rnmbx.v11compat.resourceoption.*
|
|
25
|
+
import com.rnmapbox.rnmbx.v11compat.mapboxmap.*
|
|
23
26
|
|
|
24
27
|
@ReactModule(name = RNMBXModule.REACT_CLASS)
|
|
25
28
|
class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactContextBaseJavaModule(
|
|
@@ -128,6 +131,19 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
|
|
|
128
131
|
}
|
|
129
132
|
}
|
|
130
133
|
|
|
134
|
+
@ReactMethod
|
|
135
|
+
fun clearData(promise: Promise) {
|
|
136
|
+
mReactContext.runOnUiQueueThread {
|
|
137
|
+
MapboxMap.clearData(mReactContext) {
|
|
138
|
+
if (it.isValue) {
|
|
139
|
+
promise.resolve(it.value)
|
|
140
|
+
} else {
|
|
141
|
+
promise.reject("error", "RNMBXModule.clearError ${it.error}")
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
|
|
131
147
|
@ReactMethod
|
|
132
148
|
fun setAccessToken(accessToken: String?, promise: Promise) {
|
|
133
149
|
mReactContext.runOnUiQueueThread(Runnable {
|
|
@@ -138,7 +154,7 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
|
|
|
138
154
|
|
|
139
155
|
@ReactMethod
|
|
140
156
|
fun setWellKnownTileServer(tileServer: String?) {
|
|
141
|
-
|
|
157
|
+
Logger.e(LOG_TAG, "setWellKnownTileServer is deprecated and will be removed")
|
|
142
158
|
}
|
|
143
159
|
|
|
144
160
|
@ReactMethod
|
|
@@ -153,6 +169,7 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
|
|
|
153
169
|
|
|
154
170
|
companion object {
|
|
155
171
|
const val REACT_CLASS = "RNMBXModule"
|
|
172
|
+
const val LOG_TAG = "RNMBXModule"
|
|
156
173
|
private val customHeaderInterceptorAdded = false
|
|
157
174
|
@JvmStatic
|
|
158
175
|
fun getAccessToken(reactContext: ReactApplicationContext?): String {
|
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
package com.rnmapbox.rnmbx.v11compat.mapboxmap;
|
|
2
2
|
|
|
3
3
|
import android.animation.Animator
|
|
4
|
+
import android.app.Activity
|
|
5
|
+
import android.content.Context
|
|
6
|
+
import android.content.ContextWrapper
|
|
7
|
+
import androidx.activity.result.contract.ActivityResultContracts
|
|
8
|
+
import com.mapbox.bindgen.Expected
|
|
9
|
+
import com.mapbox.bindgen.None
|
|
4
10
|
import com.mapbox.maps.CameraOptions
|
|
11
|
+
import com.mapbox.maps.MapView
|
|
5
12
|
import com.mapbox.maps.MapboxMap
|
|
6
13
|
import com.mapbox.maps.plugin.animation.MapAnimationOptions
|
|
7
14
|
import com.mapbox.maps.plugin.animation.easeTo
|
|
@@ -29,3 +36,7 @@ fun MapboxMap.easeToV11(
|
|
|
29
36
|
|
|
30
37
|
)
|
|
31
38
|
}
|
|
39
|
+
|
|
40
|
+
fun MapboxMap.Companion.clearData(context: Context, callback: (result: Expected<String, None>) -> Unit) {
|
|
41
|
+
MapView(context).getMapboxMap().clearData(callback)
|
|
42
|
+
}
|
|
@@ -4,6 +4,7 @@ import android.view.View
|
|
|
4
4
|
import com.mapbox.geojson.Geometry
|
|
5
5
|
import com.mapbox.geojson.Point
|
|
6
6
|
import com.mapbox.maps.ScreenCoordinate
|
|
7
|
+
import com.mapbox.maps.ViewAnnotationAnchor
|
|
7
8
|
import com.mapbox.maps.ViewAnnotationAnchorConfig
|
|
8
9
|
import com.mapbox.maps.ViewAnnotationOptions
|
|
9
10
|
import com.mapbox.maps.viewannotation.geometry as _geometry
|
|
@@ -22,7 +23,7 @@ fun ViewAnnotationOptions.Builder.geometry(point: Geometry): ViewAnnotationOptio
|
|
|
22
23
|
|
|
23
24
|
fun ViewAnnotationOptions.Builder.offsets(x: Double, y: Double) {
|
|
24
25
|
this.variableAnchors(listOf(
|
|
25
|
-
ViewAnnotationAnchorConfig.Builder().offsetY(x).offsetY(y).build()
|
|
26
|
+
ViewAnnotationAnchorConfig.Builder().anchor(ViewAnnotationAnchor.CENTER).offsetY(x).offsetY(y).build()
|
|
26
27
|
))
|
|
27
28
|
}
|
|
28
29
|
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
package com.rnmapbox.rnmbx.v11compat.mapboxmap
|
|
2
2
|
|
|
3
3
|
import android.animation.Animator
|
|
4
|
+
import android.content.Context
|
|
4
5
|
import com.mapbox.maps.AsyncOperationResultCallback
|
|
5
6
|
import com.mapbox.maps.CameraOptions
|
|
6
7
|
import com.mapbox.maps.MapboxMap
|
|
@@ -34,4 +35,8 @@ fun MapboxMap.easeToV11(
|
|
|
34
35
|
|
|
35
36
|
fun MapboxMap.clearData(callback: AsyncOperationResultCallback) {
|
|
36
37
|
return MapboxMap.clearData(callback)
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
fun MapboxMap.Companion.clearData(context: Context, callback: AsyncOperationResultCallback) {
|
|
41
|
+
this.clearData(callback)
|
|
37
42
|
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
|
|
3
|
+
*
|
|
4
|
+
* Do not edit this file as changes may cause incorrect behavior and will be lost
|
|
5
|
+
* once the code is regenerated.
|
|
6
|
+
*
|
|
7
|
+
* @generated by codegen project: GeneratePropsJavaDelegate.js
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
package com.facebook.react.viewmanagers;
|
|
11
|
+
|
|
12
|
+
import android.view.View;
|
|
13
|
+
import androidx.annotation.Nullable;
|
|
14
|
+
import com.facebook.react.uimanager.BaseViewManagerDelegate;
|
|
15
|
+
import com.facebook.react.uimanager.BaseViewManagerInterface;
|
|
16
|
+
|
|
17
|
+
public class RNMBXMarkerViewContentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNMBXMarkerViewContentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
|
|
18
|
+
public RNMBXMarkerViewContentManagerDelegate(U viewManager) {
|
|
19
|
+
super(viewManager);
|
|
20
|
+
}
|
|
21
|
+
@Override
|
|
22
|
+
public void setProperty(T view, String propName, @Nullable Object value) {
|
|
23
|
+
super.setProperty(view, propName, value);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
|
|
3
|
+
*
|
|
4
|
+
* Do not edit this file as changes may cause incorrect behavior and will be lost
|
|
5
|
+
* once the code is regenerated.
|
|
6
|
+
*
|
|
7
|
+
* @generated by codegen project: GeneratePropsJavaInterface.js
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
package com.facebook.react.viewmanagers;
|
|
11
|
+
|
|
12
|
+
import android.view.View;
|
|
13
|
+
|
|
14
|
+
public interface RNMBXMarkerViewContentManagerInterface<T extends View> {
|
|
15
|
+
// No props
|
|
16
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
#ifdef RCT_NEW_ARCH_ENABLED
|
|
2
|
+
|
|
3
|
+
#import <UIKit/UIKit.h>
|
|
4
|
+
|
|
5
|
+
#import <React/RCTUIManager.h>
|
|
6
|
+
#import <React/RCTViewComponentView.h>
|
|
7
|
+
|
|
8
|
+
NS_ASSUME_NONNULL_BEGIN
|
|
9
|
+
|
|
10
|
+
@interface RNMBXMarkerViewContentComponentView : RCTViewComponentView
|
|
11
|
+
@end
|
|
12
|
+
|
|
13
|
+
NS_ASSUME_NONNULL_END
|
|
14
|
+
|
|
15
|
+
#endif // RCT_NEW_ARCH_ENABLED
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
#ifdef RCT_NEW_ARCH_ENABLED
|
|
2
|
+
|
|
3
|
+
#import "RNMBXMarkerViewContentComponentView.h"
|
|
4
|
+
#import "RNMBXFabricHelpers.h"
|
|
5
|
+
|
|
6
|
+
#import <React/RCTConversions.h>
|
|
7
|
+
#import <React/RCTFabricComponentsPlugins.h>
|
|
8
|
+
|
|
9
|
+
#import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
|
|
10
|
+
#import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
|
|
11
|
+
#import <react/renderer/components/rnmapbox_maps_specs/Props.h>
|
|
12
|
+
#import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
|
|
13
|
+
|
|
14
|
+
using namespace facebook::react;
|
|
15
|
+
|
|
16
|
+
@interface RNMBXMarkerViewContentComponentView () <RCTRNMBXMarkerViewContentViewProtocol>
|
|
17
|
+
@end
|
|
18
|
+
|
|
19
|
+
@implementation RNMBXMarkerViewContentComponentView {
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
- (instancetype)initWithFrame:(CGRect)frame
|
|
23
|
+
{
|
|
24
|
+
return [super initWithFrame:frame];
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
#pragma mark - RCTComponentViewProtocol
|
|
28
|
+
|
|
29
|
+
+ (ComponentDescriptorProvider)componentDescriptorProvider
|
|
30
|
+
{
|
|
31
|
+
return concreteComponentDescriptorProvider<RNMBXMarkerViewContentComponentDescriptor>();
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
@end
|
|
35
|
+
|
|
36
|
+
Class<RCTComponentViewProtocol> RNMBXMarkerViewContentCls(void)
|
|
37
|
+
{
|
|
38
|
+
return RNMBXMarkerViewContentComponentView.class;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
#endif // RCT_NEW_ARCH_ENABLED
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import Foundation
|
|
2
|
+
import MapboxMaps
|
|
3
|
+
|
|
4
|
+
@objc(RNMBXMarkerViewContentManager)
|
|
5
|
+
class RNMBXMarkerViewContentManager : RCTViewManager {
|
|
6
|
+
@objc
|
|
7
|
+
override static func requiresMainQueueSetup() -> Bool {
|
|
8
|
+
return true
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
override func view() -> UIView! {
|
|
12
|
+
return UIView()
|
|
13
|
+
}
|
|
14
|
+
}
|
package/ios/RNMBX/RNMBXModule.m
CHANGED
|
@@ -9,6 +9,6 @@ RCT_EXTERN_METHOD(removeCustomHeader:(NSString *)headerName)
|
|
|
9
9
|
|
|
10
10
|
RCT_EXTERN_METHOD(setTelemetryEnabled:(BOOL)telemetryEnabled)
|
|
11
11
|
RCT_EXTERN_METHOD(setWellKnownTileServer:(NSString *)tileServer)
|
|
12
|
-
|
|
12
|
+
RCT_EXTERN_METHOD(clearData:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
|
|
13
13
|
|
|
14
14
|
@end
|
|
@@ -113,4 +113,28 @@ class RNMBXModule : NSObject {
|
|
|
113
113
|
Logger.error("setWellKnownTileServer: \(tileServer) should be mapbox")
|
|
114
114
|
}
|
|
115
115
|
}
|
|
116
|
+
|
|
117
|
+
@objc func clearData(_ resolver: @escaping RCTPromiseResolveBlock,
|
|
118
|
+
rejecter: @escaping RCTPromiseRejectBlock) {
|
|
119
|
+
|
|
120
|
+
DispatchQueue.main.async {
|
|
121
|
+
#if RNMBX_11
|
|
122
|
+
MapboxMap.clearData { error in
|
|
123
|
+
if let error = error {
|
|
124
|
+
rejecter("error", error.localizedDescription, error)
|
|
125
|
+
} else {
|
|
126
|
+
resolver(nil)
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
#else
|
|
130
|
+
MapboxMap.clearData(for: ResourceOptions(accessToken: RNMBXModule.accessToken ?? "")) { error in
|
|
131
|
+
if let error = error {
|
|
132
|
+
rejecter("error", error.localizedDescription, error)
|
|
133
|
+
} else {
|
|
134
|
+
resolver(nil)
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
#endif
|
|
138
|
+
}
|
|
139
|
+
}
|
|
116
140
|
}
|
|
@@ -556,7 +556,28 @@ class RNMBXStyleValue {
|
|
|
556
556
|
}
|
|
557
557
|
|
|
558
558
|
func mglStyleValueArrayTextVariableAnchor() -> Value<[TextAnchor]> {
|
|
559
|
-
|
|
559
|
+
guard let value = value as? Dictionary<String,Any> else {
|
|
560
|
+
Logger.log(level: .error, message: "Invalid value for array of TextAnchor: \(value)")
|
|
561
|
+
return .constant([.left])
|
|
562
|
+
}
|
|
563
|
+
let valueObj = RNMBXStyleValue.convert(value["stylevalue"] as! [String:Any])
|
|
564
|
+
|
|
565
|
+
if let valueObj = valueObj as? [String] {
|
|
566
|
+
let convertedVal = valueObj.compactMap(TextAnchor.init(rawValue:))
|
|
567
|
+
return .constant(convertedVal)
|
|
568
|
+
} else {
|
|
569
|
+
do {
|
|
570
|
+
if valueObj is String {
|
|
571
|
+
throw StyleConversionError.unexpectedType(message: "should be array constant or expression")
|
|
572
|
+
}
|
|
573
|
+
let data = try JSONSerialization.data(withJSONObject: valueObj, options: .prettyPrinted)
|
|
574
|
+
let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
|
|
575
|
+
return .expression(decodedExpression)
|
|
576
|
+
} catch {
|
|
577
|
+
Logger.log(level: .error, message: "Invalid value for array => value: \(value) error: \(error) setting dummy value")
|
|
578
|
+
return .constant([.left])
|
|
579
|
+
}
|
|
580
|
+
}
|
|
560
581
|
}
|
|
561
582
|
|
|
562
583
|
#if RNMBX_11
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.setWellKnownTileServer = exports.setTelemetryEnabled = exports.setConnected = exports.setAccessToken = exports.removeCustomHeader = exports.getAccessToken = exports.addCustomHeader = exports.TileServers = exports.StyleURL = exports.StyleSource = exports.OfflinePackDownloadState = exports.LineJoin = void 0;
|
|
6
|
+
exports.setWellKnownTileServer = exports.setTelemetryEnabled = exports.setConnected = exports.setAccessToken = exports.removeCustomHeader = exports.getAccessToken = exports.clearData = exports.addCustomHeader = exports.TileServers = exports.StyleURL = exports.StyleSource = exports.OfflinePackDownloadState = exports.LineJoin = void 0;
|
|
7
7
|
var _reactNative = require("react-native");
|
|
8
8
|
const RNMBXModule = {
|
|
9
9
|
..._reactNative.NativeModules.RNMBXModule
|
|
@@ -18,6 +18,7 @@ const {
|
|
|
18
18
|
addCustomHeader,
|
|
19
19
|
setAccessToken,
|
|
20
20
|
setWellKnownTileServer,
|
|
21
|
+
clearData,
|
|
21
22
|
getAccessToken,
|
|
22
23
|
setTelemetryEnabled,
|
|
23
24
|
setConnected
|
|
@@ -25,6 +26,7 @@ const {
|
|
|
25
26
|
exports.setConnected = setConnected;
|
|
26
27
|
exports.setTelemetryEnabled = setTelemetryEnabled;
|
|
27
28
|
exports.getAccessToken = getAccessToken;
|
|
29
|
+
exports.clearData = clearData;
|
|
28
30
|
exports.setWellKnownTileServer = setWellKnownTileServer;
|
|
29
31
|
exports.setAccessToken = setAccessToken;
|
|
30
32
|
exports.addCustomHeader = addCustomHeader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNative","require","RNMBXModule","NativeModules","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","addCustomHeader","setAccessToken","setWellKnownTileServer","getAccessToken","setTelemetryEnabled","setConnected","exports"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;
|
|
1
|
+
{"version":3,"names":["_reactNative","require","RNMBXModule","NativeModules","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","addCustomHeader","setAccessToken","setWellKnownTileServer","clearData","getAccessToken","setTelemetryEnabled","setConnected","exports"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAuCA,MAAMC,WAAwB,GAAG;EAAE,GAAGC,0BAAa,CAACD;AAAY,CAAC;AAE1D,MAAM;EACXE,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,eAAe;EACfC,cAAc;EACdC,sBAAsB;EACtBC,SAAS;EACTC,cAAc;EACdC,mBAAmB;EACnBC;AACF,CAAC,GAAGd,WAAW;AAACe,OAAA,CAAAD,YAAA,GAAAA,YAAA;AAAAC,OAAA,CAAAF,mBAAA,GAAAA,mBAAA;AAAAE,OAAA,CAAAH,cAAA,GAAAA,cAAA;AAAAG,OAAA,CAAAJ,SAAA,GAAAA,SAAA;AAAAI,OAAA,CAAAL,sBAAA,GAAAA,sBAAA;AAAAK,OAAA,CAAAN,cAAA,GAAAA,cAAA;AAAAM,OAAA,CAAAP,eAAA,GAAAA,eAAA;AAAAO,OAAA,CAAAR,kBAAA,GAAAA,kBAAA;AAAAQ,OAAA,CAAAT,WAAA,GAAAA,WAAA;AAAAS,OAAA,CAAAV,WAAA,GAAAA,WAAA;AAAAU,OAAA,CAAAX,QAAA,GAAAA,QAAA;AAAAW,OAAA,CAAAZ,wBAAA,GAAAA,wBAAA;AAAAY,OAAA,CAAAb,QAAA,GAAAA,QAAA"}
|
|
@@ -3,17 +3,17 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.default =
|
|
6
|
+
exports.default = void 0;
|
|
7
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
8
|
var _reactNative = require("react-native");
|
|
9
9
|
var _utils = require("../utils");
|
|
10
10
|
var _geoUtils = require("../utils/geoUtils");
|
|
11
11
|
var _RNMBXMarkerViewNativeComponent = _interopRequireDefault(require("../specs/RNMBXMarkerViewNativeComponent"));
|
|
12
|
+
var _RNMBXMarkerViewContentNativeComponent = _interopRequireDefault(require("../specs/RNMBXMarkerViewContentNativeComponent"));
|
|
12
13
|
var _PointAnnotation = _interopRequireDefault(require("./PointAnnotation"));
|
|
13
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
14
15
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
15
16
|
const Mapbox = _reactNative.NativeModules.RNMBXModule;
|
|
16
|
-
const NATIVE_MODULE_NAME = exports.NATIVE_MODULE_NAME = 'RNMBXMarkerView';
|
|
17
17
|
/**
|
|
18
18
|
* MarkerView represents an interactive React Native marker on the map.
|
|
19
19
|
*
|
|
@@ -77,7 +77,7 @@ class MarkerView extends _react.default.PureComponent {
|
|
|
77
77
|
onTouchEnd: e => {
|
|
78
78
|
e.stopPropagation();
|
|
79
79
|
}
|
|
80
|
-
}, /*#__PURE__*/_react.default.createElement(
|
|
80
|
+
}, /*#__PURE__*/_react.default.createElement(_RNMBXMarkerViewContentNativeComponent.default, {
|
|
81
81
|
style: {
|
|
82
82
|
flex: 0,
|
|
83
83
|
alignSelf: 'flex-start'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_utils","_geoUtils","_RNMBXMarkerViewNativeComponent","_PointAnnotation","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","Mapbox","NativeModules","RNMBXModule","
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_utils","_geoUtils","_RNMBXMarkerViewNativeComponent","_RNMBXMarkerViewContentNativeComponent","_PointAnnotation","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","Mapbox","NativeModules","RNMBXModule","MarkerView","React","PureComponent","defaultProps","anchor","x","y","allowOverlap","isSelected","lastId","_idForPointAnnotation","__idForPointAnnotation","undefined","_getCoordinate","coordinate","toJSONString","makePoint","render","props","console","warn","Platform","OS","MapboxV10","createElement","id","RNMBXMarkerView","style","flex","alignSelf","onTouchEnd","e","stopPropagation","onStartShouldSetResponder","_event","children","NativeMarkerViewComponent","_default","exports"],"sourceRoot":"../../../src","sources":["components/MarkerView.tsx"],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.default = void 0;
|
|
7
|
+
var _codegenNativeComponent = _interopRequireDefault(require("react-native/Libraries/Utilities/codegenNativeComponent"));
|
|
8
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
9
|
+
// eslint-disable-next-line @typescript-eslint/no-empty-interface
|
|
10
|
+
var _default = exports.default = (0, _codegenNativeComponent.default)('RNMBXMarkerViewContent');
|
|
11
|
+
//# sourceMappingURL=RNMBXMarkerViewContentNativeComponent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","obj","__esModule","default","_default","exports","codegenNativeComponent"],"sourceRoot":"../../../src","sources":["specs/RNMBXMarkerViewContentNativeComponent.ts"],"mappings":";;;;;;AACA,IAAAA,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA6F,SAAAD,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAE7F;AAAA,IAAAG,QAAA,GAAAC,OAAA,CAAAF,OAAA,GAGe,IAAAG,+BAAsB,EACnC,wBACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["NativeModules","RNMBXModule","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","addCustomHeader","setAccessToken","setWellKnownTileServer","getAccessToken","setTelemetryEnabled","setConnected"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":"AAAA,SAASA,aAAa,QAAQ,cAAc;
|
|
1
|
+
{"version":3,"names":["NativeModules","RNMBXModule","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","addCustomHeader","setAccessToken","setWellKnownTileServer","clearData","getAccessToken","setTelemetryEnabled","setConnected"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":"AAAA,SAASA,aAAa,QAAQ,cAAc;AAuC5C,MAAMC,WAAwB,GAAG;EAAE,GAAGD,aAAa,CAACC;AAAY,CAAC;AAEjE,OAAO,MAAM;EACXC,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,eAAe;EACfC,cAAc;EACdC,sBAAsB;EACtBC,SAAS;EACTC,cAAc;EACdC,mBAAmB;EACnBC;AACF,CAAC,GAAGb,WAAW"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
2
2
|
import React from 'react';
|
|
3
|
-
import { Platform, NativeModules
|
|
3
|
+
import { Platform, NativeModules } from 'react-native';
|
|
4
4
|
import { toJSONString } from '../utils';
|
|
5
5
|
import { makePoint } from '../utils/geoUtils';
|
|
6
6
|
import NativeMarkerViewComponent from '../specs/RNMBXMarkerViewNativeComponent';
|
|
7
|
+
import RNMBXMakerViewContentCoponent from '../specs/RNMBXMarkerViewContentNativeComponent';
|
|
7
8
|
import PointAnnotation from './PointAnnotation';
|
|
8
9
|
const Mapbox = NativeModules.RNMBXModule;
|
|
9
|
-
export const NATIVE_MODULE_NAME = 'RNMBXMarkerView';
|
|
10
10
|
/**
|
|
11
11
|
* MarkerView represents an interactive React Native marker on the map.
|
|
12
12
|
*
|
|
@@ -70,7 +70,7 @@ class MarkerView extends React.PureComponent {
|
|
|
70
70
|
onTouchEnd: e => {
|
|
71
71
|
e.stopPropagation();
|
|
72
72
|
}
|
|
73
|
-
}, /*#__PURE__*/React.createElement(
|
|
73
|
+
}, /*#__PURE__*/React.createElement(RNMBXMakerViewContentCoponent, {
|
|
74
74
|
style: {
|
|
75
75
|
flex: 0,
|
|
76
76
|
alignSelf: 'flex-start'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","Platform","NativeModules","
|
|
1
|
+
{"version":3,"names":["React","Platform","NativeModules","toJSONString","makePoint","NativeMarkerViewComponent","RNMBXMakerViewContentCoponent","PointAnnotation","Mapbox","RNMBXModule","MarkerView","PureComponent","defaultProps","anchor","x","y","allowOverlap","isSelected","lastId","_idForPointAnnotation","__idForPointAnnotation","undefined","_getCoordinate","coordinate","render","props","console","warn","OS","MapboxV10","createElement","_extends","id","RNMBXMarkerView","style","flex","alignSelf","onTouchEnd","e","stopPropagation","onStartShouldSetResponder","_event","children"],"sourceRoot":"../../../src","sources":["components/MarkerView.tsx"],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
|
|
2
|
+
|
|
3
|
+
// eslint-disable-next-line @typescript-eslint/no-empty-interface
|
|
4
|
+
|
|
5
|
+
export default codegenNativeComponent('RNMBXMarkerViewContent');
|
|
6
|
+
//# sourceMappingURL=RNMBXMarkerViewContentNativeComponent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["codegenNativeComponent"],"sourceRoot":"../../../src","sources":["specs/RNMBXMarkerViewContentNativeComponent.ts"],"mappings":"AACA,OAAOA,sBAAsB,MAAM,yDAAyD;;AAE5F;;AAGA,eAAeA,sBAAsB,CACnC,wBACF,CAAC"}
|
|
@@ -18,5 +18,5 @@ export declare const StyleURL: {
|
|
|
18
18
|
DefaultSourceID: string;
|
|
19
19
|
}, TileServers: {
|
|
20
20
|
Mapbox: string;
|
|
21
|
-
}, removeCustomHeader: (headerName: string) => void, addCustomHeader: (headerName: string, headerValue: string) => void, setAccessToken: (accessToken: string | null) => Promise<string | null>, setWellKnownTileServer: (tileServer: string) => void, getAccessToken: () => Promise<string>, setTelemetryEnabled: (telemetryEnabled: boolean) => void, setConnected: (connected: boolean) => void;
|
|
21
|
+
}, removeCustomHeader: (headerName: string) => void, addCustomHeader: (headerName: string, headerValue: string) => void, setAccessToken: (accessToken: string | null) => Promise<string | null>, setWellKnownTileServer: (tileServer: string) => void, clearData: () => Promise<void>, getAccessToken: () => Promise<string>, setTelemetryEnabled: (telemetryEnabled: boolean) => void, setConnected: (connected: boolean) => void;
|
|
22
22
|
//# sourceMappingURL=RNMBXModule.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RNMBXModule.d.ts","sourceRoot":"","sources":["../../../src/RNMBXModule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RNMBXModule.d.ts","sourceRoot":"","sources":["../../../src/RNMBXModule.ts"],"names":[],"mappings":"AAyCA,eAAO,MACL,QAAQ;YAtCE,GAAG;cACD,GAAG;WACN,GAAG;UACJ,GAAG;eACE,GAAG;qBACG,GAAG;GAkCtB,wBAAwB;cA/BZ,MAAM,GAAG,MAAM;YACjB,MAAM,GAAG,MAAM;cACb,MAAM,GAAG,MAAM;;GA8B3B,QAAQ;WA1BC,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;GAyBxB,WAAW;qBAtBQ,MAAM;GAuBzB,WAAW;YApBD,MAAM;GAqBhB,kBAAkB,eAlBa,MAAM,KAAG,IAAI,EAmB5C,eAAe,eAlBa,MAAM,eAAe,MAAM,KAAG,IAAI,EAmB9D,cAAc,gBAlBc,MAAM,GAAG,IAAI,KAAG,QAAQ,MAAM,GAAG,IAAI,CAAC,EAmBlE,sBAAsB,eAlBa,MAAM,KAAG,IAAI,EAmBhD,SAAS,QAlBI,QAAQ,IAAI,CAAC,EAmB1B,cAAc,QAlBI,QAAQ,MAAM,CAAC,EAmBjC,mBAAmB,qBAlBmB,OAAO,KAAG,IAAI,EAmBpD,YAAY,cAlBY,OAAO,KAAG,IAmBrB,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { type ViewProps } from 'react-native';
|
|
3
3
|
import { type Position } from '../types/Position';
|
|
4
|
-
export declare const NATIVE_MODULE_NAME = "RNMBXMarkerView";
|
|
5
4
|
declare type Props = ViewProps & {
|
|
6
5
|
/**
|
|
7
6
|
* The center point (specified as a map coordinate) of the marker.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarkerView.d.ts","sourceRoot":"","sources":["../../../../src/components/MarkerView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAA2B,KAAK,SAAS,
|
|
1
|
+
{"version":3,"file":"MarkerView.d.ts","sourceRoot":"","sources":["../../../../src/components/MarkerView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAIvE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAQlD,aAAK,KAAK,GAAG,SAAS,GAAG;IACvB;;OAEG;IACH,UAAU,EAAE,QAAQ,CAAC;IAErB;;;OAGG;IACH,MAAM,EAAE;QACN,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;IAEF;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;CAC9B,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,cAAM,UAAW,SAAQ,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC;IACjD,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAIjC;IAEF,MAAM,CAAC,MAAM,SAAK;IAClB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,qBAAqB,IAAI,MAAM;IAQ/B,cAAc,CAAC,UAAU,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS;IAOxD,MAAM;CAmDP;AAID,eAAe,UAAU,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RNMBXMarkerViewContentNativeComponent.d.ts","sourceRoot":"","sources":["../../../../src/specs/RNMBXMarkerViewContentNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAI7D,MAAM,WAAW,WAAY,SAAQ,SAAS;CAAG;;AAEjD,wBAE8B"}
|
package/package.json
CHANGED
package/setup-jest.js
CHANGED
package/src/RNMBXModule.ts
CHANGED
|
@@ -31,6 +31,7 @@ interface RNMBXModule {
|
|
|
31
31
|
addCustomHeader(headerName: string, headerValue: string): void;
|
|
32
32
|
setAccessToken(accessToken: string | null): Promise<string | null>;
|
|
33
33
|
setWellKnownTileServer(tileServer: string): void;
|
|
34
|
+
clearData(): Promise<void>;
|
|
34
35
|
getAccessToken(): Promise<string>;
|
|
35
36
|
setTelemetryEnabled(telemetryEnabled: boolean): void;
|
|
36
37
|
setConnected(connected: boolean): void;
|
|
@@ -48,6 +49,7 @@ export const {
|
|
|
48
49
|
addCustomHeader,
|
|
49
50
|
setAccessToken,
|
|
50
51
|
setWellKnownTileServer,
|
|
52
|
+
clearData,
|
|
51
53
|
getAccessToken,
|
|
52
54
|
setTelemetryEnabled,
|
|
53
55
|
setConnected,
|
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { Platform, NativeModules, type ViewProps
|
|
2
|
+
import { Platform, NativeModules, type ViewProps } from 'react-native';
|
|
3
3
|
|
|
4
4
|
import { toJSONString } from '../utils';
|
|
5
5
|
import { makePoint } from '../utils/geoUtils';
|
|
6
6
|
import { type Position } from '../types/Position';
|
|
7
7
|
import NativeMarkerViewComponent from '../specs/RNMBXMarkerViewNativeComponent';
|
|
8
|
+
import RNMBXMakerViewContentCoponent from '../specs/RNMBXMarkerViewContentNativeComponent';
|
|
8
9
|
|
|
9
10
|
import PointAnnotation from './PointAnnotation';
|
|
10
11
|
|
|
11
12
|
const Mapbox = NativeModules.RNMBXModule;
|
|
12
13
|
|
|
13
|
-
export const NATIVE_MODULE_NAME = 'RNMBXMarkerView';
|
|
14
|
-
|
|
15
14
|
type Props = ViewProps & {
|
|
16
15
|
/**
|
|
17
16
|
* The center point (specified as a map coordinate) of the marker.
|
|
@@ -118,7 +117,7 @@ class MarkerView extends React.PureComponent<Props> {
|
|
|
118
117
|
e.stopPropagation();
|
|
119
118
|
}}
|
|
120
119
|
>
|
|
121
|
-
<
|
|
120
|
+
<RNMBXMakerViewContentCoponent
|
|
122
121
|
style={{ flex: 0, alignSelf: 'flex-start' }}
|
|
123
122
|
onStartShouldSetResponder={(_event) => {
|
|
124
123
|
return true;
|
|
@@ -128,7 +127,7 @@ class MarkerView extends React.PureComponent<Props> {
|
|
|
128
127
|
}}
|
|
129
128
|
>
|
|
130
129
|
{this.props.children}
|
|
131
|
-
</
|
|
130
|
+
</RNMBXMakerViewContentCoponent>
|
|
132
131
|
</RNMBXMarkerView>
|
|
133
132
|
);
|
|
134
133
|
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { HostComponent, ViewProps } from 'react-native';
|
|
2
|
+
import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
|
|
3
|
+
|
|
4
|
+
// eslint-disable-next-line @typescript-eslint/no-empty-interface
|
|
5
|
+
export interface NativeProps extends ViewProps {}
|
|
6
|
+
|
|
7
|
+
export default codegenNativeComponent<NativeProps>(
|
|
8
|
+
'RNMBXMarkerViewContent',
|
|
9
|
+
) as HostComponent<ViewProps>;
|