@rnmapbox/maps 10.1.0-beta.2 → 10.1.0-beta.21

package/lib/typescript/src/utils/index.d.ts

@@ -0,0 +1,33 @@
+import React from 'react';
+import { ImageSourcePropType, TurboModule } from 'react-native';
+export declare function isAndroid(): boolean;
+export declare function existenceChange(cur: boolean, next: boolean): boolean;
+export declare function isFunction(fn: unknown): fn is boolean;
+export declare function isNumber(num: unknown): num is number;
+export declare function isUndefined(obj: unknown): obj is undefined;
+export declare function isString(str: unknown): str is string;
+export declare function isBoolean(bool: unknown): bool is boolean;
+export declare function isPrimitive(value: unknown): value is string | number | boolean;
+export declare type NativeArg = string | number | boolean | null | {
+    [k: string]: NativeArg;
+} | NativeArg[];
+export declare function runNativeMethod<ReturnType = NativeArg>(turboModule: TurboModule, name: string, nativeRef: any, args: NativeArg[]): Promise<ReturnType>;
+export declare function cloneReactChildrenWithProps(children: Parameters<typeof React.Children.map>[0], propsToAdd?: {
+    [key: string]: string;
+}): any;
+export declare function resolveImagePath(imageRef: ImageSourcePropType): string;
+export declare function toJSONString(json?: any): string;
+export declare type OrnamentPositonProp = {
+    top: number;
+    left: number;
+} | {
+    top: number;
+    right: number;
+} | {
+    bottom: number;
+    left: number;
+} | {
+    bottom: number;
+    right: number;
+};
+//# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/utils/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAIL,mBAAmB,EACnB,WAAW,EACZ,MAAM,cAAc,CAAC;AAEtB,wBAAgB,SAAS,IAAI,OAAO,CAEnC;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAKpE;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,IAAI,OAAO,CAErD;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,MAAM,CAEpD;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,SAAS,CAE1D;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,MAAM,CAEpD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,OAAO,CAExD;AAED,wBAAgB,WAAW,CACzB,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,MAAM,GAAG,MAAM,GAAG,OAAO,CAEpC;AAED,oBAAY,SAAS,GACjB,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAC1B,SAAS,EAAE,CAAC;AAEhB,wBAAgB,eAAe,CAAC,UAAU,GAAG,SAAS,EACpD,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,GAAG,EACd,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,UAAU,CAAC,CASrB;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAClD,UAAU,GAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAO,OAkB3C;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,MAAM,CAGtE;AAED,wBAAgB,YAAY,CAAC,IAAI,GAAE,GAAQ,UAE1C;AAED,oBAAY,mBAAmB,GAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC7B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC"}

package/lib/typescript/src/utils/nativeRef.d.ts

@@ -0,0 +1,21 @@
+import { RefObject, type Component, type MutableRefObject } from 'react';
+import { type NativeMethods, type HostComponent } from 'react-native';
+/**
+ * Helper for useRef and requireNativeComponent:
+ * @example
+ * RNMBXCamera = requireNativeComponent<NativeProps>('RNMBXCamera');
+ * const ref = useRef<typeof RNMBXCamera)(null) as NativeRefType<NativeProps>;
+ * ...
+ * <RNMBXCamera ref={ref} ... />
+ */
+export declare type NativeRefType<P> = MutableRefObject<(Component<P> & Readonly<NativeMethods>) | null>;
+/**
+ * Helper for useRef and requireNativeComponent:
+ * @example
+ * RNMBXCamera = requireNativeComponent<NativeProps>('RNMBXCamera');
+ * const ref = nativeRef(useRef<typeof RNMBXCamera)(null));
+ * ...
+ * <RNMBXCamera ref={ref} ... />
+ */
+export default function nativeRef<P>(c: RefObject<HostComponent<P> | null>): MutableRefObject<(Component<P> & Readonly<NativeMethods>) | null>;
+//# sourceMappingURL=nativeRef.d.ts.map

package/lib/typescript/src/utils/nativeRef.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nativeRef.d.ts","sourceRoot":"","sources":["../../../../src/utils/nativeRef.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,OAAO,CAAC;AACzE,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAEtE;;;;;;;GAOG;AACH,oBAAY,aAAa,CAAC,CAAC,IAAI,gBAAgB,CAC7C,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC,GAAG,IAAI,CAChD,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,CAAC,EACjC,CAAC,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GACpC,gBAAgB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC,GAAG,IAAI,CAAC,CAEnE"}

