@rnmapbox/maps 10.1.45 → 10.2.0

package/rnmapbox-maps.podspec

@@ -20,7 +20,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 ## Warning: these lines are scanned by autogenerate.js
-rnMapboxMapsDefaultMapboxVersion = '~> 10.19.0'
+rnMapboxMapsDefaultMapboxVersion = '~> 11.15.2'
 
 rnMapboxMapsDefaultImpl = 'mapbox'
 
@@ -35,6 +35,12 @@ end
 
 new_arch_enabled = $RNMapboxMaps.compute_new_arch_enabled
 
+unless new_arch_enabled
+  puts "⚠️ RNMapbox DEPRECATION WARNING: Old React Native Architecture (Paper/bridge) is deprecated and will not receive active support."
+  puts "⚠️ RNMapbox: Please upgrade to New Architecture (Fabric/TurboModules) for continued support and updates."
+  puts "⚠️ RNMapbox: For sponsor-only support for old architecture: https://github.com/sponsors/rnmapbox"
+end
+
 # DEPRECATIONS
 
 if $RNMBGL_Use_SPM
@@ -85,10 +91,15 @@ end
 
 if $RNMapboxMapsUseV11 != nil
   warn "WARNING: $RNMapboxMapsUseV11 is deprecated just set $RNMapboxMapsVersion to '= 11.15.0"
+  $RNMapboxMapsUseV11Imp = $RNMapboxMapsUseV11
 end
 
 if $MapboxImplVersion =~ /(~>|>=|=|>)?\S*11\./
-  $RNMapboxMapsUseV11 = true
+  $RNMapboxMapsUseV11Imp = true
+else
+  puts "⚠️ RNMapbox DEPRECATION WARNING: Mapbox v10.x is deprecated and will not receive active support."
+  puts "⚠️ RNMapbox: Please upgrade to Mapbox v11.x for continued support and updates."
+  puts "⚠️ RNMapbox: For sponsor-only support for v10.x: https://github.com/sponsors/rnmapbox"
 end
 
 def $RNMapboxMaps._check_no_mapbox_spm(project)
@@ -141,7 +152,7 @@ end
 
 def $RNMapboxMaps.post_install(installer)
   map_pod = installer.pod_targets.find {|p| p.name == "MapboxMaps" }
-  use_v11 = $RNMapboxMapsUseV11 || (map_pod && map_pod.version.split('.')[0].to_i >= 11)
+  use_v11 = $RNMapboxMapsUseV11Imp || (map_pod && map_pod.version.split('.')[0].to_i >= 11)
   if use_v11
     installer.pods_project.build_configurations.each do |config|
       config.build_settings['OTHER_SWIFT_FLAGS'] ||= ['$(inherited)', '-D RNMBX_11']
@@ -200,6 +211,11 @@ end
 
 ## RNMapboxMapsDownloadToken
 # expo does not support `.netrc`, so we need to patch curl command used by cocoapods to pass the credentials
+# Supports both config variable and environment variable RNMAPBOX_MAPS_DOWNLOAD_TOKEN
+
+if !$RNMapboxMapsDownloadToken && ENV['RNMAPBOX_MAPS_DOWNLOAD_TOKEN']
+  $RNMapboxMapsDownloadToken = ENV['RNMAPBOX_MAPS_DOWNLOAD_TOKEN']
+end
 
 if $RNMapboxMapsDownloadToken
   module AddCredentialsToCurlWhenDownloadingMapbox
@@ -228,7 +244,7 @@ Pod::Spec.new do |s|
   s.homepage    	= "https://github.com/rnmapbox/maps#readme"
   s.source      	= { :git => "https://github.com/rnmapbox/maps.git" }
   s.license     	= "MIT"
-  if $RNMapboxMapsUseV11
+  if $RNMapboxMapsUseV11Imp
     s.platform    	= :ios, "12.4"
   else
     s.platform    	= :ios, "11.0"

package/setup-jest.js

@@ -1,4 +1,5 @@
 // copied from `react-16-node-hanging-test-fix` module. Without it we get jest hangs.
+/* global jest */
 delete global.MessageChannel;
 import { NativeModules } from 'react-native';
 

