fix(ios): remove main.sync from HybridMapView and async camera APIs (#45)

* fix(ios): remove main.sync from HybridMapView and async camera APIs

* refactor(ios): introduce MapViewState for improved state management

* refactor: simplify MapView and MapScene components by removing forwardRef and updating prop types

* fix: handle potential errors in camera animations and retrieval

Author: jkasprzyk17

example/App.tsx

@@ -1,12 +1,12 @@
 import {
-  forwardRef,
   memo,
   useCallback,
   useEffect,
   useMemo,
   useRef,
   useState,
   type ReactNode,
+  type Ref,
 } from 'react';
 import { StatusBar } from 'expo-status-bar';
 import {
@@ -485,6 +485,7 @@ const ScenarioDock = memo(function ScenarioDock({
 });
 
 type MapSceneProps = {
+  ref?: Ref<MapViewRef>;
   scenario: MapScenario;
   provider: SupportedExampleProvider;
   mapType: MapType;
@@ -500,25 +501,22 @@ type MapSceneProps = {
   onLongPress: (coordinate: Coordinate) => void;
 };
 
-const MapScene = memo(
-  forwardRef<MapViewRef, MapSceneProps>(function MapScene(
-    {
-      scenario,
-      provider,
-      mapType,
-      mapPadding,
-      animationOption,
-      onMapReady,
-      onClusterPress,
-      onMarkerPress,
-      onMarkerDragEnd,
-      onOverlayPress,
-      onPress,
-      onPoiPress,
-      onLongPress,
-    },
-    ref,
-  ) {
+const MapScene = memo(function MapScene({
+  ref,
+  scenario,
+  provider,
+  mapType,
+  mapPadding,
+  animationOption,
+  onMapReady,
+  onClusterPress,
+  onMarkerPress,
+  onMarkerDragEnd,
+  onOverlayPress,
+  onPress,
+  onPoiPress,
+  onLongPress,
+}: MapSceneProps) {
     const commonMapProps = {
       style: styles.map,
       mapType,
@@ -569,8 +567,7 @@ const MapScene = memo(
         provider="google"
       />
     );
-  }),
-);
+});
 
 type StatusHeaderProps = {
   status: string;
@@ -671,29 +668,35 @@ export default function App() {
   );
 
   const handleAnimateCamera = useCallback(() => {
-    mapRef.current?.animateCamera(
-      {
-        center: {
-          latitude: scenario.region.latitude,
-          longitude: scenario.region.longitude,
+    mapRef.current
+      ?.animateCamera(
+        {
+          center: {
+            latitude: scenario.region.latitude,
+            longitude: scenario.region.longitude,
+          },
+          zoom: 13,
+          heading: 0,
+          pitch: 0,
         },
-        zoom: 13,
-        heading: 0,
-        pitch: 0,
-      },
-      1,
-    );
+        1,
+      )
+      ?.catch(() => {});
   }, [scenario]);
 
   const handleGetCamera = useCallback(async () => {
-    const camera = await mapRef.current?.getCamera();
-    if (camera == null) {
-      return;
-    }
+    try {
+      const camera = await mapRef.current?.getCamera();
+      if (camera == null) {
+        return;
+      }
 
-    setStatus(
-      `zoom ${camera.zoom?.toFixed(1) ?? '?'} · ${camera.center.latitude.toFixed(4)}, ${camera.center.longitude.toFixed(4)}`,
-    );
+      setStatus(
+        `zoom ${camera.zoom?.toFixed(1) ?? '?'} · ${camera.center.latitude.toFixed(4)}, ${camera.center.longitude.toFixed(4)}`,
+      );
+    } catch {
+      // Map unmounted or native call failed — ignore.
+    }
   }, []);
 
   const cycleMapType = useCallback(() => {
@@ -788,11 +791,13 @@ export default function App() {
       scenario.advanced?.fitToCoordinatesOnReady &&
       scenario.markers != null
     ) {
-      mapRef.current?.fitToCoordinates(
-        scenario.markers.map((marker) => marker.coordinate),
-        mapPadding,
-        true,
-      );
+      mapRef.current
+        ?.fitToCoordinates(
+          scenario.markers.map((marker) => marker.coordinate),
+          mapPadding,
+          true,
+        )
+        ?.catch(() => {});
     }
   }, [scenario, mapPadding]);
 

package/android/src/main/java/com/margelo/nitro/nitromaps/HybridMapView.kt

@@ -271,12 +271,14 @@ class HybridMapView(private val context: ThemedReactContext) :
 
   override fun fetchCamera(): Promise<Camera> = currentAdapter().fetchCamera()
 
-  override fun applyCamera(camera: Camera) {
+  override fun applyCamera(camera: Camera): Promise<Unit> {
     currentAdapter().applyCamera(camera)
+    return Promise.resolved(Unit)
   }
 
-  override fun animateCamera(camera: Camera, duration: Double?) {
+  override fun animateCamera(camera: Camera, duration: Double?): Promise<Unit> {
     currentAdapter().animateCamera(camera, duration)
+    return Promise.resolved(Unit)
   }
 
   override fun getVisibleRegion(): Promise<VisibleRegion> = currentAdapter().getVisibleRegion()
@@ -285,8 +287,9 @@ class HybridMapView(private val context: ThemedReactContext) :
     coordinates: Array<Coordinate>,
     padding: EdgePadding?,
     animated: Boolean?,
-  ) {
+  ): Promise<Unit> {
     currentAdapter().fitToCoordinates(coordinates, padding, animated)
+    return Promise.resolved(Unit)
   }
 
   override fun prepareForRecycle() {