package/lib/typescript/src/utils/styleMap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"styleMap.d.ts","sourceRoot":"","sources":["../../../../src/utils/styleMap.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,UAAU;;;;;;;;CAQtB,CAAC;AAEF,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,OAAO,WAAW,UAU/D;AA8ND,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoCvB,CAAC"}

package/lib/typescript/src/web/MapContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MapContext.d.ts","sourceRoot":"","sources":["../../../../src/web/MapContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAErC,QAAA,MAAM,UAAU;;EAAyC,CAAC;AAE1D,eAAe,UAAU,CAAC"}

package/lib/typescript/src/web/components/Camera.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Camera.d.ts","sourceRoot":"","sources":["../../../../../src/web/components/Camera.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,UAAU,MAAM,eAAe,CAAC;AAEvC,cAAM,MAAO,SAAQ,KAAK,CAAC,SAAS,CAAC;IACnC,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;CAC3C,CAAC;IACA,OAAO,EAAG,KAAK,CAAC,WAAW,CAAC,OAAO,UAAU,CAAC,CAAC;IAE/C,MAAM,CAAC,WAAW;;OAAc;IAChC,MAAM,CAAC,iBAAiB,UAAM;IAE9B,iBAAiB;IAQjB,SAAS,CACP,oBAAoB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EACtC,oBAAoB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EACtC,OAAO,SAAI,EACX,iBAAiB,SAAM;IAQzB,MAAM;CAGP;AAED,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,eAAe,MAAM,CAAC"}

package/lib/typescript/src/web/components/MapView.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MapView.d.ts","sourceRoot":"","sources":["../../../../../src/web/components/MapView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B;;GAEG;AACH,cAAM,OAAQ,SAAQ,KAAK,CAAC,SAAS,CACnC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAA;CAAE,EAC3C;IAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CACxB;IACC,KAAK;;MAAiB;IACtB,YAAY,EAAE,WAAW,GAAG,IAAI,CAAQ;IACxC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE1B,iBAAiB;IAcjB,MAAM;CAkBP;AAED,eAAe,OAAO,CAAC"}

package/lib/typescript/src/web/utils/Logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../../../../src/web/utils/Logger.ts"],"names":[],"mappings":"AACA,aAAK,UAAU,GAAG;IAChB,KAAK,EAAE,QAAQ,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AACF,aAAK,WAAW,GAAG,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,CAAC;AAChD,aAAK,QAAQ,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;AAEnE,cAAM,MAAM;IACV,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEtC,KAAK,EAAE,QAAQ,CAAU;IACzB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,YAAY,SAAK;IAEjB,MAAM,CAAC,cAAc;;IAWrB;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW;IAI9C;;;;OAIG;IACH,cAAc,CAAC,WAAW,EAAE,WAAW;IAIvC;;;;;;;OAOG;IAEH;;;OAGG;IACH,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ;IAIlC,KAAK;IAEL,IAAI;IAEJ,SAAS;IAIT,WAAW;IAIX,cAAc,CAAC,GAAG,EAAE,UAAU,GAAG,QAAQ;IAezC,KAAK,CAAC,GAAG,EAAE,UAAU;CAatB;AAID,eAAe,MAAM,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.1.0-beta.2",
+  "version": "10.1.0-beta.21",
   "publishConfig": {
     "access": "public"
   },
@@ -20,7 +20,7 @@
   },
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
-  "types": "lib/typescript/index.d.ts",
+  "types": "lib/typescript/src/index.d.ts",
   "browser": "./src/index.web.js",
   "react-native": "src/index",
   "source": "src/index",
