@rnmapbox/maps 10.1.45 → 10.2.0-beta.3

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 = {
   /**
@@ -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/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 = {
   /**
@@ -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';

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';

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/Images.tsx

@@ -41,13 +41,13 @@ type TypedReactNode<T> = ReactElement<T> | Array<TypedReactNode<T>> | never;
 type NativeImage =
   | string
   | {
-    name: string;
-    sdf?: boolean;
-    stretchX?: [number, number][];
-    stretchY?: [number, number][];
-    content?: [number, number, number, number];
-    scale?: number;
-  };
+      name: string;
+      sdf?: boolean;
+      stretchX?: [number, number][];
+      stretchY?: [number, number][];
+      content?: [number, number, number, number];
+      scale?: number;
+    };
 
 export type ImageEntryData = {
   url?: string;
@@ -129,9 +129,9 @@ class Images extends React.PureComponent<Props> {
           console.error(
             `Use of ${ShapeSource.NATIVE_ASSETS_KEY} in Images#images is not supported use Images#nativeAssetImages`,
           );
-        } else if (_isUrlOrPath(value)) {
+        } else if (_isUrlOrPath(value!)) {
           images[imageName] = value;
-        } else if (isImageSourcePropType(value)) {
+        } else if (isImageSourcePropType(value!)) {
           const res = RNImage.resolveAssetSource(value);
           if (res && res.uri) {
             images[imageName] = res;
@@ -156,7 +156,8 @@ class Images extends React.PureComponent<Props> {
       );
       if (childrenWithWrongType) {
         console.error(
-          `Images component on accepts Image a children passed in: ${(childrenWithWrongType as any).type || 'n/a'
+          `Images component on accepts Image a children passed in: ${
+            (childrenWithWrongType as any).type || 'n/a'
           }`,
         );
       }
@@ -177,10 +178,10 @@ class Images extends React.PureComponent<Props> {
       let { payload } = event.nativeEvent;
       if (!payload) {
         // @ts-expect-error payload renamed to avoid conflict in codegen with RN
-        payload = event.nativeEvent.payloadRenamed
+        payload = event.nativeEvent.payloadRenamed;
       }
 
-      this.props.onImageMissing(payload?.imageKey);
+      this.props.onImageMissing(payload?.imageKey!);
     }
   }
 

package/src/components/Light.tsx

@@ -40,7 +40,6 @@ function Light(props: Props, ref: React.ForwardedRef<LightMethods>) {
 
   return (
     <RNMBXLightNativeComponent
-      // @ts-expect-error just codegen stuff
       ref={nativeLightRef}
       testID="RNMBXLight"
       {...propWithoutStyle}

package/src/components/LineLayer.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { NativeModules } from 'react-native';
 
 import { FilterExpression, LineLayerStyleProps } from '../utils/MapboxStyles';

package/src/components/LocationPuck.tsx

@@ -1,4 +1,4 @@
-import React, { memo } from 'react';
+import { memo } from 'react';
 import { processColor, type ColorValue } from 'react-native';
 
 import RNMBXNativeUserLocation, {

package/src/components/MapView.tsx

@@ -465,7 +465,7 @@ const CallbablePropKeys = [
   'onCameraChanged',
 ] as const;
 
-type CallbablePropKeys = typeof CallbablePropKeys[number];
+type CallbablePropKeys = (typeof CallbablePropKeys)[number];
 
 type CallbablePropKeysWithoutOn = CallbablePropKeys extends `on${infer C}`
   ? C
@@ -577,7 +577,7 @@ class MapView extends NativeBridgeComponent(
     const callbackProps = CallbablePropKeys;
 
     const hasCallbackPropsChanged = callbackProps.some(
-      propName => prevProps[propName] !== this.props[propName]
+      (propName) => prevProps[propName] !== this.props[propName],
     );
 
     if (hasCallbackPropsChanged) {
@@ -831,7 +831,7 @@ class MapView extends NativeBridgeComponent(
   ): Promise<ReturnType> {
     return super._runNativeMethod<typeof RNMBXMapView, ReturnType>(
       methodName,
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
       // @ts-ignore TODO: fix types
       this._nativeRef as HostComponent<NativeProps> | undefined,
       args,
@@ -1170,7 +1170,7 @@ class MapView extends NativeBridgeComponent(
     });
   }
 
-  _handleOnChange<T>(propName: CallbablePropKeys, payload: object) {
+  _handleOnChange(propName: CallbablePropKeys, payload: object) {
     const func = this.props[propName] as (payload: object) => void;
     if (func && isFunction(func)) {
       func(payload);
@@ -1262,9 +1262,13 @@ class MapView extends NativeBridgeComponent(
     let mapView = null;
     if (this.state.isReady) {
       if (props._nativeImpl) {
+        // @ts-ignore - Complex native component prop type mismatch with React Native's new type system
+        // The custom _nativeImpl prop structure doesn't align with the strict NativeProps typing
         mapView = <props._nativeImpl {...props} {...callbacks} />;
       } else {
         mapView = (
+          // @ts-ignore - Native component prop type incompatibility with React Native's strict typing
+          // Props are correct at runtime but TypeScript can't verify the complex union type
           <RNMBXMapView {...props} {...callbacks}>
             {this.props.children}
           </RNMBXMapView>

package/src/components/ModelLayer.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { NativeModules } from 'react-native';
 
 import { FilterExpression, ModelLayerStyleProps } from '../utils/MapboxStyles';

package/src/components/Models.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Image } from 'react-native';
 
 import NativeModels from '../specs/RNMBXModelsNativeComponent';
@@ -25,7 +24,7 @@ function _resolveAssets(models: Props['models']): {
     if (typeof model === 'string') {
       resolvedModels[key] = { url: model };
     } else {
-      const asset = Image.resolveAssetSource(model);
+      const asset = Image.resolveAssetSource(model!);
       if (!asset) {
         throw new Error(`Could not resolve model asset: ${model}`);
       }

package/src/components/RasterDemSource.tsx

@@ -10,7 +10,7 @@ const isTileTemplateUrl = (url?: string): url is string =>
   !!url &&
   (url.includes('{z}') || url.includes('{bbox-') || url.includes('{quadkey}'));
 
-const MapboxGL = NativeModules.RNMBXModule;
+const Mapbox = NativeModules.RNMBXModule;
 
 type Props = {
   /**
@@ -61,7 +61,7 @@ type NativeProps = Props;
 
 class RasterDemSource extends AbstractSource<Props, NativeProps> {
   static defaultProps = {
-    id: MapboxGL.StyleSource.DefaultSourceID,
+    id: Mapbox.StyleSource.DefaultSourceID,
   };
 
   constructor(props: Props) {

package/src/components/RasterSource.tsx

@@ -7,7 +7,7 @@ import RNMBXRasterSourceNativeComponent from '../specs/RNMBXRasterSourceNativeCo
 
 import AbstractSource from './AbstractSource';
 
-const MapboxGL = NativeModules.RNMBXModule;
+const Mapbox = NativeModules.RNMBXModule;
 
 const isTileTemplateUrl = (url?: string): url is string =>
   !!url &&
@@ -84,7 +84,7 @@ type NativeProps = Props;
  */
 class RasterSource extends AbstractSource<Props, NativeProps> {
   static defaultProps: Props = {
-    id: MapboxGL.StyleSource.DefaultSourceID,
+    id: Mapbox.StyleSource.DefaultSourceID,
   };
 
   constructor(props: Props) {

package/src/components/ShapeSource.tsx

@@ -20,7 +20,7 @@ import { ShapeAnimatorInterface } from '../shapeAnimators';
 import AbstractSource from './AbstractSource';
 import NativeBridgeComponent from './NativeBridgeComponent';
 
-const MapboxGL = NativeModules.RNMBXModule;
+const Mapbox = NativeModules.RNMBXModule;
 
 type OnPressEventDeprecated = OnPressEvent & {
   nativeEvent?: OnPressEvent;
@@ -155,7 +155,7 @@ export class ShapeSource extends NativeBridgeComponent(
   static NATIVE_ASSETS_KEY = 'assets';
 
   static defaultProps = {
-    id: MapboxGL.StyleSource.DefaultSourceID,
+    id: Mapbox.StyleSource.DefaultSourceID,
   };
 
   constructor(props: Props) {

package/src/components/SkyLayer.tsx

@@ -65,8 +65,8 @@ class SkyLayer extends AbstractLayer<Props, NativeTypeProps> {
 
   render() {
     return (
+      // @ts-expect-error just codegen stuff
       <RNMBXSkyLayerNativeComponent
-        // @ts-expect-error just codegen stuff
         ref={this.setNativeLayer}
         {...this.baseProps}
       />

package/src/components/Style.tsx

@@ -167,7 +167,7 @@ function getImageSource(id: string, source: MapboxJSONSource) {
   return <ImageSource key={id} id={id} {...sourceProps} />;
 }
 
-type ShapeShourceShape = typeof ShapeSource.prototype.props['shape'];
+type ShapeShourceShape = (typeof ShapeSource.prototype.props)['shape'];
 
 function getShapeSource(id: string, source: MapboxJSONSource) {
   const sourceProps: {
@@ -294,9 +294,9 @@ const Style = (props: Props) => {
   // Fetch style when props.json is a URL
   useEffect(() => {
     const abortController = new AbortController();
-    const fetchStyleJson = async (json: string) => {
+    const fetchStyleJson = async (styleJson: string) => {
       try {
-        const response = await fetch(json, {
+        const response = await fetch(styleJson, {
           signal: abortController.signal,
         });
         const responseJson = await response.json();
@@ -332,7 +332,7 @@ const Style = (props: Props) => {
       return [];
     }
     return Object.keys(sources)
-      .map((id) => asSourceComponent(id, sources[id]))
+      .map((id) => asSourceComponent(id, sources[id]!))
       .filter((x) => !!x);
   }, [sources]);
 

package/src/components/StyleImport.tsx

@@ -1,4 +1,4 @@
-import React, { memo } from 'react';
+import { memo } from 'react';
 
 import NativeStyleImport from '../specs/RNMBXStyleImportNativeComponent';
 

package/src/components/Terrain.tsx

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