react-native-google-maps-plus 1.7.0-dev.9 → 1.8.0

package/ios/MapMarkerBuilder.swift

@@ -15,12 +15,13 @@ final class MapMarkerBuilder {
     let marker = GMSMarker(
       position: m.coordinate.toCLLocationCoordinate2D()
     )
-    marker.userData = m.id
-    marker.tracksViewChanges = true
     marker.icon = icon
     m.title.map { marker.title = $0 }
     m.snippet.map { marker.snippet = $0 }
-    m.opacity.map { marker.iconView?.alpha = CGFloat($0) }
+    m.opacity.map {
+      marker.opacity = Float($0)
+      marker.iconView?.alpha = CGFloat($0)
+    }
     m.flat.map { marker.isFlat = $0 }
     m.draggable.map { marker.isDraggable = $0 }
     m.rotation.map { marker.rotation = $0 }
@@ -35,65 +36,33 @@ final class MapMarkerBuilder {
     }
     m.zIndex.map { marker.zIndex = Int32($0) }
 
-    onMainAsync { [weak marker] in
-      try? await Task.sleep(nanoseconds: 250_000_000)
-      marker?.tracksViewChanges = false
-    }
+    marker.tagData = MarkerTag(
+      id: m.id,
+      iconSvg: m.infoWindowIconSvg
+    )
 
     return marker
   }
 
   @MainActor
   func update(_ prev: RNMarker, _ next: RNMarker, _ m: GMSMarker) {
-    if prev.coordinate.latitude != next.coordinate.latitude
-      || prev.coordinate.longitude != next.coordinate.longitude {
+    if !prev.coordinateEquals(next) {
       m.position = next.coordinate.toCLLocationCoordinate2D()
     }
 
-    if prev.title != next.title {
-      m.title = next.title
-    }
-
-    if prev.snippet != next.snippet {
-      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.flat != next.flat {
-      m.isFlat = next.flat ?? false
-    }
-
-    if prev.draggable != next.draggable {
-      m.isDraggable = next.draggable ?? false
-    }
-
-    if prev.rotation != next.rotation {
-      m.rotation = next.rotation ?? 0
-    }
-
-    if prev.zIndex != next.zIndex {
-      m.zIndex = Int32(next.zIndex ?? 0)
-    }
-
     if !prev.markerStyleEquals(next) {
-      buildIconAsync(next.id, next) { img in
+      buildIconAsync(next) { img in
         m.tracksViewChanges = true
         m.icon = img
 
-        if prev.anchor?.x != next.anchor?.x || prev.anchor?.y != next.anchor?.y {
+        if !prev.anchorEquals(next) {
           m.groundAnchor = CGPoint(
             x: next.anchor?.x ?? 0.5,
             y: next.anchor?.y ?? 1
           )
         }
 
-        if prev.infoWindowAnchor?.x != next.infoWindowAnchor?.x
-          || prev.infoWindowAnchor?.y != next.infoWindowAnchor?.y {
+        if !prev.infoWindowAnchorEquals(next) {
           m.infoWindowAnchor = CGPoint(
             x: next.infoWindowAnchor?.x ?? 0.5,
             y: next.infoWindowAnchor?.y ?? 0
@@ -106,30 +75,77 @@ final class MapMarkerBuilder {
         }
       }
     } else {
-      if prev.anchor?.x != next.anchor?.x || prev.anchor?.y != next.anchor?.y {
+      if !prev.anchorEquals(next) {
         m.groundAnchor = CGPoint(
           x: next.anchor?.x ?? 0.5,
           y: next.anchor?.y ?? 1
         )
       }
 
-      if prev.infoWindowAnchor?.x != next.infoWindowAnchor?.x
-        || prev.infoWindowAnchor?.y != next.infoWindowAnchor?.y {
+      if !prev.infoWindowAnchorEquals(next) {
         m.infoWindowAnchor = CGPoint(
           x: next.infoWindowAnchor?.x ?? 0.5,
           y: next.infoWindowAnchor?.y ?? 0
         )
       }
     }
+
+    var tracksInfoWindowChanges = false
+
+    if prev.title != next.title {
+      tracksInfoWindowChanges = true
+      m.title = next.title
+    }
+
+    if prev.snippet != next.snippet {
+      tracksInfoWindowChanges = true
+      m.snippet = next.snippet
+    }
+
+    if(tracksInfoWindowChanges) {
+      m.tracksInfoWindowChanges = true
+      onMainAsync { [weak m] in
+        try? await Task.sleep(nanoseconds: 250_000_000)
+        m?.tracksInfoWindowChanges = false
+      }
+    }
+
+    if prev.opacity != next.opacity {
+      let opacity = Float(next.opacity ?? 1)
+      m.opacity = opacity
+      m.iconView?.alpha = CGFloat(opacity)
+    }
+
+    if prev.flat != next.flat {
+      m.isFlat = next.flat ?? false
+    }
+
+    if prev.draggable != next.draggable {
+      m.isDraggable = next.draggable ?? false
+    }
+
+    if prev.rotation != next.rotation {
+      m.rotation = next.rotation ?? 0
+    }
+
+    if prev.zIndex != next.zIndex {
+      m.zIndex = Int32(next.zIndex ?? 0)
+    }
+
+    if !prev.markerInfoWindowStyleEquals(next) {
+      m.tagData = MarkerTag(
+        id: next.id,
+        iconSvg: next.infoWindowIconSvg
+      )
+    }
   }
 
   @MainActor
   func buildIconAsync(
-    _ id: String,
     _ m: RNMarker,
     onReady: @escaping (UIImage?) -> Void
   ) {
-    tasks[id]?.cancel()
+    tasks[m.id]?.cancel()
 
     if m.iconSvg == nil {
       onReady(nil)
@@ -144,7 +160,7 @@ final class MapMarkerBuilder {
 
     let task = Task(priority: .userInitiated) { [weak self] in
       guard let self else { return }
-      defer { self.tasks.removeValue(forKey: id) }
+      defer { self.tasks.removeValue(forKey: m.id) }
 
       let scale = UIScreen.main.scale
       let img = await self.renderUIImage(m, scale)
@@ -158,7 +174,7 @@ final class MapMarkerBuilder {
       }
     }
 
-    tasks[id] = task
+    tasks[m.id] = task
   }
 
   @MainActor
@@ -177,6 +193,46 @@ final class MapMarkerBuilder {
     iconCache.removeAllObjects()
   }
 
+  @MainActor
+  func buildInfoWindow(iconSvg: RNMarkerSvg?) -> UIImageView? {
+    guard let iconSvg = iconSvg else {
+      return nil
+    }
+
+    guard let data = iconSvg.svgString.data(using: .utf8),
+          let svgImg = SVGKImage(data: data)
+    else {
+      return nil
+    }
+
+    let size = CGSize(
+      width: max(1, CGFloat(iconSvg.width)),
+      height: max(1, CGFloat(iconSvg.height))
+    )
+
+    svgImg.size = size
+
+    guard let base = svgImg.uiImage else {
+      return nil
+    }
+
+    let fmt = UIGraphicsImageRendererFormat.default()
+    fmt.opaque = false
+    fmt.scale = UIScreen.main.scale
+    let renderer = UIGraphicsImageRenderer(size: size, format: fmt)
+
+    let finalImage = renderer.image { _ in
+      base.draw(in: CGRect(origin: .zero, size: size))
+    }
+
+    let imageView = UIImageView(image: finalImage)
+    imageView.frame = CGRect(origin: .zero, size: size)
+    imageView.contentMode = .scaleAspectFit
+    imageView.backgroundColor = .clear
+
+    return imageView
+  }
+
   @MainActor
   private func renderUIImage(_ m: RNMarker, _ scale: CGFloat) async -> UIImage? {
     guard let iconSvg = m.iconSvg,

package/ios/MapPolygonBuilder.swift

@@ -3,13 +3,7 @@ import GoogleMaps
 final class MapPolygonBuilder {
   @MainActor
   func build(_ p: RNPolygon) -> GMSPolygon {
-    let path = GMSMutablePath()
-    p.coordinates.forEach {
-      path.add(
-        $0.toCLLocationCoordinate2D()
-      )
-    }
-
+    let path = p.coordinates.toGMSPath()
     let pg = GMSPolygon(path: path)
 
     p.fillColor.map { pg.fillColor = $0.toUIColor() }
@@ -17,13 +11,7 @@ final class MapPolygonBuilder {
     p.strokeWidth.map { pg.strokeWidth = CGFloat($0) }
     p.pressable.map { pg.isTappable = $0 }
     p.geodesic.map { pg.geodesic = $0 }
-    p.holes.map {
-      pg.holes = $0.map { hole in
-        let path = GMSMutablePath()
-        hole.coordinates.forEach { path.add($0.toCLLocationCoordinate2D()) }
-        return path
-      }
-    }
+    pg.holes = p.holes.toMapPolygonHoles()
     p.zIndex.map { pg.zIndex = Int32($0) }
 
     return pg
@@ -31,35 +19,12 @@ final class MapPolygonBuilder {
 
   @MainActor
   func update(_ prev: RNPolygon, _ next: RNPolygon, _ pg: GMSPolygon) {
-    let coordsChanged =
-      prev.coordinates.count != next.coordinates.count
-        || !zip(prev.coordinates, next.coordinates).allSatisfy {
-          $0.latitude == $1.latitude && $0.longitude == $1.longitude
-        }
-
-    if coordsChanged {
-      let path = GMSMutablePath()
-      next.coordinates.forEach { path.add($0.toCLLocationCoordinate2D()) }
-      pg.path = path
+    if !prev.coordinatesEquals(next) {
+      pg.path = next.coordinates.toGMSPath()
     }
 
-    let prevHoles = prev.holes ?? []
-    let nextHoles = next.holes ?? []
-    let holesChanged =
-      prevHoles.count != nextHoles.count
-        || !zip(prevHoles, nextHoles).allSatisfy { a, b in
-          a.coordinates.count == b.coordinates.count
-            && zip(a.coordinates, b.coordinates).allSatisfy {
-              $0.latitude == $1.latitude && $0.longitude == $1.longitude
-            }
-        }
-
-    if holesChanged {
-      pg.holes = nextHoles.map { hole in
-        let path = GMSMutablePath()
-        hole.coordinates.forEach { path.add($0.toCLLocationCoordinate2D()) }
-        return path
-      }
+    if !prev.holesEquals(next) {
+      pg.holes = next.holes.toMapPolygonHoles()
     }
 
     if prev.fillColor != next.fillColor {

package/ios/MapPolylineBuilder.swift

@@ -25,16 +25,8 @@ final class MapPolylineBuilder {
 
   @MainActor
   func update(_ prev: RNPolyline, _ next: RNPolyline, _ pl: GMSPolyline) {
-    let coordsChanged =
-      prev.coordinates.count != next.coordinates.count
-        || !zip(prev.coordinates, next.coordinates).allSatisfy {
-          $0.latitude == $1.latitude && $0.longitude == $1.longitude
-        }
-
-    if coordsChanged {
-      let path = GMSMutablePath()
-      next.coordinates.forEach { path.add($0.toCLLocationCoordinate2D()) }
-      pl.path = path
+    if !prev.coordinatesEquals(next) {
+      pl.path = next.coordinates.toGMSPath()
     }
 
     if prev.width != next.width {

package/ios/RNGoogleMapsPlusView.swift

@@ -41,6 +41,9 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
       initialProps?.camera.map {
         options.camera = $0.toGMSCameraPosition(current: nil)
       }
+      initialProps?.backgroundColor.map {
+        options.backgroundColor = $0.toUIColor()
+      }
       impl.initMapView(googleMapOptions: options)
     }
   }
@@ -143,7 +146,7 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
               }
             }
           } else {
-            self.markerBuilder.buildIconAsync(next.id, next) { icon in
+            self.markerBuilder.buildIconAsync(next) { icon in
               let marker = self.markerBuilder.build(next, icon: icon)
               self.impl.addMarker(id: id, marker: marker)
             }
@@ -349,31 +352,31 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onPoiPress = onPoiPress }
   }
   @MainActor
-  var onMarkerPress: ((String?) -> Void)? {
+  var onMarkerPress: ((String) -> Void)? {
     didSet { impl.onMarkerPress = onMarkerPress }
   }
   @MainActor
-  var onPolylinePress: ((String?) -> Void)? {
+  var onPolylinePress: ((String) -> Void)? {
     didSet { impl.onPolylinePress = onPolylinePress }
   }
   @MainActor
-  var onPolygonPress: ((String?) -> Void)? {
+  var onPolygonPress: ((String) -> Void)? {
     didSet { impl.onPolygonPress = onPolygonPress }
   }
   @MainActor
-  var onCirclePress: ((String?) -> Void)? {
+  var onCirclePress: ((String) -> Void)? {
     didSet { impl.onCirclePress = onCirclePress }
   }
   @MainActor
-  var onMarkerDragStart: ((String?, RNLatLng) -> Void)? {
+  var onMarkerDragStart: ((String, RNLatLng) -> Void)? {
     didSet { impl.onMarkerDragStart = onMarkerDragStart }
   }
   @MainActor
-  var onMarkerDrag: ((String?, RNLatLng) -> Void)? {
+  var onMarkerDrag: ((String, RNLatLng) -> Void)? {
     didSet { impl.onMarkerDrag = onMarkerDrag }
   }
   @MainActor
-  var onMarkerDragEnd: ((String?, RNLatLng) -> Void)? {
+  var onMarkerDragEnd: ((String, RNLatLng) -> Void)? {
     didSet { impl.onMarkerDragEnd = onMarkerDragEnd }
   }
   @MainActor
@@ -385,15 +388,15 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onIndoorLevelActivated = onIndoorLevelActivated }
   }
   @MainActor
-  var onInfoWindowPress: ((String?) -> Void)? {
+  var onInfoWindowPress: ((String) -> Void)? {
     didSet { impl.onInfoWindowPress = onInfoWindowPress }
   }
   @MainActor
-  var onInfoWindowClose: ((String?) -> Void)? {
+  var onInfoWindowClose: ((String) -> Void)? {
     didSet { impl.onInfoWindowClose = onInfoWindowClose }
   }
   @MainActor
-  var onInfoWindowLongPress: ((String?) -> Void)? {
+  var onInfoWindowLongPress: ((String) -> Void)? {
     didSet { impl.onInfoWindowLongPress = onInfoWindowLongPress }
   }
   @MainActor
@@ -417,6 +420,16 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onCameraChangeComplete = onCameraChangeComplete }
   }
 
+  @MainActor
+  func showMarkerInfoWindow(id: String) {
+    impl.showMarkerInfoWindow(id: id);
+  }
+
+  @MainActor
+  func hideMarkerInfoWindow(id: String) {
+    impl.hideMarkerInfoWindow(id: id);
+  }
+
   @MainActor
   func setCamera(camera: RNCamera, animated: Bool?, durationMs: Double?) {
     let cam = camera.toGMSCameraPosition(current: impl.currentCamera)

package/ios/extensions/MapObjectTag+Extension.swift

@@ -0,0 +1,93 @@
+import GoogleMaps
+import Foundation
+
+protocol MapObjectTag {
+  var id: String { get }
+}
+
+struct MarkerTag: MapObjectTag {
+  let id: String
+  let iconSvg: RNMarkerSvg?
+  init(id: String, iconSvg: RNMarkerSvg? = nil) {
+    self.id = id
+    self.iconSvg = iconSvg
+  }
+}
+
+struct PolylineTag: MapObjectTag { let id: String }
+struct PolygonTag: MapObjectTag { let id: String }
+struct CircleTag: MapObjectTag { let id: String }
+
+extension GMSMarker {
+  var tagData: MarkerTag {
+    get {
+      if let tag = userData as? MarkerTag {
+        return tag
+      } else {
+        print("[MapTag] Marker without tag detected at \(position)")
+        let fallback = MarkerTag(id: "unknown")
+        userData = fallback
+        return fallback
+      }
+    }
+    set {
+      userData = newValue
+    }
+  }
+
+  var idTag: String { tagData.id }
+}
+
+extension GMSPolyline {
+  var tagData: PolylineTag {
+    get {
+      if let tag = userData as? PolylineTag {
+        return tag
+      } else {
+        print("[MapTag] Polyline without tag detected")
+        let fallback = PolylineTag(id: "unknown")
+        userData = fallback
+        return fallback
+      }
+    }
+    set { userData = newValue }
+  }
+
+  var idTag: String { tagData.id }
+}
+
+extension GMSPolygon {
+  var tagData: PolygonTag {
+    get {
+      if let tag = userData as? PolygonTag {
+        return tag
+      } else {
+        print("[MapTag] Polygon without tag detected")
+        let fallback = PolygonTag(id: "unknown")
+        userData = fallback
+        return fallback
+      }
+    }
+    set { userData = newValue }
+  }
+
+  var idTag: String { tagData.id }
+}
+
+extension GMSCircle {
+  var tagData: CircleTag {
+    get {
+      if let tag = userData as? CircleTag {
+        return tag
+      } else {
+        print("[MapTag] Circle without tag detected")
+        let fallback = CircleTag(id: "unknown")
+        userData = fallback
+        return fallback
+      }
+    }
+    set { userData = newValue }
+  }
+
+  var idTag: String { tagData.id }
+}

package/ios/extensions/RNCircle+Extension.swift

@@ -2,10 +2,19 @@ import GoogleMaps
 
 extension RNCircle {
   func circleEquals(_ b: RNCircle) -> Bool {
-    zIndex == b.zIndex && pressable == b.pressable
-      && center.latitude == b.center.latitude
-      && center.longitude == b.center.longitude && radius == b.radius
-      && strokeWidth == b.strokeWidth && strokeColor == b.strokeColor
-      && fillColor == b.fillColor
+    if zIndex != b.zIndex { return false }
+    if pressable != b.pressable { return false }
+    if !centerEquals(b) { return false }
+    if radius != b.radius { return false }
+    if strokeWidth != b.strokeWidth { return false }
+    if strokeColor != b.strokeColor { return false }
+    if fillColor != b.fillColor { return false }
+    return true
+  }
+
+  func centerEquals(_ b: RNCircle) -> Bool {
+    if center.latitude != b.center.latitude { return false }
+    if center.longitude != b.center.longitude { return false }
+    return true
   }
 }

package/ios/extensions/RNLatLng+Extension.swift

@@ -1,7 +1,18 @@
 import CoreLocation
+import GoogleMaps
 
 extension RNLatLng {
   func toCLLocationCoordinate2D() -> CLLocationCoordinate2D {
     CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
   }
 }
+
+extension Array where Element == RNLatLng {
+  func toGMSPath() -> GMSPath {
+    let path = GMSMutablePath()
+    for coord in self {
+      path.add(coord.toCLLocationCoordinate2D())
+    }
+    return path
+  }
+}

package/ios/extensions/RNLineCapType+Extension.swift

@@ -0,0 +1,10 @@
+extension RNLineCapType {
+  func toCGLineCap() -> CGLineCap {
+    switch self {
+    case .round: return .round
+    case .square: return .square
+    default: return .butt
+    }
+  }
+}
+

package/ios/extensions/RNLineJoinType+Extension.swift

@@ -0,0 +1,11 @@
+extension RNLineJoinType {
+  func toCGLineJoin() -> CGLineJoin {
+    switch self {
+    case .round: return .round
+    case .bevel: return .bevel
+    default: return .miter
+    }
+  }
+
+}
+

package/ios/extensions/RNMarker+Extension.swift

@@ -2,21 +2,52 @@ import GoogleMaps
 
 extension RNMarker {
   func markerEquals(_ b: RNMarker) -> Bool {
-    id == b.id && zIndex == b.zIndex
-      && coordinate.latitude == b.coordinate.latitude
-      && coordinate.longitude == b.coordinate.longitude
-      && anchor?.x == b.anchor?.x && anchor?.y == b.anchor?.y
-      && showInfoWindow == b.showInfoWindow && title == b.title
-      && snippet == b.snippet && opacity == b.opacity && flat == b.flat
-      && draggable == b.draggable && rotation == b.rotation
-      && infoWindowAnchor?.x == b.infoWindowAnchor?.x
-      && infoWindowAnchor?.y == b.infoWindowAnchor?.y
-      && markerStyleEquals(b)
+    if id != b.id { return false }
+    if zIndex != b.zIndex { return false }
+    if !coordinateEquals(b) { return false }
+    if !anchorEquals(b) { return false }
+    if title != b.title { return false }
+    if snippet != b.snippet { return false }
+    if opacity != b.opacity { return false }
+    if flat != b.flat { return false }
+    if draggable != b.draggable { return false }
+    if rotation != b.rotation { return false }
+    if !infoWindowAnchorEquals(b) { return false }
+    if !markerInfoWindowStyleEquals(b) { return false }
+    if !markerStyleEquals(b) { return false }
+    return true
+  }
+
+  func coordinateEquals(_ b: RNMarker) -> Bool {
+    if coordinate.latitude != b.coordinate.latitude { return false }
+    if coordinate.longitude != b.coordinate.longitude { return false }
+    return true
+  }
+
+  func anchorEquals(_ b: RNMarker) -> Bool {
+    if anchor?.x != b.anchor?.x { return false }
+    if anchor?.y != b.anchor?.y { return false }
+    return true
+  }
+
+  func infoWindowAnchorEquals(_ b: RNMarker) -> Bool {
+    if infoWindowAnchor?.x != b.infoWindowAnchor?.x { return false }
+    if infoWindowAnchor?.y != b.infoWindowAnchor?.y { return false }
+    return true
+  }
+
+  func markerInfoWindowStyleEquals(_ b: RNMarker) -> Bool {
+    if infoWindowIconSvg?.width != b.infoWindowIconSvg?.width { return false }
+    if infoWindowIconSvg?.height != b.infoWindowIconSvg?.height { return false }
+    if infoWindowIconSvg?.svgString != b.infoWindowIconSvg?.svgString { return false }
+    return true
   }
 
   func markerStyleEquals(_ b: RNMarker) -> Bool {
-    iconSvg?.width == b.iconSvg?.width && iconSvg?.height == b.iconSvg?.height
-      && iconSvg?.svgString == b.iconSvg?.svgString
+    if iconSvg?.width != b.iconSvg?.width { return false }
+    if iconSvg?.height != b.iconSvg?.height { return false }
+    if iconSvg?.svgString != b.iconSvg?.svgString { return false }
+    return true
   }
 
   func styleHash() -> NSNumber {