@rnmapbox/maps 10.0.0-rc.0 → 10.0.0-rc.10

package/README.md

@@ -84,7 +84,7 @@ _See [iOS](ios/install.md) & [Android](android/install.md) setup guide for more
 
 - [node](https://nodejs.org)
 - [npm](https://www.npmjs.com/)
-- [React Native](https://facebook.github.io/react-native/) (0.60+)
+- [React Native](https://facebook.github.io/react-native/) (0.64+)
 
 
 ## Installation
@@ -225,7 +225,7 @@ const styles = StyleSheet.create({
 
 ### Misc
 
-- [MapboxGL](/docs/MapboxGL.md)
+- [Mapbox](/docs/MapboxGL.md)
 - [CustomHttpHeaders](/docs/CustomHttpHeaders.md)
 - [Logger](/docs/Logger.md)
 

package/android/rctmgl/build.gradle

@@ -1,5 +1,5 @@
 def defaultMapboxMapsImpl = "maplibre"
-def defaultMapboxMapsVersion = "10.11.2"
+def defaultMapboxMapsVersion = "10.12.1"
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/AbstractEventEmitter.kt

@@ -0,0 +1,75 @@
+package com.mapbox.rctmgl.components
+
+import android.app.Activity
+import android.view.ViewGroup
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.common.MapBuilder
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.UIManagerModule
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.mapbox.rctmgl.events.IEvent
+import javax.annotation.Nonnull
+
+/**
+ * Created by nickitaliano on 8/23/17.
+ */
+abstract class AbstractEventEmitter<T : ViewGroup?>(reactApplicationContext: ReactApplicationContext) :
+    ViewGroupManager<T>() {
+    private val mRateLimitedEvents: MutableMap<String, Long>
+    private var mEventDispatcher: EventDispatcher? = null
+    private val mRCTAppContext: ReactApplicationContext
+
+    init {
+        mRateLimitedEvents = HashMap()
+        mRCTAppContext = reactApplicationContext
+    }
+
+    val activity : Activity?
+        get() = mRCTAppContext.currentActivity
+
+    fun handleEvent(event: IEvent) {
+        val eventCacheKey = getEventCacheKey(event)
+
+        // fail safe to protect bridge from being spammed
+        if (shouldDropEvent(eventCacheKey, event)) {
+            return
+        }
+        mRateLimitedEvents[eventCacheKey] = System.currentTimeMillis()
+        mEventDispatcher!!.dispatchEvent(
+            AbstractEvent(
+                event.iD,
+                event.key,
+                event.canCoalesce(),
+                event.toJSON()
+            )
+        )
+    }
+
+    override fun addEventEmitters(context: ThemedReactContext, @Nonnull view: T) {
+        mEventDispatcher = context.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
+        val events = customEvents() ?: return null
+        val exportedEvents: MutableMap<String, Any> = HashMap()
+        for ((key, value) in events) {
+            exportedEvents[key] = MapBuilder.of("registrationName", value)
+        }
+        return exportedEvents
+    }
+
+    abstract fun customEvents(): Map<String, String>?
+    private fun shouldDropEvent(cacheKey: String, event: IEvent): Boolean {
+        val lastEventTimestamp = mRateLimitedEvents[cacheKey]
+        return lastEventTimestamp != null && event.timestamp - lastEventTimestamp <= BRIDGE_TIMEOUT_MS
+    }
+
+    private fun getEventCacheKey(event: IEvent): String {
+        return String.format("%s-%s", event.key, event.type)
+    }
+
+    companion object {
+        private const val BRIDGE_TIMEOUT_MS = 10.0
+    }
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLMarkerViewManager.kt

@@ -14,7 +14,7 @@ import com.mapbox.maps.viewannotation.OnViewAnnotationUpdatedListener
 import com.mapbox.maps.viewannotation.ViewAnnotationManager
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 
-class RCTMGLMarkerViewManager(reactApplicationContext: ReactApplicationContext?) :
+class RCTMGLMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
     AbstractEventEmitter<RCTMGLMarkerView?>(reactApplicationContext) {
     override fun getName(): String {
         return REACT_CLASS

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/camera/RCTMGLCamera.kt

@@ -24,6 +24,9 @@ import com.mapbox.maps.plugin.viewport.ViewportStatusObserver
 import com.mapbox.maps.plugin.viewport.data.FollowPuckViewportStateBearing
 import com.mapbox.maps.plugin.viewport.data.FollowPuckViewportStateOptions
 import com.mapbox.maps.plugin.viewport.data.ViewportStatusChangeReason
+import com.mapbox.maps.plugin.viewport.state.FollowPuckViewportState
+import com.mapbox.maps.plugin.viewport.state.OverviewViewportState
+import com.mapbox.maps.plugin.viewport.state.ViewportState
 import com.mapbox.maps.plugin.viewport.viewport
 import com.mapbox.rctmgl.components.RemovalReason
 import com.mapbox.rctmgl.components.camera.constants.CameraMode
@@ -31,6 +34,7 @@ import com.mapbox.rctmgl.components.location.*
 import com.mapbox.rctmgl.events.MapUserTrackingModeEvent
 import com.mapbox.rctmgl.location.*
 import com.mapbox.rctmgl.utils.Logger
+import com.mapbox.rctmgl.utils.writableMapOf
 
 
 class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCameraManager) :
@@ -91,7 +95,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         setInitialCamera()
         updateMaxBounds()
         mCameraStop?.let { updateCamera(it) }
-        _observeViewportState(mapView)
+        _observeViewportState(mapView.mapView)
         _updateViewportState()
     }
 
@@ -281,27 +285,105 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         }
     }
 
+    fun toFollowUserLocation(toStatus: ViewportStatus): Boolean {
+        when (toStatus) {
+            ViewportStatus.Idle -> return false
+            is ViewportStatus.State -> return true
+            is ViewportStatus.Transition -> return true
+        }
+    }
+
+    fun toFollowUserMode(state: ViewportState): String? {
+        if (state is FollowPuckViewportState) {
+            when (state.options.bearing) {
+                is FollowPuckViewportStateBearing.SyncWithLocationPuck ->
+                    return "normal"
+                is FollowPuckViewportStateBearing.Constant ->
+                    return "constant"
+                else -> {
+                    Logger.w(LOG_TAG, "Unexpected bearing: ${state.options.bearing}")
+                    return "normal"
+                }
+            }
+        } else if (state is OverviewViewportState) {
+            return "overview"
+        } else {
+            return "custom"
+        }
+    }
+
+    fun toFollowUserMode(status: ViewportStatus): String? {
+        when (status) {
+            ViewportStatus.Idle -> return null
+            is ViewportStatus.State ->
+                return toFollowUserMode(status)
+            is ViewportStatus.Transition ->
+                return toFollowUserMode(status.toState)
+        }
+    }
+
+    fun toReadableMap(status: ViewportStatus): ReadableMap {
+        when (status) {
+            ViewportStatus.Idle -> return writableMapOf("state" to "idle")
+            is ViewportStatus.State ->
+                return writableMapOf(
+                    "state" to status.toString()
+                )
+            is ViewportStatus.Transition ->
+                return writableMapOf(
+                    "transition" to status.toString()
+                )
+        }
+    }
+
     fun _observeViewportState(mapView: MapView) {
         mapView.viewport.addStatusObserver(object: ViewportStatusObserver {
             override fun onViewportStatusChanged(
-                from: ViewportStatus,
-                to: ViewportStatus,
+                fromStatus: ViewportStatus,
+                toStatus: ViewportStatus,
                 reason: ViewportStatusChangeReason
             ) {
-                if (to == ViewportStatus.Idle) {
-                    mManager.handleEvent(MapUserTrackingModeEvent(this@RCTMGLCamera, UserTrackingMode.NONE))
-                } else if (to is ViewportStatus.Transition) {
+                if (reason == ViewportStatusChangeReason.USER_INTERACTION) {
+                    val followUserLocation = toFollowUserLocation(toStatus)
+
 
-                } else if (to is ViewportStatus.State){
-                    //mManager.handleEvent(MapUserTrackingModeEvent(this@RCTMGLCamera, UserTrackingMode.FOLLOW))
+
+                    mManager.handleEvent(MapUserTrackingModeEvent(this@RCTMGLCamera, UserTrackingMode.NONE,
+                    writableMapOf(
+                        "followUserMode" to toFollowUserMode(toStatus),
+                        "followUserLocation" to followUserLocation,
+                        "fromViewportState" to toReadableMap(fromStatus),
+                        "toViewportState" to toReadableMap(toStatus),
+                        "reason" to toString(reason),
+                    )
+                    ))
                 }
             }
         })
     }
 
+    fun toString(reason: ViewportStatusChangeReason): String {
+        when (reason) {
+            ViewportStatusChangeReason.IDLE_REQUESTED ->
+                return "idleRequested"
+            ViewportStatusChangeReason.TRANSITION_FAILED ->
+                return "transitionFailed"
+            ViewportStatusChangeReason.TRANSITION_STARTED ->
+                return "transitionStarted"
+            ViewportStatusChangeReason.TRANSITION_SUCCEEDED ->
+                return "transitionSucceeded"
+            ViewportStatusChangeReason.USER_INTERACTION ->
+                return "userInteraction"
+            else -> {
+                Logger.w(LOG_TAG, "toString; unkown reason: ${reason}")
+                return "unkown: $reason"
+            }
+        }
+    }
+
     fun _updateViewportState() {
         mMapView?.let {
-            val map = it
+            val map = it.mapView
             val viewport = map.viewport;
 
             if (mLocationComponentManager == null) {
@@ -418,5 +500,6 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         const val USER_LOCATION_CAMERA_MOVE_DURATION = 1000
         const val minimumZoomLevelForUserTracking = 10.5
         const val defaultZoomLevelForUserTracking = 14.0
+        const val LOG_TAG = "RCTMGLCamera"
     }
 }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/images/RCTMGLImagesManager.kt

@@ -61,7 +61,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
             ReadableType.String -> {
                 val resourceName = dynamic.asString();
                 val drawable =
-                    ResourceUtils.getDrawableByName(mContext, resourceName) as BitmapDrawable
+                    ResourceUtils.getDrawableByName(mContext, resourceName) as BitmapDrawable?
                 if (drawable != null) {
                     return NativeImage(resourceName, drawable)
                 } else {
@@ -97,7 +97,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
                     scale = map.getDouble("scale")
                 }
                 val drawable =
-                    ResourceUtils.getDrawableByName(mContext, resourceName) as BitmapDrawable
+                    ResourceUtils.getDrawableByName(mContext, resourceName) as BitmapDrawable?
                 if (drawable != null && resourceName != null) {
                     return NativeImage(resourceName, drawable, scale, sdf, stretchX, stretchY)
                 } else {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/location/LocationComponentManager.kt

@@ -64,6 +64,7 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
     }
 
     private fun applyStateChanges(map: RCTMGLMapView, oldState: State, newState: State, fullUpdate: Boolean) {
+        val mapView = map.mapView
         if (map.getLifecycleState() != Lifecycle.State.STARTED) {
             // In case lifecycle was already stopped, so we're part of shutdown, do not call updateSettings as it'll just restart
             // the loationComponent that will not be stopped. See https://github.com/mapbox/mapbox-maps-android/issues/2017
@@ -72,7 +73,7 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
             }
             return
         }
-        map.location.updateSettings {
+        mapView.location.updateSettings {
             enabled = newState.enabled
 
             if (fullUpdate || (newState.hidden != oldState.hidden) || (newState.tintColor != oldState.tintColor) || (newState.bearingImage != oldState.bearingImage)) {
@@ -140,7 +141,7 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
     }
 
     private fun useMapLocationProvider(mapView: RCTMGLMapView) {
-        val provider = mapView.location.getLocationProvider()
+        val provider = mapView.mapView.location.getLocationProvider()
         if (provider != null) {
             mLocationManager.provider = provider
         }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLAndroidTextureMapViewManager.kt

@@ -0,0 +1,23 @@
+package com.mapbox.rctmgl.components.mapview
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ThemedReactContext
+import com.mapbox.maps.MapInitOptions
+
+class RCTMGLAndroidTextureMapViewManager(context: ReactApplicationContext) : RCTMGLMapViewManager(
+    context
+) {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(themedReactContext: ThemedReactContext): RCTMGLMapView {
+        val context = getMapViewContext(themedReactContext)
+        val options = MapInitOptions(context = context, textureView= true)
+        return RCTMGLMapView(context, this, options)
+    }
+
+    companion object {
+        const val REACT_CLASS = "RCTMGLAndroidTextureMapView"
+    }
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapView.kt

@@ -7,6 +7,7 @@ import android.graphics.RectF
 import android.util.Log
 import android.view.Gravity
 import android.view.View
+import android.view.View.OnLayoutChangeListener
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.lifecycle.Lifecycle
@@ -45,6 +46,7 @@ import com.mapbox.maps.plugin.logo.generated.LogoSettings
 import com.mapbox.maps.plugin.logo.logo
 import com.mapbox.maps.plugin.scalebar.generated.ScaleBarSettings
 import com.mapbox.maps.plugin.scalebar.scalebar
+import com.mapbox.maps.viewannotation.ViewAnnotationManager
 import com.mapbox.rctmgl.R
 import com.mapbox.rctmgl.components.AbstractMapFeature
 import com.mapbox.rctmgl.components.RemovalReason
@@ -145,7 +147,7 @@ data class FeatureEntry(val feature: AbstractMapFeature?, val view: View?, var a
 
 }
 
-open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapViewManager /*, MapboxMapOptions options*/) : MapView(mContext), OnMapClickListener, OnMapLongClickListener {
+open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapViewManager, options: MapInitOptions?) : FrameLayout(mContext), OnMapClickListener, OnMapLongClickListener, OnLayoutChangeListener {
     /**
      * `PointAnnotations` are rendered to a canvas, but the React Native `Image` component is
      * implemented on top of Fresco (https://frescolib.org), which does not load images for
@@ -170,6 +172,8 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     private val mCameraChangeTracker = CameraChangeTracker()
     private val mMap: MapboxMap?
 
+    private val mMapView: MapView
+
     var savedStyle: Style? = null
         private set
 
@@ -183,17 +187,31 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         private set
 
     val mapView: MapView
-        get() = this
+        get() = this.mMapView
+
+    val viewAnnotationManager: ViewAnnotationManager
+        get() = mapView.viewAnnotationManager
+
+    var requestDisallowInterceptTouchEvent: Boolean = false
+        set(value) {
+            val oldValue = field
+            field = value
+            updateRequestDisallowInterceptTouchEvent(oldValue, value)
+        }
+
+    fun getMapboxMap(): MapboxMap {
+        return mapView.getMapboxMap()
+    }
 
     val pointAnnotationManager: PointAnnotationManager?
         get() {
             if (mPointAnnotationManager == null) {
                 val _this = this
-                val gesturesPlugin: GesturesPlugin = this.gestures
+                val gesturesPlugin: GesturesPlugin = mapView.gestures
                 gesturesPlugin.removeOnMapClickListener(_this)
                 gesturesPlugin.removeOnMapLongClickListener(_this)
 
-                mPointAnnotationManager = annotations.createPointAnnotationManager(AnnotationConfig(layerId = "rctmgl-mapview-annotations"))
+                mPointAnnotationManager = mapView.annotations.createPointAnnotationManager(AnnotationConfig(layerId = "rctmgl-mapview-annotations"))
                 mPointAnnotationManager?.addClickListener(OnPointAnnotationClickListener { pointAnnotation ->
                         onMarkerClick(pointAnnotation)
                         false
@@ -272,7 +290,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             handleMapChangedEvent(EventTypes.MAP_IDLE);
         })
 
-        val gesturesPlugin: GesturesPlugin = this.gestures
+        val gesturesPlugin: GesturesPlugin = mapView.gestures
         gesturesPlugin.addOnMapLongClickListener(_this)
         gesturesPlugin.addOnMapClickListener(_this)
 
@@ -581,7 +599,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
                     ScreenCoordinate(screenPoint.x + halfWidth,
                             screenPoint.y + halfHeight)
             )
-            getMapboxMap().queryRenderedFeatures(RenderedQueryGeometry(screenBox),
+            mapView.getMapboxMap().queryRenderedFeatures(RenderedQueryGeometry(screenBox),
                     RenderedQueryOptions(
                             source.layerIDs,
                             null
@@ -814,7 +832,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         }
 
     fun getMapAsync(mapReady: OnMapReadyCallback) {
-        mapReady.onMapReady(getMapboxMap())
+        mapReady.onMapReady(mapView.getMapboxMap())
     }
 
     //fun setTintColor(color: Int) {
@@ -938,7 +956,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     fun takeSnap(callbackID: String?, writeToDisk: Boolean) {
-        this.snapshot { snapshot ->
+        mapView.snapshot { snapshot ->
             if (snapshot == null) {
                 Logger.e("takeSnap", "snapshot failed")
 
@@ -1030,7 +1048,13 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         offscreenAnnotationViewContainer?.setLayoutParams(p)
         addView(offscreenAnnotationViewContainer)
 
-        mMap = getMapboxMap()
+        mMapView = if (options != null) MapView(mContext, options) else MapView(mContext)
+
+        val matchParent = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        mMapView.setLayoutParams(matchParent)
+        addView(mMapView)
+
+        mMap = mapView.getMapboxMap()
         mSources = HashMap()
         mImages = ArrayList()
         mPointAnnotations = HashMap()
@@ -1050,7 +1074,9 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             }
         })
 
-        RCTMGLMarkerViewManager.markerViewContainerSizeFixer(this, this.viewAnnotationManager)
+        RCTMGLMarkerViewManager.markerViewContainerSizeFixer(this, mapView.viewAnnotationManager)
+
+        this.addOnLayoutChangeListener(this)
     }
 
     // region Ornaments
@@ -1135,7 +1161,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     private fun updateCompass() {
-        compass.updateSettings {
+        mapView.compass.updateSettings {
             fadeWhenFacingNorth = mCompassFadeWhenNorth
             updateOrnament("compass", mCompassSettings, this.toGenericOrnamentSettings())
         }
@@ -1180,8 +1206,8 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         mapView.forceLayout();
 
         mapView.measure(
-            MeasureSpec.makeMeasureSpec(mapView.measuredWidth, MeasureSpec.EXACTLY),
-            MeasureSpec.makeMeasureSpec(mapView.measuredHeight, MeasureSpec.EXACTLY)
+            MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
         );
         mapView.layout(mapView.left, mapView.top, mapView.right, mapView.bottom)
     }
@@ -1236,7 +1262,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     private fun updateAttribution() {
-        attribution.updateSettings {
+        mapView.attribution.updateSettings {
             updateOrnament("attribution", mAttributionSettings, this.toGenericOrnamentSettings())
         }
         workaroundToRelayoutChildOfMapView()
@@ -1271,7 +1297,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     private fun updateLogo() {
-        logo.updateSettings {
+        mapView.logo.updateSettings {
             updateOrnament("logo", mLogoSettings, this.toGenericOrnamentSettings())
         }
         workaroundToRelayoutChildOfMapView()
@@ -1290,18 +1316,21 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         super.onDetachedFromWindow();
     }
 
+    /* FMTODO
     override fun onDestroy() {
+        this.removeOnLayoutChangeListener(this)
         removeAllFeaturesFromMap(RemovalReason.ON_DESTROY)
-        viewAnnotationManager.removeAllViewAnnotations()
+        mapView.viewAnnotationManager.removeAllViewAnnotations()
         mLocationComponentManager?.onDestroy();
 
         lifecycle.onDestroy()
         super.onDestroy()
     }
+     */
 
     fun onDropViewInstance() {
         removeAllFeaturesFromMap(RemovalReason.ON_DESTROY)
-        viewAnnotationManager.removeAllViewAnnotations()
+        mapView.viewAnnotationManager.removeAllViewAnnotations()
         lifecycle.onDestroy()
     }
 
@@ -1310,10 +1339,50 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         super.onAttachedToWindow()
     }
 
+    override fun onLayoutChange(
+        v: View?,
+        left: Int,
+        top: Int,
+        right: Int,
+        bottom: Int,
+        oldLeft: Int,
+        oldTop: Int,
+        oldRight: Int,
+        oldBottom: Int
+    ) {
+        mapView.post {
+            mapView.measure(
+                MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+            )
+            mapView.layout(mapView.left, mapView.top, mapView.right, mapView.bottom)
+        }
+    }
+
 
     // endregion
 }
 
+// region requestDisallowInterceptTouchEvent
+fun RCTMGLMapView.updateRequestDisallowInterceptTouchEvent(oldValue: Boolean, value: Boolean) {
+    if (oldValue == value) {
+        return
+    }
+    if (value) {
+        mapView.setOnTouchListener { view, event ->
+            this.requestDisallowInterceptTouchEvent(true)
+            mapView.onTouchEvent(event)
+            true
+        }
+    } else {
+        mapView.setOnTouchListener { view, event ->
+            mapView.onTouchEvent(event)
+        }
+    }
+}
+// endregion
+
+
 fun OrnamentSettings.setPosAndMargins(posAndMargins: ReadableMap?) {
     if (posAndMargins == null) { return }
 

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapViewManager.kt

@@ -1,5 +1,6 @@
 package com.mapbox.rctmgl.components.mapview
 
+import android.content.Context
 import android.util.Log
 import android.view.View
 import com.facebook.react.bridge.*
@@ -11,6 +12,7 @@ import com.facebook.react.uimanager.annotations.ReactProp
 import com.mapbox.rctmgl.events.constants.EventKeys
 import com.mapbox.maps.MapboxMap
 import com.facebook.react.common.MapBuilder
+import com.mapbox.maps.MapInitOptions
 import com.mapbox.maps.extension.style.layers.properties.generated.ProjectionName
 import com.mapbox.maps.plugin.compass.compass
 import com.mapbox.maps.plugin.gestures.gestures
@@ -36,8 +38,8 @@ fun ReadableArray.asArrayString(): Array<String> {
     return result
 }
 
-open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
-    AbstractEventEmitter<RCTMGLMapView?>(context) {
+open class RCTMGLMapViewManager(context: ReactApplicationContext) :
+    AbstractEventEmitter<RCTMGLMapView>(context) {
     private val mViews: MutableMap<Int, RCTMGLMapView>
     override fun getName(): String {
         return REACT_CLASS
@@ -75,8 +77,13 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
         mapView!!.removeFeatureAt(index)
     }
 
+    fun getMapViewContext(themedReactContext: ThemedReactContext): Context {
+        return activity ?: themedReactContext
+    }
+
     override fun createViewInstance(themedReactContext: ThemedReactContext): RCTMGLMapView {
-        return RCTMGLMapView(themedReactContext, this /*, null*/)
+        val context = getMapViewContext(themedReactContext)
+        return RCTMGLMapView(context, this, options=null)
     }
 
     override fun onDropViewInstance(mapView: RCTMGLMapView) {
@@ -116,24 +123,28 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
     }
 
     @ReactProp(name = "zoomEnabled")
-    fun setZoomEnabled(mapView: RCTMGLMapView, zoomEnabled: Boolean) {
+    fun setZoomEnabled(map: RCTMGLMapView, zoomEnabled: Boolean) {
+        val mapView = map.mapView
         mapView.gestures.pinchToZoomEnabled = zoomEnabled
         mapView.gestures.doubleTouchToZoomOutEnabled = zoomEnabled
         mapView.gestures.doubleTapToZoomInEnabled = zoomEnabled
     }
 
     @ReactProp(name = "scrollEnabled")
-    fun setScrollEnabled(mapView: RCTMGLMapView, scrollEnabled: Boolean) {
+    fun setScrollEnabled(map: RCTMGLMapView, scrollEnabled: Boolean) {
+        val mapView = map.mapView
         mapView.gestures.scrollEnabled = scrollEnabled
     }
 
     @ReactProp(name = "pitchEnabled")
-    fun setPitchEnabled(mapView: RCTMGLMapView, pitchEnabled: Boolean) {
+    fun setPitchEnabled(map: RCTMGLMapView, pitchEnabled: Boolean) {
+        val mapView = map.mapView
         mapView.gestures.pitchEnabled = pitchEnabled
     }
 
     @ReactProp(name = "rotateEnabled")
-    fun setRotateEnabled(mapView: RCTMGLMapView, rotateEnabled: Boolean) {
+    fun setRotateEnabled(map: RCTMGLMapView, rotateEnabled: Boolean) {
+        val mapView = map.mapView
         mapView.gestures.rotateEnabled = rotateEnabled
     }
 
@@ -222,6 +233,11 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
         //mapView.setTintColor(tintColor);
     }
 
+    @ReactProp(name = "requestDisallowInterceptTouchEvent")
+    fun setRequestDisallowInterceptTouchEvent(mapView: RCTMGLMapView, requestDisallowInterceptTouchEvent: Boolean) {
+        mapView.requestDisallowInterceptTouchEvent = requestDisallowInterceptTouchEvent
+    }
+
     //endregion
     //region Custom Events
     override fun customEvents(): Map<String, String>? {
@@ -310,7 +326,7 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
             }
             METHOD_SET_HANDLED_MAP_EVENTS -> {
                 args?.let {
-                    mapView.setHandledMapChangedEvents(args.asArrayString());
+                    mapView.setHandledMapChangedEvents(it.getArray(1).asArrayString());
                 }
             }
         }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLRasterSourceManager.kt

@@ -5,7 +5,7 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import javax.annotation.Nonnull
 
-class RCTMGLRasterSourceManager(reactApplicationContext: ReactApplicationContext?) :
+class RCTMGLRasterSourceManager(reactApplicationContext: ReactApplicationContext) :
     RCTMGLTileSourceManager<RCTMGLRasterSource?>(reactApplicationContext) {
     @Nonnull
     override fun getName(): String {