@rnmapbox/maps 10.0.9 → 10.0.10-rc.0

package/ios/RCTMGL-v10/RCTMGLAtmosphere.swift

@@ -17,15 +17,16 @@ class RCTMGLAtmosphere : RCTMGLSingletonLayer, RCTMGLMapComponent, RCTMGLSourceC
     addStylesAndUpdate()
   }
   
-  func removeFromMap(_ map: RCTMGLMapView) {
+  func removeFromMap(_ map: RCTMGLMapView, reason _: RemovalReason) -> Bool {
     self.map = nil
     
     guard let mapboxMap = map.mapboxMap else {
-      return
+      return false
     }
     
     let style = mapboxMap.style
     removeFromMap(map, style: style)
+    return true
   }
   
   func waitForStyleLoad() -> Bool {

package/ios/RCTMGL-v10/RCTMGLCamera.swift

@@ -2,9 +2,13 @@ import Foundation
 import MapboxMaps
 import Turf
 
-protocol RCTMGLMapComponent : class {
+enum RemovalReason {
+    case ViewRemoval, StyleChange, OnDestory, ComponentChange, Reorder
+}
+
+protocol RCTMGLMapComponent: AnyObject {
   func addToMap(_ map: RCTMGLMapView, style: Style)
-  func removeFromMap(_ map: RCTMGLMapView)
+  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool
   
   func waitForStyleLoad() -> Bool
 }
@@ -98,9 +102,10 @@ open class RCTMGLMapComponentBase : UIView, RCTMGLMapComponent {
     _map = map
   }
   
-  func removeFromMap(_ map: RCTMGLMapView) {
+  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
     _mapCallbacks = []
     _map = nil
+    return true
   }
 }
 
@@ -506,9 +511,13 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
     map.reactCamera = self
   }
   
-  override func removeFromMap(_ map: RCTMGLMapView) {
+  override func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
+    if (reason == .StyleChange) {
+      return false
+    }
+
     map.viewport.removeStatusObserver(self)
-    super.removeFromMap(map)
+    return super.removeFromMap(map, reason:reason)
   }
 }
 

package/ios/RCTMGL-v10/RCTMGLImages.swift

@@ -61,9 +61,10 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
     self.addImageViews(style: style, imageViews: imageViews)
   }
   
