react-native-maps 2.0.0-beta.6 → 2.0.0-beta.8

package/lib/MapView.d.ts

@@ -581,11 +581,11 @@ declare class MapView extends React.Component<MapViewProps, State> {
     private _onChange;
     getCamera(): Promise<Camera>;
     setCamera(camera: Partial<Camera>): void;
-    animateCamera(camera: Partial<Camera>, duration?: number): void;
-    animateToRegion(region: Region, duration?: number): void;
-    fitToElements(options?: FitToOptions): void;
-    fitToSuppliedMarkers(markers: string[], options?: FitToOptions): void;
-    fitToCoordinates(coordinates?: LatLng[], options?: FitToOptions): void;
+    animateCamera(camera: Partial<Camera>, duration?: number): Promise<void>;
+    animateToRegion(region: Region, duration?: number): Promise<void>;
+    fitToElements(options?: FitToOptions): Promise<void>;
+    fitToSuppliedMarkers(markers: string[], options?: FitToOptions): Promise<void>;
+    fitToCoordinates(coordinates?: LatLng[], options?: FitToOptions): Promise<void>;
     /**
      * Get visible boudaries
      *

package/lib/MapView.js

@@ -95,32 +95,37 @@ class MapView extends React.Component {
         }
     }
     animateCamera(camera, duration = 500) {
-        if (this.map.current) {
-            MapViewNativeComponent_1.Commands.animateCamera(this.map.current, camera, duration);
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('animateCamera')(this._getHandle(), camera, duration);
         }
+        return mapViewModuleMethod('animateCamera')(this._getHandle(), camera, duration);
     }
     animateToRegion(region, duration = 500) {
-        if (this.map.current) {
-            MapViewNativeComponent_1.Commands.animateToRegion(this.map.current, region, duration);
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('animateToRegion')(this._getHandle(), region, duration);
         }
+        return mapViewModuleMethod('animateToRegion')(this._getHandle(), region, duration);
     }
     fitToElements(options = {}) {
-        if (this.map.current) {
-            const { edgePadding = { top: 0, right: 0, bottom: 0, left: 0 }, animated = true, } = options;
-            MapViewNativeComponent_1.Commands.fitToElements(this.map.current, edgePadding, animated);
+        const { edgePadding = { top: 0, right: 0, bottom: 0, left: 0 }, duration = 0 } = options;
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('fitToElements')(this._getHandle(), edgePadding, duration);
         }
+        return mapViewModuleMethod('fitToElements')(this._getHandle(), edgePadding, duration);
     }
     fitToSuppliedMarkers(markers, options = {}) {
-        if (this.map.current) {
-            const { edgePadding = { top: 0, right: 0, bottom: 0, left: 0 }, animated = true, } = options;
-            MapViewNativeComponent_1.Commands.fitToSuppliedMarkers(this.map.current, markers, edgePadding, animated);
+        const { edgePadding = { top: 0, right: 0, bottom: 0, left: 0 }, duration = 0 } = options;
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('fitToSuppliedMarkers')(this._getHandle(), markers, edgePadding, duration);
         }
+        return mapViewModuleMethod('fitToSuppliedMarkers')(this._getHandle(), markers, edgePadding, duration);
     }
     fitToCoordinates(coordinates = [], options = {}) {
-        if (this.map.current) {
-            const { edgePadding = { top: 0, right: 0, bottom: 0, left: 0 }, animated = true, } = options;
-            MapViewNativeComponent_1.Commands.fitToCoordinates(this.map.current, coordinates, edgePadding, animated);
+        const { edgePadding = { top: 0, right: 0, bottom: 0, left: 0 }, duration = 0 } = options;
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('fitToCoordinates')(this._getHandle(), coordinates, edgePadding, duration);
         }
+        return mapViewModuleMethod('fitToCoordinates')(this._getHandle(), coordinates, edgePadding, duration);
     }
     /**
      * Get visible boudaries

package/lib/MapView.types.d.ts

@@ -119,7 +119,7 @@ export type ChangeEvent = NativeSyntheticEvent<{
 }>;
 export type FitToOptions = {
     edgePadding?: EdgePadding;
-    animated?: boolean;
+    duration?: number;
 };
 export type BoundingBox = {
     northEast: LatLng;

package/lib/MapViewNativeComponent.d.ts

@@ -1,16 +1,11 @@
 /// <reference types="react" />
 import type { HostComponent } from 'react-native';
 import { NativeProps } from './MapView';
-import { Camera, EdgePadding } from './MapView.types';
-import { LatLng, Region } from './sharedTypes';
+import { Camera } from './MapView.types';
+import { LatLng } from './sharedTypes';
 export type MapViewNativeComponentType = HostComponent<NativeProps>;
 interface NativeCommands {
-    animateToRegion: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, region: Region, duration: number) => void;
     setCamera: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, camera: Partial<Camera>) => void;
-    animateCamera: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, camera: Partial<Camera>, duration: number) => void;
-    fitToElements: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, edgePadding: EdgePadding, animated: boolean) => void;
-    fitToSuppliedMarkers: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, markers: string[], edgePadding: EdgePadding, animated: boolean) => void;
-    fitToCoordinates: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, coordinates: LatLng[], edgePadding: EdgePadding, animated: boolean) => void;
     setMapBoundaries: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, northEast: LatLng, southWest: LatLng) => void;
     setIndoorActiveLevelIndex: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, activeLevelIndex: number) => void;
 }

package/lib/MapViewNativeComponent.js

@@ -7,12 +7,7 @@ exports.Commands = void 0;
 const codegenNativeCommands_1 = __importDefault(require("react-native/Libraries/Utilities/codegenNativeCommands"));
 exports.Commands = (0, codegenNativeCommands_1.default)({
     supportedCommands: [
-        'animateToRegion',
         'setCamera',
-        'animateCamera',
-        'fitToElements',
-        'fitToSuppliedMarkers',
-        'fitToCoordinates',
         'setMapBoundaries',
         'setIndoorActiveLevelIndex',
     ],

package/lib/NativeGoogleMapViewModule.d.ts

@@ -1,8 +1,13 @@
 import type { TurboModule } from 'react-native';
-import { BoundingBox, Camera, MarkersFrames } from './MapView.types';
+import { BoundingBox, Camera, EdgePadding, MarkersFrames } from './MapView.types';
 import { LatLng, Point, Region } from './sharedTypes';
 export interface Spec extends TurboModule {
+    animateCamera: (viewTag: number, camera: Partial<Camera>, duration: number) => Promise<void>;
+    animateToRegion: (viewTag: number, region: Region, duration: number) => Promise<void>;
     coordinateForPoint: (viewTag: number, point: Point) => Promise<LatLng>;
+    fitToCoordinates: (viewTag: number, coordinates: LatLng[], edgePadding: EdgePadding, duration: number) => Promise<void>;
+    fitToElements: (viewTag: number, edgePadding: EdgePadding, duration: number) => Promise<void>;
+    fitToSuppliedMarkers: (viewTag: number, markers: string[], edgePadding: EdgePadding, duration: number) => Promise<void>;
     getCamera: (viewTag: number) => Promise<Camera>;
     getMapBoundaries: (viewTag: number) => Promise<BoundingBox>;
     getMarkersFrames: (viewTag: number, onlyVisible: boolean) => Promise<MarkersFrames>;

package/lib/NativeMapViewModule.d.ts

@@ -1,10 +1,15 @@
 import type { TurboModule } from 'react-native';
-import { Address, BoundingBox, Camera, MarkersFrames } from './MapView.types';
+import { Address, BoundingBox, Camera, EdgePadding, MarkersFrames } from './MapView.types';
 import { LatLng, Point, Region } from './sharedTypes';
 export interface Spec extends TurboModule {
+    animateCamera: (viewTag: number, camera: Partial<Camera>, duration: number) => Promise<void>;
+    animateToRegion: (viewTag: number, region: Region, duration: number) => Promise<void>;
     coordinateForPoint: (viewTag: number, point: Point) => Promise<LatLng>;
     /** android only */
     enableLatestRenderer: () => Promise<string>;
+    fitToCoordinates: (viewTag: number, coordinates: LatLng[], edgePadding: EdgePadding, duration: number) => Promise<void>;
+    fitToElements: (viewTag: number, edgePadding: EdgePadding, duration: number) => Promise<void>;
+    fitToSuppliedMarkers: (viewTag: number, markers: string[], edgePadding: EdgePadding, duration: number) => Promise<void>;
     getAddressFromCoordinates: (viewTag: number, coordinate: LatLng) => Promise<Address>;
     getCamera: (viewTag: number) => Promise<Camera>;
     getMapBoundaries: (viewTag: number) => Promise<BoundingBox>;

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.8",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",