@rnmapbox/maps 10.1.0-beta.6 → 10.1.0-beta.8

package/README.md

@@ -175,6 +175,7 @@ const styles = StyleSheet.create({
 ### Components
 
 - [MapView](/docs/MapView.md)
+- [StyleImport](/docs/StyleImport.md)
 - [Light](/docs/Light.md)
 - [StyleSheet](/docs/StyleSheet.md)
 - [PointAnnotation](/docs/PointAnnotation.md)

package/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt

@@ -16,6 +16,7 @@ import com.rnmapbox.rnmbx.components.images.RNMBXImagesManager
 import com.rnmapbox.rnmbx.components.location.RNMBXNativeUserLocationManager
 import com.rnmapbox.rnmbx.components.mapview.NativeMapViewModule
 import com.rnmapbox.rnmbx.components.mapview.RNMBXAndroidTextureMapViewManager
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapViewManager
 import com.rnmapbox.rnmbx.components.styles.RNMBXStyleImportManager
 import com.rnmapbox.rnmbx.components.styles.atmosphere.RNMBXAtmosphereManager
@@ -40,8 +41,21 @@ import com.rnmapbox.rnmbx.modules.RNMBXLogging
 import com.rnmapbox.rnmbx.modules.RNMBXModule
 import com.rnmapbox.rnmbx.modules.RNMBXOfflineModule
 import com.rnmapbox.rnmbx.modules.RNMBXSnapshotModule
+import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
 class RNMBXPackage : TurboReactPackage() {
+
+    var mapViewTagResolver: ViewTagResolver<RNMBXMapView>? = null
+    fun getMapViewTagResolver(context: ReactApplicationContext) : ViewTagResolver<RNMBXMapView> {
+        val viewTagResolver = mapViewTagResolver
+        if (viewTagResolver == null) {
+            val viewTagResolver = ViewTagResolver<RNMBXMapView>(context)
+            mapViewTagResolver = viewTagResolver
+            return viewTagResolver
+        }
+        return viewTagResolver
+    }
+
     override fun getModule(
         s: String,
         reactApplicationContext: ReactApplicationContext
@@ -52,7 +66,7 @@ class RNMBXPackage : TurboReactPackage() {
             RNMBXOfflineModule.REACT_CLASS -> return RNMBXOfflineModule(reactApplicationContext)
             RNMBXSnapshotModule.REACT_CLASS -> return RNMBXSnapshotModule(reactApplicationContext)
             RNMBXLogging.REACT_CLASS -> return RNMBXLogging(reactApplicationContext)
-            NativeMapViewModule.NAME -> return NativeMapViewModule(reactApplicationContext)
+            NativeMapViewModule.NAME -> return NativeMapViewModule(reactApplicationContext, getMapViewTagResolver(reactApplicationContext))
         }
         return null
     }
@@ -67,8 +81,8 @@ class RNMBXPackage : TurboReactPackage() {
 
         // components
         managers.add(RNMBXCameraManager(reactApplicationContext))
-        managers.add(RNMBXAndroidTextureMapViewManager(reactApplicationContext))
-        managers.add(RNMBXMapViewManager(reactApplicationContext))
+        managers.add(RNMBXAndroidTextureMapViewManager(reactApplicationContext, getMapViewTagResolver(reactApplicationContext)))
+        managers.add(RNMBXMapViewManager(reactApplicationContext, getMapViewTagResolver(reactApplicationContext)))
         managers.add(RNMBXStyleImportManager(reactApplicationContext))
 
         // annotations

package/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt

@@ -91,9 +91,11 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
 
     override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
-        setInitialCamera()
-        updateMaxBounds()
-        mCameraStop?.let { updateCamera(it) }
+        mapView.callIfAttachedToWindow {
+            setInitialCamera()
+            updateMaxBounds()
+            mCameraStop?.let { updateCamera(it) }
+        }
         _observeViewportState(mapView.mapView)
         _updateViewportState()
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/NativeMapViewModule.kt

@@ -1,38 +1,34 @@
 package com.rnmapbox.rnmbx.components.mapview
 
+import android.util.Log
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.UIManager
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.uimanager.IllegalViewOperationException
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
 import com.rnmapbox.rnmbx.BuildConfig
 import com.rnmapbox.rnmbx.NativeMapViewModuleSpec
 import com.rnmapbox.rnmbx.utils.ConvertUtils
 import com.rnmapbox.rnmbx.utils.ExpressionParser
+import com.rnmapbox.rnmbx.utils.Logger
+import com.rnmapbox.rnmbx.utils.ViewTagResolver
 import com.rnmapbox.rnmbx.utils.extensions.toCoordinate
 import com.rnmapbox.rnmbx.utils.extensions.toScreenCoordinate
 
-class NativeMapViewModule(context: ReactApplicationContext) : NativeMapViewModuleSpec(context) {
-    private fun withMapViewOnUIThread(viewRef: Double?, promise: Promise, fn: (RNMBXMapView) -> Unit) {
+class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver: ViewTagResolver<RNMBXMapView>) : NativeMapViewModuleSpec(context) {
+    private fun withMapViewOnUIThread(
+        viewRef: Double?,
+        reject: Promise,
+        fn: (RNMBXMapView) -> Unit
+    ) {
         if (viewRef == null) {
-            return
-        }
-
-        reactApplicationContext.runOnUiQueueThread {
-            val manager = if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED)
-                UIManagerHelper.getUIManager(reactApplicationContext, UIManagerType.FABRIC)
-            else
-                UIManagerHelper.getUIManager(reactApplicationContext, UIManagerType.DEFAULT)
-
-            val view = manager?.resolveView(viewRef.toInt()) as? RNMBXMapView
-
-            if (view != null) {
-                fn(view)
-            } else {
-                promise.reject(Exception("cannot find map view for tag ${viewRef.toInt()}"))
-            }
+            reject.reject(Exception("viewRef is null"))
+        } else {
+            viewTagResolver.withViewResolved(viewRef.toInt(), reject, fn)
         }
     }
 

package/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXAndroidTextureMapViewManager.kt

@@ -7,9 +7,11 @@ import com.facebook.react.viewmanagers.RNMBXAndroidTextureMapViewManagerDelegate
 import com.facebook.react.viewmanagers.RNMBXAndroidTextureMapViewManagerInterface
 import com.facebook.react.viewmanagers.RNMBXMapViewManagerDelegate
 import com.mapbox.maps.MapInitOptions
+import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
-class RNMBXAndroidTextureMapViewManager(context: ReactApplicationContext) : RNMBXMapViewManager(
-    context
+class RNMBXAndroidTextureMapViewManager(context: ReactApplicationContext, viewTagResolver: ViewTagResolver<RNMBXMapView>) : RNMBXMapViewManager(
+    context,
+    viewTagResolver
 ), RNMBXAndroidTextureMapViewManagerInterface<RNMBXMapView> {
     private val mDelegate: ViewManagerDelegate<RNMBXMapView>
 

package/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt

@@ -4,6 +4,8 @@ import android.content.Context
 import android.graphics.BitmapFactory
 import android.graphics.PointF
 import android.graphics.RectF
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import android.view.Gravity
 import android.view.View
@@ -102,6 +104,10 @@ interface RNMBXLifeCycleOwner : LifecycleOwner {
     fun handleLifecycleEvent(event: Lifecycle.Event)
 }
 
+fun interface Cancelable {
+    fun cancel()
+}
+
 class RNMBXLifeCycle {
     private var lifecycleOwner : RNMBXLifeCycleOwner? = null
 
@@ -150,6 +156,25 @@ class RNMBXLifeCycle {
     fun getState() : Lifecycle.State {
         return lifecycleOwner?.lifecycle?.currentState ?: Lifecycle.State.INITIALIZED;
     }
+
+    var attachedToWindowWaiters : MutableList<()-> Unit> = mutableListOf()
+
+    fun callIfAttachedToWindow(callback: () -> Unit) : com.rnmapbox.rnmbx.components.mapview.Cancelable {
+        if (getState() == Lifecycle.State.STARTED) {
+            callback()
+            return com.rnmapbox.rnmbx.components.mapview.Cancelable {}
+        } else {
+            attachedToWindowWaiters.add(callback)
+            return com.rnmapbox.rnmbx.components.mapview.Cancelable {
+                attachedToWindowWaiters.removeIf { it === callback }
+            }
+        }
+    }
+
+    fun afterAttachFromLooper() {
+        attachedToWindowWaiters.forEach { it() }
+        attachedToWindowWaiters.clear()
+    }
 }
 
 data class FeatureEntry(val feature: AbstractMapFeature?, val view: View?, var addedToMap: Boolean = false) {
@@ -215,6 +240,11 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         return mapView.getMapboxMap()
     }
 
+    override fun setId(id: Int) {
+        super.setId(id)
+        mManager.tagAssigned(id)
+    }
+
     val pointAnnotationManager: PointAnnotationManager?
         get() {
             if (mPointAnnotationManager == null) {
@@ -1413,6 +1443,13 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     override fun onAttachedToWindow() {
         lifecycle.onAttachedToWindow(this)
         super.onAttachedToWindow()
+        Handler(Looper.getMainLooper()).post {
+            lifecycle.afterAttachFromLooper()
+        }
+    }
+
+    fun callIfAttachedToWindow(callback: () -> Unit) {
+       lifecycle.callIfAttachedToWindow(callback)
     }
 
     override fun onLayoutChange(

package/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapViewManager.kt

@@ -22,6 +22,7 @@ import com.rnmapbox.rnmbx.events.AndroidCallbackEvent
 import com.rnmapbox.rnmbx.utils.ConvertUtils
 import com.rnmapbox.rnmbx.utils.ExpressionParser
 import com.rnmapbox.rnmbx.utils.Logger
+import com.rnmapbox.rnmbx.utils.ViewTagResolver
 import com.rnmapbox.rnmbx.utils.extensions.toCoordinate
 import com.rnmapbox.rnmbx.utils.extensions.toRectF
 import com.rnmapbox.rnmbx.utils.extensions.toScreenCoordinate
@@ -46,7 +47,7 @@ interface CommandResponse {
     fun error(message: String)
 }
 
-open class RNMBXMapViewManager(context: ReactApplicationContext) :
+open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagResolver: ViewTagResolver<RNMBXMapView>) :
     AbstractEventEmitter<RNMBXMapView>(context), RNMBXMapViewManagerInterface<RNMBXMapView> {
     private val mViews: MutableMap<Int, RNMBXMapView>
 
@@ -107,6 +108,9 @@ open class RNMBXMapViewManager(context: ReactApplicationContext) :
 
     override fun onDropViewInstance(mapView: RNMBXMapView) {
         val reactTag = mapView.id
+
+        viewTagResolver.viewRemoved(reactTag)
+
         if (mViews.containsKey(reactTag)) {
             mViews.remove(reactTag)
         }
@@ -118,6 +122,10 @@ open class RNMBXMapViewManager(context: ReactApplicationContext) :
         return mViews[reactTag]
     }
 
+    fun tagAssigned(reactTag: Int) {
+        return viewTagResolver.tagAssigned(reactTag)
+    }
+
     // region React Props
     @ReactProp(name = "projection")
     override fun setProjection(mapView: RNMBXMapView, projection: String?) {

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/RNMBXStyleValue.kt

@@ -169,12 +169,12 @@ class RNMBXStyleValue(config: ReadableMap) {
                     config.getMap("enablePlacementTransitions")!!.getBoolean("value")
             }
             var duration = 300
-            val delay = 0
+            var delay = 0
             if (config.hasKey("duration") && ReadableType.Map == config.getType("duration")) {
                 duration = config.getMap("duration")!!.getInt("value")
             }
             if (config.hasKey("delay") && ReadableType.Map == config.getType("delay")) {
-                duration = config.getMap("delay")!!.getInt("value")
+                delay = config.getMap("delay")!!.getInt("value")
             }
             return Builder().duration(duration.toLong()).delay(delay.toLong()).build()
         }

package/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt

@@ -0,0 +1,68 @@
+package com.rnmapbox.rnmbx.utils
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.UIManager
+import com.facebook.react.uimanager.IllegalViewOperationException
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.common.UIManagerType
+import com.rnmapbox.rnmbx.BuildConfig
+
+data class ViewTagWaiter<V>(
+    val fn: (V) -> Unit,
+    val reject: Promise?
+)
+
+// see https://github.com/rnmapbox/maps/pull/3074
+open class ViewTagResolver<V>(val context: ReactApplicationContext) {
+    private val createdViews: HashSet<Int> = hashSetOf<Int>()
+    private val viewWaiters: HashMap<Int, MutableList<ViewTagWaiter<V>>> = hashMapOf()
+
+    // to be called from view.setId
+    fun tagAssigned(viewTag: Int) {
+        createdViews.add(viewTag)
+
+        val list = viewWaiters[viewTag]
+        if (list != null) {
+            context.runOnUiQueueThread {
+                try {
+                    val view = manager.resolveView(viewTag) as V
+
+                    list.forEach { it.fn(view) }
+                } catch (err: IllegalViewOperationException) {
+                    list.forEach { it.reject?.reject(err) }
+                }
+                viewWaiters.remove(viewTag)
+            }
+        }
+    }
+
+    fun viewRemoved(viewTag: Int) {
+        viewWaiters.remove(viewTag)
+        createdViews.remove(viewTag)
+    }
+
+    private val manager : UIManager
+        get() =
+            if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+                UIManagerHelper.getUIManager(context, UIManagerType.FABRIC)!!
+            } else {
+                UIManagerHelper.getUIManager(context, UIManagerType.DEFAULT)!!
+            }
+
+    // calls on UiQueueThread with resolved view
+    fun withViewResolved(viewTag: Int, reject: Promise? = null, fn: (V) -> Unit) {
+        context.runOnUiQueueThread() {
+            try {
+                val view = manager.resolveView(viewTag) as V
+                fn(view)
+            } catch (err: IllegalViewOperationException) {
+                if (!createdViews.contains(viewTag)) {
+                    viewWaiters.getOrPut(viewTag) { mutableListOf<ViewTagWaiter<V>>() }.add(ViewTagWaiter(fn, reject))
+                } else {
+                    reject?.reject(err)
+                }
+            }
+        }
+    }
+}

package/ios/RNMBX/RNMBXCamera.swift

@@ -287,25 +287,9 @@ class RNMBXCamera : RNMBXMapComponentBase {
       }
 
       if let locationModule = RNMBXLocationModule.shared {
-        var isSameProvider = false
-        #if !RNMBX_11
-        if let currentProvider = map.location.locationProvider as? AnyObject, let newProvider = locationModule.locationProvider as? AnyObject {
-          if currentProvider === newProvider {
-            isSameProvider = true
-          }
-        }
-        #endif
-        if !isSameProvider {
-          #if RNMBX_11
-          map.location.override(provider: locationModule.locationProvider)
-          #else
-          map.location.overrideLocationProvider(with: locationModule.locationProvider)
-          #endif
-        }
+        locationModule.override(for: map.location)
       }
-      #if RNMBX_11
-      // RNMBX_11_TODO
-      #else
+      #if !RNMBX_11
       map.location.locationProvider.requestWhenInUseAuthorization()
       #endif
       var trackingModeChanged = false

package/ios/RNMBX/RNMBXLocationModule.swift

@@ -34,10 +34,6 @@ let RCT_MAPBOX_USER_LOCATION_UPDATE = "MapboxUserLocationUpdate";
 /// This implementation of LocationProviderDelegate is used by `LocationManager` to work around
 /// the fact that the `LocationProvider` API does not allow the delegate to be set to `nil`.
 internal class EmptyLocationProviderDelegate: LocationProviderDelegate {
-    #if RNMBX_11
-    func onLocationUpdateReceived(for locations: [Location]) {}
-    #endif
-  
     func locationProvider(_ provider: LocationProvider, didFailWithError error: Error) {}
     func locationProvider(_ provider: LocationProvider, didUpdateHeading newHeading: CLHeading) {}
     func locationProvider(_ provider: LocationProvider, didUpdateLocations locations: [CLLocation]) {}
@@ -51,17 +47,6 @@ protocol LocationProviderRNMBXDelegate : AnyObject {
 class RNMBXAppleLocationProvider: NSObject {
     private var locationProvider: CLLocationManager
   
-  #if RNMBX_11
-    private var observers : [LocationObserver] = []
-    private var privateAppleLocationProviderOptions: AppleLocationProvider.Options {
-        didSet {
-            locationProvider.distanceFilter = privateAppleLocationProviderOptions.distanceFilter
-            locationProvider.desiredAccuracy = privateAppleLocationProviderOptions.desiredAccuracy
-            locationProvider.activityType = privateAppleLocationProviderOptions.activityType
-        }
-    }
-    private var privateLocationProviderOptions: LocationOptions
-  #else
     private var privateLocationProviderOptions: LocationOptions {
         didSet {
             locationProvider.distanceFilter = privateLocationProviderOptions.distanceFilter
@@ -70,7 +55,6 @@ class RNMBXAppleLocationProvider: NSObject {
         }
     }
     private weak var delegate: LocationProviderDelegate?
-  #endif
 
     public var headingOrientation: CLDeviceOrientation {
         didSet { locationProvider.headingOrientation = headingOrientation }
@@ -78,9 +62,6 @@ class RNMBXAppleLocationProvider: NSObject {
 
     public override init() {
         locationProvider = CLLocationManager()
-      #if RNMBX_11
-        privateAppleLocationProviderOptions = AppleLocationProvider.Options()
-      #endif
         privateLocationProviderOptions = LocationOptions()
         headingOrientation = locationProvider.headingOrientation
         super.init()
@@ -89,21 +70,6 @@ class RNMBXAppleLocationProvider: NSObject {
 }
 
 extension RNMBXAppleLocationProvider: LocationProvider {
-  #if RNMBX_11
-    func addLocationObserver(for observer: LocationObserver) {
-      observers.append(observer)
-    }
-    
-    func removeLocationObserver(for observer: LocationObserver) {
-      observers.removeAll { $0 === observer }
-    }
-    
-    func getLastObservedLocation() -> Location? {
-      locationProvider.location
-    }
-  #endif
-  
-
     public var locationProviderOptions: LocationOptions {
         get { privateLocationProviderOptions }
         set { privateLocationProviderOptions = newValue }
@@ -169,45 +135,29 @@ extension RNMBXAppleLocationProvider: LocationProvider {
 
 extension RNMBXAppleLocationProvider: CLLocationManagerDelegate {
   public func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
-  #if RNMBX_11
-    observers.forEach { $0.onLocationUpdateReceived(for: locations) }
-  #else
     delegate?.locationProvider(self, didUpdateLocations: locations)
-  #endif
   }
 
-    public func locationManager(_ manager: CLLocationManager, didUpdateHeading heading: CLHeading)
-  {
-    #if RNMBX_11
-      
-    #else
-      delegate?.locationProvider(self, didUpdateHeading: heading)
-    #endif
+  public func locationManager(_ manager: CLLocationManager, didUpdateHeading heading: CLHeading) {
+    delegate?.locationProvider(self, didUpdateHeading: heading)
   }
 
   public func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
-    #if RNMBX_11
-      
-    #else
       delegate?.locationProvider(self, didFailWithError: error)
-    #endif
   }
 
-    @available(iOS 14.0, *)
+  @available(iOS 14.0, *)
   public func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
-    #if RNMBX_11
-    #else
       delegate?.locationProviderDidChangeAuthorization(self)
-    #endif
   }
 
-    public func locationManagerShouldDisplayHeadingCalibration(_ manager: CLLocationManager) -> Bool {
-        guard let calibratingDelegate = delegate as? CalibratingLocationProviderDelegate else {
-            return false
-        }
-
-        return calibratingDelegate.locationProviderShouldDisplayHeadingCalibration(self)
+  public func locationManagerShouldDisplayHeadingCalibration(_ manager: CLLocationManager) -> Bool {
+    guard let calibratingDelegate = delegate as? CalibratingLocationProviderDelegate else {
+      return false
     }
+
+    return calibratingDelegate.locationProviderShouldDisplayHeadingCalibration(self)
+  }
 }
 
 internal protocol CalibratingLocationProviderDelegate: LocationProviderDelegate {
@@ -593,6 +543,20 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
     }
   }
   
+  func override(for locationManager: LocationManager) {
+    if let locationModule = RNMBXLocationModule.shared {
+      var isSameProvider = false
+      if let currentProvider = locationManager.locationProvider as? AnyObject, let newProvider = locationModule.locationProvider as? AnyObject {
+        if currentProvider === newProvider {
+          isSameProvider = true
+        }
+      }
+      if !isSameProvider {
+        locationManager.overrideLocationProvider(with: locationModule.locationProvider)
+      }
+    }
+  }
+  
   // MARK: - location event throttle
   @objc
   func setLocationEventThrottle(_ throttleValue:NSNumber) {