@@ -41,7 +41,7 @@
   ],
   "scripts": {
     "fetch:style:spec": ". ./scripts/download-style-spec.sh",
-    "generate": "node ./scripts/autogenerate",
+    "generate": "node ./scripts/autogenerate.mjs",
     "test": "yarn lint && yarn unittest",
     "unittest": "yarn jest",
     "unittest:single": "yarn jest --testNamePattern",
@@ -50,6 +50,7 @@
     "type:check": "yarn tsc --noEmit",
     "test:plugin": "yarn expo-module test plugin",
     "build:plugin": "yarn tsc --build plugin",
+    "build:examples.json": "cd example; jest __tests__/dumpExamplesJson.ts",
     "lint:plugin": "yarn eslint plugin/src/*",
     "build": "yarn bob build",
     "prepare": "yarn bob build && yarn husky install"
@@ -82,15 +83,14 @@
     "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-proposal-class-properties": "7.18.6",
     "@babel/runtime": "7.19.0",
-    "@react-native-community/eslint-config": "^3.2.0",
+    "@react-native/eslint-config": "^0.72.2",
     "@sinonjs/fake-timers": "^8.0.1",
-    "@testing-library/react-native": "^11.0.0",
+    "@testing-library/react-native": "^12.4.0",
     "@types/debounce": "^1.2.1",
     "@types/mapbox-gl": "^2.7.5",
-    "@types/react-native": ">=0.59.9",
     "@typescript-eslint/eslint-plugin": "^5.37.0",
     "@typescript-eslint/parser": "^5.37.0",
-    "babel-jest": "^29.0.3",
+    "babel-jest": "^29.6.3",
     "documentation": "14.0.0",
     "ejs": "^3.1.3",
     "ejs-lint": "^1.1.0",
@@ -102,18 +102,19 @@
     "expo": "^47.0.0",
     "expo-module-scripts": "^3.0.4",
     "husky": "^8.0.1",
-    "jest": "27.5.1",
-    "jest-cli": "27.5.1",
+    "jest": "29.7.0",
+    "jest-cli": "29.7.0",
     "lint-staged": "^12.1.2",
     "mapbox-gl": "^2.9.0",
     "metro-react-native-babel-preset": "0.71.1",
     "node-dir": "0.1.17",
     "prettier": "2.7.1",
-    "react": "17.0.2",
-    "react-docgen": "rnmapbox/react-docgen#rnmapbox-dist",
-    "react-native": "0.67.0",
-    "react-native-builder-bob": "^0.20.0",
-    "react-test-renderer": "17.0.2",
+    "react": "18.2.0",
+    "react-docgen": "rnmapbox/react-docgen#rnmapbox-dist-react-docgen-v6",
+    "react-native": "0.73.0-rc.4",
+    "react-native-builder-bob": "^0.23.1",
+    "react-test-renderer": "18.2.0",
+    "ts-node": "10.9.1",
     "typescript": "4.8.4"
   },
   "codegenConfig": {
@@ -121,25 +122,9 @@
     "type": "all",
     "jsSrcsDir": "src/specs",
     "android": {
-      "javaPackageName": "com.mapbox.rctmgl"
+      "javaPackageName": "com.rnmapbox.rnmbx"
     }
   },
-  "jest": {
-    "preset": "react-native",
-    "collectCoverageFrom": [
-      "src/**/*.js"
-    ],
-    "setupFiles": [
-      "./setup-jest.js",
-      "./__tests__/__mocks__/react-native.mock.js"
-    ],
-    "modulePathIgnorePatterns": [
-      "example",
-      "__tests__/__mocks__",
-      "fixtures",
-      "<rootDir>/lib/"
-    ]
-  },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": "eslint --fix"
   },

package/plugin/build/withMapbox.d.ts

@@ -1,16 +1,17 @@
 import { ConfigPlugin } from 'expo/config-plugins';
 declare type InstallerBlockName = 'pre' | 'post';
 export declare type MapboxPlugProps = {
-    RNMapboxMapsImpl?: string;
     /**
-     * @platform ios
+     * @deprecated
      */
+    RNMapboxMapsImpl?: 'mapbox';
     RNMapboxMapsVersion?: string;
     RNMapboxMapsDownloadToken?: string;
+    RNMapboxMapsUseV11?: boolean;
 };
 export declare const addInstallerBlock: (src: string, blockName: InstallerBlockName) => string;
-export declare const addConstantBlock: (src: string, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, }: MapboxPlugProps) => string;
-export declare const applyCocoaPodsModifications: (contents: string, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, }: MapboxPlugProps) => string;
+export declare const addConstantBlock: (src: string, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, RNMapboxMapsUseV11, }: MapboxPlugProps) => string;
+export declare const applyCocoaPodsModifications: (contents: string, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, RNMapboxMapsUseV11, }: MapboxPlugProps) => string;
 export declare const addMapboxInstallerBlock: (src: string, blockName: InstallerBlockName) => string;
 export declare const addMapboxMavenRepo: (src: string) => string;
 declare const _default: ConfigPlugin<MapboxPlugProps>;

