@rnmapbox/maps 10.0.0-beta.77 → 10.0.0-beta.78

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.0.0-beta.77",
+  "version": "10.0.0-beta.78",
   "publishConfig": {
     "access": "public"
   },
@@ -21,11 +21,11 @@
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
   "types": "lib/typescript/index.d.ts",
-  "browser": "./javascript/index.web.js",
-  "react-native": "javascript/index",
-  "source": "javascript/index",
+  "browser": "./src/index.web.js",
+  "react-native": "src/index",
+  "source": "src/index",
   "files": [
-    "javascript",
+    "src",
     "lib",
     "plugin",
     "assets",
@@ -119,7 +119,7 @@
   "jest": {
     "preset": "react-native",
     "collectCoverageFrom": [
-      "javascript/**/*.js"
+      "src/**/*.js"
     ],
     "setupFiles": [
       "./setup-jest.js",
@@ -136,7 +136,7 @@
     "*.{js,jsx,ts,tsx}": "eslint --fix"
   },
   "react-native-builder-bob": {
-    "source": "javascript",
+    "source": "src",
     "output": "lib",
     "targets": [
       "commonjs",

package/plugin/build/withMapbox.js

@@ -57,14 +57,17 @@ const addConstantBlock = (src, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapbox
             return modified;
         }
     }
+    const newSrc = [
+        `$RNMapboxMapsImpl = '${RNMapboxMapsImpl}'`,
+        `$RNMapboxMapsDownloadToken = '${RNMapboxMapsDownloadToken}'`,
+    ];
+    if (RNMapboxMapsVersion) {
+        newSrc.push(`$RNMapboxMapsVersion = '${RNMapboxMapsVersion}'`);
+    }
     return (0, generateCode_1.mergeContents)({
         tag,
         src,
-        newSrc: [
-            `$RNMapboxMapsImpl = '${RNMapboxMapsImpl}'`,
-            `$RNMapboxMapsVersion = '${RNMapboxMapsVersion}'`,
-            `$RNMapboxMapsDownloadToken = '${RNMapboxMapsDownloadToken}'`,
-        ].join('\n'),
+        newSrc: newSrc.join('\n'),
         anchor: /target .+ do/,
         // We can't go after the use_react_native block because it might have parameters, causing it to be multi-line (see react-native template).
         offset: 0,

package/plugin/src/withMapbox.ts

@@ -95,14 +95,19 @@ export const addConstantBlock = (
     }
   }
 
+  const newSrc = [
+    `$RNMapboxMapsImpl = '${RNMapboxMapsImpl}'`,
+    `$RNMapboxMapsDownloadToken = '${RNMapboxMapsDownloadToken}'`,
+  ];
+
+  if (RNMapboxMapsVersion) {
+    newSrc.push(`$RNMapboxMapsVersion = '${RNMapboxMapsVersion}'`);
+  }
+
   return mergeContents({
     tag,
     src,
-    newSrc: [
-      `$RNMapboxMapsImpl = '${RNMapboxMapsImpl}'`,
-      `$RNMapboxMapsVersion = '${RNMapboxMapsVersion}'`,
-      `$RNMapboxMapsDownloadToken = '${RNMapboxMapsDownloadToken}'`,
-    ].join('\n'),
+    newSrc: newSrc.join('\n'),
     anchor: /target .+ do/,
     // We can't go after the use_react_native block because it might have parameters, causing it to be multi-line (see react-native template).
     offset: 0,

package/{javascript → src}/components/Camera.tsx

@@ -1,4 +1,3 @@
-import { Position } from '@turf/helpers';
 import React, {
   forwardRef,
   memo,
@@ -15,6 +14,8 @@ import { type NativeRefType } from '../utils/nativeRef';
 
 const NativeModule = NativeModules.MGLModule;
 
+type Position = number[] | [number, number];
+
 export enum UserTrackingMode {
   Follow = 'normal',
   FollowWithHeading = 'compass',

package/{javascript → src}/components/MapView.tsx

@@ -78,6 +78,16 @@ export type MapState = {
   };
 };
 
+/**
+ * label localization settings (v10 only)
+ */
+type LocalizeLabels = {
+  /** locale code like `es` or `current` for the device's current locale */
+  locale: string;
+  /** layer id to localize. If not specified, all layers will be localized */
+  layerIds?: string[];
+};
+
 type Props = ViewProps & {
   /**
    * The distance from the edges of the map view’s frame to the edges of the map view’s logical viewport.
@@ -110,12 +120,6 @@ type Props = ViewProps & {
    */
   preferredFramesPerSecond?: number;
 
-  /**
-   * Automatically change the language of the map labels to the system’s preferred language,
-   * this is not something that can be toggled on/off
-   */
-  localizeLabels?: boolean;
-
   /**
    * Enable/Disable zoom on the map
    */
@@ -214,6 +218,12 @@ type Props = ViewProps & {
    */
   surfaceView?: boolean;
 
+  /**
+   * [`mapbox` (v10) implementation only]
+   * Set map's label locale, e.g. { "locale": "es" } will localize labels to Spanish, { "locale": "current" } will localize labels to system locale.
+   */
+  localizeLabels?: LocalizeLabels;
+
   /**
    * Map press listener, gets called when a user presses the map
    */
@@ -371,7 +381,6 @@ class MapView extends NativeBridgeComponent(
 ) {
   static defaultProps: Props = {
     projection: 'mercator',
-    localizeLabels: false,
     scrollEnabled: true,
     pitchEnabled: true,
     rotateEnabled: true,
@@ -934,6 +943,20 @@ class MapView extends NativeBridgeComponent(
     }
   }
 
+  _setLocalizeLabels(props: Props) {
+    if (!MapboxGL.MapboxV10) {
+      return;
+    }
+    if (typeof props.localizeLabels === 'boolean') {
+      console.warn(
+        'boolean value of localizeLabels is deprecated. Please set this as Locale object instead',
+      );
+      props.localizeLabels = {
+        locale: 'current',
+      };
+    }
+  }
+
   render() {
     const props = {
       ...this.props,
@@ -942,6 +965,7 @@ class MapView extends NativeBridgeComponent(
     };
 
     this._setStyleURL(props);
+    this._setLocalizeLabels(props);
 
     const callbacks = {
       ref: (nativeRef: RCTMGLMapViewRefType) => this._setNativeRef(nativeRef),

package/{javascript → src}/components/UserLocation.tsx

@@ -82,7 +82,7 @@ type Props = {
   /**
    * Custom location icon of type mapbox-gl-native components
    */
-  children?: ReactElement;
+  children?: ReactElement | ReactElement[];
 
   /**
    * Minimum amount of movement before GPS location is updated in meters