@maplibre/maplibre-react-native 10.0.0-beta.13 → 10.0.0-beta.15

package/README.md

@@ -1,13 +1,13 @@
 [![MapLibre Logo](https://maplibre.org/img/maplibre-logo-big.svg)](https://maplibre.org)
 
 # MapLibre React Native
+
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE.md)
 [![Version](https://img.shields.io/npm/v/@maplibre/maplibre-react-native)](https://www.npmjs.com/package/@maplibre/maplibre-react-native)
-[![Actions](https://img.shields.io/github/actions/workflow/status/maplibre/maplibre-react-native/review.yml?label=Actions
-)](https://github.com/maplibre/maplibre-react-native/actions/workflows/review.yml)
-
+[![Actions](https://img.shields.io/github/actions/workflow/status/maplibre/maplibre-react-native/review.yml?label=Actions)](https://github.com/maplibre/maplibre-react-native/actions/workflows/review.yml)
 
-_React Native library for creating maps with [MapLibre Native for Android & iOS](https://github.com/maplibre/maplibre-gl-native)_.
+_React Native library for creating maps
+with [MapLibre Native for Android & iOS](https://github.com/maplibre/maplibre-gl-native)._
 
 This project originated as a fork of [rnmapbox](https://github.com/rnmapbox/maps), a community-maintained
 React Native library for building maps with the Mapbox iOS and Android mobile SDKs. The original product
@@ -27,12 +27,10 @@ diverged, it has become necessary to separate the projects into specific wrapper
 
 ## Documentation
 
-- [Getting Started](/docs/guides/setup/GettingStarted.md)
+- [Getting Started](/docs/guides/setup/Getting-Started)
 - Installation
-  - React Native  
-    - [Android](/docs/guides/setup/Android.md)
-    - [iOS](/docs/guides/setup/iOS.md)
   - [Expo](/docs/guides/setup/Expo.md)
+  - [React Native](/docs/guides/setup/React-Native.md)
 - Migrations
   - [Migrating to v10](/docs/guides/migrations/v10.md)
 
@@ -71,13 +69,13 @@ diverged, it has become necessary to separate the projects into specific wrapper
 
 ### Misc
 
-- [MLRNModule](/docs/guides/MLRNModule)
-- [Custom HTTP Headers](/docs/guides/CustomHTTPHeaders.md)
+- [MLRNModule](/docs/guides/MLRNModule.md)
+- [Custom HTTP Headers](/docs/guides/Custom-HTTP-Headers.md)
 - [Logger](/docs/guides/Logger.md)
 
 ## Contributing & Development
 
-Read the [CONTRIBUTING.md](CONTRIBUTING.md) guide in order to get familiar with how we do things around here and
+Read the [CONTRIBUTING](/CONTRIBUTING.md) guide in order to get familiar with how we do things around here and
 set up your local development environment.
 
 ## Community

package/android/src/main/java/org/maplibre/reactnative/components/camera/MLRNCamera.java

@@ -2,6 +2,7 @@ package org.maplibre.reactnative.components.camera;
 
 import android.content.Context;
 import android.location.Location;
+import android.util.Log;
 
 import org.maplibre.android.camera.CameraPosition;
 import org.maplibre.android.camera.CameraUpdate;
@@ -11,13 +12,9 @@ import org.maplibre.android.geometry.LatLngBounds;
 import org.maplibre.android.geometry.VisibleRegion;
 import org.maplibre.android.location.OnCameraTrackingChangedListener;
 import org.maplibre.android.location.modes.CameraMode;
-import org.maplibre.android.location.modes.RenderMode;
 import org.maplibre.android.maps.MapLibreMap;
 import org.maplibre.android.maps.Style;
-import org.maplibre.android.location.LocationComponent;
-import org.maplibre.android.location.LocationComponentOptions;
-import org.maplibre.android.location.LocationComponentActivationOptions;
-// import org.maplibre.android.plugins.locationlayer.LocationLayerPlugin;
+
 import org.maplibre.reactnative.components.AbstractMapFeature;
 import org.maplibre.reactnative.components.location.LocationComponentManager;
 import org.maplibre.reactnative.components.mapview.MLRNMapView;
@@ -31,8 +28,6 @@ import org.maplibre.reactnative.location.UserTrackingMode;
 import org.maplibre.reactnative.location.UserTrackingState;
 import org.maplibre.reactnative.utils.GeoJSONUtils;
 
-import org.maplibre.reactnative.R;
-
 import org.maplibre.reactnative.events.constants.EventTypes;
 
 import com.facebook.react.bridge.WritableMap;
@@ -87,12 +82,12 @@ public class MLRNCamera extends AbstractMapFeature {
     private LocationManager.OnUserLocationChange mLocationChangeListener = new LocationManager.OnUserLocationChange() {
         @Override
         public void onLocationChange(Location nextLocation) {
-        if (getMapboxMap() == null || mLocationComponentManager == null || !mLocationComponentManager.hasLocationComponent() || (!mFollowUserLocation)) {
-            return;
-        }
+            if (getMapboxMap() == null || mLocationComponentManager == null || !mLocationComponentManager.hasLocationComponent() || (!mFollowUserLocation)) {
+                return;
+            }
 
-        mUserLocation.setCurrentLocation(nextLocation);
-        sendUserLocationUpdateEvent(nextLocation);
+            mUserLocation.setCurrentLocation(nextLocation);
+            sendUserLocationUpdateEvent(nextLocation);
         }
     };
 
@@ -236,12 +231,7 @@ public class MLRNCamera extends AbstractMapFeature {
             }
         }
 
-        return new CameraPosition.Builder()
-                .target(center)
-                .bearing(getDirectionForUserLocationUpdate())
-                .tilt(mPitch)
-                .zoom(zoomLevel)
-                .build();
+        return new CameraPosition.Builder().target(center).bearing(getDirectionForUserLocationUpdate()).tilt(mPitch).zoom(zoomLevel).build();
     }
 
     private double getDirectionForUserLocationUpdate() {
@@ -260,7 +250,7 @@ public class MLRNCamera extends AbstractMapFeature {
     }
 
     private void sendUserLocationUpdateEvent(Location location) {
-        if(location == null){
+        if (location == null) {
             return;
         }
         IEvent event = new MapChangeEvent(this, EventTypes.USER_LOCATION_UPDATED, makeLocationChangePayload(location));
@@ -376,37 +366,38 @@ public class MLRNCamera extends AbstractMapFeature {
         }
 
         mLocationComponentManager.update(style);
-
-        if (mFollowUserLocation) {
-            mLocationComponentManager.setCameraMode(UserTrackingMode.getCameraMode(mUserTrackingMode));
-        }
         mLocationComponentManager.setFollowUserLocation(mFollowUserLocation);
 
         if (mFollowUserLocation) {
             mLocationComponentManager.setCameraMode(UserTrackingMode.getCameraMode(mUserTrackingMode));
             mLocationComponentManager.addOnCameraTrackingChangedListener(new OnCameraTrackingChangedListener() {
-                    @Override public void onCameraTrackingChanged(int currentMode) {
-                        int userTrackingMode = UserTrackingMode.NONE;
-                        switch (currentMode) {
-                            case CameraMode.NONE:
-                                userTrackingMode = UserTrackingMode.NONE;
-                                break;
-                            case CameraMode.TRACKING:
-                                userTrackingMode = UserTrackingMode.FOLLOW;
-                                break;
-                            case CameraMode.TRACKING_COMPASS:
-                                userTrackingMode = UserTrackingMode.FollowWithHeading;
-                                break;
-                            case CameraMode.TRACKING_GPS:
-                                userTrackingMode = UserTrackingMode.FollowWithCourse;
-                                break;
-                            default:
-                                userTrackingMode = UserTrackingMode.NONE;
-                        }
-                        updateUserTrackingMode(userTrackingMode);
-                    }
-                    @Override public void onCameraTrackingDismissed() {
+                @Override
+                public void onCameraTrackingChanged(int currentMode) {
+                    int userTrackingMode;
+
+                    switch (currentMode) {
+                        case CameraMode.NONE:
+                            userTrackingMode = UserTrackingMode.NONE;
+                            break;
+                        case CameraMode.TRACKING:
+                            userTrackingMode = UserTrackingMode.FOLLOW;
+                            break;
+                        case CameraMode.TRACKING_COMPASS:
+                            userTrackingMode = UserTrackingMode.FollowWithHeading;
+                            break;
+                        case CameraMode.TRACKING_GPS:
+                            userTrackingMode = UserTrackingMode.FollowWithCourse;
+                            break;
+                        default:
+                            userTrackingMode = UserTrackingMode.NONE;
                     }
+
+                    updateUserTrackingMode(userTrackingMode);
+                }
+
+                @Override
+                public void onCameraTrackingDismissed() {
+                }
             });
         } else {
             mLocationComponentManager.setCameraMode(CameraMode.NONE);
@@ -429,10 +420,7 @@ public class MLRNCamera extends AbstractMapFeature {
     }
 
     private CameraPosition buildCamera(CameraPosition previousPosition, boolean shouldUpdateTarget) {
-        CameraPosition.Builder builder = new CameraPosition.Builder(previousPosition)
-                .bearing(mHeading)
-                .tilt(mPitch)
-                .zoom(mZoomLevel);
+        CameraPosition.Builder builder = new CameraPosition.Builder(previousPosition).bearing(mHeading).tilt(mPitch).zoom(mZoomLevel);
 
         if (shouldUpdateTarget) {
             builder.target(GeoJSONUtils.toLatLng(mCenterCoordinate));
@@ -507,6 +495,7 @@ public class MLRNCamera extends AbstractMapFeature {
     /**
      * Create a payload of the location data per the web api geolocation spec
      * https://dev.w3.org/geo/api/spec-source.html#position
+     *
      * @return
      */
     private WritableMap makeLocationChangePayload(Location location) {

package/android/src/main/java/org/maplibre/reactnative/components/location/LocationComponentManager.java

@@ -46,6 +46,8 @@ public class LocationComponentManager {
 
     private boolean mShowingUserLocation = false;
 
+    private OnCameraTrackingChangedListener mOnCameraTrackingChangedListener = null;
+
     public void showUserLocation(boolean showUserLocation) {
         mShowUserLocation = showUserLocation;
         stateChanged();
@@ -68,16 +70,21 @@ public class LocationComponentManager {
     }
 
     public void setPreferredFramesPerSecond(int preferredFramesPerSecond) {
-       if(mLocationComponent == null || preferredFramesPerSecond <= 0) {
+        if (mLocationComponent == null || preferredFramesPerSecond <= 0) {
             return;
-       }
+        }
 
         mLocationComponent.setMaxAnimationFps(preferredFramesPerSecond);
     }
 
-
     public void addOnCameraTrackingChangedListener(OnCameraTrackingChangedListener onCameraTrackingChangedListener) {
-        mLocationComponent.addOnCameraTrackingChangedListener(onCameraTrackingChangedListener);
+        if (mOnCameraTrackingChangedListener != null) {
+            mLocationComponent.removeOnCameraTrackingChangedListener(mOnCameraTrackingChangedListener);
+        }
+
+        mOnCameraTrackingChangedListener = onCameraTrackingChangedListener;
+
+        mLocationComponent.addOnCameraTrackingChangedListener(mOnCameraTrackingChangedListener);
     }
 
     @SuppressLint("MissingPermission")
@@ -111,7 +118,7 @@ public class LocationComponentManager {
     public void update(boolean displayUserLocation, @NonNull Style style) {
         Integer tintColor = mMapView.getTintColor();
 
-        if (mLocationComponent == null || tintColor != null ) {
+        if (mLocationComponent == null || tintColor != null) {
             mLocationComponent = mMap.getLocationComponent();
 
             LocationComponentActivationOptions locationComponentActivationOptions = LocationComponentActivationOptions
@@ -148,10 +155,10 @@ public class LocationComponentManager {
                     .accuracyAlpha(0.0f);
         } else if (tintColor != null) {
             builder = builder
-                .enableStaleState(false)
-                .bearingTintColor(tintColor)
-                .foregroundTintColor(tintColor)
-                .accuracyColor(tintColor);
+                    .enableStaleState(false)
+                    .bearingTintColor(tintColor)
+                    .foregroundTintColor(tintColor)
+                    .accuracyColor(tintColor);
         }
         return builder.build();
     }

package/android/src/main/java/org/maplibre/reactnative/utils/GeoJSONUtils.java

@@ -6,6 +6,8 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
+import com.google.gson.JsonObject;
+
 import org.maplibre.geojson.Feature;
 import org.maplibre.geojson.FeatureCollection;
 import org.maplibre.geojson.Geometry;
@@ -19,23 +21,34 @@ import org.maplibre.geojson.Polygon;
 import org.maplibre.android.geometry.LatLng;
 import org.maplibre.android.geometry.LatLngBounds;
 import org.maplibre.android.geometry.LatLngQuad;
-import org.maplibre.android.style.light.Position;
+import org.maplibre.android.log.Logger;
 import org.maplibre.turf.TurfMeasurement;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class GeoJSONUtils {
+    public static final String LOG_TAG = "GeoJSONUtils";
+
     public static WritableMap fromFeature(Feature feature) {
         WritableMap map = Arguments.createMap();
         map.putString("type", "Feature");
         map.putString("id", feature.id());
 
-        WritableMap geometry = fromGeometry(feature.geometry());
-        map.putMap("geometry", geometry);
+        Geometry geometry = feature.geometry();
+        if (geometry == null) {
+            map.putNull("geometry");
+        } else {
+            map.putMap("geometry", fromGeometry(geometry));
+        }
 
-        WritableMap properties = ConvertUtils.toWritableMap(feature.properties());
-        map.putMap("properties", properties);
+        JsonObject properties = feature.properties();
+        if(properties == null) {
+            map.putNull("properties");
+        } else {
+            map.putMap("properties", ConvertUtils.toWritableMap(properties));
+        }
 
         return map;
     }
@@ -43,22 +56,20 @@ public class GeoJSONUtils {
     public static WritableMap fromGeometry(Geometry geometry) {
         final String type = geometry.type();
 
-        switch (type) {
-            case "Point":
-                return fromPoint((Point) geometry);
-            case "LineString":
-                return fromLineString((LineString) geometry);
-            case "Polygon":
-                return fromPolygon((Polygon) geometry);
-            case "MultiPoint":
-                return fromMultiPoint((MultiPoint) geometry);
-            case "MultiLineString":
-                return fromMultiLineString((MultiLineString) geometry);
-            case "MultiPolygon":
-                return fromMultiPolygon((MultiPolygon) geometry);
-            default:
-                return null;
-        }
+        return switch (type) {
+            case "Point" -> fromPoint((Point) geometry);
+            case "LineString" -> fromLineString((LineString) geometry);
+            case "Polygon" -> fromPolygon((Polygon) geometry);
+            case "MultiPoint" -> fromMultiPoint((MultiPoint) geometry);
+            case "MultiLineString" -> fromMultiLineString((MultiLineString) geometry);
+            case "MultiPolygon" -> fromMultiPolygon((MultiPolygon) geometry);
+            case "GeometryCollection" -> fromGeometryCollection((GeometryCollection) geometry);
+            default -> {
+                Logger.w(LOG_TAG, "GeoJSONUtils.fromGeometry unsupported type: \"" + type + "\"");
+
+                yield null;
+            }
+        };
     }
 
     public static WritableMap fromPoint(Point point) {
@@ -103,6 +114,23 @@ public class GeoJSONUtils {
         return map;
     }
 
+    public static WritableMap fromGeometryCollection(GeometryCollection geometryCollection) {
+        WritableMap map = Arguments.createMap();
+        map.putString("type", "GeometryCollection");
+
+        map.putArray("geometries",
+                Arguments.fromList(
+                        geometryCollection
+                                .geometries()
+                                .stream()
+                                .map(GeoJSONUtils::fromGeometry)
+                                .collect(Collectors.toList())
+                )
+        );
+
+        return map;
+    }
+
     public static WritableArray getCoordinates(Point point) {
         return Arguments.fromArray(pointToDoubleArray(point));
     }
@@ -122,9 +150,6 @@ public class GeoJSONUtils {
         WritableArray array = Arguments.createArray();
 
         List<List<Point>> points = polygon.coordinates();
-        if (points == null) {
-            return array;
-        }
 
         for (List<Point> curPoint : points) {
             WritableArray innerArray = Arguments.createArray();

package/app.plugin.js

@@ -1 +1 @@
-module.exports = require("./plugin/build/withMapLibre");
+module.exports = require("./lib/commonjs/plugin/withMapLibre");

package/ios/MLRN/MLRNCamera.m

@@ -179,11 +179,6 @@
         return;
     }
     
-    if (_map.userTrackingMode != [self _userTrackingMode]) {
-        _map.showsUserLocation = [self _userTrackingMode] != MLNUserTrackingModeNone;
-        _map.userTrackingMode = [self _userTrackingMode];
-    }
-    
     MLNMapCamera *camera = _map.camera;
     if (_followPitch != nil && [_followPitch floatValue] >= 0.0) {
         camera.pitch = [_followPitch floatValue];
@@ -202,8 +197,12 @@
     if (_followZoomLevel != nil && [_followZoomLevel doubleValue] >= 0.0) {
         camera.altitude = [_map altitudeFromZoom:[_followZoomLevel doubleValue]];
     }
-    
-    [_map setCamera:camera animated:YES];
+
+    [_map setCamera:camera animated:NO];
+
+    if (_map.userTrackingMode != [self _userTrackingMode]) {
+      [_map setUserTrackingMode:[self _userTrackingMode] animated:NO completionHandler:nil];
+    }
 }
 
 - (NSUInteger)_userTrackingMode

package/lib/commonjs/components/Camera.js

@@ -37,49 +37,52 @@ function makeNativeCameraStop(stop) {
   if (!stop) {
     return undefined;
   }
-  const nativeStop = {};
+  const newNativeStop = {};
   if (stop.animationDuration !== undefined) {
-    nativeStop.duration = stop.animationDuration;
+    newNativeStop.duration = stop.animationDuration;
   }
   if (stop.animationMode !== undefined) {
-    nativeStop.mode = getNativeCameraMode(stop.animationMode);
+    newNativeStop.mode = getNativeCameraMode(stop.animationMode);
   }
   if (stop.centerCoordinate) {
-    nativeStop.centerCoordinate = JSON.stringify((0, _helpers.point)(stop.centerCoordinate));
+    newNativeStop.centerCoordinate = JSON.stringify((0, _helpers.point)(stop.centerCoordinate));
   }
   if (stop.heading !== undefined) {
-    nativeStop.heading = stop.heading;
+    newNativeStop.heading = stop.heading;
   }
   if (stop.pitch !== undefined) {
-    nativeStop.pitch = stop.pitch;
+    newNativeStop.pitch = stop.pitch;
   }
   if (stop.zoomLevel !== undefined) {
-    nativeStop.zoom = stop.zoomLevel;
+    newNativeStop.zoom = stop.zoomLevel;
   }
   if (stop.bounds && stop.bounds.ne && stop.bounds.sw) {
     const {
       ne,
       sw
     } = stop.bounds;
-    nativeStop.bounds = (0, _makeNativeBounds.makeNativeBounds)(ne, sw);
+    newNativeStop.bounds = (0, _makeNativeBounds.makeNativeBounds)(ne, sw);
   }
   const paddingTop = stop.padding?.paddingTop ?? stop.bounds?.paddingTop;
   if (paddingTop !== undefined) {
-    nativeStop.paddingTop = paddingTop;
+    newNativeStop.paddingTop = paddingTop;
   }
   const paddingRight = stop.padding?.paddingRight ?? stop.bounds?.paddingRight;
   if (paddingRight !== undefined) {
-    nativeStop.paddingRight = paddingRight;
+    newNativeStop.paddingRight = paddingRight;
   }
   const paddingBottom = stop.padding?.paddingBottom ?? stop.bounds?.paddingBottom;
   if (paddingBottom !== undefined) {
-    nativeStop.paddingBottom = paddingBottom;
+    newNativeStop.paddingBottom = paddingBottom;
   }
   const paddingLeft = stop.padding?.paddingLeft ?? stop.bounds?.paddingLeft;
   if (paddingLeft !== undefined) {
-    nativeStop.paddingLeft = paddingLeft;
+    newNativeStop.paddingLeft = paddingLeft;
   }
-  return nativeStop;
+  if (newNativeStop.centerCoordinate && newNativeStop.bounds) {
+    throw new Error("Create a camera stop with bounds and centerCoordinate – this is not possible.");
+  }
+  return newNativeStop;
 }
 const Camera = exports.Camera = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _react.forwardRef)(({
   animationMode,
@@ -101,40 +104,19 @@ const Camera = exports.Camera = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _
   pitch,
   zoomLevel
 }, ref) => {
-  const nativeCamera = (0, _useNativeRef.useNativeRef)();
-  const nativeStop = (0, _react.useMemo)(() => {
-    return makeNativeCameraStop({
-      animationDuration,
-      animationMode,
-      bounds,
-      centerCoordinate,
-      heading,
-      padding,
-      pitch,
-      zoomLevel
-    });
-  }, [animationDuration, animationMode, bounds, centerCoordinate, heading, padding, pitch, zoomLevel]);
-  const nativeDefaultStop = (0, _react.useMemo)(() => {
-    return makeNativeCameraStop(defaultSettings);
-  }, [defaultSettings]);
-  const nativeMaxBounds = (0, _react.useMemo)(() => {
-    if (!maxBounds?.ne || !maxBounds?.sw) {
-      return undefined;
-    }
-    return (0, _makeNativeBounds.makeNativeBounds)(maxBounds.ne, maxBounds.sw);
-  }, [maxBounds]);
+  const nativeCameraRef = (0, _useNativeRef.useNativeRef)();
   const setCamera = (config = {}) => {
     if ("stops" in config) {
-      nativeCamera.current?.setNativeProps({
+      nativeCameraRef.current?.setNativeProps({
         stop: {
           stops: config.stops.map(stopItem => makeNativeCameraStop(stopItem)).filter(stopItem => !!stopItem)
         }
       });
     } else {
-      const nativeStop = makeNativeCameraStop(config);
-      if (nativeStop) {
-        nativeCamera.current?.setNativeProps({
-          stop: nativeStop
+      const stop = makeNativeCameraStop(config);
+      if (stop) {
+        nativeCameraRef.current?.setNativeProps({
+          stop
         });
       }
     }
@@ -200,10 +182,10 @@ const Camera = exports.Camera = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _
      * cameraRef.current?.fitBounds([lng, lat], [lng, lat], [verticalPadding, horizontalPadding], 1000)
      * cameraRef.current?.fitBounds([lng, lat], [lng, lat], [top, right, bottom, left], 1000)
      *
-     * @param {Array<Number>} ne - North east coordinate of bound
-     * @param {Array<Number>} sw - South west coordinate of bound
-     * @param {Number|Array<Number>|undefined} padding - Padding for the bounds
-     * @param {Number=} animationDuration - Duration of camera animation
+     * @param {Array<number>} ne - North east coordinate of bound
+     * @param {Array<number>} sw - South west coordinate of bound
+     * @param {number|Array<number>|undefined} padding - Padding for the bounds
+     * @param {number=} animationDuration - Duration of camera animation
      * @return {void}
      */
     fitBounds,
@@ -214,8 +196,8 @@ const Camera = exports.Camera = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _
      * cameraRef.current?.flyTo([lng, lat])
      * cameraRef.current?.flyTo([lng, lat], 12000)
      *
-     *  @param {Array<Number>} coordinates - Coordinates that map camera will jump to
-     *  @param {Number=} animationDuration - Duration of camera animation
+     *  @param {Array<number>} coordinates - Coordinates that map camera will jump to
+     *  @param {number=} animationDuration - Duration of camera animation
      *  @return {void}
      */
     flyTo,
@@ -226,8 +208,8 @@ const Camera = exports.Camera = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _
      * cameraRef.current?.moveTo([lng, lat], 200) // eases camera to new location based on duration
      * cameraRef.current?.moveTo([lng, lat]) // snaps camera to new location without any easing
      *
-     *  @param {Array<Number>} coordinates - Coordinates that map camera will move too
-     *  @param {Number=} animationDuration - Duration of camera animation
+     *  @param {Array<number>} coordinates - Coordinates that map camera will move too
+     *  @param {number=} animationDuration - Duration of camera animation
      *  @return {void}
      */
     moveTo,
@@ -238,8 +220,8 @@ const Camera = exports.Camera = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _
      * cameraRef.current?.zoomTo(16)
      * cameraRef.current?.zoomTo(16, 100)
      *
-     * @param {Number} zoomLevel - Zoom level that the map camera will animate too
-     * @param {Number=} animationDuration - Duration of camera animation
+     * @param {number} zoomLevel - Zoom level that the map camera will animate too
+     * @param {number=} animationDuration - Duration of camera animation
      * @return {void}
      */
     zoomTo,
@@ -264,19 +246,86 @@ const Camera = exports.Camera = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _
      */
     setCamera
   }));
+  const followProps = (0, _react.useMemo)(() => {
+    return {
+      followUserMode,
+      followPitch: followPitch ?? pitch,
+      followHeading: followHeading ?? heading,
+      followZoomLevel: followZoomLevel ?? zoomLevel
+    };
+  }, [followUserMode, followPitch, pitch, followHeading, heading, followZoomLevel, zoomLevel]);
+  (0, _react.useEffect)(() => {
+    if (followUserLocation) {
+      if (_reactNative.Platform.OS === "android") {
+        nativeCameraRef.current?.setNativeProps({
+          ...followProps,
+          followUserLocation
+        });
+      } else {
+        nativeCameraRef.current?.setNativeProps({
+          ...followProps
+        });
+        nativeCameraRef.current?.setNativeProps({
+          followUserLocation
+        });
+      }
+    } else {
+      nativeCameraRef.current?.setNativeProps({
+        followUserLocation
+      });
+    }
+  }, [followUserLocation, followProps]);
+  const nativeMaxBounds = (0, _react.useMemo)(() => {
+    if (!maxBounds?.ne || !maxBounds?.sw) {
+      return undefined;
+    }
+    return (0, _makeNativeBounds.makeNativeBounds)(maxBounds.ne, maxBounds.sw);
+  }, [maxBounds]);
+  (0, _react.useEffect)(() => {
+    if (!followUserLocation) {
+      nativeCameraRef.current?.setNativeProps({
+        maxBounds: nativeMaxBounds
+      });
+    }
+  }, [followUserLocation, nativeMaxBounds]);
+  (0, _react.useEffect)(() => {
+    if (!followUserLocation) {
+      nativeCameraRef.current?.setNativeProps({
+        minZoomLevel
+      });
+    }
+  }, [followUserLocation, minZoomLevel]);
+  (0, _react.useEffect)(() => {
+    if (!followUserLocation) {
+      nativeCameraRef.current?.setNativeProps({
+        maxZoomLevel
+      });
+    }
+  }, [followUserLocation, maxZoomLevel]);
+  const nativeStop = (0, _react.useMemo)(() => {
+    return makeNativeCameraStop({
+      animationDuration,
+      animationMode,
+      bounds,
+      centerCoordinate,
+      heading,
+      padding,
+      pitch,
+      zoomLevel
+    });
+  }, [animationDuration, animationMode, bounds, centerCoordinate, heading, padding, pitch, zoomLevel]);
+  (0, _react.useEffect)(() => {
+    if (!followUserLocation) {
+      nativeCameraRef.current?.setNativeProps({
+        stop: nativeStop
+      });
+    }
+  }, [followUserLocation, nativeStop]);
+  const [nativeDefaultStop] = (0, _react.useState)(makeNativeCameraStop(defaultSettings));
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(MLRNCamera, {
     testID: "Camera",
-    ref: nativeCamera,
-    stop: nativeStop,
+    ref: nativeCameraRef,
     defaultStop: nativeDefaultStop,
-    maxBounds: nativeMaxBounds,
-    followUserLocation: followUserLocation,
-    followHeading: followHeading,
-    followPitch: followPitch,
-    followUserMode: followUserMode,
-    followZoomLevel: followZoomLevel,
-    maxZoomLevel: maxZoomLevel,
-    minZoomLevel: minZoomLevel,
     onUserTrackingModeChange: onUserTrackingModeChange
   });
 }));