package/plugin/build/withMapbox.js

@@ -46,9 +46,11 @@ const addInstallerBlock = (src, blockName) => {
     }).contents;
 };
 exports.addInstallerBlock = addInstallerBlock;
-const addConstantBlock = (src, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, }) => {
+const addConstantBlock = (src, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, RNMapboxMapsUseV11, }) => {
     const tag = `@rnmapbox/maps-rnmapboxmapsimpl`;
-    if (RNMapboxMapsImpl == null) {
+    if (RNMapboxMapsVersion == null &&
+        RNMapboxMapsDownloadToken == null &&
+        RNMapboxMapsUseV11 == null) {
         const modified = (0, generateCode_1.removeGeneratedContents)(src, tag);
         if (!modified) {
             return src;
@@ -57,13 +59,19 @@ const addConstantBlock = (src, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapbox
             return modified;
         }
     }
-    const newSrc = [
-        `$RNMapboxMapsImpl = '${RNMapboxMapsImpl}'`,
-        `$RNMapboxMapsDownloadToken = '${RNMapboxMapsDownloadToken}'`,
-    ];
+    const newSrc = [];
+    if (RNMapboxMapsDownloadToken) {
+        newSrc.push(`$RNMapboxMapsDownloadToken = '${RNMapboxMapsDownloadToken}'`);
+    }
+    if (RNMapboxMapsImpl) {
+        newSrc.push(`$RNMapboxMapsImpl = '${RNMapboxMapsImpl}'`);
+    }
     if (RNMapboxMapsVersion) {
         newSrc.push(`$RNMapboxMapsVersion = '${RNMapboxMapsVersion}'`);
     }
+    if (RNMapboxMapsUseV11) {
+        newSrc.push(`$RNMapboxMapsUseV11 = true`);
+    }
     return (0, generateCode_1.mergeContents)({
         tag,
         src,
@@ -77,12 +85,13 @@ const addConstantBlock = (src, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapbox
 exports.addConstantBlock = addConstantBlock;
 // Only the preinstaller block is required, the post installer block is
 // used for spm (swift package manager) which Expo doesn't currently support.
-const applyCocoaPodsModifications = (contents, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, }) => {
+const applyCocoaPodsModifications = (contents, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, RNMapboxMapsUseV11, }) => {
     // Ensure installer blocks exist
     let src = (0, exports.addConstantBlock)(contents, {
         RNMapboxMapsImpl,
         RNMapboxMapsVersion,
         RNMapboxMapsDownloadToken,
+        RNMapboxMapsUseV11,
     });
     src = (0, exports.addInstallerBlock)(src, 'pre');
     src = (0, exports.addInstallerBlock)(src, 'post');
@@ -106,7 +115,7 @@ exports.addMapboxInstallerBlock = addMapboxInstallerBlock;
  *
  * https://github.com/rnmapbox/maps/blob/main/ios/install.md#react-native--0600
  */
-const withCocoaPodsInstallerBlocks = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken }) => (0, config_plugins_1.withDangerousMod)(config, [
+const withCocoaPodsInstallerBlocks = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, RNMapboxMapsUseV11, }) => (0, config_plugins_1.withDangerousMod)(config, [
     'ios',
     async (exportedConfig) => {
         const file = path_1.default.join(exportedConfig.modRequest.platformProjectRoot, 'Podfile');
@@ -115,6 +124,7 @@ const withCocoaPodsInstallerBlocks = (config, { RNMapboxMapsImpl, RNMapboxMapsVe
             RNMapboxMapsImpl,
             RNMapboxMapsVersion,
             RNMapboxMapsDownloadToken,
+            RNMapboxMapsUseV11,
         }), 'utf-8');
         return exportedConfig;
     },
@@ -134,27 +144,40 @@ const withAndroidPropertiesDownloadToken = (config, { RNMapboxMapsDownloadToken
     }
     return config;
 };
-const withAndroidPropertiesImpl2 = (config, { RNMapboxMapsImpl }) => {
-    const key = 'expoRNMapboxMapsImpl';
-    if (RNMapboxMapsImpl) {
+const withAndroidPropertiesImpl2 = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsUseV11 }) => {
+    const keyValues = {
+        expoRNMapboxMapsImpl: RNMapboxMapsImpl,
+        expoRNMapboxMapsVersion: RNMapboxMapsVersion,
+        expoRNMapboxMapsUseV11: RNMapboxMapsUseV11,
+    };
+    const keys = Object.keys(keyValues);
+    const values = Object.values(keyValues);
+    if (values.filter((v) => v).length > 0) {
         return (0, config_plugins_1.withGradleProperties)(config, (exportedConfig) => {
-            exportedConfig.modResults = exportedConfig.modResults.filter((item) => !(item.type === 'property' && item.key === key));
-            exportedConfig.modResults.push({
-                type: 'property',
-                key: key,
-                value: RNMapboxMapsImpl,
+            exportedConfig.modResults = exportedConfig.modResults.filter((item) => !(item.type === 'property' && keys.includes(item.key)));
+            keys.forEach((key) => {
+                const value = keyValues[key];
+                if (value != null) {
+                    exportedConfig.modResults.push({
+                        type: 'property',
+                        key: key,
+                        value: value.toString(),
+                    });
+                }
             });
             return exportedConfig;
         });
     }
     return config;
 };
-const withAndroidProperties = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken }) => {
+const withAndroidProperties = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken, RNMapboxMapsVersion, RNMapboxMapsUseV11, }) => {
     config = withAndroidPropertiesDownloadToken(config, {
         RNMapboxMapsDownloadToken,
     });
     config = withAndroidPropertiesImpl2(config, {
         RNMapboxMapsImpl,
+        RNMapboxMapsVersion,
+        RNMapboxMapsUseV11,
     });
     return config;
 };
@@ -239,25 +262,29 @@ const withAndroidProjectGradle = (config) => (0, config_plugins_1.withProjectBui
     modResults.contents = (0, exports.addMapboxMavenRepo)(modResults.contents);
     return { modResults, ...exportedConfig };
 });
-const withMapboxAndroid = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken }) => {
+const withMapboxAndroid = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken, RNMapboxMapsVersion, RNMapboxMapsUseV11, }) => {
     config = withAndroidProperties(config, {
         RNMapboxMapsImpl,
         RNMapboxMapsDownloadToken,
+        RNMapboxMapsVersion,
+        RNMapboxMapsUseV11,
     });
     config = withAndroidProjectGradle(config, { RNMapboxMapsImpl });
     config = withAndroidAppGradle(config, { RNMapboxMapsImpl });
     return config;
 };