package/src/Mapbox.native.ts

@@ -0,0 +1,125 @@
+export * from './RNMBXModule';
+
+export {
+  Camera,
+  UserTrackingMode,
+  type CameraPadding,
+  type CameraAnimationMode,
+  type CameraBounds,
+  type CameraStop,
+} from './components/Camera';
+export { Atmosphere } from './components/Atmosphere';
+export { default as MapView, type MapState } from './components/MapView';
+export { default as Light } from './components/Light';
+export { default as PointAnnotation } from './components/PointAnnotation';
+export { default as Annotation } from './components/Annotation';
+export { default as Callout } from './components/Callout';
+export { default as StyleImport } from './components/StyleImport';
+export {
+  default as UserLocation,
+  UserLocationRenderMode,
+} from './components/UserLocation';
+export { default as LocationPuck } from './components/LocationPuck';
+export { default as VectorSource } from './components/VectorSource';
+export { ShapeSource } from './components/ShapeSource';
+export { default as RasterSource } from './components/RasterSource';
+export { default as RasterDemSource } from './components/RasterDemSource';
+export { default as ImageSource } from './components/ImageSource';
+export { Viewport } from './components/Viewport';
+export { default as Models } from './components/Models';
+export { default as Images, type ImageEntry } from './components/Images';
+export { default as Image } from './components/Image';
+export { default as FillLayer } from './components/FillLayer';
+export { default as FillExtrusionLayer } from './components/FillExtrusionLayer';
+export { default as HeatmapLayer } from './components/HeatmapLayer';
+export { default as LineLayer } from './components/LineLayer';
+export { default as CircleLayer } from './components/CircleLayer';
+export { default as SkyLayer } from './components/SkyLayer';
+export { default as ModelLayer } from './components/ModelLayer';
+export { SymbolLayer } from './components/SymbolLayer';
+export { default as RasterLayer } from './components/RasterLayer';
+export { default as BackgroundLayer } from './components/BackgroundLayer';
+export { default as CustomLocationProvider } from './components/CustomLocationProvider';
+export { Terrain } from './components/Terrain';
+export {
+  default as locationManager,
+  type Location,
+} from './modules/location/locationManager';
+export {
+  default as offlineManager,
+  OfflineCreatePackOptions,
+} from './modules/offline/offlineManager';
+export { default as offlineManagerLegacy } from './modules/offline/offlineManagerLegacy';
+export { default as TileStore } from './modules/offline/TileStore';
+export {
+  default as snapshotManager,
+  type SnapshotOptions,
+} from './modules/snapshot/snapshotManager';
+export { default as MarkerView } from './components/MarkerView';
+export { default as Animated } from './utils/animated/Animated';
+export {
+  AnimatedCoordinatesArray,
+  AnimatedExtractCoordinateFromArray,
+  AnimatedPoint,
+  AnimatedRouteCoordinatesArray,
+  AnimatedShape,
+} from './classes';
+export { default as Style } from './components/Style';
+export { default as Logger, type LogLevel } from './utils/Logger';
+export { requestAndroidLocationPermissions } from './requestAndroidLocationPermissions';
+export { getAnnotationsLayerID } from './utils/getAnnotationsLayerID';
+export type {
+  FillLayerStyleProps as FillLayerStyle,
+  LineLayerStyleProps as LineLayerStyle,
+  SymbolLayerStyleProps as SymbolLayerStyle,
+  CircleLayerStyleProps as CircleLayerStyle,
+  HeatmapLayerStyleProps as HeatmapLayerStyle,
+  FillExtrusionLayerStyleProps as FillExtrusionLayerStyle,
+  RasterLayerStyleProps as RasterLayerStyle,
+  HillshadeLayerStyleProps as HillshadeLayerStyle,
+  BackgroundLayerStyleProps as BackgroundLayerStyle,
+  SkyLayerStyleProps as SkyLayerStyle,
+  LightLayerStyleProps as LightLayerStyle,
+  AtmosphereLayerStyleProps as AtmosphereLayerStyle,
+  TerrainLayerStyleProps as TerrainLayerStyle,
+  ModelLayerStyleProps as ModelLayerStyle,
+} from './utils/MapboxStyles';
+
+import { deprecatedClass } from './utils/deprecation';
+import { AnimatedPoint } from './classes';
+import { UserTrackingMode } from './components/Camera';
+import MovePointShapeAnimator from './shapeAnimators/MovePointShapeAnimator';
+import ChangeLineOffsetsShapeAnimator from './shapeAnimators/ChangeLineOffsetsShapeAnimator';
+import LocationPuck from './components/LocationPuck';
+
+/** @deprecated This will be removed in a future release. Use `AnimatedPoint` instead. */
+
+export const AnimatedMapPoint = deprecatedClass(
+  AnimatedPoint,
+  'AnimatedMapPoint is deprecated please use AnimatedPoint',
+);
+
+/** @deprecated NativeUserLocation will be removed in future release. Use `LocationPuck` instead. */
+export const NativeUserLocation = LocationPuck;
+
+// types:
+export enum StyleURL {
+  Street = 'mapbox://styles/mapbox/streets-v11',
+  Dark = 'mapbox://styles/mapbox/dark-v10',
+  Light = 'mapbox://styles/mapbox/light-v10',
+  Outdoors = 'mapbox://styles/mapbox/outdoors-v11',
+  Satellite = 'mapbox://styles/mapbox/satellite-v9',
+  SatelliteStreet = 'mapbox://styles/mapbox/satellite-streets-v11',
+  TrafficDay = 'mapbox://styles/mapbox/navigation-preview-day-v4',
+  TrafficNight = 'mapbox://styles/mapbox/navigation-preview-night-v4',
+}
+
+/** @deprecated UserTrackingModes is deprecated use UserTrackingMode */
+export const UserTrackingModes = UserTrackingMode;
+
+/** @experimental */
+
+export const __experimental = {
+  MovePointShapeAnimator,
+  ChangeLineOffsetsShapeAnimator,
+};

