react-native-google-maps-plus 1.0.1 → 1.0.3-dev.1

package/ios/{HybridGoogleMapsNitroView.swift → RNGoogleMapsPlusView.swift}

@@ -3,95 +3,110 @@ import Foundation
 import GoogleMaps
 import NitroModules
 
-final class HybridGoogleMapsNitroView: HybridGoogleMapsNitroViewSpec {
+final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
 
   private let permissionHandler: PermissionHandler
   private let locationHandler: LocationHandler
 
-  private let impl: GoogleMapsNitroViewImpl
+  private let markerOptions = MapMarkerOptions()
+  private let polylineOptions = MapPolylineOptions()
+  private let polygonOptions = MapPolygonOptions()
+  private let circleOptions = MapCircleOptions()
+
+  private let impl: GoogleMapsViewImpl
 
   var view: UIView {
     return impl
   }
 
-  private var currentCustomMapStyle: String = ""
-  private let markerOptions = MapMarkerOptions()
-  private let polylineOptions = MapPolylineOptions()
-  private let polygonOptions = MapPolygonOptions()
-
   override init() {
     self.permissionHandler = PermissionHandler()
     self.locationHandler = LocationHandler()
-    self.impl = GoogleMapsNitroViewImpl(
+    self.impl = GoogleMapsViewImpl(
       locationHandler: locationHandler,
       markerOptions: markerOptions
     )
   }
 
+  /*
+     /// TODO: prepareForRecycle
+    override func prepareForRecycle() {
+      impl.clearAll()
+    }
+   */
+
   @MainActor
-  var buildingEnabled: Bool {
-    get { impl.buildingEnabled }
-    set { impl.buildingEnabled = newValue }
+  var initialProps: RNInitialProps? {
+    didSet {
+      impl.initMapView(
+        mapId: initialProps?.mapId,
+        liteMode: initialProps?.liteMode,
+        camera: mapCameraToGMSCamera(initialProps?.initialCamera)
+      )
+    }
   }
 
   @MainActor
-  var trafficEnabled: Bool {
-    get { impl.trafficEnabled }
-    set { impl.trafficEnabled = newValue }
+  var buildingEnabled: Bool? {
+    didSet { impl.buildingEnabled = buildingEnabled }
   }
 
   @MainActor
-  var customMapStyle: String {
-    get { currentCustomMapStyle }
-    set {
-      currentCustomMapStyle = newValue
-      impl.customMapStyle = try? GMSMapStyle(jsonString: newValue)
-    }
+  var trafficEnabled: Bool? {
+    didSet { impl.trafficEnabled = trafficEnabled }
   }
 
   @MainActor
-  var initialCamera: RNCamera {
-    get { mapCameraPositionToCamera(impl.initialCamera) }
-    set { impl.initialCamera = mapCameraToGMSCamera(newValue) }
+  var customMapStyle: String? {
+    didSet {
+      if let value = customMapStyle {
+        impl.customMapStyle = try? GMSMapStyle(jsonString: value)
+      }
+    }
   }
 
   @MainActor
-  var userInterfaceStyle: RNUserInterfaceStyle {
-    get { mapUIUserInterfaceStyletoUserInterfaceStyle(impl.userInterfaceStyle) }
-    set {
+  var userInterfaceStyle: RNUserInterfaceStyle? {
+    didSet {
       impl.userInterfaceStyle = mapUserInterfaceStyleToUIUserInterfaceStyle(
-        newValue
+        userInterfaceStyle
       )
     }
   }
 
   @MainActor
-  var minZoomLevel: Double {
-    get { impl.minZoomLevel }
-    set { impl.minZoomLevel = newValue }
+  var minZoomLevel: Double? {
+    didSet { impl.minZoomLevel = minZoomLevel }
+  }
+
+  @MainActor
+  var maxZoomLevel: Double? {
+    didSet { impl.maxZoomLevel = maxZoomLevel }
   }
 
   @MainActor
-  var maxZoomLevel: Double {
-    get { impl.maxZoomLevel }
-    set { impl.maxZoomLevel = newValue }
+  var mapPadding: RNMapPadding? {
+    didSet { impl.mapPadding = mapPadding }
   }
 
   @MainActor
-  var mapPadding: RNMapPadding {
-    get { impl.mapPadding }
-    set { impl.mapPadding = newValue }
+  var mapType: RNMapType? {
+    didSet {
+      impl.mapType = mapType.map {
+        GMSMapViewType(rawValue: UInt($0.rawValue)) ?? .normal
+      }
+    }
   }
 
   @MainActor
-  var markers: [RNMarker] = [] {
+  var markers: [RNMarker]? {
     didSet {
       let prevById = Dictionary(
-        oldValue.map { ($0.id, $0) },
+        (oldValue ?? []).map { ($0.id, $0) },
         uniquingKeysWith: { _, new in new }
       )
       let nextById = Dictionary(
-        markers.map { ($0.id, $0) },
+        (markers ?? []).map { ($0.id, $0) },
         uniquingKeysWith: { _, new in new }
       )
 
@@ -123,14 +138,14 @@ final class HybridGoogleMapsNitroView: HybridGoogleMapsNitroViewSpec {
   }
 
   @MainActor
-  var polylines: [RNPolyline] = [] {
+  var polylines: [RNPolyline]? {
     didSet {
       let prevById = Dictionary(
-        oldValue.map { ($0.id, $0) },
+        (oldValue ?? []).map { ($0.id, $0) },
         uniquingKeysWith: { _, new in new }
       )
       let nextById = Dictionary(
-        polylines.map { ($0.id, $0) },
+        (polylines ?? []).map { ($0.id, $0) },
         uniquingKeysWith: { _, new in new }
       )
 
@@ -140,29 +155,29 @@ final class HybridGoogleMapsNitroView: HybridGoogleMapsNitroViewSpec {
       for (id, next) in nextById {
         if let prev = prevById[id] {
           if !prev.polylineEquals(next) {
-            impl.updatePolyline(id: id) { gms in
-              prev.updatePolyline(next, gms)
+            impl.updatePolyline(id: id) { pl in
+              prev.updatePolyline(next, pl)
             }
-          } else {
-            impl.addPolyline(
-              id: id,
-              polyline: polylineOptions.buildPolyline(next)
-            )
           }
+        } else {
+          impl.addPolyline(
+            id: id,
+            polyline: polylineOptions.buildPolyline(next)
+          )
         }
       }
     }
   }
 
   @MainActor
-  var polygons: [RNPolygon] = [] {
+  var polygons: [RNPolygon]? {
     didSet {
       let prevById = Dictionary(
-        oldValue.map { ($0.id, $0) },
+        (oldValue ?? []).map { ($0.id, $0) },
         uniquingKeysWith: { _, new in new }
       )
       let nextById = Dictionary(
-        polygons.map { ($0.id, $0) },
+        (polygons ?? []).map { ($0.id, $0) },
         uniquingKeysWith: { _, new in new }
       )
 
@@ -183,10 +198,56 @@ final class HybridGoogleMapsNitroView: HybridGoogleMapsNitroViewSpec {
     }
   }
 
+  @MainActor
+  var circles: [RNCircle]? {
+    didSet {
+      let prevById = Dictionary(
+        (oldValue ?? []).map { ($0.id, $0) },
+        uniquingKeysWith: { _, new in new }
+      )
+      let nextById = Dictionary(
+        (circles ?? []).map { ($0.id, $0) },
+        uniquingKeysWith: { _, new in new }
+      )
+
+      let removed = Set(prevById.keys).subtracting(nextById.keys)
+      removed.forEach { impl.removeCircle(id: $0) }
+
+      for (id, next) in nextById {
+        if let prev = prevById[id] {
+          if !prev.circleEquals(next) {
+            impl.updateCircle(id: id) { circle in
+              prev.updateCircle(next, circle)
+            }
+          }
+        } else {
+          impl.addCircle(id: id, circle: circleOptions.buildCircle(next))
+        }
+      }
+    }
+  }
+
   func setCamera(camera: RNCamera, animated: Bool?, durationMS: Double?) {
+    let current = impl.currentCamera
+
+    let zoom = Float(camera.zoom ?? Double(current?.zoom ?? 0))
+    let bearing = camera.bearing ?? current?.bearing ?? 0
+    let viewingAngle = camera.bearing ?? current?.viewingAngle ?? 0
+
+    let target = CLLocationCoordinate2D(
+      latitude: camera.center?.latitude ?? current?.target.latitude ?? 0,
+      longitude: camera.center?.longitude ?? current?.target.longitude ?? 0
+    )
+
+    let cam = GMSCameraPosition.camera(
+      withTarget: target,
+      zoom: zoom,
+      bearing: bearing,
+      viewingAngle: viewingAngle
+    )
     onMain {
       self.impl.setCamera(
-        camera: camera,
+        camera: cam,
         animated: animated ?? true,
         durationMS: durationMS ?? 3000
       )
@@ -210,40 +271,40 @@ final class HybridGoogleMapsNitroView: HybridGoogleMapsNitroViewSpec {
   }
 
   var onMapError: ((RNMapErrorCode) -> Void)? {
-    get { impl.onMapError }
-    set { impl.onMapError = newValue }
+    didSet { impl.onMapError = onMapError }
   }
   var onMapReady: ((Bool) -> Void)? {
-    get { impl.onMapReady }
-    set { impl.onMapReady = newValue }
+    didSet { impl.onMapReady = onMapReady }
   }
   var onLocationUpdate: ((RNLocation) -> Void)? {
-    get { impl.onLocationUpdate }
-    set { impl.onLocationUpdate = newValue }
+    didSet { impl.onLocationUpdate = onLocationUpdate }
   }
   var onLocationError: ((_ error: RNLocationErrorCode) -> Void)? {
-    get { impl.onLocationError }
-    set { impl.onLocationError = newValue }
+    didSet { impl.onLocationError = onLocationError }
   }
   var onMapPress: ((RNLatLng) -> Void)? {
-    get { impl.onMapPress }
-    set { impl.onMapPress = newValue }
+    didSet { impl.onMapPress = onMapPress }
   }
   var onMarkerPress: ((String) -> Void)? {
-    get { impl.onMarkerPress }
-    set { impl.onMarkerPress = newValue }
+    didSet { impl.onMarkerPress = onMarkerPress }
+  }
+  var onPolylinePress: ((String) -> Void)? {
+    didSet { impl.onPolylinePress = onPolylinePress }
+  }
+  var onPolygonPress: ((String) -> Void)? {
+    didSet { impl.onPolygonPress = onPolygonPress }
+  }
+  var onCirclePress: ((String) -> Void)? {
+    didSet { impl.onCirclePress = onCirclePress }
   }
   var onCameraChangeStart: ((RNRegion, RNCamera, Bool) -> Void)? {
-    get { impl.onCameraChangeStart }
-    set { impl.onCameraChangeStart = newValue }
+    didSet { impl.onCameraChangeStart = onCameraChangeStart }
   }
   var onCameraChange: ((RNRegion, RNCamera, Bool) -> Void)? {
-    get { impl.onCameraChange }
-    set { impl.onCameraChange = newValue }
+    didSet { impl.onCameraChange = onCameraChange }
   }
   var onCameraChangeComplete: ((RNRegion, RNCamera, Bool) -> Void)? {
-    get { impl.onCameraChangeComplete }
-    set { impl.onCameraChangeComplete = newValue }
+    didSet { impl.onCameraChangeComplete = onCameraChangeComplete }
   }
 
   func showLocationDialog() {
@@ -255,7 +316,7 @@ final class HybridGoogleMapsNitroView: HybridGoogleMapsNitroViewSpec {
   }
 
   func requestLocationPermission()
-    -> NitroModules.Promise<RNLocationPermissionResult> {
+  -> NitroModules.Promise<RNLocationPermissionResult> {
     return permissionHandler.requestLocationPermission()
   }
 
@@ -264,15 +325,17 @@ final class HybridGoogleMapsNitroView: HybridGoogleMapsNitroViewSpec {
     return true
   }
 
-  private func mapCameraToGMSCamera(_ c: RNCamera) -> GMSCameraPosition {
+  private func mapCameraToGMSCamera(_ c: RNCamera?) -> GMSCameraPosition? {
+    guard let c = c else { return nil }
+
     let current = impl.currentCamera
     let center = CLLocationCoordinate2D(
-      latitude: c.center?.latitude ?? current.target.latitude,
-      longitude: c.center?.longitude ?? current.target.longitude
+      latitude: c.center?.latitude ?? current?.target.latitude ?? 0,
+      longitude: c.center?.longitude ?? current?.target.longitude ?? 0
     )
-    let z = Float(c.zoom ?? Double(current.zoom))
-    let b = c.bearing ?? current.bearing
-    let t = c.tilt ?? current.viewingAngle
+    let z = Float(c.zoom ?? Double(current?.zoom ?? 0))
+    let b = c.bearing ?? current?.bearing ?? 0
+    let t = c.tilt ?? current?.viewingAngle ?? 0
 
     return GMSCameraPosition.camera(
       withTarget: center,
@@ -282,38 +345,18 @@ final class HybridGoogleMapsNitroView: HybridGoogleMapsNitroViewSpec {
     )
   }
 
-  private func mapCameraPositionToCamera(_ cp: GMSCameraPosition)
-    -> RNCamera {
-    return RNCamera(
-      center: RNLatLng(
-        latitude: cp.target.latitude,
-        longitude: cp.target.longitude
-      ),
-      zoom: Double(cp.zoom),
-      bearing: cp.bearing,
-      tilt: cp.viewingAngle
-    )
-  }
-
   func mapUserInterfaceStyleToUIUserInterfaceStyle(
-    _ style: RNUserInterfaceStyle
-  )
-    -> UIUserInterfaceStyle {
-    switch style {
-    case .light: return .light
-    case .dark: return .dark
-    case .default: return .unspecified
-    }
-  }
+    _ style: RNUserInterfaceStyle?
+  ) -> UIUserInterfaceStyle? {
+    guard let style = style else { return nil }
 
-  func mapUIUserInterfaceStyletoUserInterfaceStyle(
-    _ uiStyle: UIUserInterfaceStyle
-  ) -> RNUserInterfaceStyle {
-    switch uiStyle {
-    case .light: return .light
-    case .dark: return .dark
-    case .unspecified: return .default
-    @unknown default: return .default
+    switch style {
+    case .light:
+      return .light
+    case .dark:
+      return .dark
+    case .default:
+      return .unspecified
     }
   }
 }

package/lib/module/RNGoogleMapsPlusModule.nitro.js

@@ -0,0 +1,4 @@
+"use strict";
+
+export {};
+//# sourceMappingURL=RNGoogleMapsPlusModule.nitro.js.map

package/lib/module/RNGoogleMapsPlusModule.nitro.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../src","sources":["RNGoogleMapsPlusModule.nitro.ts"],"mappings":"","ignoreList":[]}

package/lib/module/RNGoogleMapsPlusView.nitro.js

@@ -0,0 +1,4 @@
+"use strict";
+
+export {};
+//# sourceMappingURL=RNGoogleMapsPlusView.nitro.js.map

package/lib/module/RNGoogleMapsPlusView.nitro.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../src","sources":["RNGoogleMapsPlusView.nitro.ts"],"mappings":"","ignoreList":[]}

package/lib/module/index.js

@@ -1,8 +1,8 @@
 "use strict";
 
 import { getHostComponent, NitroModules } from 'react-native-nitro-modules';
-const GoogleMapsNitroConfig = require('../nitrogen/generated/shared/json/GoogleMapsNitroViewConfig.json');
+import ViewConfig from '../nitrogen/generated/shared/json/RNGoogleMapsPlusViewConfig.json';
 export * from "./types.js";
-export const GoogleMapsView = getHostComponent('GoogleMapsNitroView', () => GoogleMapsNitroConfig);
-export const GoogleMapsModule = NitroModules.createHybridObject('GoogleMapsNitroModule');
+export const GoogleMapsView = getHostComponent('RNGoogleMapsPlusView', () => ViewConfig);
+export const GoogleMapsModule = NitroModules.createHybridObject('RNGoogleMapsPlusModule');
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["getHostComponent","NitroModules","GoogleMapsNitroConfig","require","GoogleMapsView","GoogleMapsModule","createHybridObject"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,gBAAgB,EAAEC,YAAY,QAAQ,4BAA4B;AAE3E,MAAMC,qBAAqB,GAAGC,OAAO,CAAC,kEAAkE,CAAC;AASzG,cAAc,YAAS;AAIvB,OAAO,MAAMC,cAAc,GAAGJ,gBAAgB,CAG5C,qBAAqB,EAAE,MAAME,qBAAqB,CAAC;AAErD,OAAO,MAAMG,gBAAgB,GAC3BJ,YAAY,CAACK,kBAAkB,CAC7B,uBACF,CAAC","ignoreList":[]}
+{"version":3,"names":["getHostComponent","NitroModules","ViewConfig","GoogleMapsView","GoogleMapsModule","createHybridObject"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,gBAAgB,EAAEC,YAAY,QAAQ,4BAA4B;AAE3E,OAAOC,UAAU,MAAM,mEAAmE;AAS1F,cAAc,YAAS;AAIvB,OAAO,MAAMC,cAAc,GAAGH,gBAAgB,CAG5C,sBAAsB,EAAE,MAAME,UAAU,CAAC;AAE3C,OAAO,MAAME,gBAAgB,GAC3BH,YAAY,CAACI,kBAAkB,CAC7B,wBACF,CAAC","ignoreList":[]}

package/lib/module/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["RNAndroidLocationPermissionResult","RNIOSPermissionResult","RNLocationErrorCode","RNMapErrorCode"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;AAoBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;;AAyEA,WAAYA,iCAAiC,0BAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAA,OAAjCA,iCAAiC;AAAA;AAM7C,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAUjC,WAAYC,mBAAmB,0BAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA;AAS/B,WAAYC,cAAc,0BAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA","ignoreList":[]}
+{"version":3,"names":["RNAndroidLocationPermissionResult","RNIOSPermissionResult","RNLocationErrorCode","RNMapErrorCode"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;AA4BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;;AAsFA,WAAYA,iCAAiC,0BAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAA,OAAjCA,iCAAiC;AAAA;AAM7C,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAUjC,WAAYC,mBAAmB,0BAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA;AAS/B,WAAYC,cAAc,0BAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA","ignoreList":[]}

package/lib/typescript/src/{GoogleMapsNitroModule.nitro.d.ts → RNGoogleMapsPlusModule.nitro.d.ts}

@@ -1,6 +1,6 @@
 import { type HybridObject } from 'react-native-nitro-modules';
 import type { RNLocationPermissionResult } from './types';
-export interface GoogleMapsNitroModule extends HybridObject<{
+export interface RNGoogleMapsPlusModule extends HybridObject<{
     ios: 'swift';
     android: 'kotlin';
 }> {
@@ -9,4 +9,4 @@ export interface GoogleMapsNitroModule extends HybridObject<{
     requestLocationPermission(): Promise<RNLocationPermissionResult>;
     isGooglePlayServicesAvailable(): boolean;
 }
-//# sourceMappingURL=GoogleMapsNitroModule.nitro.d.ts.map
+//# sourceMappingURL=RNGoogleMapsPlusModule.nitro.d.ts.map

package/lib/typescript/src/RNGoogleMapsPlusModule.nitro.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RNGoogleMapsPlusModule.nitro.d.ts","sourceRoot":"","sources":["../../../src/RNGoogleMapsPlusModule.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AAE1D,MAAM,WAAW,sBACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IACzD,kBAAkB,IAAI,IAAI,CAAC;IAE3B,oBAAoB,IAAI,IAAI,CAAC;IAE7B,yBAAyB,IAAI,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAEjE,6BAA6B,IAAI,OAAO,CAAC;CAC1C"}

package/lib/typescript/src/{GoogleMapsNitroView.nitro.d.ts → RNGoogleMapsPlusView.nitro.d.ts}

@@ -1,28 +1,33 @@
 import type { HybridView, HybridViewMethods, HybridViewProps } from 'react-native-nitro-modules';
-import type { RNCamera, RNLatLng, RNMapPadding, RNPolygon, RNPolyline, RNUserInterfaceStyle, RNLocationErrorCode, RNMarker, RNLocationPermissionResult, RNRegion, RNLocation, RNMapErrorCode } from './types';
-export interface GoogleMapsNitroViewProps extends HybridViewProps {
-    buildingEnabled: boolean;
-    trafficEnabled: boolean;
-    customMapStyle: string;
-    initialCamera: RNCamera;
-    userInterfaceStyle: RNUserInterfaceStyle;
-    minZoomLevel: number;
-    maxZoomLevel: number;
-    mapPadding: RNMapPadding;
-    markers: RNMarker[];
-    polygons: RNPolygon[];
-    polylines: RNPolyline[];
+import type { RNCamera, RNLatLng, RNMapPadding, RNPolygon, RNPolyline, RNUserInterfaceStyle, RNLocationErrorCode, RNMarker, RNLocationPermissionResult, RNRegion, RNLocation, RNMapErrorCode, RNMapType, RNInitialProps, RNCircle } from './types';
+export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
+    initialProps?: RNInitialProps;
+    buildingEnabled?: boolean;
+    trafficEnabled?: boolean;
+    customMapStyle?: string;
+    userInterfaceStyle?: RNUserInterfaceStyle;
+    minZoomLevel?: number;
+    maxZoomLevel?: number;
+    mapPadding?: RNMapPadding;
+    mapType?: RNMapType;
+    markers?: RNMarker[];
+    polygons?: RNPolygon[];
+    polylines?: RNPolyline[];
+    circles?: RNCircle[];
     onMapError?: (error: RNMapErrorCode) => void;
     onMapReady?: (ready: boolean) => void;
     onLocationUpdate?: (location: RNLocation) => void;
     onLocationError?: (error: RNLocationErrorCode) => void;
     onMapPress?: (coordinate: RNLatLng) => void;
     onMarkerPress?: (id: string) => void;
+    onPolylinePress?: (id: string) => void;
+    onPolygonPress?: (id: string) => void;
+    onCirclePress?: (id: string) => void;
     onCameraChangeStart?: (region: RNRegion, camera: RNCamera, isGesture: boolean) => void;
     onCameraChange?: (region: RNRegion, camera: RNCamera, isGesture: boolean) => void;
     onCameraChangeComplete?: (region: RNRegion, camera: RNCamera, isGesture: boolean) => void;
 }
-export interface GoogleMapsNitroViewMethods extends HybridViewMethods {
+export interface RNGoogleMapsPlusViewMethods extends HybridViewMethods {
     setCamera(camera: RNCamera, animated?: boolean, durationMS?: number): void;
     setCameraToCoordinates(coordinates: RNLatLng[], padding?: RNMapPadding, animated?: boolean, durationMS?: number): void;
     showLocationDialog(): void;
@@ -30,5 +35,5 @@ export interface GoogleMapsNitroViewMethods extends HybridViewMethods {
     requestLocationPermission(): Promise<RNLocationPermissionResult>;
     isGooglePlayServicesAvailable(): boolean;
 }
-export type GoogleMapsNitroView = HybridView<GoogleMapsNitroViewProps, GoogleMapsNitroViewMethods>;
-//# sourceMappingURL=GoogleMapsNitroView.nitro.d.ts.map
+export type RNGoogleMapsPlusView = HybridView<RNGoogleMapsPlusViewProps, RNGoogleMapsPlusViewMethods>;
+//# sourceMappingURL=RNGoogleMapsPlusView.nitro.d.ts.map

package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RNGoogleMapsPlusView.nitro.d.ts","sourceRoot":"","sources":["../../../src/RNGoogleMapsPlusView.nitro.ts"],"names":[],"mappings":"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"}

package/lib/typescript/src/index.d.ts

@@ -1,7 +1,7 @@
-import type { GoogleMapsNitroViewMethods, GoogleMapsNitroViewProps } from './GoogleMapsNitroView.nitro';
-import type { GoogleMapsNitroModule } from './GoogleMapsNitroModule.nitro';
+import type { RNGoogleMapsPlusViewMethods, RNGoogleMapsPlusViewProps } from './RNGoogleMapsPlusView.nitro';
+import type { RNGoogleMapsPlusModule } from './RNGoogleMapsPlusModule.nitro';
 export * from './types';
-export type { GoogleMapsNitroViewMethods, GoogleMapsNitroViewProps };
-export declare const GoogleMapsView: import("react-native-nitro-modules").ReactNativeView<GoogleMapsNitroViewProps, GoogleMapsNitroViewMethods>;
-export declare const GoogleMapsModule: GoogleMapsNitroModule;
+export type { RNGoogleMapsPlusViewMethods, RNGoogleMapsPlusViewProps };
+export declare const GoogleMapsView: import("react-native-nitro-modules").ReactNativeView<RNGoogleMapsPlusViewProps, RNGoogleMapsPlusViewMethods>;
+export declare const GoogleMapsModule: RNGoogleMapsPlusModule;
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,0BAA0B,EAC1B,wBAAwB,EACzB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,cAAc,SAAS,CAAC;AAExB,YAAY,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,CAAC;AAErE,eAAO,MAAM,cAAc,4GAG0B,CAAC;AAEtD,eAAO,MAAM,gBAAgB,uBAG1B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,2BAA2B,EAC3B,yBAAyB,EAC1B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAE7E,cAAc,SAAS,CAAC;AAExB,YAAY,EAAE,2BAA2B,EAAE,yBAAyB,EAAE,CAAC;AAEvE,eAAO,MAAM,cAAc,8GAGgB,CAAC;AAE5C,eAAO,MAAM,gBAAgB,wBAG1B,CAAC"}

package/lib/typescript/src/types.d.ts

@@ -1,6 +1,11 @@
-import type { GoogleMapsNitroViewMethods } from './GoogleMapsNitroView.nitro';
+import type { RNGoogleMapsPlusViewMethods } from './RNGoogleMapsPlusView.nitro';
 import type { HybridView } from 'react-native-nitro-modules';
-export type GoogleMapsViewRef = HybridView<GoogleMapsNitroViewMethods>;
+export type GoogleMapsViewRef = HybridView<RNGoogleMapsPlusViewMethods>;
+export type RNInitialProps = {
+    mapId?: string;
+    liteMode?: boolean;
+    initialCamera?: RNCamera;
+};
 export type RNLatLng = {
     latitude: number;
     longitude: number;
@@ -15,6 +20,7 @@ export type RNMapPadding = {
     bottom: number;
     right: number;
 };
+export type RNMapType = 'none' | 'normal' | 'hybrid' | 'satellite' | 'terrain';
 export type RNUserInterfaceStyle = 'light' | 'dark' | 'default';
 export type RNFeatureType = string;
 export type RNElementType = string;
@@ -52,7 +58,7 @@ export type RNLineCapType = 'butt' | 'round' | 'square';
 export type RNLineJoinType = 'miter' | 'round' | 'bevel';
 export type RNMarker = {
     id: string;
-    zIndex: number;
+    zIndex?: number;
     coordinate: RNLatLng;
     anchor?: RNPosition;
     width: number;
@@ -61,7 +67,8 @@ export type RNMarker = {
 };
 export type RNPolygon = {
     id: string;
-    zIndex: number;
+    zIndex?: number;
+    pressable?: boolean;
     coordinates: RNLatLng[];
     fillColor?: string;
     strokeColor?: string;
@@ -69,13 +76,24 @@ export type RNPolygon = {
 };
 export type RNPolyline = {
     id: string;
-    zIndex: number;
+    zIndex?: number;
+    pressable?: boolean;
     coordinates: RNLatLng[];
     lineCap?: RNLineCapType;
     lineJoin?: RNLineJoinType;
     color?: string;
     width?: number;
 };
+export type RNCircle = {
+    id: string;
+    pressable?: boolean;
+    zIndex?: number;
+    center: RNLatLng;
+    radius?: number;
+    strokeWidth?: number;
+    strokeColor?: string;
+    fillColor?: string;
+};
 export type RNLocationPermissionResult = {
     android?: RNAndroidLocationPermissionResult;
     ios?: RNIOSPermissionResult;

package/lib/typescript/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"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"}