-const withMapbox = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken }) => {
+const withMapbox = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, RNMapboxMapsUseV11, }) => {
     config = withMapboxAndroid(config, {
         RNMapboxMapsImpl,
         RNMapboxMapsVersion,
+        RNMapboxMapsUseV11,
         RNMapboxMapsDownloadToken,
     });
     config = withCocoaPodsInstallerBlocks(config, {
         RNMapboxMapsImpl,
         RNMapboxMapsVersion,
         RNMapboxMapsDownloadToken,
+        RNMapboxMapsUseV11,
     });
     return config;
 };

package/plugin/install.md

@@ -32,7 +32,7 @@ After installing this package, add the [config plugin](https://docs.expo.io/guid
 }
 ```
 
-For `mapbox` or `mapbox-gl` you'll need to provide `RNMapboxMapsDownloadToken` as well.
+For `mapbox` or `mapbox-gl` you'll need to provide `RNMapboxMapsDownloadToken` as well. This secret token requires the `DOWNLOADS:READ` scope. You can refer to the [iOS guide](https://docs.mapbox.com/ios/maps/guides/install/#configure-credentials), which explains how to configure this token under the section `Configure your secret token`.
 
 ```json
 {
@@ -90,6 +90,26 @@ For `mapbox` or `mapbox-gl` on iOS it's possible to overwrite the native SDK ver
 }
 ```
 
+If using V11, on iOS, you can use property `RNMapboxMapsUseV11`, see [the ios guide](/ios/install.md):
+
+```json
+{
+  "expo": {
+    "plugins": [
+      [
+        "@rnmapbox/maps",
+        {
+          "RNMapboxMapsImpl": "mapbox",
+          "RNMapboxMapsVersion": "11.XX.XX",
+          "RNMapboxMapsDownloadToken": "sk.ey...qg",
+          "RNMapboxMapsUseV11": true
+        }
+      ]
+    ]
+  }
+}
+```
+
 ## Manual Setup
 
 For bare workflow projects, you can follow the manual setup guides:

package/plugin/src/withMapbox.ts

@@ -30,14 +30,16 @@ try {
 type InstallerBlockName = 'pre' | 'post';
 
 export type MapboxPlugProps = {
-  RNMapboxMapsImpl?: string;
-
   /**
-   * @platform ios
+   * @deprecated
    */
+  RNMapboxMapsImpl?: 'mapbox';
+
   RNMapboxMapsVersion?: string;
 
   RNMapboxMapsDownloadToken?: string;
+
+  RNMapboxMapsUseV11?: boolean;
 };
 
 export const addInstallerBlock = (
@@ -80,11 +82,16 @@ export const addConstantBlock = (
     RNMapboxMapsImpl,
     RNMapboxMapsVersion,
     RNMapboxMapsDownloadToken,
+    RNMapboxMapsUseV11,
   }: MapboxPlugProps,
 ): string => {
   const tag = `@rnmapbox/maps-rnmapboxmapsimpl`;
 
-  if (RNMapboxMapsImpl == null) {
+  if (
+    RNMapboxMapsVersion == null &&
+    RNMapboxMapsDownloadToken == null &&
+    RNMapboxMapsUseV11 == null
+  ) {
     const modified = removeGeneratedContents(src, tag);
     if (!modified) {
       return src;
@@ -93,15 +100,24 @@ export const addConstantBlock = (
     }
   }
 
-  const newSrc = [
-    `$RNMapboxMapsImpl = '${RNMapboxMapsImpl}'`,
-    `$RNMapboxMapsDownloadToken = '${RNMapboxMapsDownloadToken}'`,
-  ];
+  const newSrc = [];
+
+  if (RNMapboxMapsDownloadToken) {
+    newSrc.push(`$RNMapboxMapsDownloadToken = '${RNMapboxMapsDownloadToken}'`);
+  }
+
+  if (RNMapboxMapsImpl) {
+    newSrc.push(`$RNMapboxMapsImpl = '${RNMapboxMapsImpl}'`);
+  }
 
   if (RNMapboxMapsVersion) {
     newSrc.push(`$RNMapboxMapsVersion = '${RNMapboxMapsVersion}'`);
   }
 
+  if (RNMapboxMapsUseV11) {
+    newSrc.push(`$RNMapboxMapsUseV11 = true`);
+  }
+
   return mergeContents({
     tag,
     src,
@@ -121,6 +137,7 @@ export const applyCocoaPodsModifications = (
     RNMapboxMapsImpl,
     RNMapboxMapsVersion,
     RNMapboxMapsDownloadToken,
+    RNMapboxMapsUseV11,
   }: MapboxPlugProps,
 ): string => {
   // Ensure installer blocks exist
@@ -128,6 +145,7 @@ export const applyCocoaPodsModifications = (
     RNMapboxMapsImpl,
     RNMapboxMapsVersion,
     RNMapboxMapsDownloadToken,
+    RNMapboxMapsUseV11,
   });
   src = addInstallerBlock(src, 'pre');
   src = addInstallerBlock(src, 'post');
@@ -158,7 +176,12 @@ export const addMapboxInstallerBlock = (
  */
 const withCocoaPodsInstallerBlocks: ConfigPlugin<MapboxPlugProps> = (
   config,
-  { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken },
+  {
+    RNMapboxMapsImpl,
+    RNMapboxMapsVersion,
+    RNMapboxMapsDownloadToken,
+    RNMapboxMapsUseV11,
+  },
 ) =>
   withDangerousMod(config, [
     'ios',
@@ -175,6 +198,7 @@ const withCocoaPodsInstallerBlocks: ConfigPlugin<MapboxPlugProps> = (
           RNMapboxMapsImpl,
           RNMapboxMapsVersion,
           RNMapboxMapsDownloadToken,
+          RNMapboxMapsUseV11,
         }),
         'utf-8',
       );
@@ -209,19 +233,32 @@ const withAndroidPropertiesDownloadToken: ConfigPlugin<MapboxPlugProps> = (
 
 const withAndroidPropertiesImpl2: ConfigPlugin<MapboxPlugProps> = (
   config,
-  { RNMapboxMapsImpl },
+  { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsUseV11 },
 ) => {
-  const key = 'expoRNMapboxMapsImpl';
-
-  if (RNMapboxMapsImpl) {
+  const keyValues = {
+    expoRNMapboxMapsImpl: RNMapboxMapsImpl,
+    expoRNMapboxMapsVersion: RNMapboxMapsVersion,
+    expoRNMapboxMapsUseV11: RNMapboxMapsUseV11,
+  } as const;
+  type Keys = keyof typeof keyValues;
+  const keys = Object.keys(keyValues) as Keys[];
+  const values = Object.values(keyValues);
+
+  if (values.filter((v) => v).length > 0) {
     return withGradleProperties(config, (exportedConfig) => {
       exportedConfig.modResults = exportedConfig.modResults.filter(
-        (item) => !(item.type === 'property' && item.key === key),
+        (item) =>
+          !(item.type === 'property' && (keys as string[]).includes(item.key)),
       );
-      exportedConfig.modResults.push({
-        type: 'property',
-        key: key,
-        value: RNMapboxMapsImpl,
+      keys.forEach((key) => {
+        const value = keyValues[key];
+        if (value != null) {
+          exportedConfig.modResults.push({
+            type: 'property',
+            key: key,
+            value: value.toString(),
+          });
+        }
       });
 
       return exportedConfig;
@@ -233,13 +270,20 @@ const withAndroidPropertiesImpl2: ConfigPlugin<MapboxPlugProps> = (
 
 const withAndroidProperties: ConfigPlugin<MapboxPlugProps> = (
   config,
-  { RNMapboxMapsImpl, RNMapboxMapsDownloadToken },
+  {
+    RNMapboxMapsImpl,
+    RNMapboxMapsDownloadToken,
+    RNMapboxMapsVersion,
+    RNMapboxMapsUseV11,
+  },
 ) => {
   config = withAndroidPropertiesDownloadToken(config, {
     RNMapboxMapsDownloadToken,
   });
   config = withAndroidPropertiesImpl2(config, {
     RNMapboxMapsImpl,
+    RNMapboxMapsVersion,
+    RNMapboxMapsUseV11,
   });
 
   return config;
@@ -361,11 +405,18 @@ const withAndroidProjectGradle: ConfigPlugin<MapboxPlugProps> = (config) =>
 
 const withMapboxAndroid: ConfigPlugin<MapboxPlugProps> = (
   config,
-  { RNMapboxMapsImpl, RNMapboxMapsDownloadToken },
+  {
+    RNMapboxMapsImpl,
+    RNMapboxMapsDownloadToken,
+    RNMapboxMapsVersion,
+    RNMapboxMapsUseV11,
+  },
 ) => {
   config = withAndroidProperties(config, {
     RNMapboxMapsImpl,
     RNMapboxMapsDownloadToken,
+    RNMapboxMapsVersion,
+    RNMapboxMapsUseV11,
   });
   config = withAndroidProjectGradle(config, { RNMapboxMapsImpl });
   config = withAndroidAppGradle(config, { RNMapboxMapsImpl });
@@ -375,17 +426,24 @@ const withMapboxAndroid: ConfigPlugin<MapboxPlugProps> = (
 
 const withMapbox: ConfigPlugin<MapboxPlugProps> = (
   config,
-  { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken },
+  {
+    RNMapboxMapsImpl,
+    RNMapboxMapsVersion,
+    RNMapboxMapsDownloadToken,
+    RNMapboxMapsUseV11,
+  },
 ) => {
   config = withMapboxAndroid(config, {
     RNMapboxMapsImpl,
     RNMapboxMapsVersion,
+    RNMapboxMapsUseV11,
     RNMapboxMapsDownloadToken,
   });
   config = withCocoaPodsInstallerBlocks(config, {
     RNMapboxMapsImpl,
     RNMapboxMapsVersion,
     RNMapboxMapsDownloadToken,
+    RNMapboxMapsUseV11,
   });
 
   return config;