@rnmapbox/maps 10.1.0-beta.4 → 10.1.0-beta.6

package/src/components/MapView.tsx

@@ -13,8 +13,8 @@ import {
 import { debounce } from 'debounce';
 import { GeoJsonProperties, Geometry } from 'geojson';
 
-import NativeMapView from '../specs/MBXMapViewNativeComponent';
-import NativeAndroidTextureMapView from '../specs/MBXAndroidTextureMapViewNativeComponent';
+import NativeMapView from '../specs/RNMBXMapViewNativeComponent';
+import NativeAndroidTextureMapView from '../specs/RNMBXAndroidTextureMapViewNativeComponent';
 import NativeMapViewModule from '../specs/NativeMapViewModule';
 import {
   isFunction,
@@ -30,15 +30,15 @@ import { type Location } from '../modules/location/locationManager';
 
 import NativeBridgeComponent from './NativeBridgeComponent';
 
-const { MGLModule } = NativeModules;
-const { EventTypes } = MGLModule;
+const { RNMBXModule } = NativeModules;
+const { EventTypes } = RNMBXModule;
 
-if (MGLModule == null) {
+if (RNMBXModule == null) {
   console.error(
     'Native part of Mapbox React Native libraries were not registered properly, double check our native installation guides.',
   );
 }
-if (!MGLModule.MapboxV10) {
+if (!RNMBXModule.MapboxV10) {
   console.warn(
     '@rnmapbox/maps: Non v10 implementations are deprecated and will be removed in next version - see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre',
   );
@@ -51,7 +51,7 @@ const styles = StyleSheet.create({
   matchParent: { flex: 1 },
 });
 
-const defaultStyleURL = MGLModule.StyleURL.Street;
+const defaultStyleURL = RNMBXModule.StyleURL.Street;
 
 export type Point = {
   x: number;
@@ -409,7 +409,7 @@ class MapView extends NativeBridgeComponent(
     compassFadeWhenNorth: false,
     logoEnabled: true,
     scaleBarEnabled: true,
-    surfaceView: MGLModule.MapboxV10 ? true : false,
+    surfaceView: RNMBXModule.MapboxV10 ? true : false,
     requestDisallowInterceptTouchEvent: false,
     regionWillChangeDebounceTime: 10,
     regionDidChangeDebounceTime: 500,
@@ -441,7 +441,7 @@ class MapView extends NativeBridgeComponent(
       >,
     ) => void
   >;
-  _nativeRef?: RCTMGLMapViewRefType;
+  _nativeRef?: RNMBXMapViewRefType;
   state: {
     isReady: boolean | null;
     region: null;
@@ -498,7 +498,7 @@ class MapView extends NativeBridgeComponent(
   }
 
   _setHandledMapChangedEvents(props: Props) {
-    if (isAndroid() || MGLModule.MapboxV10) {
+    if (isAndroid() || RNMBXModule.MapboxV10) {
       const events: string[] = [];
 
       function addIfHasHandler(name: CallbablePropKeysWithoutOn) {
@@ -679,7 +679,7 @@ class MapView extends NativeBridgeComponent(
   ): Promise<GeoJSON.FeatureCollection | undefined> {
     if (
       bbox != null &&
-      (bbox.length === 4 || (MGLModule.MapboxV10 && bbox.length === 0))
+      (bbox.length === 4 || (RNMBXModule.MapboxV10 && bbox.length === 0))
     ) {
       const res = await this._runNative<{ data: GeoJSON.FeatureCollection }>(
         'queryRenderedFeaturesInRect',
@@ -741,7 +741,7 @@ class MapView extends NativeBridgeComponent(
     methodName: string,
     args: NativeArg[] = [],
   ): Promise<ReturnType> {
-    return this._runNativeCommand<typeof RCTMGLMapView, ReturnType>(
+    return this._runNativeCommand<typeof RNMBXMapView, ReturnType>(
       methodName,
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore TODO: fix types
@@ -798,7 +798,7 @@ class MapView extends NativeBridgeComponent(
    * v10 only
    */
   async clearData(): Promise<void> {
-    if (!MGLModule.MapboxV10) {
+    if (!RNMBXModule.MapboxV10) {
       console.warn(
         'RNMapbox: clearData is only implemented in v10 implementation or later',
       );
@@ -850,19 +850,22 @@ class MapView extends NativeBridgeComponent(
    * If you implement a custom attribution button, you should add this action to the button.
    */
   showAttribution() {
-    return this._runNativeCommand('showAttribution', this._nativeRef);
+    return this._runNative<void>('showAttribution');
   }
 
   _runNativeCommand<RefType, ReturnType = NativeArg>(
     methodName: string,
     nativeRef: RefType | undefined,
-    args?: NativeArg[],
+    args: NativeArg[],
   ): Promise<ReturnType> {
     // when this method is called after component mounts, the ref is not yet set
     // schedule it to be called after a timeout
     if (!this._nativeRef) {
-      return new Promise((resolve) => setTimeout(resolve, 1)).then(() => {
-        return this._runNativeCommand(methodName, this._nativeRef, args);
+      return new Promise<ReturnType>((resolve) => {
+        this._preRefMapMethodQueue.push({
+          method: { name: methodName, args },
+          resolver: resolve as (args: NativeArg) => void,
+        });
       });
     }
 
@@ -1037,7 +1040,7 @@ class MapView extends NativeBridgeComponent(
       return;
     }
 
-    if (MGLModule.MapboxV10) {
+    if (RNMBXModule.MapboxV10) {
       if (!this.deprecationLogged.contentInset) {
         console.warn(
           '@rnmapbox/maps: contentInset is deprecated, use Camera padding instead.',
@@ -1053,7 +1056,7 @@ class MapView extends NativeBridgeComponent(
     return this.props.contentInset;
   }
 
-  _setNativeRef(nativeRef: RCTMGLMapViewRefType) {
+  _setNativeRef(nativeRef: RNMBXMapViewRefType) {
     this._nativeRef = nativeRef;
     super._runPendingNativeCommands(nativeRef);
   }
@@ -1083,7 +1086,7 @@ class MapView extends NativeBridgeComponent(
   }
 
   _setLocalizeLabels(props: Props) {
-    if (!MGLModule.MapboxV10) {
+    if (!RNMBXModule.MapboxV10) {
       return;
     }
     if (typeof props.localizeLabels === 'boolean') {
@@ -1104,7 +1107,7 @@ class MapView extends NativeBridgeComponent(
     this._setLocalizeLabels(props);
 
     const callbacks = {
-      ref: (nativeRef: RCTMGLMapViewRefType) => this._setNativeRef(nativeRef),
+      ref: (nativeRef: RNMBXMapViewRefType) => this._setNativeRef(nativeRef),
       onPress: this._onPress,
       onLongPress: this._onLongPress,
       onMapChange: this._onChange,
@@ -1115,17 +1118,17 @@ class MapView extends NativeBridgeComponent(
     let mapView = null;
     if (isAndroid() && !this.props.surfaceView && this.state.isReady) {
       mapView = (
-        <RCTMGLAndroidTextureMapView {...props} {...callbacks}>
+        <RNMBXAndroidTextureMapView {...props} {...callbacks}>
           {this.props.children}
-        </RCTMGLAndroidTextureMapView>
+        </RNMBXAndroidTextureMapView>
       );
     } else if (this.state.isReady) {
       mapView = (
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore TODO: fix types
-        <RCTMGLMapView {...props} {...callbacks}>
+        <RNMBXMapView {...props} {...callbacks}>
           {this.props.children}
-        </RCTMGLMapView>
+        </RNMBXMapView>
       );
     }
 
@@ -1150,14 +1153,14 @@ type NativeProps = Omit<
   onCameraChanged(event: NativeSyntheticEvent<{ payload: MapState }>): void;
 };
 
-type RCTMGLMapViewRefType = Component<NativeProps> & Readonly<NativeMethods>;
-// const RCTMGLMapView = requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
+type RNMBXMapViewRefType = Component<NativeProps> & Readonly<NativeMethods>;
+// const RNMBXMapView = requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
 // TODO: figure out how to pick the correct implementation
-const RCTMGLMapView = NativeMapView;
+const RNMBXMapView = NativeMapView;
 
-let RCTMGLAndroidTextureMapView: any;
+let RNMBXAndroidTextureMapView: any;
 if (isAndroid()) {
-  RCTMGLAndroidTextureMapView = NativeAndroidTextureMapView;
+  RNMBXAndroidTextureMapView = NativeAndroidTextureMapView;
 }
 
 export default MapView;

package/src/components/MarkerView.tsx

@@ -13,9 +13,9 @@ import { type Position } from '../types/Position';
 
 import PointAnnotation from './PointAnnotation';
 
-const Mapbox = NativeModules.MGLModule;
+const Mapbox = NativeModules.RNMBXModule;
 
-export const NATIVE_MODULE_NAME = 'RCTMGLMarkerView';
+export const NATIVE_MODULE_NAME = 'RNMBXMarkerView';
 
 type Props = ViewProps & {
   /**
@@ -107,7 +107,7 @@ class MarkerView extends React.PureComponent<Props> {
     const { anchor = { x: 0.5, y: 0.5 } } = this.props;
 
     return (
-      <RCTMGLMarkerView
+      <RNMBXMarkerView
         style={[
           {
             flex: 0,
@@ -134,7 +134,7 @@ class MarkerView extends React.PureComponent<Props> {
         >
           {this.props.children}
         </View>
-      </RCTMGLMarkerView>
+      </RNMBXMarkerView>
     );
   }
 }
@@ -146,7 +146,6 @@ type NativeProps = ViewProps & {
   isSelected: boolean;
 };
 
-const RCTMGLMarkerView =
-  requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
+const RNMBXMarkerView = requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
 
 export default MarkerView;

package/src/components/NativeUserLocation.tsx

@@ -1,7 +1,7 @@
 import React, { memo } from 'react';
 import { requireNativeComponent } from 'react-native';
 
-const NATIVE_MODULE_NAME = 'RCTMGLNativeUserLocation';
+const NATIVE_MODULE_NAME = 'RNMBXNativeUserLocation';
 
 export type Props = {
   /**
@@ -25,11 +25,11 @@ export type Props = {
 
 type NativeProps = Props;
 
-const RCTMGLNativeUserLocation =
+const RNMBXNativeUserLocation =
   requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
 
 const NativeUserLocation = memo((props: Props) => {
-  return <RCTMGLNativeUserLocation {...props} />;
+  return <RNMBXNativeUserLocation {...props} />;
 });
 
 export default NativeUserLocation;

package/src/components/PointAnnotation.tsx

@@ -15,7 +15,7 @@ import { Position } from '../types/Position';
 
 import NativeBridgeComponent, { type RNMBEvent } from './NativeBridgeComponent';
 
-export const NATIVE_MODULE_NAME = 'RCTMGLPointAnnotation';
+export const NATIVE_MODULE_NAME = 'RNMBXPointAnnotation';
 
 const styles = StyleSheet.create({
   container: {
@@ -221,9 +221,9 @@ class PointAnnotation extends NativeBridgeComponent(
       coordinate: this._getCoordinate(),
     };
     return (
-      <RCTMGLPointAnnotation {...props}>
+      <RNMBXPointAnnotation {...props}>
         {this.props.children}
-      </RCTMGLPointAnnotation>
+      </RNMBXPointAnnotation>
     );
   }
 }
@@ -234,7 +234,7 @@ type NativeProps = Omit<Props, 'coordinate'> & {
 
 type NativePointAnnotationRef = Component<NativeProps>;
 
-const RCTMGLPointAnnotation =
+const RNMBXPointAnnotation =
   requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
 
 export default PointAnnotation;

package/src/components/RasterDemSource.tsx

@@ -9,9 +9,9 @@ const isTileTemplateUrl = (url?: string): url is string =>
   !!url &&
   (url.includes('{z}') || url.includes('{bbox-') || url.includes('{quadkey}'));
 
-const MapboxGL = NativeModules.MGLModule;
+const MapboxGL = NativeModules.RNMBXModule;
 
-export const NATIVE_MODULE_NAME = 'RCTMGLRasterDemSource';
+export const NATIVE_MODULE_NAME = 'RNMBXRasterDemSource';
 
 type Props = {
   /**
@@ -96,16 +96,16 @@ class RasterDemSource extends AbstractSource<Props, NativeProps> {
       tileSize: this.props.tileSize,
     };
     return (
-      <RCTMGLRasterDemSource ref={this.setNativeRef} {...props}>
+      <RNMBXRasterDemSource ref={this.setNativeRef} {...props}>
         {cloneReactChildrenWithProps(this.props.children, {
           sourceID: this.props.id,
         })}
-      </RCTMGLRasterDemSource>
+      </RNMBXRasterDemSource>
     );
   }
 }
 
-const RCTMGLRasterDemSource =
+const RNMBXRasterDemSource =
   requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
 
 export default RasterDemSource;

package/src/components/RasterLayer.tsx

@@ -6,9 +6,9 @@ import { StyleValue } from '../utils/StyleValue';
 
 import AbstractLayer from './AbstractLayer';
 
-const MapboxGL = NativeModules.MGLModule;
+const MapboxGL = NativeModules.RNMBXModule;
 
-export const NATIVE_MODULE_NAME = 'RCTMGLRasterLayer';
+export const NATIVE_MODULE_NAME = 'RNMBXRasterLayer';
 
 export type Props = {
   /**
@@ -83,11 +83,11 @@ class RasterLayer extends AbstractLayer<Props, NativeTypeProps> {
       ...this.baseProps,
       sourceLayerID: this.props.sourceLayerID,
     };
-    return <RCTMGLRasterLayer ref={this.setNativeLayer} {...props} />;
+    return <RNMBXRasterLayer ref={this.setNativeLayer} {...props} />;
   }
 }
 
-const RCTMGLRasterLayer =
+const RNMBXRasterLayer =
   requireNativeComponent<NativeTypeProps>(NATIVE_MODULE_NAME);
 
 export default RasterLayer;

package/src/components/RasterSource.tsx

@@ -6,9 +6,9 @@ import { BaseProps } from '../types/BaseProps';
 
 import AbstractSource from './AbstractSource';
 
-const MapboxGL = NativeModules.MGLModule;
+const MapboxGL = NativeModules.RNMBXModule;
 
-export const NATIVE_MODULE_NAME = 'RCTMGLRasterSource';
+export const NATIVE_MODULE_NAME = 'RNMBXRasterSource';
 
 const isTileTemplateUrl = (url?: string): url is string =>
   !!url &&
@@ -115,16 +115,16 @@ class RasterSource extends AbstractSource<Props, NativeProps> {
       attribution: this.props.attribution,
     };
     return (
-      <RCTMGLRasterSource ref={this.setNativeRef} {...props}>
+      <RNMBXRasterSource ref={this.setNativeRef} {...props}>
         {cloneReactChildrenWithProps(this.props.children, {
           sourceID: this.props.id,
         })}
-      </RCTMGLRasterSource>
+      </RNMBXRasterSource>
     );
   }
 }
 
-const RCTMGLRasterSource =
+const RNMBXRasterSource =
   requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
 
 export default RasterSource;

package/src/components/ShapeSource.tsx

@@ -19,9 +19,9 @@ import { OnPressEvent } from '../types/OnPressEvent';
 import AbstractSource from './AbstractSource';
 import NativeBridgeComponent from './NativeBridgeComponent';
 
-const MapboxGL = NativeModules.MGLModule;
+const MapboxGL = NativeModules.RNMBXModule;
 
-export const NATIVE_MODULE_NAME = 'RCTMGLShapeSource';
+export const NATIVE_MODULE_NAME = 'RNMBXShapeSource';
 
 type OnPressEventDeprecated = OnPressEvent & {
   nativeEvent?: OnPressEvent;
@@ -388,11 +388,11 @@ export class ShapeSource extends NativeBridgeComponent(
     };
 
     return (
-      <RCTMGLShapeSource {...props}>
+      <RNMBXShapeSource {...props}>
         {cloneReactChildrenWithProps(this.props.children, {
           sourceID: this.props.id,
         })}
-      </RCTMGLShapeSource>
+      </RNMBXShapeSource>
     );
   }
 }
@@ -402,5 +402,5 @@ type NativeProps = {
   shape?: string;
 };
 
-const RCTMGLShapeSource =
+const RNMBXShapeSource =
   requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);

package/src/components/SkyLayer.tsx

@@ -6,9 +6,9 @@ import { StyleValue } from '../utils/StyleValue';
 
 import AbstractLayer from './AbstractLayer';
 
-const MapboxGL = NativeModules.MGLModule;
+const MapboxGL = NativeModules.RNMBXModule;
 
-export const NATIVE_MODULE_NAME = 'RCTMGLSkyLayer';
+export const NATIVE_MODULE_NAME = 'RNMBXSkyLayer';
 
 export type Props = {
   /**
@@ -65,11 +65,11 @@ class SkyLayer extends AbstractLayer<Props, NativeTypeProps> {
   };
 
   render() {
-    return <RCTMGLSkyLayer ref={this.setNativeLayer} {...this.baseProps} />;
+    return <RNMBXSkyLayer ref={this.setNativeLayer} {...this.baseProps} />;
   }
 }
 
-const RCTMGLSkyLayer =
+const RNMBXSkyLayer =
   requireNativeComponent<NativeTypeProps>(NATIVE_MODULE_NAME);
 
 export default SkyLayer;

package/src/components/StyleImport.tsx

@@ -0,0 +1,17 @@
+import React, { memo } from 'react';
+
+import NativeStyleImport from '../specs/RNMBXStyleImportNativeComponent';
+
+type Props = {
+  id: string;
+
+  existing: boolean;
+
+  config: {
+    [key: string]: string;
+  };
+};
+
+export default memo((props: Props) => {
+  return <NativeStyleImport {...props} />;
+});

package/src/components/SymbolLayer.tsx

@@ -6,9 +6,9 @@ import { type StyleValue } from '../utils/StyleValue';
 
 import AbstractLayer from './AbstractLayer';
 
-const MapboxGL = NativeModules.MGLModule;
+const MapboxGL = NativeModules.RNMBXModule;
 
-export const NATIVE_MODULE_NAME = 'RCTMGLSymbolLayer';
+export const NATIVE_MODULE_NAME = 'RNMBXSymbolLayer';
 
 export type Props = {
   /**
@@ -77,7 +77,7 @@ type NativeTypeProps = Omit<Props, 'style'> & {
   reactStyle?: { [key: string]: StyleValue };
 };
 
-const RCTMGLSymbolLayer =
+const RNMBXSymbolLayer =
   requireNativeComponent<NativeTypeProps>(NATIVE_MODULE_NAME);
 
 /**
@@ -119,9 +119,9 @@ export class SymbolLayer extends AbstractLayer<Props, NativeTypeProps> {
     };
 
     return (
-      <RCTMGLSymbolLayer ref={this.setNativeLayer} {...props}>
+      <RNMBXSymbolLayer ref={this.setNativeLayer} {...props}>
         {this.props.children}
-      </RCTMGLSymbolLayer>
+      </RNMBXSymbolLayer>
     );
   }
 }

package/src/components/Terrain.tsx

@@ -5,7 +5,7 @@ import type { TerrainLayerStyleProps, Value } from '../utils/MapboxStyles';
 import { StyleValue, transformStyle } from '../utils/StyleValue';
 import type { BaseProps } from '../types/BaseProps';
 
-export const NATIVE_MODULE_NAME = 'RCTMGLTerrain';
+export const NATIVE_MODULE_NAME = 'RNMBXTerrain';
 
 type Props = BaseProps & {
   /**
@@ -46,7 +46,7 @@ export const Terrain = memo((props: Props) => {
     };
   }, [props, style]);
 
-  return <RCTMGLTerrain {...baseProps} />;
+  return <RNMBXTerrain {...baseProps} />;
 });
 
-const RCTMGLTerrain = requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
+const RNMBXTerrain = requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);

package/src/components/VectorSource.tsx

@@ -14,9 +14,9 @@ import { OnPressEvent } from '../types/OnPressEvent';
 import AbstractSource from './AbstractSource';
 import NativeBridgeComponent from './NativeBridgeComponent';
 
-const MapboxGL = NativeModules.MGLModule;
+const MapboxGL = NativeModules.RNMBXModule;
 
-export const NATIVE_MODULE_NAME = 'RCTMGLVectorSource';
+export const NATIVE_MODULE_NAME = 'RNMBXVectorSource';
 
 interface Props {
   /**
@@ -200,16 +200,16 @@ class VectorSource extends NativeBridgeComponent(
       onAndroidCallback: isAndroid() ? this._onAndroidCallback : undefined,
     };
     return (
-      <RCTMGLVectorSource ref={(r) => this._setNativeRef(r)} {...props}>
+      <RNMBXVectorSource ref={(r) => this._setNativeRef(r)} {...props}>
         {cloneReactChildrenWithProps(this.props.children, {
           sourceID: this.props.id,
         })}
-      </RCTMGLVectorSource>
+      </RNMBXVectorSource>
     );
   }
 }
 
-const RCTMGLVectorSource =
+const RNMBXVectorSource =
   requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
 
 export default VectorSource;

package/src/modules/location/locationManager.ts

@@ -7,8 +7,8 @@ import {
   type AppStateStatus,
 } from 'react-native';
 
-const MapboxGL = NativeModules.MGLModule;
-const MapboxGLLocationManager = NativeModules.MGLLocationModule;
+const MapboxGL = NativeModules.RNMBXModule;
+const MapboxGLLocationManager = NativeModules.RNMBXLocationModule;
 
 export const LocationModuleEventEmitter = new NativeEventEmitter(
   MapboxGLLocationManager,

package/src/modules/offline/OfflinePack.ts

@@ -2,7 +2,7 @@ import { NativeModules } from 'react-native';
 
 import OfflineCreatePackOptions from './OfflineCreatePackOptions';
 
-const MapboxGLOfflineManager = NativeModules.MGLOfflineModule;
+const MapboxGLOfflineManager = NativeModules.RNMBXOfflineModule;
 
 type OfflinePackStatus = {
   name: string;

package/src/modules/offline/offlineManager.ts

@@ -15,9 +15,9 @@ import OfflineCreatePackOptions, {
 } from './OfflineCreatePackOptions';
 import OfflinePack from './OfflinePack';
 
-const { MGLModule } = NativeModules;
+const { RNMBXModule } = NativeModules;
 
-const MapboxOfflineManager = NativeModules.MGLOfflineModule;
+const MapboxOfflineManager = NativeModules.RNMBXOfflineModule;
 export const OfflineModuleEventEmitter = new NativeEventEmitter(
   MapboxOfflineManager,
 );
@@ -183,7 +183,7 @@ class OfflineManager {
    * @return {void}
    */
   async invalidateAmbientCache(): Promise<void> {
-    if (MGLModule.MapboxV10) {
+    if (RNMBXModule.MapboxV10) {
       console.warn(
         'RNMapbox: invalidateAmbientCache is not implemented on v10',
       );
@@ -205,7 +205,7 @@ class OfflineManager {
    * @return {void}
    */
   async clearAmbientCache(): Promise<void> {
-    if (MGLModule.MapboxV10) {
+    if (RNMBXModule.MapboxV10) {
       console.warn('RNMapbox: clearAmbientCache is not implemented on v10');
       return;
     }
@@ -348,7 +348,7 @@ class OfflineManager {
     if (isFunction(progressListener)) {
       if (totalProgressListeners === 0) {
         this.subscriptionProgress = OfflineModuleEventEmitter.addListener(
-          MGLModule.OfflineCallbackName.Progress,
+          RNMBXModule.OfflineCallbackName.Progress,
           this._onProgress,
         );
       }
@@ -359,7 +359,7 @@ class OfflineManager {
     if (isFunction(errorListener)) {
       if (totalErrorListeners === 0) {
         this.subscriptionError = OfflineModuleEventEmitter.addListener(
-          MGLModule.OfflineCallbackName.Error,
+          RNMBXModule.OfflineCallbackName.Error,
           this._onError,
         );
       }
@@ -434,7 +434,7 @@ class OfflineManager {
     this._progressListeners[name](pack, e.payload);
 
     // cleanup listeners now that they are no longer needed
-    if (state === MGLModule.OfflinePackDownloadState.Complete) {
+    if (state === RNMBXModule.OfflinePackDownloadState.Complete) {
       this.unsubscribe(name);
     }
   }

package/src/modules/snapshot/SnapshotOptions.ts

@@ -3,7 +3,7 @@ import { NativeModules } from 'react-native';
 import { toJSONString } from '../../utils';
 import { makePoint, makeFeatureCollection } from '../../utils/geoUtils';
 
-const MapboxGL = NativeModules.MGLModule;
+const MapboxGL = NativeModules.RNMBXModule;
 
 export type SnapshotOptionsArgs = {
   centerCoordinate?: GeoJSON.Position;

package/src/modules/snapshot/snapshotManager.ts

@@ -3,7 +3,7 @@ import { NativeModules } from 'react-native';
 export type { default as SnapshotOptions } from './SnapshotOptions';
 import SnapshotOptions from './SnapshotOptions';
 
-const MapboxGLSnapshotManger = NativeModules.MGLSnapshotModule;
+const MapboxGLSnapshotManger = NativeModules.RNMBXSnapshotModule;
 
 /**
  * The snapshotManager generates static raster images of the map.

package/src/specs/NativeMapViewModule.ts

@@ -51,4 +51,4 @@ export interface Spec extends TurboModule {
   ) => Promise<Object>;
 }
 
-export default TurboModuleRegistry.getEnforcing<Spec>('MBXMapViewModule');
+export default TurboModuleRegistry.getEnforcing<Spec>('RNMBXMapViewModule');