fix: camera event type

Author: pinpong

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

@@ -368,7 +368,7 @@ class GoogleMapsViewImpl(
 
   var onMapError: ((RNMapErrorCode) -> Unit)? = null
   var onMapReady: ((Boolean) -> Unit)? = null
-  var onMapLoaded: ((RNRegion, RNCamera) -> Unit)? = null
+  var onMapLoaded: ((RNRegion, RNCameraChange) -> Unit)? = null
   var onLocationUpdate: ((RNLocation) -> Unit)? = null
   var onLocationError: ((RNLocationErrorCode) -> Unit)? = null
   var onMapPress: ((RNLatLng) -> Unit)? = null
@@ -388,9 +388,9 @@ class GoogleMapsViewImpl(
   var onInfoWindowLongPress: ((String) -> Unit)? = null
   var onMyLocationPress: ((RNLocation) -> Unit)? = null
   var onMyLocationButtonPress: ((Boolean) -> Unit)? = null
-  var onCameraChangeStart: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
-  var onCameraChange: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
-  var onCameraChangeComplete: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
+  var onCameraChangeStart: ((RNRegion, RNCameraChange, Boolean) -> Unit)? = null
+  var onCameraChange: ((RNRegion, RNCameraChange, Boolean) -> Unit)? = null
+  var onCameraChangeComplete: ((RNRegion, RNCameraChange, Boolean) -> Unit)? = null
 
   fun showMarkerInfoWindow(id: String) =
     onUi {

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

@@ -305,7 +305,7 @@ class RNGoogleMapsPlusView(
       view.onMapReady = cb
     }
 
-  override var onMapLoaded: ((RNRegion, RNCamera) -> Unit)? = null
+  override var onMapLoaded: ((RNRegion, RNCameraChange) -> Unit)? = null
     set(cb) {
       view.onMapLoaded = cb
     }
@@ -405,17 +405,17 @@ class RNGoogleMapsPlusView(
       view.onMyLocationButtonPress = cb
     }
 
-  override var onCameraChangeStart: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
+  override var onCameraChangeStart: ((RNRegion, RNCameraChange, Boolean) -> Unit)? = null
     set(cb) {
       view.onCameraChangeStart = cb
     }
 
-  override var onCameraChange: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
+  override var onCameraChange: ((RNRegion, RNCameraChange, Boolean) -> Unit)? = null
     set(cb) {
       view.onCameraChange = cb
     }
 
-  override var onCameraChangeComplete: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
+  override var onCameraChangeComplete: ((RNRegion, RNCameraChange, Boolean) -> Unit)? = null
     set(cb) {
       view.onCameraChangeComplete = cb
     }

android/src/main/java/com/rngooglemapsplus/extensions/CameraPositionExtension.kt

@@ -2,9 +2,10 @@ package com.rngooglemapsplus.extensions
 
 import com.google.android.gms.maps.model.CameraPosition
 import com.rngooglemapsplus.RNCamera
+import com.rngooglemapsplus.RNCameraChange
 
-fun CameraPosition.toRnCamera(): RNCamera =
-  RNCamera(
+fun CameraPosition.toRnCamera(): RNCameraChange =
+  RNCameraChange(
     center = target.toRnLatLng(),
     zoom = zoom.toDouble(),
     bearing = bearing.toDouble(),

ios/GoogleMapViewImpl.swift

@@ -261,7 +261,7 @@ GMSIndoorDisplayDelegate {
 
   var onMapError: ((RNMapErrorCode) -> Void)?
   var onMapReady: ((Bool) -> Void)?
-  var onMapLoaded: ((RNRegion, RNCamera) -> Void)?
+  var onMapLoaded: ((RNRegion, RNCameraChange) -> Void)?
   var onLocationUpdate: ((RNLocation) -> Void)?
   var onLocationError: ((_ error: RNLocationErrorCode) -> Void)?
   var onMapPress: ((RNLatLng) -> Void)?
@@ -281,9 +281,9 @@ GMSIndoorDisplayDelegate {
   var onInfoWindowLongPress: ((String) -> Void)?
   var onMyLocationPress: ((RNLocation) -> Void)?
   var onMyLocationButtonPress: ((Bool) -> Void)?
-  var onCameraChangeStart: ((RNRegion, RNCamera, Bool) -> Void)?
-  var onCameraChange: ((RNRegion, RNCamera, Bool) -> Void)?
-  var onCameraChangeComplete: ((RNRegion, RNCamera, Bool) -> Void)?
+  var onCameraChangeStart: ((RNRegion, RNCameraChange, Bool) -> Void)?
+  var onCameraChange: ((RNRegion, RNCameraChange, Bool) -> Void)?
+  var onCameraChangeComplete: ((RNRegion, RNCameraChange, Bool) -> Void)?
 
   @MainActor
   func showMarkerInfoWindow(id: String) {

ios/RNGoogleMapsPlusView.swift

@@ -331,7 +331,7 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onMapReady = onMapReady }
   }
   @MainActor
-  var onMapLoaded: ((RNRegion, RNCamera) -> Void)? {
+  var onMapLoaded: ((RNRegion, RNCameraChange) -> Void)? {
     didSet { impl.onMapLoaded = onMapLoaded }
   }
   @MainActor
@@ -411,15 +411,15 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onMyLocationButtonPress = onMyLocationButtonPress }
   }
   @MainActor
-  var onCameraChangeStart: ((RNRegion, RNCamera, Bool) -> Void)? {
+  var onCameraChangeStart: ((RNRegion, RNCameraChange, Bool) -> Void)? {
     didSet { impl.onCameraChangeStart = onCameraChangeStart }
   }
   @MainActor
-  var onCameraChange: ((RNRegion, RNCamera, Bool) -> Void)? {
+  var onCameraChange: ((RNRegion, RNCameraChange, Bool) -> Void)? {
     didSet { impl.onCameraChange = onCameraChange }
   }
   @MainActor
-  var onCameraChangeComplete: ((RNRegion, RNCamera, Bool) -> Void)? {
+  var onCameraChangeComplete: ((RNRegion, RNCameraChange, Bool) -> Void)? {
     didSet { impl.onCameraChangeComplete = onCameraChangeComplete }
   }
 

ios/extensions/GMSCameraPosition+Extension.swift

@@ -1,8 +1,8 @@
 import GoogleMaps
 
 extension GMSCameraPosition {
-  func toRNCamera() -> RNCamera {
-    return RNCamera(
+  func toRNCamera() -> RNCameraChange {
+    return RNCameraChange(
       center: target.toRNLatLng(),
       zoom: Double(zoom),
       bearing: bearing,

src/RNGoogleMapsPlusView.nitro.ts

@@ -5,6 +5,7 @@ import type {
 } from 'react-native-nitro-modules';
 import type {
   RNCamera,
+  RNCameraChange,
   RNLatLng,
   RNMapPadding,
   RNPolygon,
@@ -53,7 +54,7 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
   locationConfig?: RNLocationConfig;
   onMapError?: (error: RNMapErrorCode) => void;
   onMapReady?: (ready: boolean) => void;
-  onMapLoaded?: (region: RNRegion, camera: RNCamera) => void;
+  onMapLoaded?: (region: RNRegion, camera: RNCameraChange) => void;
   onLocationUpdate?: (location: RNLocation) => void;
   onLocationError?: (error: RNLocationErrorCode) => void;
   onMapPress?: (coordinate: RNLatLng) => void;
@@ -75,17 +76,17 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
   onMyLocationButtonPress?: (pressed: boolean) => void;
   onCameraChangeStart?: (
     region: RNRegion,
-    camera: RNCamera,
+    camera: RNCameraChange,
     isGesture: boolean
   ) => void;
   onCameraChange?: (
     region: RNRegion,
-    camera: RNCamera,
+    camera: RNCameraChange,
     isGesture: boolean
   ) => void;
   onCameraChangeComplete?: (
     region: RNRegion,
-    camera: RNCamera,
+    camera: RNCameraChange,
     isGesture: boolean
   ) => void;
 }

src/types.ts

@@ -130,6 +130,13 @@ export interface RNMapStyleElement {
   stylers: RNMapStyler[];
 }
 
+export type RNCameraChange = {
+  center: RNLatLng;
+  zoom: number;
+  bearing: number;
+  tilt: number;
+};
+
 export type RNCamera = {
   center?: RNLatLng;
   zoom?: number;