package/src/Mapbox.ts

@@ -1,125 +1,4 @@
-export * from './RNMBXModule';
+export * from './web';
+import Mapbox from './web';
 
-export {
-  Camera,
-  UserTrackingMode,
-  type CameraPadding,
-  type CameraAnimationMode,
-  type CameraBounds,
-  type CameraStop,
-} from './components/Camera';
-export { Atmosphere } from './components/Atmosphere';
-export { default as MapView, type MapState } from './components/MapView';
-export { default as Light } from './components/Light';
-export { default as PointAnnotation } from './components/PointAnnotation';
-export { default as Annotation } from './components/Annotation';
-export { default as Callout } from './components/Callout';
-export { default as StyleImport } from './components/StyleImport';
-export {
-  default as UserLocation,
-  UserLocationRenderMode,
-} from './components/UserLocation';
-export { default as LocationPuck } from './components/LocationPuck';
-export { default as VectorSource } from './components/VectorSource';
-export { ShapeSource } from './components/ShapeSource';
-export { default as RasterSource } from './components/RasterSource';
-export { default as RasterDemSource } from './components/RasterDemSource';
-export { default as ImageSource } from './components/ImageSource';
-export { Viewport } from './components/Viewport';
-export { default as Models } from './components/Models';
-export { default as Images, type ImageEntry } from './components/Images';
-export { default as Image } from './components/Image';
-export { default as FillLayer } from './components/FillLayer';
-export { default as FillExtrusionLayer } from './components/FillExtrusionLayer';
-export { default as HeatmapLayer } from './components/HeatmapLayer';
-export { default as LineLayer } from './components/LineLayer';
-export { default as CircleLayer } from './components/CircleLayer';
-export { default as SkyLayer } from './components/SkyLayer';
-export { default as ModelLayer } from './components/ModelLayer';
-export { SymbolLayer } from './components/SymbolLayer';
-export { default as RasterLayer } from './components/RasterLayer';
-export { default as BackgroundLayer } from './components/BackgroundLayer';
-export { default as CustomLocationProvider } from './components/CustomLocationProvider';
-export { Terrain } from './components/Terrain';
-export {
-  default as locationManager,
-  type Location,
-} from './modules/location/locationManager';
-export {
-  default as offlineManager,
-  OfflineCreatePackOptions,
-} from './modules/offline/offlineManager';
-export { default as offlineManagerLegacy } from './modules/offline/offlineManagerLegacy';
-export { default as TileStore } from './modules/offline/TileStore';
-export {
-  default as snapshotManager,
-  type SnapshotOptions,
-} from './modules/snapshot/snapshotManager';
-export { default as MarkerView } from './components/MarkerView';
-export { default as Animated } from './utils/animated/Animated';
-export {
-  AnimatedCoordinatesArray,
-  AnimatedExtractCoordinateFromArray,
-  AnimatedPoint,
-  AnimatedRouteCoordinatesArray,
-  AnimatedShape,
-} from './classes';
-export { default as Style } from './components/Style';
-export { default as Logger, type LogLevel } from './utils/Logger';
-export { requestAndroidLocationPermissions } from './requestAndroidLocationPermissions';
-export { getAnnotationsLayerID } from './utils/getAnnotationsLayerID';
-export type {
-  FillLayerStyleProps as FillLayerStyle,
-  LineLayerStyleProps as LineLayerStyle,
-  SymbolLayerStyleProps as SymbolLayerStyle,
-  CircleLayerStyleProps as CircleLayerStyle,
-  HeatmapLayerStyleProps as HeatmapLayerStyle,
-  FillExtrusionLayerStyleProps as FillExtrusionLayerStyle,
-  RasterLayerStyleProps as RasterLayerStyle,
-  HillshadeLayerStyleProps as HillshadeLayerStyle,
-  BackgroundLayerStyleProps as BackgroundLayerStyle,
-  SkyLayerStyleProps as SkyLayerStyle,
-  LightLayerStyleProps as LightLayerStyle,
-  AtmosphereLayerStyleProps as AtmosphereLayerStyle,
-  TerrainLayerStyleProps as TerrainLayerStyle,
-  ModelLayerStyleProps as ModelLayerStyle,
-} from './utils/MapboxStyles';
-
-import { deprecatedClass } from './utils/deprecation';
-import { AnimatedPoint } from './classes';
-import { UserTrackingMode } from './components/Camera';
-import MovePointShapeAnimator from './shapeAnimators/MovePointShapeAnimator';
-import ChangeLineOffsetsShapeAnimator from './shapeAnimators/ChangeLineOffsetsShapeAnimator';
-import LocationPuck from './components/LocationPuck';
-
-/** @deprecated This will be removed in a future release. Use `AnimatedPoint` instead. */
-
-export const AnimatedMapPoint = deprecatedClass(
-  AnimatedPoint,
-  'AnimatedMapPoint is deprecated please use AnimatedPoint',
-);
-
-/** @deprecated NativeUserLocation will be removed in future release. Use `LocationPuck` instead. */
-export const NativeUserLocation = LocationPuck;
-
-// types:
-export enum StyleURL {
-  Street = 'mapbox://styles/mapbox/streets-v11',
-  Dark = 'mapbox://styles/mapbox/dark-v10',
-  Light = 'mapbox://styles/mapbox/light-v10',
-  Outdoors = 'mapbox://styles/mapbox/outdoors-v11',
-  Satellite = 'mapbox://styles/mapbox/satellite-v9',
-  SatelliteStreet = 'mapbox://styles/mapbox/satellite-streets-v11',
-  TrafficDay = 'mapbox://styles/mapbox/navigation-preview-day-v4',
-  TrafficNight = 'mapbox://styles/mapbox/navigation-preview-night-v4',
-}
-
-/** @deprecated UserTrackingModes is deprecated use UserTrackingMode */
-export const UserTrackingModes = UserTrackingMode;
-
-/** @experimental */
-
-export const __experimental = {
-  MovePointShapeAnimator,
-  ChangeLineOffsetsShapeAnimator,
-};
+export default Mapbox;

