@rnmapbox/maps 10.2.6 → 10.2.7

package/android/src/main/java/com/rnmapbox/rnmbx/modules/CustomHttpHeaders.kt

@@ -1,36 +1,58 @@
 package com.rnmapbox.rnmbx.modules
 
 import com.mapbox.common.*
-
 import com.rnmapbox.rnmbx.v11compat.httpinterceptor.*
 
+data class CustomHttpHeadersOptions(val urlRegexp: Regex?)
+
+data class CustomHttpHeadersMapValue(
+    val headerValue: String,
+    val options: CustomHttpHeadersOptions?
+)
+
 object CustomHttpHeaders : HttpServiceBase() {
+    const val LOG_TAG = "CustomHttpHeaders"
+
     init {}
 
-    val map = mutableMapOf<String, String>()
+    val map = mutableMapOf<String, CustomHttpHeadersMapValue>()
 
-    fun addCustomHeader(headerName: String, headerValue: String) {
+    fun addCustomHeader(headerName: String, headerValue: String, options: CustomHttpHeadersOptions? = null) {
         HttpServiceFactory.getInstance().setInterceptor(
             this
         )
-        map.put(headerName, headerValue)
+        map.put(headerName, CustomHttpHeadersMapValue(headerValue = headerValue, options = options))
     }
 
     fun removeCustomHeader(headerName: String) {
         map.remove(headerName)
     }
 
-    override fun onRequest(request: HttpRequest): HttpRequest {
+    fun getCustomRequestHeaders(customRequestHeaders: MutableMap<String, CustomHttpHeadersMapValue>, httpRequest: HttpRequest): HashMap<String, String> {
+        val headers = hashMapOf<String, String>()
         for (entry in map.entries.iterator()) {
-            request.headers[entry.key] = entry.value
+            val urlRegexp = entry.value.options?.urlRegexp
+            if (urlRegexp != null) {
+                val destination = httpRequest.headers.getOrDefault("location", httpRequest.url)
+                if (urlRegexp.matches(destination)) {
+                    headers[entry.key] = entry.value.headerValue
+                }
+            }
+            else {
+                headers[entry.key] = entry.value.headerValue
+            }
         }
+        return headers
+    }
+
+    override fun onRequest(request: HttpRequest): HttpRequest {
+        request.headers.remove("Authorization")
+        request.headers.putAll(getCustomRequestHeaders(map, request))
         return request
     }
 
     override fun onDownload(download: DownloadOptions): DownloadOptions {
-        for (entry in map.entries.iterator()) {
-            download.request.headers[entry.key] = entry.value
-        }
+        download.request.headers.putAll(getCustomRequestHeaders(map, download.request))
         return download
     }
 

package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXModule.kt

@@ -1,6 +1,7 @@
 package com.rnmapbox.rnmbx.modules
 
 import android.os.Handler
+import androidx.annotation.Nullable
 import com.facebook.react.bridge.Promise
 import com.mapbox.maps.extension.style.layers.properties.generated.LineJoin
 import com.facebook.react.module.annotations.ReactModule
@@ -11,6 +12,8 @@ import com.rnmapbox.rnmbx.events.constants.EventTypes
 import com.rnmapbox.rnmbx.modules.RNMBXOfflineModule
 import com.rnmapbox.rnmbx.modules.RNMBXLocationModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.buildReadableMap
 import com.facebook.react.common.MapBuilder
 import com.mapbox.bindgen.None
 import com.mapbox.common.*
@@ -24,6 +27,7 @@ import java.util.HashMap
 
 import com.rnmapbox.rnmbx.v11compat.resourceoption.*
 import com.rnmapbox.rnmbx.v11compat.mapboxmap.*
+import java.util.regex.PatternSyntaxException
 
 @ReactModule(name = RNMBXModule.REACT_CLASS)
 class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactContextBaseJavaModule(
@@ -165,7 +169,17 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
 
     @ReactMethod
     fun addCustomHeader(headerName: String, headerValue: String) {
-        CustomHttpHeaders.addCustomHeader(headerName, headerValue)
+        addCustomHeaderWithOptions(headerName, headerValue)
+    }
+
+    @ReactMethod
+    fun addCustomHeaderWithOptions(headerName: String, headerValue: String, options: ReadableMap? = buildReadableMap { }) {
+        try {
+            val urlRegexp = options?.getString("urlRegexp")?.toRegex()
+            CustomHttpHeaders.addCustomHeader(headerName, headerValue, CustomHttpHeadersOptions(urlRegexp = urlRegexp))
+        } catch (e: PatternSyntaxException) {
+            Logger.e(CustomHttpHeaders.LOG_TAG, e.localizedMessage ?: "Error converting ${options?.getString("urlRegexp")} to regex")
+        }
     }
 
     @ReactMethod

package/ios/RNMBX/CustomHttpHeaders.swift

@@ -1,5 +1,14 @@
 import MapboxMaps
 
+struct CustomHttpHeadersOptions {
+  var urlRegexp: NSRegularExpression?
+}
+
+struct CustomHttpHeadersMapValue {
+  var headerValue: String
+  var options: CustomHttpHeadersOptions
+}
+
 class CustomHttpHeaders : HttpServiceInterceptorInterface {
   #if RNMBX_11
   func onRequest(for request: HttpRequest, continuation: @escaping HttpServiceInterceptorRequestContinuation) {
@@ -18,7 +27,7 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
     return headers
   }()
 
-  var customHeaders : [String:String] = [:]
+  var customHeaders : [String:CustomHttpHeadersMapValue] = [:]
 
   func install() {
     #if RNMBX_11
@@ -38,19 +47,39 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
   }
 
   // MARK: - HttpServiceInterceptorInterface
+  
+  func getCustomRequestHeaders(for request: HttpRequest, with customHeaders: [String: CustomHttpHeadersMapValue]) -> [String: String] {
+    var headers: [String: String] = [:]
+    let urlString = request.url
 
-  func onRequest(for request: HttpRequest) -> HttpRequest {
-    customHeaders.forEach {(key, value) in
-      request.headers[key] = value
+    for (key, entry) in customHeaders {
+      let options = entry.options
+
+      if let pattern = options.urlRegexp {
+        do {
+          let range = NSRange(location: 0, length: urlString.utf16.count)
+          if pattern.firstMatch(in: urlString, options: [], range: range) != nil {
+            headers[key] = entry.headerValue
+          }
+        }
+      } else {
+        headers[key] = entry.headerValue
+      }
     }
+    return headers
+  }
+
+
+  func onRequest(for request: HttpRequest) -> HttpRequest {
+    let customHeaders = getCustomRequestHeaders(for: request, with: customHeaders)
+    request.headers.merge(customHeaders) { (_, new) in new }
     return request
   }
 
   #if !RNMBX_11
   func onDownload(forDownload download: DownloadOptions) -> DownloadOptions {
-    customHeaders.forEach {(key,value) in
-      download.request.headers[key] = value
-    }
+    let customHeaders = getCustomRequestHeaders(for: download.request, with: customHeaders)
+    download.request.headers.merge(customHeaders) { (_, new) in new }
     return download
   }
   #endif

package/ios/RNMBX/RNMBXModule.m

@@ -5,6 +5,7 @@
 RCT_EXTERN_METHOD(setAccessToken:(NSString *)accessToken resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(addCustomHeader:(NSString *)headerName forHeaderValue:(NSString *) headerValue)
+RCT_EXTERN_METHOD(addCustomHeaderWithOptions:(NSString *)headerName forHeaderValue:(NSString *) headerValue forOptions:(nullable NSDictionary *) options)
 RCT_EXTERN_METHOD(removeCustomHeader:(NSString *)headerName)
 
 RCT_EXTERN_METHOD(setTelemetryEnabled:(BOOL)telemetryEnabled)

package/ios/RNMBX/RNMBXModule.swift

@@ -98,9 +98,23 @@ class RNMBXModule : NSObject {
       RNMBXModule.accessToken = token
       resolver(token)
   }
+  
+  @objc func addCustomHeader(_ headerName: String, forHeaderValue headerValue: String) {
+    addCustomHeaderWithOptions(headerName, forHeaderValue: headerValue, forOptions: nil)
+  }
 
-  @objc func addCustomHeader(_ headerName: String, forHeaderValue headerValue: String ) {
-    CustomHttpHeaders.shared.customHeaders[headerName] = headerValue
+  @objc func addCustomHeaderWithOptions(_ headerName: String, forHeaderValue headerValue: String, forOptions options: NSDictionary?) {
+    var urlRegexp: NSRegularExpression? = nil
+    if let pattern = options?.value(forKey: "urlRegexp") as? String {
+      do {
+        urlRegexp = try NSRegularExpression(pattern: pattern)
+      }
+      catch {
+        Logger.log(level: .error, message: "Invalid regex pattern: \(error.localizedDescription)")
+      }
+    }
+    
+    CustomHttpHeaders.shared.customHeaders[headerName] = CustomHttpHeadersMapValue(headerValue: headerValue, options: CustomHttpHeadersOptions(urlRegexp: urlRegexp))
   }
 
   @objc func removeCustomHeader(_ headerName: String) {

package/ios/RNMBX/Utils/RNMBXViewResolver.mm

@@ -6,6 +6,12 @@
 
 #import "RNMBXViewResolver.h"
 
+// View resolution timeout and delay constants
+static const NSTimeInterval MAX_TIMEOUT = 10.0; // 10 seconds
+static const int64_t DELAY_ON_FIRST_ATTEMPT = (NSEC_PER_MSEC/5); // 0.2ms
+static const int64_t DELAY_ON_NEXT_5_ATTEMPTS = 10 * NSEC_PER_MSEC; // 10ms
+static const int64_t DELAY_ON_FURTHER_ATTEMPTS = 200 * NSEC_PER_MSEC; // 200ms
+
 @implementation RNMBXViewResolver
 
 + (void)withViewRef:(NSNumber *)viewRef
@@ -84,7 +90,7 @@
     }
 
     NSTimeInterval elapsed = [[NSDate date] timeIntervalSinceDate:startTime];
-    if (elapsed >= 0.2) { // 200ms timeout
+    if (elapsed >= MAX_TIMEOUT) {
         NSString *errorMsg = [NSString stringWithFormat:@"Could not find view with tag %@ in %@ after %d attempts over %.1fms",
                       viewRef, methodName, (int)attemptCount + 1, elapsed * 1000];
         NSLog(@"%@", errorMsg);
@@ -92,7 +98,14 @@
         return;
     }
 
-    int64_t delay = (attemptCount == 0) ? (NSEC_PER_MSEC/5) : 10 * NSEC_PER_MSEC;
+    int64_t delay;
+    if (attemptCount == 0) {
+        delay = DELAY_ON_FIRST_ATTEMPT;
+    } else if (attemptCount <= 5) {
+        delay = DELAY_ON_NEXT_5_ATTEMPTS;
+    } else {
+        delay = DELAY_ON_FURTHER_ATTEMPTS;
+    }
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay), dispatch_get_main_queue(), ^{
         [self resolveViewWithPolling:viewRef
                             delegate:delegate

package/lib/commonjs/plugin/build/withMapbox.js

@@ -117,7 +117,7 @@ exports.addMapboxInstallerBlock = addMapboxInstallerBlock;
  *
  * https://github.com/rnmapbox/maps/blob/main/ios/install.md#react-native--0600
  */
-const withCocoaPodsInstallerBlocks = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, RNMapboxMapsUseV11, }) => (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');
@@ -131,7 +131,7 @@ const withCocoaPodsInstallerBlocks = (config, { RNMapboxMapsImpl, RNMapboxMapsVe
         return exportedConfig;
     },
 ]);
-const withAndroidPropertiesDownloadToken = (config, { RNMapboxMapsDownloadToken }) => {
+const withAndroidPropertiesDownloadToken = (config, { RNMapboxMapsDownloadToken } = {}) => {
     const key = 'MAPBOX_DOWNLOADS_TOKEN';
     if (RNMapboxMapsDownloadToken) {
         console.warn('⚠️ WARNING: RNMapboxMapsDownloadToken is deprecated. Use RNMAPBOX_MAPS_DOWNLOAD_TOKEN environment variable instead.');
@@ -148,7 +148,7 @@ const withAndroidPropertiesDownloadToken = (config, { RNMapboxMapsDownloadToken
     }
     return config;
 };
-const withAndroidPropertiesImpl2 = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsUseV11 }) => {
+const withAndroidPropertiesImpl2 = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsUseV11 } = {}) => {
     const keyValues = {
         expoRNMapboxMapsImpl: RNMapboxMapsImpl,
         expoRNMapboxMapsVersion: RNMapboxMapsVersion,
@@ -174,7 +174,7 @@ const withAndroidPropertiesImpl2 = (config, { RNMapboxMapsImpl, RNMapboxMapsVers
     }
     return config;
 };
-const withAndroidProperties = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken, RNMapboxMapsVersion, RNMapboxMapsUseV11, }) => {
+const withAndroidProperties = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken, RNMapboxMapsVersion, RNMapboxMapsUseV11, } = {}) => {
     config = withAndroidPropertiesDownloadToken(config, {
         RNMapboxMapsDownloadToken,
     });
@@ -256,7 +256,7 @@ const addMapboxMavenRepo = (src) => appendContents({
 }).contents;
 exports.addMapboxMavenRepo = addMapboxMavenRepo;
 exports._addMapboxMavenRepo = exports.addMapboxMavenRepo;
-const withAndroidAppGradle = (config) => (0, config_plugins_1.withAppBuildGradle)(config, ({ modResults, ...exportedConfig }) => {
+const withAndroidAppGradle = (config, _props = {}) => (0, config_plugins_1.withAppBuildGradle)(config, ({ modResults, ...exportedConfig }) => {
     if (modResults.language !== 'groovy') {
         config_plugins_1.WarningAggregator.addWarningAndroid('withMapbox', `Cannot automatically configure app build.gradle if it's not groovy`);
         return { modResults, ...exportedConfig };
@@ -264,7 +264,7 @@ const withAndroidAppGradle = (config) => (0, config_plugins_1.withAppBuildGradle
     modResults.contents = addLibCppFilter(modResults.contents);
     return { modResults, ...exportedConfig };
 });
-const withAndroidProjectGradle = (config) => (0, config_plugins_1.withProjectBuildGradle)(config, ({ modResults, ...exportedConfig }) => {
+const withAndroidProjectGradle = (config, _props = {}) => (0, config_plugins_1.withProjectBuildGradle)(config, ({ modResults, ...exportedConfig }) => {
     if (modResults.language !== 'groovy') {
         config_plugins_1.WarningAggregator.addWarningAndroid('withMapbox', `Cannot automatically configure app build.gradle if it's not groovy`);
         return { modResults, ...exportedConfig };
@@ -272,7 +272,7 @@ const withAndroidProjectGradle = (config) => (0, config_plugins_1.withProjectBui
     modResults.contents = (0, exports.addMapboxMavenRepo)(modResults.contents);
     return { modResults, ...exportedConfig };
 });
-const withMapboxAndroid = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken, RNMapboxMapsVersion, RNMapboxMapsUseV11, }) => {
+const withMapboxAndroid = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken, RNMapboxMapsVersion, RNMapboxMapsUseV11, } = {}) => {
     config = withAndroidProperties(config, {
         RNMapboxMapsImpl,
         RNMapboxMapsDownloadToken,
@@ -283,7 +283,7 @@ const withMapboxAndroid = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken
     config = withAndroidAppGradle(config, { RNMapboxMapsImpl });
     return config;
 };
-const withMapbox = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, RNMapboxMapsUseV11, }) => {
+const withMapbox = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, RNMapboxMapsUseV11, } = {}) => {
     config = withMapboxAndroid(config, {
         RNMapboxMapsImpl,
         RNMapboxMapsVersion,

package/lib/commonjs/plugin/src/withMapbox.ts

@@ -188,7 +188,7 @@ const withCocoaPodsInstallerBlocks: ConfigPlugin<MapboxPlugProps> = (
     RNMapboxMapsVersion,
     RNMapboxMapsDownloadToken,
     RNMapboxMapsUseV11,
-  },
+  }: MapboxPlugProps = {},
 ) =>
   withDangerousMod(config, [
     'ios',
@@ -216,7 +216,7 @@ const withCocoaPodsInstallerBlocks: ConfigPlugin<MapboxPlugProps> = (
 
 const withAndroidPropertiesDownloadToken: ConfigPlugin<MapboxPlugProps> = (
   config,
-  { RNMapboxMapsDownloadToken },
+  { RNMapboxMapsDownloadToken }: MapboxPlugProps = {},
 ) => {
   const key = 'MAPBOX_DOWNLOADS_TOKEN';
 
@@ -247,7 +247,7 @@ const withAndroidPropertiesDownloadToken: ConfigPlugin<MapboxPlugProps> = (
 
 const withAndroidPropertiesImpl2: ConfigPlugin<MapboxPlugProps> = (
   config,
-  { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsUseV11 },
+  { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsUseV11 }: MapboxPlugProps = {},
 ) => {
   const keyValues = {
     expoRNMapboxMapsImpl: RNMapboxMapsImpl,
@@ -289,7 +289,7 @@ const withAndroidProperties: ConfigPlugin<MapboxPlugProps> = (
     RNMapboxMapsDownloadToken,
     RNMapboxMapsVersion,
     RNMapboxMapsUseV11,
-  },
+  }: MapboxPlugProps = {},
 ) => {
   config = withAndroidPropertiesDownloadToken(config, {
     RNMapboxMapsDownloadToken,
@@ -391,7 +391,7 @@ export const addMapboxMavenRepo = (src: string): string =>
     comment: '//',
   }).contents;
 
-const withAndroidAppGradle: ConfigPlugin<MapboxPlugProps> = (config) =>
+const withAndroidAppGradle: ConfigPlugin<MapboxPlugProps> = (config, _props: MapboxPlugProps = {}) =>
   withAppBuildGradle(config, ({ modResults, ...exportedConfig }) => {
     if (modResults.language !== 'groovy') {
       WarningAggregator.addWarningAndroid(
@@ -407,7 +407,7 @@ const withAndroidAppGradle: ConfigPlugin<MapboxPlugProps> = (config) =>
     return { modResults, ...exportedConfig };
   });
 
-const withAndroidProjectGradle: ConfigPlugin<MapboxPlugProps> = (config) =>
+const withAndroidProjectGradle: ConfigPlugin<MapboxPlugProps> = (config, _props: MapboxPlugProps = {}) =>
   withProjectBuildGradle(config, ({ modResults, ...exportedConfig }) => {
     if (modResults.language !== 'groovy') {
       WarningAggregator.addWarningAndroid(
@@ -430,7 +430,7 @@ const withMapboxAndroid: ConfigPlugin<MapboxPlugProps> = (
     RNMapboxMapsDownloadToken,
     RNMapboxMapsVersion,
     RNMapboxMapsUseV11,
-  },
+  }: MapboxPlugProps = {},
 ) => {
   config = withAndroidProperties(config, {
     RNMapboxMapsImpl,
@@ -451,7 +451,7 @@ const withMapbox: ConfigPlugin<MapboxPlugProps> = (
     RNMapboxMapsVersion,
     RNMapboxMapsDownloadToken,
     RNMapboxMapsUseV11,
-  },
+  }: MapboxPlugProps = {},
 ) => {
   config = withMapboxAndroid(config, {
     RNMapboxMapsImpl,

package/lib/module/RNMBXModule.js

@@ -10,6 +10,20 @@ if (NativeModules.RNMBXModule == null) {
     throw new Error('@rnmapbox/maps native code not available. Make sure you have linked the library and rebuild your app. See https://rnmapbox.github.io/docs/install');
   }
 }
+
+/**
+ * Add a custom header to HTTP requests.
+ * @param headerName - The name of the header
+ * @param headerValue - The value of the header
+ * @param options - Optional configuration. If provided with urlRegexp, the header will only be added to URLs matching the regex
+ */
+function addCustomHeader(headerName, headerValue, options) {
+  if (options) {
+    RNMBXModule.addCustomHeaderWithOptions(headerName, headerValue, options);
+  } else {
+    RNMBXModule.addCustomHeader(headerName, headerValue);
+  }
+}
 export const {
   StyleURL,
   OfflinePackDownloadState,
@@ -17,7 +31,6 @@ export const {
   StyleSource,
   TileServers,
   removeCustomHeader,
-  addCustomHeader,
   setAccessToken,
   setWellKnownTileServer,
   clearData,
@@ -25,4 +38,5 @@ export const {
   setTelemetryEnabled,
   setConnected
 } = RNMBXModule;
+export { addCustomHeader };
 //# sourceMappingURL=RNMBXModule.js.map

package/lib/module/RNMBXModule.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","RNMBXModule","global","expo","Error","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","addCustomHeader","setAccessToken","setWellKnownTileServer","clearData","getAccessToken","setTelemetryEnabled","setConnected"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":";;AAAA,SAASA,aAAa,QAAQ,cAAc;AAuC5C,MAAMC,WAAwB,GAAGD,aAAa,CAACC,WAAW;AAC1D,IAAID,aAAa,CAACC,WAAW,IAAI,IAAI,EAAE;EACrC,IAAKC,MAAM,CAAwBC,IAAI,IAAI,IAAI,EAAE;IAC/C;IACA,MAAM,IAAIC,KAAK,CACb,wKACF,CAAC;EACH,CAAC,MAAM;IACL,MAAM,IAAIA,KAAK,CACb,mJACF,CAAC;EACH;AACF;AAEA,OAAO,MAAM;EACXC,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,eAAe;EACfC,cAAc;EACdC,sBAAsB;EACtBC,SAAS;EACTC,cAAc;EACdC,mBAAmB;EACnBC;AACF,CAAC,GAAGhB,WAAW","ignoreList":[]}
+{"version":3,"names":["NativeModules","RNMBXModule","global","expo","Error","addCustomHeader","headerName","headerValue","options","addCustomHeaderWithOptions","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","setAccessToken","setWellKnownTileServer","clearData","getAccessToken","setTelemetryEnabled","setConnected"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":";;AAAA,SAASA,aAAa,QAAQ,cAAc;AA8C5C,MAAMC,WAAwB,GAAGD,aAAa,CAACC,WAAW;AAC1D,IAAID,aAAa,CAACC,WAAW,IAAI,IAAI,EAAE;EACrC,IAAKC,MAAM,CAAwBC,IAAI,IAAI,IAAI,EAAE;IAC/C;IACA,MAAM,IAAIC,KAAK,CACb,wKACF,CAAC;EACH,CAAC,MAAM;IACL,MAAM,IAAIA,KAAK,CACb,mJACF,CAAC;EACH;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,eAAeA,CACtBC,UAAkB,EAClBC,WAAmB,EACnBC,OAAgC,EAC1B;EACN,IAAIA,OAAO,EAAE;IACXP,WAAW,CAACQ,0BAA0B,CAACH,UAAU,EAAEC,WAAW,EAAEC,OAAO,CAAC;EAC1E,CAAC,MAAM;IACLP,WAAW,CAACI,eAAe,CAACC,UAAU,EAAEC,WAAW,CAAC;EACtD;AACF;AAEA,OAAO,MAAM;EACXG,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,cAAc;EACdC,sBAAsB;EACtBC,SAAS;EACTC,cAAc;EACdC,mBAAmB;EACnBC;AACF,CAAC,GAAGpB,WAAW;AAEf,SAASI,eAAe","ignoreList":[]}

package/lib/typescript/plugin/build/withMapbox.d.ts

@@ -1,10 +1,5 @@
 export const __esModule: boolean;
-declare const _default: config_plugins_1.ConfigPlugin<{
-    RNMapboxMapsImpl: any;
-    RNMapboxMapsVersion: any;
-    RNMapboxMapsDownloadToken: any;
-    RNMapboxMapsUseV11: any;
-}>;
+declare const _default: config_plugins_1.ConfigPlugin<{} | undefined>;
 export default _default;
 export function addInstallerBlock(src: any, blockName: any): any;
 export function addConstantBlock(src: any, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, RNMapboxMapsUseV11, }: {

package/lib/typescript/plugin/build/withMapbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withMapbox.d.ts","sourceRoot":"","sources":["../../../../plugin/build/withMapbox.js"],"names":[],"mappings":";;;;;;;;AAmBA,iEA2BC;AAED;;;;;QAqCC;AAID;;;;;QAaC;AAED,0EAOW;AA2IX,kDAKW"}
+{"version":3,"file":"withMapbox.d.ts","sourceRoot":"","sources":["../../../../plugin/build/withMapbox.js"],"names":[],"mappings":";;;AAmBA,iEA2BC;AAED;;;;;QAqCC;AAID;;;;;QAaC;AAED,0EAOW;AA2IX,kDAKW"}

package/lib/typescript/src/RNMBXModule.d.ts

@@ -1,3 +1,12 @@
+/**
+ * Add a custom header to HTTP requests.
+ * @param headerName - The name of the header
+ * @param headerValue - The value of the header
+ * @param options - Optional configuration. If provided with urlRegexp, the header will only be added to URLs matching the regex
+ */
+declare function addCustomHeader(headerName: string, headerValue: string, options?: {
+    urlRegexp?: string;
+}): void;
 export declare const StyleURL: {
     Street: URL;
     Outdoors: URL;
@@ -18,5 +27,6 @@ export declare const StyleURL: {
     DefaultSourceID: string;
 }, TileServers: {
     Mapbox: string;
-}, removeCustomHeader: (headerName: string) => void, addCustomHeader: (headerName: string, headerValue: string) => void, setAccessToken: (accessToken: string | null) => Promise<string | null>, setWellKnownTileServer: (tileServer: string) => void, clearData: () => Promise<void>, getAccessToken: () => Promise<string>, setTelemetryEnabled: (telemetryEnabled: boolean) => void, setConnected: (connected: boolean) => void;
+}, removeCustomHeader: (headerName: string) => void, setAccessToken: (accessToken: string | null) => Promise<string | null>, setWellKnownTileServer: (tileServer: string) => void, clearData: () => Promise<void>, getAccessToken: () => Promise<string>, setTelemetryEnabled: (telemetryEnabled: boolean) => void, setConnected: (connected: boolean) => void;
+export { addCustomHeader };
 //# sourceMappingURL=RNMBXModule.d.ts.map

package/lib/typescript/src/RNMBXModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RNMBXModule.d.ts","sourceRoot":"","sources":["../../../src/RNMBXModule.ts"],"names":[],"mappings":"AAqDA,eAAO,MACL,QAAQ;YAlDE,GAAG;cACD,GAAG;WACN,GAAG;UACJ,GAAG;eACE,GAAG;qBACG,GAAG;GA8CtB,wBAAwB;cA3CZ,MAAM,GAAG,MAAM;YACjB,MAAM,GAAG,MAAM;cACb,MAAM,GAAG,MAAM;cACf,MAAM,GAAG,MAAM;GAyC3B,QAAQ;WAtCC,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;GAqCxB,WAAW;qBAlCQ,MAAM;GAmCzB,WAAW;YAhCD,MAAM;GAiChB,kBAAkB,eA9Ba,MAAM,KAAG,IAAI,EA+B5C,eAAe,eA9Ba,MAAM,eAAe,MAAM,KAAG,IAAI,EA+B9D,cAAc,gBA9Bc,MAAM,GAAG,IAAI,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EA+BlE,sBAAsB,eA9Ba,MAAM,KAAG,IAAI,EA+BhD,SAAS,QA9BI,OAAO,CAAC,IAAI,CAAC,EA+B1B,cAAc,QA9BI,OAAO,CAAC,MAAM,CAAC,EA+BjC,mBAAmB,qBA9BmB,OAAO,KAAG,IAAI,EA+BpD,YAAY,cA9BY,OAAO,KAAG,IA+BrB,CAAC"}
+{"version":3,"file":"RNMBXModule.d.ts","sourceRoot":"","sources":["../../../src/RNMBXModule.ts"],"names":[],"mappings":"AA4DA;;;;;GAKG;AACH,iBAAS,eAAe,CACtB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAC/B,IAAI,CAMN;AAED,eAAO,MACL,QAAQ;YA3EE,GAAG;cACD,GAAG;WACN,GAAG;UACJ,GAAG;eACE,GAAG;qBACG,GAAG;GAuEtB,wBAAwB;cApEZ,MAAM,GAAG,MAAM;YACjB,MAAM,GAAG,MAAM;cACb,MAAM,GAAG,MAAM;cACf,MAAM,GAAG,MAAM;GAkE3B,QAAQ;WA/DC,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;GA8DxB,WAAW;qBA3DQ,MAAM;GA4DzB,WAAW;YAzDD,MAAM;GA0DhB,kBAAkB,eAxDa,MAAM,KAAG,IAAI,EAyD5C,cAAc,gBA/Cc,MAAM,GAAG,IAAI,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EAgDlE,sBAAsB,eA/Ca,MAAM,KAAG,IAAI,EAgDhD,SAAS,QA/CI,OAAO,CAAC,IAAI,CAAC,EAgD1B,cAAc,QA/CI,OAAO,CAAC,MAAM,CAAC,EAgDjC,mBAAmB,qBA/CmB,OAAO,KAAG,IAAI,EAgDpD,YAAY,cA/CY,OAAO,KAAG,IAgDrB,CAAC;AAEhB,OAAO,EAAE,eAAe,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnmapbox/maps",
-  "version": "10.2.6",
+  "version": "10.2.7",
   "description": "Community-supported, open-source React Native library for building maps using Mapbox native maps SDK for iOS and Android",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.native.d.ts",

package/plugin/build/withMapbox.js

@@ -117,7 +117,7 @@ exports.addMapboxInstallerBlock = addMapboxInstallerBlock;
  *
  * https://github.com/rnmapbox/maps/blob/main/ios/install.md#react-native--0600
  */
-const withCocoaPodsInstallerBlocks = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, RNMapboxMapsUseV11, }) => (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');
@@ -131,7 +131,7 @@ const withCocoaPodsInstallerBlocks = (config, { RNMapboxMapsImpl, RNMapboxMapsVe
         return exportedConfig;
     },
 ]);
-const withAndroidPropertiesDownloadToken = (config, { RNMapboxMapsDownloadToken }) => {
+const withAndroidPropertiesDownloadToken = (config, { RNMapboxMapsDownloadToken } = {}) => {
     const key = 'MAPBOX_DOWNLOADS_TOKEN';
     if (RNMapboxMapsDownloadToken) {
         console.warn('⚠️ WARNING: RNMapboxMapsDownloadToken is deprecated. Use RNMAPBOX_MAPS_DOWNLOAD_TOKEN environment variable instead.');
@@ -148,7 +148,7 @@ const withAndroidPropertiesDownloadToken = (config, { RNMapboxMapsDownloadToken
     }
     return config;
 };
-const withAndroidPropertiesImpl2 = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsUseV11 }) => {
+const withAndroidPropertiesImpl2 = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsUseV11 } = {}) => {
     const keyValues = {
         expoRNMapboxMapsImpl: RNMapboxMapsImpl,
         expoRNMapboxMapsVersion: RNMapboxMapsVersion,
@@ -174,7 +174,7 @@ const withAndroidPropertiesImpl2 = (config, { RNMapboxMapsImpl, RNMapboxMapsVers
     }
     return config;
 };
-const withAndroidProperties = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken, RNMapboxMapsVersion, RNMapboxMapsUseV11, }) => {
+const withAndroidProperties = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken, RNMapboxMapsVersion, RNMapboxMapsUseV11, } = {}) => {
     config = withAndroidPropertiesDownloadToken(config, {
         RNMapboxMapsDownloadToken,
     });
@@ -256,7 +256,7 @@ const addMapboxMavenRepo = (src) => appendContents({
 }).contents;
 exports.addMapboxMavenRepo = addMapboxMavenRepo;
 exports._addMapboxMavenRepo = exports.addMapboxMavenRepo;
-const withAndroidAppGradle = (config) => (0, config_plugins_1.withAppBuildGradle)(config, ({ modResults, ...exportedConfig }) => {
+const withAndroidAppGradle = (config, _props = {}) => (0, config_plugins_1.withAppBuildGradle)(config, ({ modResults, ...exportedConfig }) => {
     if (modResults.language !== 'groovy') {
         config_plugins_1.WarningAggregator.addWarningAndroid('withMapbox', `Cannot automatically configure app build.gradle if it's not groovy`);
         return { modResults, ...exportedConfig };
@@ -264,7 +264,7 @@ const withAndroidAppGradle = (config) => (0, config_plugins_1.withAppBuildGradle
     modResults.contents = addLibCppFilter(modResults.contents);
     return { modResults, ...exportedConfig };
 });
-const withAndroidProjectGradle = (config) => (0, config_plugins_1.withProjectBuildGradle)(config, ({ modResults, ...exportedConfig }) => {
+const withAndroidProjectGradle = (config, _props = {}) => (0, config_plugins_1.withProjectBuildGradle)(config, ({ modResults, ...exportedConfig }) => {
     if (modResults.language !== 'groovy') {
         config_plugins_1.WarningAggregator.addWarningAndroid('withMapbox', `Cannot automatically configure app build.gradle if it's not groovy`);
         return { modResults, ...exportedConfig };
@@ -272,7 +272,7 @@ const withAndroidProjectGradle = (config) => (0, config_plugins_1.withProjectBui
     modResults.contents = (0, exports.addMapboxMavenRepo)(modResults.contents);
     return { modResults, ...exportedConfig };
 });
-const withMapboxAndroid = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken, RNMapboxMapsVersion, RNMapboxMapsUseV11, }) => {
+const withMapboxAndroid = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken, RNMapboxMapsVersion, RNMapboxMapsUseV11, } = {}) => {
     config = withAndroidProperties(config, {
         RNMapboxMapsImpl,
         RNMapboxMapsDownloadToken,
@@ -283,7 +283,7 @@ const withMapboxAndroid = (config, { RNMapboxMapsImpl, RNMapboxMapsDownloadToken
     config = withAndroidAppGradle(config, { RNMapboxMapsImpl });
     return config;
 };
-const withMapbox = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, RNMapboxMapsUseV11, }) => {
+const withMapbox = (config, { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsDownloadToken, RNMapboxMapsUseV11, } = {}) => {
     config = withMapboxAndroid(config, {
         RNMapboxMapsImpl,
         RNMapboxMapsVersion,

package/plugin/src/withMapbox.ts

@@ -188,7 +188,7 @@ const withCocoaPodsInstallerBlocks: ConfigPlugin<MapboxPlugProps> = (
     RNMapboxMapsVersion,
     RNMapboxMapsDownloadToken,
     RNMapboxMapsUseV11,
-  },
+  }: MapboxPlugProps = {},
 ) =>
   withDangerousMod(config, [
     'ios',
@@ -216,7 +216,7 @@ const withCocoaPodsInstallerBlocks: ConfigPlugin<MapboxPlugProps> = (
 
 const withAndroidPropertiesDownloadToken: ConfigPlugin<MapboxPlugProps> = (
   config,
-  { RNMapboxMapsDownloadToken },
+  { RNMapboxMapsDownloadToken }: MapboxPlugProps = {},
 ) => {
   const key = 'MAPBOX_DOWNLOADS_TOKEN';
 
@@ -247,7 +247,7 @@ const withAndroidPropertiesDownloadToken: ConfigPlugin<MapboxPlugProps> = (
 
 const withAndroidPropertiesImpl2: ConfigPlugin<MapboxPlugProps> = (
   config,
-  { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsUseV11 },
+  { RNMapboxMapsImpl, RNMapboxMapsVersion, RNMapboxMapsUseV11 }: MapboxPlugProps = {},
 ) => {
   const keyValues = {
     expoRNMapboxMapsImpl: RNMapboxMapsImpl,
@@ -289,7 +289,7 @@ const withAndroidProperties: ConfigPlugin<MapboxPlugProps> = (
     RNMapboxMapsDownloadToken,
     RNMapboxMapsVersion,
     RNMapboxMapsUseV11,
-  },
+  }: MapboxPlugProps = {},
 ) => {
   config = withAndroidPropertiesDownloadToken(config, {
     RNMapboxMapsDownloadToken,
@@ -391,7 +391,7 @@ export const addMapboxMavenRepo = (src: string): string =>
     comment: '//',
   }).contents;
 
-const withAndroidAppGradle: ConfigPlugin<MapboxPlugProps> = (config) =>
+const withAndroidAppGradle: ConfigPlugin<MapboxPlugProps> = (config, _props: MapboxPlugProps = {}) =>
   withAppBuildGradle(config, ({ modResults, ...exportedConfig }) => {
     if (modResults.language !== 'groovy') {
       WarningAggregator.addWarningAndroid(
@@ -407,7 +407,7 @@ const withAndroidAppGradle: ConfigPlugin<MapboxPlugProps> = (config) =>
     return { modResults, ...exportedConfig };
   });
 
-const withAndroidProjectGradle: ConfigPlugin<MapboxPlugProps> = (config) =>
+const withAndroidProjectGradle: ConfigPlugin<MapboxPlugProps> = (config, _props: MapboxPlugProps = {}) =>
   withProjectBuildGradle(config, ({ modResults, ...exportedConfig }) => {
     if (modResults.language !== 'groovy') {
       WarningAggregator.addWarningAndroid(
@@ -430,7 +430,7 @@ const withMapboxAndroid: ConfigPlugin<MapboxPlugProps> = (
     RNMapboxMapsDownloadToken,
     RNMapboxMapsVersion,
     RNMapboxMapsUseV11,
-  },
+  }: MapboxPlugProps = {},
 ) => {
   config = withAndroidProperties(config, {
     RNMapboxMapsImpl,
@@ -451,7 +451,7 @@ const withMapbox: ConfigPlugin<MapboxPlugProps> = (
     RNMapboxMapsVersion,
     RNMapboxMapsDownloadToken,
     RNMapboxMapsUseV11,
-  },
+  }: MapboxPlugProps = {},
 ) => {
   config = withMapboxAndroid(config, {
     RNMapboxMapsImpl,

package/src/RNMBXModule.ts

@@ -26,9 +26,16 @@ interface RNMBXModule {
   TileServers: {
     Mapbox: string;
   };
-
   removeCustomHeader(headerName: string): void;
-  addCustomHeader(headerName: string, headerValue: string): void;
+  addCustomHeader(
+    headerName: string,
+    headerValue: string
+  ): void;
+  addCustomHeaderWithOptions(
+    headerName: string,
+    headerValue: string,
+    options: { urlRegexp?: string },
+  ): void;
   setAccessToken(accessToken: string | null): Promise<string | null>;
   setWellKnownTileServer(tileServer: string): void;
   clearData(): Promise<void>;
@@ -51,6 +58,24 @@ if (NativeModules.RNMBXModule == null) {
   }
 }
 
+/**
+ * Add a custom header to HTTP requests.
+ * @param headerName - The name of the header
+ * @param headerValue - The value of the header
+ * @param options - Optional configuration. If provided with urlRegexp, the header will only be added to URLs matching the regex
+ */
+function addCustomHeader(
+  headerName: string,
+  headerValue: string,
+  options?: { urlRegexp?: string },
+): void {
+  if (options) {
+    RNMBXModule.addCustomHeaderWithOptions(headerName, headerValue, options);
+  } else {
+    RNMBXModule.addCustomHeader(headerName, headerValue);
+  }
+}
+
 export const {
   StyleURL,
   OfflinePackDownloadState,
@@ -58,7 +83,6 @@ export const {
   StyleSource,
   TileServers,
   removeCustomHeader,
-  addCustomHeader,
   setAccessToken,
   setWellKnownTileServer,
   clearData,
@@ -66,3 +90,5 @@ export const {
   setTelemetryEnabled,
   setConnected,
 } = RNMBXModule;
+
+export { addCustomHeader };