-  func removeFromMap(_ map: RCTMGLMapView) {
+  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
     self.style = nil
     // v10todo
+    return true
   }
   
   func addRemoteImages(style: Style, remoteImages: [String: Any]) {

package/ios/RCTMGL-v10/RCTMGLInteractiveElement.swift

@@ -19,7 +19,7 @@ class RCTMGLInteractiveElement : UIView, RCTMGLMapComponent {
     willSet {
       if id != nil && newValue != id {
         Logger.log(level:.warn, message: "Changing id from: \(optional: id) to \(optional: newValue), changing of id is supported")
-        if let map = map { removeFromMap(map) }
+        if let map = map { removeFromMap(map, reason: .ComponentChange) }
       }
     }
     didSet {
@@ -53,8 +53,9 @@ class RCTMGLInteractiveElement : UIView, RCTMGLMapComponent {
     self.map = map
   }
 
-  func removeFromMap(_ map: RCTMGLMapView) {
+  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
     self.map = nil
+    return true
   }
   
   func waitForStyleLoad() -> Bool {

package/ios/RCTMGL-v10/RCTMGLLayer.swift

@@ -276,8 +276,9 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     }
   }
 
-  func removeFromMap(_ map: RCTMGLMapView) {
+  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
     removeFromMap(map.mapboxMap.style)
+    return true
   }
   
   private func removeFromMap(_ style: Style) {

package/ios/RCTMGL-v10/RCTMGLLight.swift

@@ -52,7 +52,8 @@ class RCTMGLLight: UIView, RCTMGLMapComponent {
     }
   }
   
-  func removeFromMap(_ map: RCTMGLMapView) {
+  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool  {
     self.map = nil
+    return true
   }
 }

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -2,6 +2,18 @@
 import Turf
 import MapKit
 
+class FeatureEntry {
+  let feature: RCTMGLMapComponent
+  let view: UIView
+  var addedToMap: Bool = false
+
+  init(feature:RCTMGLMapComponent, view: UIView, addedToMap: Bool = false) {
+    self.feature = feature
+    self.view = view
+    self.addedToMap = addedToMap
+  }
+}
+
 class RCTMGLCameraChanged : RCTMGLEvent, RCTEvent {
   init(type: EventType, payload: [String:Any?]?, reactTag: NSNumber) {
     super.init(type: type, payload: payload)
@@ -54,9 +66,8 @@ open class RCTMGLMapView : MapView {
 
   var styleLoaded: Bool = false
   var styleLoadWaiters : [(MapboxMap)->Void] = []
-  var onStyleLoadedComponents: [RCTMGLMapComponent] = []
-  
-  var componentsToRefreshOnStyleChange: [RCTMGLMapComponent] = []
+
+  var features: [FeatureEntry] = []
 
   weak var reactCamera : RCTMGLCamera?
   var images : [RCTMGLImages] = []
@@ -89,16 +100,21 @@ open class RCTMGLMapView : MapView {
   func addToMap(_ subview: UIView) {
     if let mapComponent = subview as? RCTMGLMapComponent {
       let style = mapView.mapboxMap.style
+      var addToMap = false
       if mapComponent.waitForStyleLoad() {
-        componentsToRefreshOnStyleChange.append(mapComponent)
         if (self.styleLoaded) {
-          mapComponent.addToMap(self, style: style)
-        } else {
-          onStyleLoadedComponents.append(mapComponent)
+          addToMap = true
         }
       } else {
+        addToMap = true
+      }
+
+      let entry = FeatureEntry(feature: mapComponent, view: subview, addedToMap: false)
+      if (addToMap) {
         mapComponent.addToMap(self, style: style)
+        entry.addedToMap = true
       }
+      features.append(entry)
     } else {
       subview.reactSubviews()?.forEach { addToMap($0) }
     }
@@ -109,11 +125,15 @@ open class RCTMGLMapView : MapView {
   
   func removeFromMap(_ subview: UIView) {
     if let mapComponent = subview as? RCTMGLMapComponent {
-      if mapComponent.waitForStyleLoad() {
-        onStyleLoadedComponents.removeAll { $0 === mapComponent }
-        componentsToRefreshOnStyleChange.removeAll { $0 === mapComponent }
+      var entryIndex = features.firstIndex { $0.view == subview }
+      if let entryIndex = entryIndex {
+        var entry = features[entryIndex]
+        if (entry.addedToMap) {
+            mapComponent.removeFromMap(self, reason: .OnDestory)
+            entry.addedToMap = false
+        }
+        features.remove(at: entryIndex)
       }
-      mapComponent.removeFromMap(self)
     } else {
       subview.reactSubviews()?.forEach { removeFromMap($0) }
     }
@@ -321,17 +341,31 @@ open class RCTMGLMapView : MapView {
   @objc func setReactPitchEnabled(_ value: Bool) {
     self.mapView.gestures.options.pitchEnabled = value
   }
+
+  private func removeAllFeaturesFromMap(reason: RemovalReason) {
+    features.forEach { entry in
+      if (entry.addedToMap) {
+        entry.feature.removeFromMap(self, reason: reason)
+        entry.addedToMap = false
+      }
+    }
+  }
+
+  private func addFeaturesToMap(style: Style) {
+    features.forEach { entry in
+      if (!entry.addedToMap) {
+        entry.feature.addToMap(self, style: style)
+        entry.addedToMap = true
+      }
+    }
+  }
   
   func refreshComponentsBeforeStyleChange() {
-    componentsToRefreshOnStyleChange.forEach {
-      $0.removeFromMap(self)
-    }
+    removeAllFeaturesFromMap(reason: .StyleChange)
   }
   
   func refreshComponentsAfterStyleChange(style: Style) {
-    componentsToRefreshOnStyleChange.forEach {
-      $0.addToMap(self, style: style)
-    }
+      addFeaturesToMap(style: style)
   }
   
   @objc func setReactStyleURL(_ value: String?) {
@@ -353,7 +387,7 @@ open class RCTMGLMapView : MapView {
       }
       if !initialLoad {
         self.onNext(event: .styleLoaded) {_,_ in
-          self.refreshComponentsAfterStyleChange(style: self.mapboxMap.style)
+          self.addFeaturesToMap(style: self.mapboxMap.style)
         }
       }
     }
@@ -557,9 +591,7 @@ extension RCTMGLMapView {
     })
     
     self.onEvery(event: .styleLoaded, handler: { (self, event) in
-      self.onStyleLoadedComponents.forEach { (component) in
-        component.addToMap(self, style: self.mapboxMap.style)
-      }
+      self.addFeaturesToMap(style: self.mapboxMap.style)
       
       if !self.styleLoaded {
         self.styleLoaded = true

package/ios/RCTMGL-v10/RCTMGLMarkerView.swift

@@ -108,8 +108,9 @@ class RCTMGLMarkerView: UIView, RCTMGLMapComponent {
     add()
   }
 
-  func removeFromMap(_ map: RCTMGLMapView) {
+  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
     remove()
+    return true
   }
   
   // MARK: - React methods

package/ios/RCTMGL-v10/RCTMGLNativeUserLocation.swift

@@ -30,14 +30,16 @@ class RCTMGLNativeUserLocation : UIView, RCTMGLMapComponent {
     _applySettings(map)
   }
 
-  func removeFromMap(_ map: RCTMGLMapView) {
+  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
     map.location.options.puckType = nil
     guard let mapboxMap = map.mapboxMap else {
-      return
+      return true
     }
     let style = mapboxMap.style
     map.location.options.puckType = .none
     self.map = nil
+
+    return true
   }
   
   func waitForStyleLoad() -> Bool {

package/ios/RCTMGL-v10/RCTMGLPointAnnotation.swift

@@ -212,9 +212,10 @@ class RCTMGLPointAnnotation : RCTMGLInteractiveElement {
     addIfPossible()
   }
 
-  override func removeFromMap(_ map: RCTMGLMapView) {
+  override func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
     removeIfAdded()
     self.map = nil
+    return true
   }
   
   // MARK: - RCTMGLInteractiveElement

package/ios/RCTMGL-v10/RCTMGLSource.swift

@@ -54,7 +54,7 @@ class RCTMGLSource : RCTMGLInteractiveElement {
       layers.removeAll { $0 as AnyObject === layer }
     } else if let component = subview as? RCTMGLMapComponent {
       if let map = map {
-        component.removeFromMap(map)
+        component.removeFromMap(map, reason: .ViewRemoval)
       }
       layers.removeAll { $0 as AnyObject === component }
     }
@@ -95,7 +95,7 @@ class RCTMGLSource : RCTMGLInteractiveElement {
     }
   }
 
-  override func removeFromMap(_ map: RCTMGLMapView) {
+  override func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
     self.map = nil
 
     for layer in self.layers {
@@ -109,5 +109,6 @@ class RCTMGLSource : RCTMGLInteractiveElement {
       }
       self.ownsSource = false
     }
+    return true
   }
 }

package/ios/RCTMGL-v10/RCTMGLTerrain.swift

@@ -22,15 +22,16 @@ class RCTMGLTerrain : RCTMGLSingletonLayer, RCTMGLMapComponent, RCTMGLSourceCons
     addStylesAndUpdate()
   }
   
-  func removeFromMap(_ map: RCTMGLMapView) {
+  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
     self.map = nil
     
     guard let mapboxMap = map.mapboxMap else {
-      return
+      return true
     }
     
     let style = mapboxMap.style
     removeFromMap(map, style: style)
+    return true
   }
   
   func waitForStyleLoad() -> Bool {

package/package.json

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