package/src/RNMBXModule.ts

@@ -37,7 +37,6 @@ interface RNMBXModule {
   setConnected(connected: boolean): void;
 }
 
-// eslint-disable-next-line prefer-destructuring
 const RNMBXModule: RNMBXModule = NativeModules.RNMBXModule;
 if (NativeModules.RNMBXModule == null) {
   if ((global as { expo?: unknown }).expo != null) {

package/src/classes/AnimatedRouteCoordinatesArray.js

@@ -1,7 +1,7 @@
 import {
   lineString,
   point,
-  convertDistance as convertDistanceFn, // eslint-disable-line import/named
+  convertDistance as convertDistanceFn,
   convertLength as convertLengthFn,
 } from '@turf/helpers';
 import distance from '@turf/distance';

package/src/components/Annotation.tsx

@@ -130,6 +130,8 @@ class Annotation extends React.Component<Props, AnnotationState> {
       <Animated.ShapeSource
         id={this.props.id}
         onPress={this.onPress}
+        // @ts-expect-error TODO: WithAnimatedObject is not exported from React Native's new type structure
+        // Need to find the correct replacement type or use Animated.AnimatedComponent
         shape={this.state.shape as RNAnimated.WithAnimatedObject<Point>}
       >
         {children}

package/src/components/Atmosphere.tsx

@@ -1,4 +1,4 @@
-import React, { memo, useMemo } from 'react';
+import { memo, useMemo } from 'react';
 
 import type { AtmosphereLayerStyleProps } from '../utils/MapboxStyles';
 import { transformStyle } from '../utils/StyleValue';

package/src/components/BackgroundLayer.tsx

@@ -1,16 +1,16 @@
 import React from 'react';
 import { NativeModules } from 'react-native';
 
-import {
+import type {
   FilterExpression,
   BackgroundLayerStyleProps,
 } from '../utils/MapboxStyles';
-import { StyleValue } from '../utils/StyleValue';
+import type { StyleValue } from '../utils/StyleValue';
 import RNMBXBackgroundLayerNativeComponent from '../specs/RNMBXBackgroundLayerNativeComponent';
 
 import AbstractLayer from './AbstractLayer';
 
-const MapboxGL = NativeModules.RNMBXModule;
+const Mapbox = NativeModules.RNMBXModule;
 
 export type Props = {
   /**
@@ -19,7 +19,7 @@ export type Props = {
   id: string;
 
   /**
-   * The id refers to en existing layer in the style. Does not create a new layer.
+   * The id refers to an existing layer in the style. Does not create a new layer.
    */
   existing?: boolean;
 
@@ -77,7 +77,7 @@ type NativeTypeProps = Omit<Props, 'style'> & {
 
 class BackgroundLayer extends AbstractLayer<Props, NativeTypeProps> {
   static defaultProps = {
-    sourceID: MapboxGL.StyleSource.DefaultSourceID,
+    sourceID: Mapbox.StyleSource.DefaultSourceID,
   };
 
   render() {
@@ -86,8 +86,8 @@ class BackgroundLayer extends AbstractLayer<Props, NativeTypeProps> {
       sourceLayerID: this.props.sourceLayerID,
     };
     return (
+      // @ts-expect-error just codegen stuff
       <RNMBXBackgroundLayerNativeComponent
-        // @ts-expect-error just codegen stuff
         ref={this.setNativeLayer}
         {...props}
       />

package/src/components/Camera.tsx

@@ -342,7 +342,7 @@ export const Camera = memo(
 
           const paddingBottom =
             stop.padding?.paddingBottom ?? stop.bounds?.paddingBottom;
-          if (paddingBottom != undefined) {
+          if (paddingBottom !== undefined) {
             _nativeStop.paddingBottom = paddingBottom;
           }
 
@@ -476,14 +476,14 @@ export const Camera = memo(
         };
 
         if (typeof paddingConfig === 'object') {
-          if (paddingConfig.length === 2) {
+          if (validPaddingConfig2(paddingConfig)) {
             _padding = {
               paddingTop: paddingConfig[0],
               paddingBottom: paddingConfig[0],
               paddingLeft: paddingConfig[1],
               paddingRight: paddingConfig[1],
             };
-          } else if (paddingConfig.length === 4) {
+          } else if (validPaddingConfig4(paddingConfig)) {
             _padding = {
               paddingTop: paddingConfig[0],
               paddingBottom: paddingConfig[2],
@@ -552,13 +552,13 @@ export const Camera = memo(
       const zoomTo = useCallback(_zoomTo, [setCamera]);
 
       const moveBy: CameraRef['moveBy'] = useCallback(
-        (
-          moveProps,
-        ) => {
+        (moveProps) => {
           commands.call<void>('moveBy', [
             moveProps.x,
             moveProps.y,
-            'animationMode' in moveProps ? nativeAnimationMode(moveProps.animationMode) : nativeAnimationMode('linearTo'),
+            'animationMode' in moveProps
+              ? nativeAnimationMode(moveProps.animationMode)
+              : nativeAnimationMode('linearTo'),
             'animationDuration' in moveProps ? moveProps.animationDuration : 0,
           ]);
         },
@@ -566,14 +566,16 @@ export const Camera = memo(
       );
 
       const scaleBy: CameraRef['scaleBy'] = useCallback(
-        (
-          scaleProps
-        ) => {
+        (scaleProps) => {
           commands.call<void>('scaleBy', [
             scaleProps.x,
             scaleProps.y,
-            'animationMode' in scaleProps ? nativeAnimationMode(scaleProps.animationMode) : nativeAnimationMode('linearTo'),
-            'animationDuration' in scaleProps ? scaleProps.animationDuration : 0,
+            'animationMode' in scaleProps
+              ? nativeAnimationMode(scaleProps.animationMode)
+              : nativeAnimationMode('linearTo'),
+            'animationDuration' in scaleProps
+              ? scaleProps.animationDuration
+              : 0,
             scaleProps.scaleFactor,
           ]);
         },
@@ -643,7 +645,7 @@ export const Camera = memo(
         /**
          * Move the map by a given screen coordinate offset with optional animation.
          * Can be used to get the Android Auto (onScroll) or Carplay(mapTemplate didUpdatePanGestureWithTranslation) pan gesture applied, for these to work properly do not specify animationDuration.
-         * 
+         *
          * @param {number} x screen coordinate offset
          * @param {number} y screen coordinate offset
          * @param {NativeAnimationMode} animationMode mode used for the animation
@@ -654,7 +656,7 @@ export const Camera = memo(
         /**
          * Scale the map with optional animation.
          * Can be used to get Android Auto pinch gesture (onScale with scaleFactor > 0.0 and < 2.0) or Android Auto double tap (onScale with scaleFactor == 2.0) applied.
-         * 
+         *
          * @param {number} x center screen coordinate
          * @param {number} y center screen coordinate
          * @param {number} scaleFactor scale factor value > 0.0 and < 2.0 when 1.0 means no scaling, > 1.0 zoom in and < 1.0 zoom out
@@ -667,7 +669,6 @@ export const Camera = memo(
       return (
         <RNMBXCamera
           testID={'Camera'}
-          // @ts-expect-error just codegen stuff
           ref={nativeCamera}
           stop={nativeStop}
           animationDuration={animationDuration}
@@ -682,7 +683,7 @@ export const Camera = memo(
           minZoomLevel={minZoomLevel}
           maxZoomLevel={maxZoomLevel}
           maxBounds={nativeMaxBounds}
-          // @ts-expect-error just codegen stuff
+          // @ts-ignore just codegen stuff
           onUserTrackingModeChange={_onUserTrackingModeChange}
         />
       );
@@ -690,6 +691,18 @@ export const Camera = memo(
   ),
 );
 
+function validPaddingConfig2(
+  paddingConfig: number[],
+): paddingConfig is [number, number] {
+  return paddingConfig.length === 2;
+}
+
+function validPaddingConfig4(
+  paddingConfig: number[],
+): paddingConfig is [number, number, number, number] {
+  return paddingConfig.length === 4;
+}
+
 const RNMBXCamera = NativeCameraView;
 
 export type Camera = CameraRef;

package/src/components/CircleLayer.tsx

@@ -19,7 +19,7 @@ type LayerPropsCommon = {
   id: string;
 
   /**
-   * The id refers to en existing layer in the style. Does not create a new layer.
+   * The id refers to an existing layer in the style. Does not create a new layer.
    */
   existing?: boolean;
 

package/src/components/CustomLocationProvider.tsx

@@ -1,4 +1,4 @@
-import React, { memo } from 'react';
+import { memo } from 'react';
 
 import RNMBXCustomLocationProvider from '../specs/RNMBXCustomLocationProviderNativeComponent';
 import { Position } from '../types/Position';

package/src/components/FillExtrusionLayer.tsx

@@ -10,7 +10,7 @@ import RNMBXFillExtrusionLayerNativeComponent from '../specs/RNMBXFillExtrusionL
 
 import AbstractLayer from './AbstractLayer';
 
-const MapboxGL = NativeModules.RNMBXModule;
+const Mapbox = NativeModules.RNMBXModule;
 
 export type Props = {
   /**
@@ -19,7 +19,7 @@ export type Props = {
   id: string;
 
   /**
-   * The id refers to en existing layer in the style. Does not create a new layer.
+   * The id refers to an existing layer in the style. Does not create a new layer.
    */
   existing?: boolean;
 
@@ -80,7 +80,7 @@ type NativeTypeProps = Omit<Props, 'style'> & {
  */
 class FillExtrusionLayer extends AbstractLayer<Props, NativeTypeProps> {
   static defaultProps = {
-    sourceID: MapboxGL.StyleSource.DefaultSourceID,
+    sourceID: Mapbox.StyleSource.DefaultSourceID,
   };
 
   render() {
@@ -90,8 +90,8 @@ class FillExtrusionLayer extends AbstractLayer<Props, NativeTypeProps> {
       sourceLayerID: this.props.sourceLayerID,
     };
     return (
+      // @ts-expect-error just codegen stuff
       <RNMBXFillExtrusionLayerNativeComponent
-        // @ts-expect-error just codegen stuff
         ref={this.setNativeLayer}
         {...props}
       />

package/src/components/FillLayer.tsx

@@ -1,8 +1,11 @@
 import React from 'react';
 import { NativeModules } from 'react-native';
 
-import { FilterExpression, FillLayerStyleProps } from '../utils/MapboxStyles';
-import { StyleValue } from '../utils/StyleValue';
+import type {
+  FilterExpression,
+  FillLayerStyleProps,
+} from '../utils/MapboxStyles';
+import type { StyleValue } from '../utils/StyleValue';
 import RNMBXFillLayerNativeComponent from '../specs/RNMBXFillLayerNativeComponent';
 
 import AbstractLayer from './AbstractLayer';
@@ -19,7 +22,7 @@ type LayerPropsCommon = {
   id: string;
 
   /**
-   * The id refers to en existing layer in the style. Does not create a new layer.
+   * The id refers to an existing layer in the style. Does not create a new layer.
    */
   existing?: boolean;
 

package/src/components/HeatmapLayer.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 import { NativeModules } from 'react-native';
 
-import {
+import type {
   FilterExpression,
   HeatmapLayerStyleProps,
 } from '../utils/MapboxStyles';
-import { StyleValue } from '../utils/StyleValue';
+import type { StyleValue } from '../utils/StyleValue';
 import RNMBXHeatmapLayerNativeComponent from '../specs/RNMBXHeatmapLayerNativeComponent';
 
 import AbstractLayer from './AbstractLayer';
@@ -22,7 +22,7 @@ type LayerPropsCommon = {
   id: string;
 
   /**
-   * The id refers to en existing layer in the style. Does not create a new layer.
+   * The id refers to an existing layer in the style. Does not create a new layer.
    */
   existing?: boolean;
 

package/src/components/Image.tsx

@@ -50,7 +50,7 @@ const Image = memo(
 
     const refresh = () => {
       const handle = findNodeHandle(imageRef.current as any);
-      NativeRNMBXImageModule.refresh(handle);
+      NativeRNMBXImageModule.refresh(handle ?? null);
     };
 
     React.useImperativeHandle(ref, () => {

package/src/components/ImageSource.tsx

@@ -21,7 +21,7 @@ type Props = BaseProps & {
   id: string;
 
   /**
-   * The id refers to en existing source in the style. Does not create a new source.
+   * The id refers to an existing source in the style. Does not create a new source.
    */
   existing?: boolean;