react-native-google-maps-plus 1.7.0-dev.16 → 1.7.0-dev.17

package/ios/LocationHandler.swift

@@ -35,6 +35,8 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
 
   func showLocationDialog() {
     onMainAsync { [weak self] in
+      guard let self = self else { return }
+
       guard let vc = Self.topMostViewController() else { return }
       let title =
         Bundle.main.object(forInfoDictionaryKey: "LocationNotAvailableTitle")
@@ -61,7 +63,7 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
           title: openLocationSettingsButton ?? "Open settings",
           style: .default
         ) { _ in
-          self?.openLocationSettings()
+          self.openLocationSettings()
         }
       )
       vc.present(alert, animated: true, completion: nil)

package/ios/MapHelper.swift

@@ -32,11 +32,9 @@ func onMain(_ block: @escaping @MainActor () -> Void) {
 
 @inline(__always)
 func onMainAsync(
-  _ block: @MainActor @escaping () async -> Void
+  _ block: @escaping @MainActor () async -> Void
 ) {
-  if Thread.isMainThread {
-    Task { @MainActor in await block() }
-  } else {
-    Task { @MainActor in await block() }
+  Task { @MainActor in
+    await block()
   }
 }

package/ios/MapMarkerBuilder.swift

@@ -46,14 +46,35 @@ final class MapMarkerBuilder {
 
   @MainActor
   func update(_ prev: RNMarker, _ next: RNMarker, _ m: GMSMarker) {
-    if !prev.coordinateEquals(next) {
-      m.position = next.coordinate.toCLLocationCoordinate2D()
-    }
+    withCATransaction(disableActions: true) {
+
+      var tracksViewChanges = false
+      var tracksInfoWindowChanges = false
 
-    if !prev.markerStyleEquals(next) {
-      buildIconAsync(next) { img in
-        m.icon = img
+      if !prev.coordinateEquals(next) {
+        m.position = next.coordinate.toCLLocationCoordinate2D()
+      }
 
+      if !prev.markerStyleEquals(next) {
+        self.buildIconAsync(next) { img in
+          tracksViewChanges = true
+          m.icon = img
+
+          if !prev.anchorEquals(next) {
+            m.groundAnchor = CGPoint(
+              x: next.anchor?.x ?? 0.5,
+              y: next.anchor?.y ?? 1
+            )
+          }
+
+          if !prev.infoWindowAnchorEquals(next) {
+            m.infoWindowAnchor = CGPoint(
+              x: next.infoWindowAnchor?.x ?? 0.5,
+              y: next.infoWindowAnchor?.y ?? 0
+            )
+          }
+        }
+      } else {
         if !prev.anchorEquals(next) {
           m.groundAnchor = CGPoint(
             x: next.anchor?.x ?? 0.5,
@@ -67,74 +88,67 @@ final class MapMarkerBuilder {
             y: next.infoWindowAnchor?.y ?? 0
           )
         }
-
-        m.tracksViewChanges = true
-        DispatchQueue.main.async {
-          m.tracksViewChanges = false
-        }
       }
-    } else {
-      if !prev.anchorEquals(next) {
-        m.groundAnchor = CGPoint(
-          x: next.anchor?.x ?? 0.5,
-          y: next.anchor?.y ?? 1
-        )
+
+      if prev.title != next.title {
+        tracksInfoWindowChanges = true
+        m.title = next.title
       }
 
-      if !prev.infoWindowAnchorEquals(next) {
-        m.infoWindowAnchor = CGPoint(
-          x: next.infoWindowAnchor?.x ?? 0.5,
-          y: next.infoWindowAnchor?.y ?? 0
-        )
+      if prev.snippet != next.snippet {
+        tracksInfoWindowChanges = true
+        m.snippet = next.snippet
       }
-    }
 
-    var tracksInfoWindowChanges = false
+      if prev.opacity != next.opacity {
+        let opacity = Float(next.opacity ?? 1)
+        m.opacity = opacity
+        m.iconView?.alpha = CGFloat(opacity)
+      }
 
-    if prev.title != next.title {
-      tracksInfoWindowChanges = true
-      m.title = next.title
-    }
+      if prev.flat != next.flat {
+        m.isFlat = next.flat ?? false
+      }
 
-    if prev.snippet != next.snippet {
-      tracksInfoWindowChanges = true
-      m.snippet = next.snippet
-    }
+      if prev.draggable != next.draggable {
+        m.isDraggable = next.draggable ?? false
+      }
 
-    if tracksInfoWindowChanges {
-      m.tracksInfoWindowChanges = true
-      DispatchQueue.main.async {
-        m.tracksInfoWindowChanges = false
+      if prev.rotation != next.rotation {
+        m.rotation = next.rotation ?? 0
       }
-    }
 
-    if prev.opacity != next.opacity {
-      let opacity = Float(next.opacity ?? 1)
-      m.opacity = opacity
-      m.iconView?.alpha = CGFloat(opacity)
-    }
+      if prev.zIndex != next.zIndex {
+        m.zIndex = Int32(next.zIndex ?? 0)
+      }
 
-    if prev.flat != next.flat {
-      m.isFlat = next.flat ?? false
-    }
+      if !prev.markerInfoWindowStyleEquals(next) {
+        m.tagData = MarkerTag(
+          id: next.id,
+          iconSvg: next.infoWindowIconSvg
+        )
+      }
 
-    if prev.draggable != next.draggable {
-      m.isDraggable = next.draggable ?? false
-    }
+      if tracksViewChanges {
+        m.tracksViewChanges = tracksViewChanges
+      }
+      if tracksInfoWindowChanges {
+        m.tracksInfoWindowChanges = tracksInfoWindowChanges
+      }
 
-    if prev.rotation != next.rotation {
-      m.rotation = next.rotation ?? 0
-    }
+      if tracksViewChanges || tracksInfoWindowChanges {
+        onMain { [weak m] in
+          guard let m = m else { return }
 
-    if prev.zIndex != next.zIndex {
-      m.zIndex = Int32(next.zIndex ?? 0)
-    }
+          if tracksViewChanges {
+            m.tracksViewChanges = false
+          }
 
-    if !prev.markerInfoWindowStyleEquals(next) {
-      m.tagData = MarkerTag(
-        id: next.id,
-        iconSvg: next.infoWindowIconSvg
-      )
+          if tracksInfoWindowChanges {
+            m.tracksInfoWindowChanges = false
+          }
+        }
+      }
     }
   }
 
@@ -170,9 +184,6 @@ final class MapMarkerBuilder {
 
       await MainActor.run {
         guard !Task.isCancelled else { return }
-      }
-
-      Task { @MainActor in
         onReady(img)
       }
     }

package/ios/RNGoogleMapsPlusView.swift

@@ -131,28 +131,26 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
       )
 
       let removed = Set(prevById.keys).subtracting(nextById.keys)
-      withCATransaction(disableActions: true) {
 
-        removed.forEach {
-          self.impl.removeMarker(id: $0)
-          self.markerBuilder.cancelIconTask($0)
-        }
+      removed.forEach {
+        self.impl.removeMarker(id: $0)
+        self.markerBuilder.cancelIconTask($0)
+      }
 
-        for (id, next) in nextById {
-          if let prev = prevById[id] {
-            if !prev.markerEquals(next) {
-              self.impl.updateMarker(id: id) { [weak self] m in
-                guard let self else { return }
-                self.markerBuilder.update(prev, next, m)
-              }
-            }
-          } else {
-            self.markerBuilder.buildIconAsync(next) { [weak self] icon in
+      for (id, next) in nextById {
+        if let prev = prevById[id] {
+          if !prev.markerEquals(next) {
+            self.impl.updateMarker(id: id) { [weak self] m in
               guard let self else { return }
-              let marker = self.markerBuilder.build(next, icon: icon)
-              self.impl.addMarker(id: id, marker: marker)
+              self.markerBuilder.update(prev, next, m)
             }
           }
+        } else {
+          self.markerBuilder.buildIconAsync(next) { [weak self] icon in
+            guard let self else { return }
+            let marker = self.markerBuilder.build(next, icon: icon)
+            self.impl.addMarker(id: id, marker: marker)
+          }
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.7.0-dev.16",
+  "version": "1.7.0-dev.17",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",