@rnmapbox/maps 10.0.0-rc.6 → 10.0.0-rc.7

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

@@ -91,7 +91,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         setInitialCamera()
         updateMaxBounds()
         mCameraStop?.let { updateCamera(it) }
-        _observeViewportState(mapView)
+        _observeViewportState(mapView.mapView)
         _updateViewportState()
     }
 
@@ -301,7 +301,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
 
     fun _updateViewportState() {
         mMapView?.let {
-            val map = it
+            val map = it.mapView
             val viewport = map.viewport;
 
             if (mLocationComponentManager == null) {

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/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 /*, MapboxMapOptions options*/) : 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,24 @@ 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
+
+    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 +283,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 +592,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 +825,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 +949,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 +1041,13 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         offscreenAnnotationViewContainer?.setLayoutParams(p)
         addView(offscreenAnnotationViewContainer)
 
-        mMap = getMapboxMap()
+        mMapView = 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 +1067,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 +1154,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 +1199,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 +1255,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 +1290,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 +1309,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,6 +1332,26 @@ 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
 }

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

@@ -117,24 +117,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
     }
 

package/lib/commonjs/components/Terrain.js

@@ -16,7 +16,7 @@ const Terrain = /*#__PURE__*/(0, _react.memo)(props => {
     style = {}
   } = props;
   if (props.exaggeration) {
-    console.warn(`Tarrain: exaggeration property is deprecated pls use style.exaggeration instead!`);
+    console.warn(`Terrain: exaggeration property is deprecated pls use style.exaggeration instead!`);
     style = {
       exaggeration: props.exaggeration,
       ...style

package/lib/module/components/Terrain.js

@@ -7,7 +7,7 @@ export const Terrain = /*#__PURE__*/memo(props => {
     style = {}
   } = props;
   if (props.exaggeration) {
-    console.warn(`Tarrain: exaggeration property is deprecated pls use style.exaggeration instead!`);
+    console.warn(`Terrain: exaggeration property is deprecated pls use style.exaggeration instead!`);
     style = {
       exaggeration: props.exaggeration,
       ...style

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.0.0-rc.6",
+  "version": "10.0.0-rc.7",
   "publishConfig": {
     "access": "public"
   },

package/src/components/Terrain.tsx

@@ -33,7 +33,7 @@ export const Terrain = memo((props: Props) => {
 
   if (props.exaggeration) {
     console.warn(
-      `Tarrain: exaggeration property is deprecated pls use style.exaggeration instead!`,
+      `Terrain: exaggeration property is deprecated pls use style.exaggeration instead!`,
     );
     style = { exaggeration: props.exaggeration, ...style };
   }