react-native-google-maps-plus 1.10.0-dev.7 → 1.10.1-dev.1

package/ios/LocationHandler.swift

@@ -45,9 +45,7 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
   }
 
   func showLocationDialog() {
-    onMainAsync { [weak self] in
-      guard let self = self else { return }
-
+    onMain {
       guard let vc = Self.topMostViewController() else { return }
       let title =
         Bundle.main.object(forInfoDictionaryKey: "LocationNotAvailableTitle")
@@ -96,7 +94,7 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
   }
 
   func openLocationSettings() {
-    onMainAsync {
+    onMain {
       let openSettings = {
         if #available(iOS 18.3, *) {
           guard

package/ios/MapCircleBuilder.swift

@@ -1,7 +1,6 @@
 import GoogleMaps
 
 final class MapCircleBuilder {
-  @MainActor
   func build(_ c: RNCircle) -> GMSCircle {
     let circle = GMSCircle()
     circle.position = c.center.toCLLocationCoordinate2D()
@@ -15,34 +14,35 @@ final class MapCircleBuilder {
     return circle
   }
 
-  @MainActor
   func update(_ prev: RNCircle, _ next: RNCircle, _ c: GMSCircle) {
-    if !prev.centerEquals(next) {
-      c.position = next.center.toCLLocationCoordinate2D()
-    }
-
-    if prev.radius != next.radius {
-      c.radius = next.radius
-    }
-
-    if prev.fillColor != next.fillColor {
-      c.fillColor = next.fillColor?.toUIColor() ?? .clear
-    }
-
-    if prev.strokeColor != next.strokeColor {
-      c.strokeColor = next.strokeColor?.toUIColor() ?? .black
-    }
-
-    if prev.strokeWidth != next.strokeWidth {
-      c.strokeWidth = CGFloat(next.strokeWidth ?? 1.0)
-    }
-
-    if prev.pressable != next.pressable {
-      c.isTappable = next.pressable ?? false
-    }
-
-    if prev.zIndex != next.zIndex {
-      c.zIndex = Int32(next.zIndex ?? 0)
+    onMain {
+      if !prev.centerEquals(next) {
+        c.position = next.center.toCLLocationCoordinate2D()
+      }
+
+      if prev.radius != next.radius {
+        c.radius = next.radius
+      }
+
+      if prev.fillColor != next.fillColor {
+        c.fillColor = next.fillColor?.toUIColor() ?? .clear
+      }
+
+      if prev.strokeColor != next.strokeColor {
+        c.strokeColor = next.strokeColor?.toUIColor() ?? .black
+      }
+
+      if prev.strokeWidth != next.strokeWidth {
+        c.strokeWidth = CGFloat(next.strokeWidth ?? 1.0)
+      }
+
+      if prev.pressable != next.pressable {
+        c.isTappable = next.pressable ?? false
+      }
+
+      if prev.zIndex != next.zIndex {
+        c.zIndex = Int32(next.zIndex ?? 0)
+      }
     }
   }
 }

package/ios/MapHeatmapBuilder.swift

@@ -4,7 +4,6 @@ import GoogleMapsUtils
 import UIKit
 
 final class MapHeatmapBuilder {
-  @MainActor
   func build(_ h: RNHeatmap) -> GMUHeatmapTileLayer {
     let heatmap = GMUHeatmapTileLayer()
     heatmap.weightedData = h.weightedData.toWeightedLatLngs()

package/ios/MapHelper.swift

@@ -1,12 +1,12 @@
 import QuartzCore
 
-@MainActor @inline(__always)
+@inline(__always)
 func withCATransaction(
   disableActions: Bool = true,
   duration: CFTimeInterval? = nil,
   timingFunction: CAMediaTimingFunction? = nil,
   completion: (() -> Void)? = nil,
-  _ body: @escaping @MainActor () -> Void
+  _ body: @escaping () -> Void
 ) {
   onMain {
     CATransaction.begin()
@@ -21,20 +21,15 @@ func withCATransaction(
   }
 }
 
-@MainActor @inline(__always)
-func onMain(_ block: @escaping @MainActor () -> Void) {
+@inline(__always)
+func onMain(
+  _ block: @escaping () -> Void
+) {
   if Thread.isMainThread {
     block()
   } else {
-    Task { @MainActor in block() }
-  }
-}
-
-@inline(__always)
-func onMainAsync(
-  _ block: @escaping @MainActor () async -> Void
-) {
-  Task { @MainActor in
-    await block()
+    Task { @MainActor in
+      block()
+    }
   }
 }

package/ios/MapMarkerBuilder.swift

@@ -10,7 +10,6 @@ final class MapMarkerBuilder {
   }()
   private var tasks: [String: Task<Void, Never>] = [:]
 
-  @MainActor
   func build(_ m: RNMarker, icon: UIImage?) -> GMSMarker {
     let marker = GMSMarker(
       position: m.coordinate.toCLLocationCoordinate2D()
@@ -44,22 +43,37 @@ final class MapMarkerBuilder {
     return marker
   }
 
-  @MainActor
   func update(_ prev: RNMarker, _ next: RNMarker, _ m: GMSMarker) {
-    withCATransaction(disableActions: true) {
+    onMain {
+      withCATransaction(disableActions: true) {
 
-      var tracksViewChanges = false
-      var tracksInfoWindowChanges = false
+        var tracksViewChanges = false
+        var tracksInfoWindowChanges = false
 
-      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.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,
@@ -74,72 +88,54 @@ final class MapMarkerBuilder {
             )
           }
         }
-      } else {
-        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
-          )
+        if prev.title != next.title {
+          tracksInfoWindowChanges = true
+          m.title = next.title
         }
-      }
 
-      if prev.title != next.title {
-        tracksInfoWindowChanges = true
-        m.title = next.title
-      }
-
-      if prev.snippet != next.snippet {
-        tracksInfoWindowChanges = true
-        m.snippet = next.snippet
-      }
-
-      if prev.opacity != next.opacity {
-        let opacity = Float(next.opacity ?? 1)
-        m.opacity = opacity
-        m.iconView?.alpha = CGFloat(opacity)
-      }
+        if prev.snippet != next.snippet {
+          tracksInfoWindowChanges = true
+          m.snippet = next.snippet
+        }
 
-      if prev.flat != next.flat {
-        m.isFlat = next.flat ?? false
-      }
+        if prev.opacity != next.opacity {
+          let opacity = Float(next.opacity ?? 1)
+          m.opacity = opacity
+          m.iconView?.alpha = CGFloat(opacity)
+        }
 
-      if prev.draggable != next.draggable {
-        m.isDraggable = next.draggable ?? false
-      }
+        if prev.flat != next.flat {
+          m.isFlat = next.flat ?? false
+        }
 
-      if prev.rotation != next.rotation {
-        m.rotation = next.rotation ?? 0
-      }
+        if prev.draggable != next.draggable {
+          m.isDraggable = next.draggable ?? false
+        }
 
-      if prev.zIndex != next.zIndex {
-        m.zIndex = Int32(next.zIndex ?? 0)
-      }
+        if prev.rotation != next.rotation {
+          m.rotation = next.rotation ?? 0
+        }
 
-      if !prev.markerInfoWindowStyleEquals(next) {
-        m.tagData = MarkerTag(
-          id: next.id,
-          iconSvg: next.infoWindowIconSvg
-        )
-      }
+        if prev.zIndex != next.zIndex {
+          m.zIndex = Int32(next.zIndex ?? 0)
+        }
 
-      if tracksViewChanges {
-        m.tracksViewChanges = tracksViewChanges
-      }
-      if tracksInfoWindowChanges {
-        m.tracksInfoWindowChanges = tracksInfoWindowChanges
-      }
+        if !prev.markerInfoWindowStyleEquals(next) {
+          m.tagData = MarkerTag(
+            id: next.id,
+            iconSvg: next.infoWindowIconSvg
+          )
+        }
 
-      if tracksViewChanges || tracksInfoWindowChanges {
-        onMain { [weak m] in
-          guard let m = m else { return }
+        if tracksViewChanges {
+          m.tracksViewChanges = tracksViewChanges
+        }
+        if tracksInfoWindowChanges {
+          m.tracksInfoWindowChanges = tracksInfoWindowChanges
+        }
 
+        if tracksViewChanges || tracksInfoWindowChanges {
           if tracksViewChanges {
             m.tracksViewChanges = false
           }
@@ -191,13 +187,11 @@ final class MapMarkerBuilder {
     tasks[m.id] = task
   }
 
-  @MainActor
   func cancelIconTask(_ id: String) {
     tasks[id]?.cancel()
     tasks.removeValue(forKey: id)
   }
 
-  @MainActor
   func cancelAllIconTasks() {
     let ids = Array(tasks.keys)
     for id in ids {
@@ -208,7 +202,6 @@ final class MapMarkerBuilder {
     CATransaction.flush()
   }
 
-  @MainActor
   func buildInfoWindow(iconSvg: RNMarkerSvg?) -> UIImageView? {
     guard let iconSvg = iconSvg else {
       return nil
@@ -246,6 +239,7 @@ final class MapMarkerBuilder {
       let iconSvg = m.iconSvg,
       let data = iconSvg.svgString.data(using: .utf8)
     else { return nil }
+    print("Is main thread:", Thread.isMainThread)
 
     let size = CGSize(
       width: max(1, CGFloat(iconSvg.width)),

package/ios/MapPolygonBuilder.swift

@@ -1,7 +1,6 @@
 import GoogleMaps
 
 final class MapPolygonBuilder {
-  @MainActor
   func build(_ p: RNPolygon) -> GMSPolygon {
     let path = p.coordinates.toGMSPath()
     let pg = GMSPolygon(path: path)
@@ -17,38 +16,39 @@ final class MapPolygonBuilder {
     return pg
   }
 
-  @MainActor
   func update(_ prev: RNPolygon, _ next: RNPolygon, _ pg: GMSPolygon) {
-    if !prev.coordinatesEquals(next) {
-      pg.path = next.coordinates.toGMSPath()
-    }
-
-    if !prev.holesEquals(next) {
-      pg.holes = next.holes.toMapPolygonHoles()
-    }
-
-    if prev.fillColor != next.fillColor {
-      pg.fillColor = next.fillColor?.toUIColor() ?? .clear
-    }
-
-    if prev.strokeColor != next.strokeColor {
-      pg.strokeColor = next.strokeColor?.toUIColor() ?? .black
-    }
-
-    if prev.strokeWidth != next.strokeWidth {
-      pg.strokeWidth = CGFloat(next.strokeWidth ?? 1.0)
-    }
-
-    if prev.pressable != next.pressable {
-      pg.isTappable = next.pressable ?? false
-    }
-
-    if prev.geodesic != next.geodesic {
-      pg.geodesic = next.geodesic ?? false
-    }
-
-    if prev.zIndex != next.zIndex {
-      pg.zIndex = Int32(next.zIndex ?? 0)
+    onMain {
+      if !prev.coordinatesEquals(next) {
+        pg.path = next.coordinates.toGMSPath()
+      }
+
+      if !prev.holesEquals(next) {
+        pg.holes = next.holes.toMapPolygonHoles()
+      }
+
+      if prev.fillColor != next.fillColor {
+        pg.fillColor = next.fillColor?.toUIColor() ?? .clear
+      }
+
+      if prev.strokeColor != next.strokeColor {
+        pg.strokeColor = next.strokeColor?.toUIColor() ?? .black
+      }
+
+      if prev.strokeWidth != next.strokeWidth {
+        pg.strokeWidth = CGFloat(next.strokeWidth ?? 1.0)
+      }
+
+      if prev.pressable != next.pressable {
+        pg.isTappable = next.pressable ?? false
+      }
+
+      if prev.geodesic != next.geodesic {
+        pg.geodesic = next.geodesic ?? false
+      }
+
+      if prev.zIndex != next.zIndex {
+        pg.zIndex = Int32(next.zIndex ?? 0)
+      }
     }
   }
 }

package/ios/MapPolylineBuilder.swift

@@ -1,7 +1,6 @@
 import GoogleMaps
 
 final class MapPolylineBuilder {
-  @MainActor
   func build(_ p: RNPolyline) -> GMSPolyline {
     let path = GMSMutablePath()
     p.coordinates.forEach {
@@ -23,30 +22,31 @@ final class MapPolylineBuilder {
     return pl
   }
 
-  @MainActor
   func update(_ prev: RNPolyline, _ next: RNPolyline, _ pl: GMSPolyline) {
-    if !prev.coordinatesEquals(next) {
-      pl.path = next.coordinates.toGMSPath()
-    }
-
-    if prev.width != next.width {
-      pl.strokeWidth = CGFloat(next.width ?? 1.0)
-    }
-
-    if prev.color != next.color {
-      pl.strokeColor = next.color?.toUIColor() ?? .black
-    }
-
-    if prev.pressable != next.pressable {
-      pl.isTappable = next.pressable ?? false
-    }
-
-    if prev.geodesic != next.geodesic {
-      pl.geodesic = next.geodesic ?? false
-    }
-
-    if prev.zIndex != next.zIndex {
-      pl.zIndex = Int32(next.zIndex ?? 0)
+    onMain {
+      if !prev.coordinatesEquals(next) {
+        pl.path = next.coordinates.toGMSPath()
+      }
+
+      if prev.width != next.width {
+        pl.strokeWidth = CGFloat(next.width ?? 1.0)
+      }
+
+      if prev.color != next.color {
+        pl.strokeColor = next.color?.toUIColor() ?? .black
+      }
+
+      if prev.pressable != next.pressable {
+        pl.isTappable = next.pressable ?? false
+      }
+
+      if prev.geodesic != next.geodesic {
+        pl.geodesic = next.geodesic ?? false
+      }
+
+      if prev.zIndex != next.zIndex {
+        pl.zIndex = Int32(next.zIndex ?? 0)
+      }
     }
   }
 }

package/ios/MapUrlTileOverlayBuilder.swift

@@ -1,7 +1,6 @@
 import GoogleMaps
 
 class MapUrlTileOverlayBuilder {
-  @MainActor
   func build(_ t: RNUrlTileOverlay) -> GMSURLTileLayer {
 
     let constructor: GMSTileURLConstructor = { (x: UInt, y: UInt, zoom: UInt) in