react-native-google-maps-plus 1.3.0-dev.3 → 1.3.0

package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt

@@ -153,9 +153,9 @@ class GoogleMapsViewImpl(
       }
       initLocationCallbacks()
       applyPending()
+      mapReady = true
+      onMapReady?.invoke(true)
     }
-    mapReady = true
-    onMapReady?.invoke(true)
   }
 
   override fun onCameraMoveStarted(reason: Int) {
@@ -372,6 +372,8 @@ class GoogleMapsViewImpl(
     }
   }
 
+  var initialProps: RNInitialProps? = null
+
   var uiSettings: RNMapUiSettings? = null
     set(value) {
       field = value
@@ -975,6 +977,7 @@ class GoogleMapsViewImpl(
 
   fun destroyInternal() {
     onUi {
+      locationHandler.stop()
       markerBuilder.cancelAllJobs()
       clearMarkers()
       clearPolylines()
@@ -982,7 +985,6 @@ class GoogleMapsViewImpl(
       clearCircles()
       clearHeatmaps()
       clearKmlLayer()
-      locationHandler.stop()
       googleMap?.apply {
         setOnCameraMoveStartedListener(null)
         setOnCameraMoveListener(null)
@@ -1003,6 +1005,7 @@ class GoogleMapsViewImpl(
       }
       super.removeAllViews()
       reactContext.removeLifecycleEventListener(this)
+      initialized = false
     }
   }
 

package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt

@@ -21,6 +21,7 @@ import com.rngooglemapsplus.extensions.toSize
 class RNGoogleMapsPlusView(
   val context: ThemedReactContext,
 ) : HybridRNGoogleMapsPlusViewSpec() {
+  private var propsInitialized = false
   private var currentCustomMapStyle: String? = null
   private var permissionHandler = PermissionHandler(context)
   private var locationHandler = LocationHandler(context)
@@ -35,15 +36,23 @@ class RNGoogleMapsPlusView(
   override val view =
     GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerBuilder)
 
+  override fun afterUpdate() {
+    super.afterUpdate()
+    if (!propsInitialized) {
+      propsInitialized = true
+      view.initMapView(
+        initialProps?.mapId,
+        initialProps?.liteMode,
+        initialProps?.camera?.toCameraPosition(),
+      )
+    }
+  }
+
   override var initialProps: RNInitialProps? = null
     set(value) {
       if (field == value) return
       field = value
-      view.initMapView(
-        value?.mapId,
-        value?.liteMode,
-        value?.camera?.toCameraPosition(),
-      )
+      view.initialProps = value
     }
 
   override var uiSettings: RNMapUiSettings? = null

package/ios/GoogleMapViewImpl.swift

@@ -198,6 +198,11 @@ GMSIndoorDisplayDelegate {
     mapView?.camera
   }
 
+  @MainActor
+  var initialProps: RNInitialProps? {
+    didSet {}
+  }
+
   @MainActor
   var uiSettings: RNMapUiSettings? {
     didSet {
@@ -629,7 +634,10 @@ GMSIndoorDisplayDelegate {
 
   @MainActor
   func clearHeatmaps() {
-    heatmapsById.values.forEach { $0.map = nil }
+    heatmapsById.values.forEach {
+      $0.clearTileCache()
+      $0.map = nil
+    }
     heatmapsById.removeAll()
     pendingHeatmaps.removeAll()
   }
@@ -671,16 +679,21 @@ GMSIndoorDisplayDelegate {
   }
 
   func deinitInternal() {
-    markerBuilder.cancelAllIconTasks()
-    clearMarkers()
-    clearPolylines()
-    clearPolygons()
-    clearCircles()
-    clearHeatmaps()
-    locationHandler.stop()
-    mapView?.clear()
-    mapView?.delegate = nil
-    mapView = nil
+    onMain {
+      self.locationHandler.stop()
+      self.markerBuilder.cancelAllIconTasks()
+      self.clearMarkers()
+      self.clearPolylines()
+      self.clearPolygons()
+      self.clearCircles()
+      self.clearHeatmaps()
+      self.clearKmlLayers()
+      self.mapView?.clear()
+      self.mapView?.indoorDisplay.delegate = nil
+      self.mapView?.delegate = nil
+      self.mapView = nil
+      self.initialized = false
+    }
   }
 
   @objc private func appDidBecomeActive() {
@@ -696,9 +709,6 @@ GMSIndoorDisplayDelegate {
   override func didMoveToWindow() {
     super.didMoveToWindow()
     if window != nil {
-      if mapView != nil && mapReady {
-        onMapReady?(true)
-      }
       locationHandler.start()
     } else {
       locationHandler.stop()

package/ios/RNGoogleMapsPlusView.swift

@@ -8,6 +8,7 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
   private let permissionHandler: PermissionHandler
   private let locationHandler: LocationHandler
 
+  private var propsInitialized = false
   private let markerBuilder = MapMarkerBuilder()
   private let polylineBuilder = MapPolylineBuilder()
   private let polygonBuilder = MapPolygonBuilder()
@@ -29,21 +30,23 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     )
   }
 
-  /*
-   /// TODO: prepareForRecycle
-   override func prepareForRecycle() {
-   impl.clearAll()
-   }
-   */
+  func afterUpdate() {
+    if !propsInitialized {
+      propsInitialized = true
+      Task { @MainActor in
+        impl.initMapView(
+          mapId: self.initialProps?.mapId,
+          liteMode: self.initialProps?.liteMode,
+          camera: self.initialProps?.camera?.toGMSCameraPosition(current: nil)
+        )
+      }
+    }
+  }
 
   @MainActor
   var initialProps: RNInitialProps? {
     didSet {
-      impl.initMapView(
-        mapId: initialProps?.mapId,
-        liteMode: initialProps?.liteMode,
-        camera: initialProps?.camera?.toGMSCameraPosition(current: nil)
-      )
+      impl.initialProps = initialProps
     }
   }
 

package/nitrogen/generated/ios/c++/views/HybridRNGoogleMapsPlusViewComponent.mm

@@ -49,6 +49,13 @@ using namespace margelo::nitro::rngooglemapsplus::views;
   return self;
 }
 
+/// added by nitrogen-patch.js
++ (BOOL)shouldBeRecycled
+{
+  return NO;
+}
+
+
 - (void) updateView {
   // 1. Get Swift part
   RNGoogleMapsPlus::HybridRNGoogleMapsPlusViewSpec_cxx& swiftPart = _hybridView->getSwiftPart();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.3.0-dev.3",
+  "version": "1.3.0",
   "description": "React-native wrapper for android & IOS google maps sdk",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",