feat(MapView): remove setCamera

BREAKING CHANGE: `setCamera` removed. Use `animateCamera` with `duration: 0` instead.
react-native-maps · May 4, 2023 · aef8148 · aef8148
1 parent 854e5df
commit aef8148
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 89 deletions.
diff --git a/android/src/main/java/com/rnmaps/maps/MapManager.java b/android/src/main/java/com/rnmaps/maps/MapManager.java
@@ -281,17 +281,7 @@ public void setBoundary(MapView view, ReadableMap boundary) {
 
   @Override
   public void receiveCommand(@NonNull MapView view, String commandId, @Nullable ReadableArray args) {
-    ReadableMap camera;
-
     switch (commandId) {
-      case "setCamera":
-        if(args == null) {
-          break;
-        }
-        camera = args.getMap(0);
-        view.animateToCamera(camera, 0);
-        break;
-
       case "setIndoorActiveLevelIndex":
         if(args == null) {
           break;

diff --git a/android/src/main/java/com/rnmaps/maps/MapView.java b/android/src/main/java/com/rnmaps/maps/MapView.java
@@ -886,19 +886,6 @@ public CameraUpdate buildCameraUpdate(ReadableMap camera) {
     return CameraUpdateFactory.newCameraPosition(builder.build());
   }
 
-  public void animateToCamera(ReadableMap camera, int duration) {
-    if (map == null) return;
-
-    CameraUpdate update = buildCameraUpdate(camera);
-
-    if (duration <= 0) {
-      map.moveCamera(update);
-    }
-    else {
-      map.animateCamera(update, duration, null);
-    }
-  }
-
   public int baseLeftMapPadding;
   public int baseRightMapPadding;
   public int baseTopMapPadding;

diff --git a/docs/mapview.md b/docs/mapview.md
@@ -93,7 +93,6 @@ To access event data, you will need to use `e.nativeEvent`. For example, `onPres
 | `getMapBoundaries`          |                                                                                          | `Promise<{northEast: LatLng, southWest: LatLng}>`                                                                                                                                                                      |
 | `getMarkersFrames`          | `onlyVisible: Boolean`                                                                   | Get markers' centers and frames in view coordinates. Returns a `Promise<{ "markerID" : { point: Point, frame: Frame } }>`. **Note**: iOS only.                                                                         |
 | `pointForCoordinate`        | `coordinate: LatLng`                                                                     | Converts a map coordinate to a view coordinate (`Point`). Returns a `Promise<Point>`.                                                                                                                                  |
-| `setCamera`                 | `camera: Camera`                                                                         | Like `animateCamera`, but sets the new view instantly, without an animation.                                                                                                                                           |
 | `setIndoorActiveLevelIndex` | `levelIndex: Number`                                                                     |
 
 ## Types

diff --git a/ios/GoogleMaps/RNMGoogleMapManager.m b/ios/GoogleMaps/RNMGoogleMapManager.m
@@ -107,21 +107,6 @@ - (UIView *)view
 RCT_REMAP_VIEW_PROPERTY(paddingAdjustmentBehavior, paddingAdjustmentBehaviorString, NSString)
 RCT_REMAP_VIEW_PROPERTY(testID, accessibilityIdentifier, NSString)
 
-RCT_EXPORT_METHOD(setCamera:(nonnull NSNumber *)reactTag
-                  camera:(id)json)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RNMGoogleMap class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RNMGoogleMap, got: %@", view);
-        } else {
-            RNMGoogleMap *mapView = (RNMGoogleMap *)view;
-            GMSCameraPosition *camera = [RCTConvert GMSCameraPositionWithDefaults:json existingCamera:[mapView camera]];
-            [mapView setCamera:camera];
-        }
-    }];
-}
-
 RCT_EXPORT_METHOD(setIndoorActiveLevelIndex:(nonnull NSNumber *)reactTag
                   levelIndex:(NSInteger) levelIndex)
 {

diff --git a/ios/GoogleMaps/RNMGoogleMapViewModule.m b/ios/GoogleMaps/RNMGoogleMapViewModule.m
@@ -224,13 +224,18 @@ - (dispatch_queue_t)methodQueue
             RNMGoogleMap *mapView = (RNMGoogleMap *)view;
             GMSCameraPosition *camera = [RCTConvert GMSCameraPositionWithDefaults:json existingCamera:[mapView camera]];
 
-            [CATransaction begin];
-            [CATransaction setCompletionBlock:^{
-                resolve(nil);
-            }];
-            [CATransaction setAnimationDuration:duration/1000];
-            [mapView animateToCameraPosition:camera];
-            [CATransaction commit];
+            if(duration > 0.0f) {
+              [CATransaction begin];
+              [CATransaction setCompletionBlock:^{
+                  resolve(nil);
+              }];
+              [CATransaction setAnimationDuration:duration/1000];
+              [mapView animateToCameraPosition:camera];
+              [CATransaction commit];
+            } else {
+              [mapView moveCamera:camera];
+              resolve(nil);
+            }
         }
     }];
 }

diff --git a/ios/Maps/RNMMapManager.m b/ios/Maps/RNMMapManager.m
@@ -170,30 +170,6 @@ - (UIView *)view
     view.ignoreRegionChanges = originalIgnore;
 }
 
-#pragma mark exported MapView methods
-
-RCT_EXPORT_METHOD(setCamera:(nonnull NSNumber *)reactTag
-                  camera:(id)json)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RNMMap class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RNMMap, got: %@", view);
-        } else {
-            RNMMap *mapView = (RNMMap *)view;
-
-            // Merge the changes given with the current camera
-            MKMapCamera *camera = [RCTConvert MKMapCameraWithDefaults:json existingCamera:[mapView camera]];
-
-            // don't emit region change events when we are setting the camera
-            BOOL originalIgnore = mapView.ignoreRegionChanges;
-            mapView.ignoreRegionChanges = YES;
-            [mapView setCamera:camera animated:NO];
-            mapView.ignoreRegionChanges = originalIgnore;
-        }
-    }];
-}
-
 #pragma mark Gesture Recognizer Handlers
 
 #define MAX_DISTANCE_PX 10.0f

diff --git a/ios/Maps/RNMMapViewModule.m b/ios/Maps/RNMMapViewModule.m
@@ -259,12 +259,18 @@ - (dispatch_queue_t)methodQueue
             // don't emit region change events when we are setting the camera
             BOOL originalIgnore = mapView.ignoreRegionChanges;
             mapView.ignoreRegionChanges = YES;
-            [RNMMap animateWithDuration:duration/1000 animations:^{
-                [mapView setCamera:camera animated:YES];
-            } completion:^(BOOL finished){
+            if(duration > 0.0f) {
+                [RNMMap animateWithDuration:duration/1000 animations:^{
+                    [mapView setCamera:camera animated:YES];
+                } completion:^(BOOL finished){
+                    mapView.ignoreRegionChanges = originalIgnore;
+                    resolve(nil);
+                }];
+            } else {
+                [mapView setCamera:camera animated:NO];
                 mapView.ignoreRegionChanges = originalIgnore;
                 resolve(nil);
-            }];
+            }
         }
     }];
 }

diff --git a/src/MapView.tsx b/src/MapView.tsx
@@ -771,12 +771,6 @@ class MapView extends React.Component<MapViewProps, State> {
     return mapViewModuleMethod('getCamera')(this._getHandle());
   }
 
-  setCamera(camera: Partial<Camera>) {
-    if (this.map.current) {
-      Commands.setCamera(this.map.current, camera);
-    }
-  }
-
   animateCamera(
     camera: Partial<Camera>,
     duration: number = 500,

diff --git a/src/MapViewNativeComponent.ts b/src/MapViewNativeComponent.ts
@@ -1,18 +1,10 @@
 import type {HostComponent} from 'react-native';
 import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
 import {NativeProps} from './MapView';
-import {Camera} from './MapView.types';
 
 export type MapViewNativeComponentType = HostComponent<NativeProps>;
 
 interface NativeCommands {
-  setCamera: (
-    viewRef: NonNullable<
-      React.RefObject<MapViewNativeComponentType>['current']
-    >,
-    camera: Partial<Camera>,
-  ) => void;
-
   setIndoorActiveLevelIndex: (
     viewRef: NonNullable<
       React.RefObject<MapViewNativeComponentType>['current']
@@ -22,5 +14,5 @@ interface NativeCommands {
 }
 
 export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
-  supportedCommands: ['setCamera', 'setIndoorActiveLevelIndex'],
+  supportedCommands: ['setIndoorActiveLevelIndex'],
 });