react-native-maps 1.25.0-alpha.8 → 1.25.0

package/src/decorateMapComponent.ts

@@ -4,10 +4,10 @@ import {
   NativeModules,
   Platform,
   UIManager,
-  HostComponent,
+  type HostComponent,
 } from 'react-native';
 import {PROVIDER_DEFAULT, PROVIDER_GOOGLE} from './ProviderConstants';
-import {Provider} from './sharedTypes';
+import type {Provider} from './sharedTypes';
 import {MapCallout} from './MapCallout';
 import {MapOverlay} from './MapOverlay';
 import {MapCalloutSubview} from './MapCalloutSubview';
@@ -23,7 +23,7 @@ import {Commands} from './MapViewNativeComponent';
 import GooglePolygon from './specs/NativeComponentGooglePolygon';
 import FabricMarker from './specs/NativeComponentMarker';
 import FabricUrlTile from './specs/NativeComponentUrlTile';
-import FabricWMSTile from './specs/NativeComponentWMSTile.ts';
+import FabricWMSTile from './specs/NativeComponentWMSTile';
 import FabricCallout from './specs/NativeComponentCallout';
 import FabricPolyline from './specs/NativeComponentPolyline';
 import FabricCircle from './specs/NativeComponentCircle';
@@ -73,6 +73,7 @@ export default function decorateMapComponent<Type extends Component>(
   const getDefaultComponent = () =>
     requireNativeComponent(getNativeComponentName(undefined, componentName));
 
+  // @ts-ignore
   Component.contextType = ProviderContext;
 
   Component.prototype.getNativeComponent =
@@ -126,8 +127,13 @@ export default function decorateMapComponent<Type extends Component>(
         return components[key];
       }
 
+      if (!provider) {
+        throw new Error('react-native-maps: provider is not set');
+      }
+
       // @ts-ignore
       const providerInfo = providers[provider];
+
       // quick fix. Previous code assumed android | ios
       if (Platform.OS !== 'android' && Platform.OS !== 'ios') {
         throw new Error(`react-native-maps doesn't support ${Platform.OS}`);

package/src/fixImageProp.ts

@@ -1,4 +1,4 @@
-import {Image, ImageSourcePropType} from 'react-native';
+import {Image, type ImageSourcePropType} from 'react-native';
 
 export function fixImageProp(
   image: ImageSourcePropType,

package/src/index.ts

@@ -1,7 +1,7 @@
 import MapView, {
   AnimatedMapView as Animated,
   MAP_TYPES,
-  MapViewProps,
+  type MapViewProps,
 } from './MapView';
 
 import Marker from './MapMarker';

package/src/sharedTypes.ts

@@ -1,4 +1,4 @@
-import {NativeSyntheticEvent} from 'react-native';
+import type {NativeSyntheticEvent} from 'react-native';
 
 export type Provider = 'google' | undefined;
 

package/src/specs/NativeAirMapsModule.ts

@@ -2,7 +2,7 @@ import type {TurboModule} from 'react-native';
 import {TurboModuleRegistry} from 'react-native';
 import type {Double} from 'react-native/Libraries/Types/CodegenTypes';
 import type {Camera} from './NativeComponentMapView';
-import {Address} from '../MapView.types';
+import type {Address} from '../MapView.types';
 
 type LatLng = {
   latitude: Double;

package/src/specs/NativeComponentCallout.ts

@@ -1,7 +1,7 @@
 import type {HostComponent, ViewProps} from 'react-native';
 
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import {
+import type {
   Double,
   BubblingEventHandler,
 } from 'react-native/Libraries/Types/CodegenTypes';

package/src/specs/NativeComponentCircle.ts

@@ -1,10 +1,11 @@
 import type {HostComponent, ViewProps, ColorValue} from 'react-native';
 
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import {
+import type {
   Double,
   Float,
   BubblingEventHandler,
+  WithDefault,
 } from 'react-native/Libraries/Types/CodegenTypes';
 
 export type LatLng = Readonly<{
@@ -77,7 +78,7 @@ export interface CircleFabricNativeProps extends ViewProps {
    * @platform iOS: Supported
    * @platform Android: Supported
    */
-  strokeWidth?: Float;
+  strokeWidth?: WithDefault<Float, 1.0>;
 
   /**
    * Boolean to allow a polygon to be tappable and use the onPress function.

package/src/specs/NativeComponentGoogleMapView.ts

@@ -1,8 +1,9 @@
+// @ts-nocheck
 import type {HostComponent, ViewProps, ColorValue} from 'react-native';
 
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
-import {
+import type {
   Double,
   Int32,
   WithDefault,
@@ -10,6 +11,7 @@ import {
   DirectEventHandler,
   BubblingEventHandler,
 } from 'react-native/Libraries/Types/CodegenTypes';
+import GoogleMapView from './NativeComponentGoogleMapView';
 
 export type EdgePadding = Readonly<{
   top: Double; // Non-nullable Double for top
@@ -305,7 +307,7 @@ export type RegionChangeEvent = Readonly<{
     latitudeDelta: Double; // Non-nullable Double for latitudeDelta
     longitudeDelta: Double; // Non-nullable Double for longitudeDelta
   }; // The region object
-  continuous?: boolean;
+  isGesture?: boolean;
 }>;
 
 export type RegionChangeEventHandler = BubblingEventHandler<RegionChangeEvent>;
@@ -859,45 +861,45 @@ export interface MapFabricNativeProps extends ViewProps {
   zoomTapEnabled?: WithDefault<boolean, true>;
 }
 
-export interface NativeCommands {
+interface NativeCommands {
   animateToRegion: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof GoogleMapView>,
     regionJSON: string,
     duration: Int32,
   ) => void;
 
   setCamera: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof GoogleMapView>,
     cameraJSON: string,
   ) => void;
 
   animateCamera: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof GoogleMapView>,
     cameraJSON: string,
     duration: Int32,
   ) => void;
 
   fitToElements: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof GoogleMapView>,
     edgePaddingJSON: string,
     animated: boolean,
   ) => void;
 
   fitToSuppliedMarkers: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof GoogleMapView>,
     markersJSON: string,
     edgePaddingJSON: string,
     animated: boolean,
   ) => void;
 
   fitToCoordinates: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof GoogleMapView>,
     coordinatesJSON: string,
     edgePaddingJSON: string,
     animated: boolean,
   ) => void;
   setIndoorActiveLevelIndex: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof GoogleMapView>,
     activeLevelIndex: Int32,
   ) => void;
 }

package/src/specs/NativeComponentGooglePolygon.ts

@@ -1,9 +1,11 @@
 import type {HostComponent, ViewProps, ColorValue} from 'react-native';
 
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import {
+import type {
   Double,
   BubblingEventHandler,
+  Float,
+  WithDefault,
 } from 'react-native/Libraries/Types/CodegenTypes';
 
 export type LatLng = Readonly<{
@@ -53,6 +55,15 @@ export interface PolygonFabricNativeProps extends ViewProps {
    */
   strokeColor?: ColorValue;
 
+  /**
+   * The stroke width to use for the path.
+   *
+   * @default 1
+   * @platform iOS: Supported
+   * @platform Android: Supported
+   */
+  strokeWidth?: WithDefault<Float, 1.0>;
+
   /**
    * Boolean to indicate whether to draw each segment of the line as a geodesic as opposed to straight lines on the Mercator projection.
    * A geodesic is the shortest path between two points on the Earth's surface.

package/src/specs/NativeComponentMapView.ts

@@ -1,8 +1,9 @@
+// @ts-nocheck
 import type {HostComponent, ViewProps, ColorValue} from 'react-native';
 
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
-import {
+import type {
   Double,
   Int32,
   WithDefault,
@@ -10,6 +11,7 @@ import {
   DirectEventHandler,
   BubblingEventHandler,
 } from 'react-native/Libraries/Types/CodegenTypes';
+import FabricMapView from './NativeComponentMapView';
 
 export type EdgePadding = Readonly<{
   top: Double; // Non-nullable Double for top
@@ -299,7 +301,7 @@ export type RegionChangeEvent = Readonly<{
     latitudeDelta: Double; // Non-nullable Double for latitudeDelta
     longitudeDelta: Double; // Non-nullable Double for longitudeDelta
   }; // The region object
-  continuous?: boolean;
+  isGesture?: boolean;
 }>;
 export type UserLocationChangeEvent = Readonly<{
   coordinate?: {
@@ -1038,46 +1040,46 @@ export interface MapFabricNativeProps extends ViewProps {
   cameraZoomRange?: CameraZoomRange;
 }
 
-export interface NativeCommands {
+interface NativeCommands {
   animateToRegion: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof FabricMapView>,
     regionJSON: string,
     duration: Int32,
   ) => void;
 
   setCamera: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof FabricMapView>,
     cameraJSON: string,
   ) => void;
 
   animateCamera: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof FabricMapView>,
     cameraJSON: string,
     duration: Int32,
   ) => void;
 
   fitToElements: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof FabricMapView>,
     edgePaddingJSON: string,
     animated: boolean,
   ) => void;
 
   fitToSuppliedMarkers: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof FabricMapView>,
     markersJSON: string,
     edgePaddingJSON: string,
     animated: boolean,
   ) => void;
 
   fitToCoordinates: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof FabricMapView>,
     coordinatesJSON: string,
     edgePaddingJSON: string,
     animated: boolean,
   ) => void;
 
   setIndoorActiveLevelIndex: (
-    viewRef: React.ElementRef<React.ComponentType>,
+    viewRef: React.ElementRef<typeof FabricMapView>,
     activeLevelIndex: Int32,
   ) => void;
 }

package/src/specs/NativeComponentMarker.ts

@@ -1,4 +1,5 @@
-import {HostComponent} from 'react-native';
+// @ts-nocheck
+import type {HostComponent} from 'react-native';
 import type {
   ViewProps,
   ColorValue,
@@ -7,7 +8,7 @@ import type {
 
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
-import {
+import type {
   Int32,
   Double,
   BubblingEventHandler,
@@ -132,6 +133,19 @@ export interface MarkerFabricNativeProps extends ViewProps {
      */
   displayPriority?: WithDefault<AppleMarkerPriority, 'required'>;
 
+  /**
+   * The offset (in points) at which to display the annotation view.
+   *
+   * By default, the center point of an annotation view is placed at the coordinate point of the associated annotation.
+   *
+   * Positive offset values move the annotation view down and to the right, while negative values move it up and to the left.
+   *
+   * @default {x: 0.0, y: 0.0}
+   * @platform iOS: Apple Maps only. For Google Maps, see the `anchor` prop
+   * @platform Android: Not supported. see the `anchor` prop
+   */
+  centerOffset?: Point;
+
   /**
    * The coordinate for the marker.
    *
@@ -173,6 +187,16 @@ export interface MarkerFabricNativeProps extends ViewProps {
    */
   title?: string;
 
+  /**
+   * Sets whether this marker should track view changes.
+   * It's recommended to turn it off whenever it's possible to improve custom marker performance.
+   *
+   * @default true
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  tracksViewChanges?: WithDefault<boolean, true>;
+
   /**
    * A string that can be used to identify this marker.
    *

package/src/specs/NativeComponentOverlay.ts

@@ -1,5 +1,5 @@
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import {
+import type {
   Double,
   Float,
   BubblingEventHandler,

package/src/specs/NativeComponentPolyline.ts

@@ -1,7 +1,7 @@
 import type {HostComponent, ViewProps, ColorValue} from 'react-native';
 
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import {
+import type {
   Double,
   Float,
   BubblingEventHandler,
@@ -107,7 +107,7 @@ export interface PolylineFabricNativeProps extends ViewProps {
    * @platform iOS: Supported
    * @platform Android: Supported
    */
-  strokeWidth?: Float;
+  strokeWidth?: WithDefault<Float, 1.0>;
 
   /**
    * Boolean to allow a polygon to be tappable and use the onPress function.

package/src/specs/NativeComponentUrlTile.ts

@@ -1,7 +1,10 @@
 import type {HostComponent, ViewProps} from 'react-native';
 
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import {Int32, WithDefault} from 'react-native/Libraries/Types/CodegenTypes';
+import type {
+  Int32,
+  WithDefault,
+} from 'react-native/Libraries/Types/CodegenTypes';
 
 export interface UrlTileFabricNativeProps extends ViewProps {
   /**

package/src/specs/NativeComponentWMSTile.ts

@@ -1,7 +1,10 @@
 import type {HostComponent, ViewProps} from 'react-native';
 
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import {Int32, WithDefault} from 'react-native/Libraries/Types/CodegenTypes';
+import type {
+  Int32,
+  WithDefault,
+} from 'react-native/Libraries/Types/CodegenTypes';
 
 export interface WMSTileFabricNativeProps extends ViewProps {
   /**

package/android/src/main/java/com/rnmaps/maps/MapAirModulePackage.java

@@ -1,98 +0,0 @@
-package com.rnmaps.maps;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.TurboReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.module.model.ReactModuleInfo;
-import com.facebook.react.module.model.ReactModuleInfoProvider;
-import com.facebook.react.uimanager.ViewManager;
-import com.facebook.fbreact.specs.NativeAirMapsModuleSpec;
-import com.rnmaps.fabric.CalloutManager;
-import com.rnmaps.fabric.CircleManager;
-import com.rnmaps.fabric.MapViewManager;
-import com.rnmaps.fabric.MarkerManager;
-import com.rnmaps.fabric.NativeAirMapsModule;
-import com.rnmaps.fabric.OverlayManager;
-import com.rnmaps.fabric.PolygonManager;
-import com.rnmaps.fabric.PolylineManager;
-import com.rnmaps.fabric.UrlTileManager;
-import com.rnmaps.fabric.WMSTileManager;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class MapAirModulePackage extends TurboReactPackage {
-
-    @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return List.of(new MapViewManager(reactContext),
-                new MarkerManager(reactContext),
-                new CalloutManager(reactContext),
-                new PolygonManager(reactContext),
-                new PolylineManager(reactContext),
-                new CircleManager(reactContext),
-                new OverlayManager(reactContext),
-                new UrlTileManager(reactContext),
-                new WMSTileManager(reactContext));
-    }
-
-
-    @Override
-    public NativeModule getModule(String name, ReactApplicationContext reactContext) {
-        if (OverlayManager.REACT_CLASS.equals(name)) {
-            return new OverlayManager(reactContext);
-        }
-        if (CircleManager.REACT_CLASS.equals(name)) {
-            return new CircleManager(reactContext);
-        }
-        if (PolylineManager.REACT_CLASS.equals(name)) {
-            return new PolylineManager(reactContext);
-        }
-        if (PolygonManager.REACT_CLASS.equals(name)) {
-            return new PolygonManager(reactContext);
-        }
-        if (CalloutManager.REACT_CLASS.equals(name)) {
-            return new CalloutManager(reactContext);
-        }
-        if (MarkerManager.REACT_CLASS.equals(name)) {
-            return new MarkerManager(reactContext);
-        }
-        if (MapViewManager.REACT_CLASS.equals(name)) {
-            return new MapViewManager(reactContext);
-        }
-        if (UrlTileManager.REACT_CLASS.equals(name)) {
-            return new UrlTileManager(reactContext);
-        }
-        if (WMSTileManager.REACT_CLASS.equals(name)) {
-            return new WMSTileManager(reactContext);
-        }
-        if (NativeAirMapsModuleSpec.NAME.equals(name)) {
-            return new NativeAirMapsModule(reactContext);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public ReactModuleInfoProvider getReactModuleInfoProvider() {
-        return new ReactModuleInfoProvider() {
-            @NonNull
-            @Override
-            public Map<String, ReactModuleInfo> getReactModuleInfos() {
-                Map<String, ReactModuleInfo> map = new HashMap<>();
-                map.put(NativeAirMapsModuleSpec.NAME, new ReactModuleInfo(
-                        NativeAirMapsModuleSpec.NAME,       // name
-                        NativeAirMapsModuleSpec.NAME,       // className
-                        false, // canOverrideExistingModule
-                        false, // needsEagerInit
-                        false, // isCXXModule
-                        true   // isTurboModule
-                ));
-                return map;
-            }
-        };
-    }
-}