@rnmapbox/maps 10.0.0-beta.35 → 10.0.0-beta.38

package/.github/pull_request_template.md

@@ -19,9 +19,8 @@ Added `your feature` that allows ...
 
 - [ ] I have tested this on a device/simulator for each compatible OS
 - [ ] I updated the documentation with running `yarn generate` in the root folder
-- [ ] I mentioned this change in `CHANGELOG.md`
-- [ ] I updated the typings files (`index.d.ts`)
-- [ ] I added/ updated a sample (`/example`)
+- [ ] I updated the typings files - if js interface was changed (`index.d.ts`)
+- [ ] I added/ updated a sample - if a new feature was implemented (`/example`)
 
 ## Screenshot OR Video
 

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

@@ -65,6 +65,10 @@ import org.json.JSONObject
 import java.util.*
 
 
+interface RCTMGLMapViewLifecycleOwner : LifecycleOwner {
+    fun handleLifecycleEvent(event: Lifecycle.Event)
+}
+
 open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapViewManager /*, MapboxMapOptions options*/) : MapView(mContext), OnMapClickListener, OnMapLongClickListener {
     private val mSources: MutableMap<String, RCTSource<*>>
     private val mImages: MutableList<RCTMGLImages>
@@ -204,6 +208,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         mMap.getStyle(onStyleLoaded)
     }
 
+    // region features
     fun addFeature(childView: View?, childPosition: Int) {
         var feature: AbstractMapFeature? = null
         if (childView is RCTSource<*>) {
@@ -281,6 +286,18 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         return features()[i]
     }
 
+    fun removeAllFeatures() {
+        mFeatures.forEach {
+            it.removeFromMap(this)
+        }
+        mFeatures.clear()
+        val queuedFeatures = mQueuedFeatures
+        if (queuedFeatures != null) {
+            queuedFeatures.clear()
+        }
+    }
+    // endregion
+
     fun sendRegionChangeEvent(isAnimated: Boolean) {
         val event: IEvent = MapChangeEvent(this, EventTypes.REGION_DID_CHANGE,
                 makeRegionPayload(isAnimated))
@@ -471,23 +488,6 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         return false
     }
 
-    override fun onAttachedToWindow() {
-        val hostingLifecycleOwner = ViewTreeLifecycleOwner.get(this)
-        if (hostingLifecycleOwner == null) {
-            ViewTreeLifecycleOwner.set(this, object : LifecycleOwner {
-                private lateinit var lifecycleRegistry: LifecycleRegistry
-                init {
-                    lifecycleRegistry = LifecycleRegistry(this)
-                    lifecycleRegistry.currentState = Lifecycle.State.CREATED
-                }
-                override fun getLifecycle(): Lifecycle {
-                    return lifecycleRegistry
-                }
-            })
-        }
-        super.onAttachedToWindow()
-    }
-
     override fun onMapLongClick(point: Point): Boolean {
         val _this = this
         if (mAnnotationDragged) {
@@ -1093,4 +1093,49 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         }
     }
     // endregion
+
+    // region lifecycle
+    private var lifecycleOwner : RCTMGLMapViewLifecycleOwner? = null
+
+    override fun onDetachedFromWindow() {
+        lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+        super.onDetachedFromWindow();
+    }
+
+    override fun onDestroy() {
+        removeAllFeatures()
+        lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+        super.onDestroy()
+    }
+
+    fun onDropViewInstance() {
+        removeAllFeatures()
+        lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    }
+
+    override fun onAttachedToWindow() {
+        if (lifecycleOwner == null) {
+            lifecycleOwner = object : RCTMGLMapViewLifecycleOwner {
+                private lateinit var lifecycleRegistry: LifecycleRegistry
+                init {
+                    lifecycleRegistry = LifecycleRegistry(this)
+                    lifecycleRegistry.currentState = Lifecycle.State.CREATED
+                }
+
+                override fun handleLifecycleEvent(event: Lifecycle.Event) {
+                    lifecycleRegistry.handleLifecycleEvent(event)
+                }
+
+                override fun getLifecycle(): Lifecycle {
+                    return lifecycleRegistry
+                }
+            }
+            ViewTreeLifecycleOwner.set(this, lifecycleOwner);
+        } else {
+            lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
+        }
+        super.onAttachedToWindow()
+    }
+
+    // endregion
 }

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

@@ -70,6 +70,7 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
         if (mViews.containsKey(reactTag)) {
             mViews.remove(reactTag)
         }
+        mapView.onDropViewInstance()
         super.onDropViewInstance(mapView)
     }
 

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/GeoJSONUtils.kt

@@ -127,15 +127,9 @@ object GeoJSONUtils {
         val array = Arguments.createArray()
         val ne = bounds.northeast
         val sw = bounds.southwest
-        val latLngs = arrayOf(
-            LatLng(ne.latitude(), ne.longitude()),
-            LatLng(ne.latitude(), sw.longitude()),
-            LatLng(sw.latitude(), sw.longitude()),
-            LatLng(sw.latitude(), ne.longitude())
-        )
-        for (latLng in latLngs) {
-            array.pushArray(fromLatLng(latLng))
-        }
+
+        array.pushArray(fromLatLng(LatLng(ne.latitude(), ne.longitude())));
+        array.pushArray(fromLatLng(LatLng(sw.latitude(), sw.longitude())));
         return array
     }
 

package/package.json

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