@rnmapbox/maps 10.1.41-rc.2 → 10.1.41-rc.3

package/android/build.gradle

@@ -78,13 +78,130 @@ android {
                 }
                 java.srcDirs += 'src/main/rn-compat/rn75'
 
+                // Adapted from react-native-screens for consistency
+                // https://github.com/software-mansion/react-native-screens/blob/main/android/build.gradle
+                def resolveReactNativeDirectory = {
+                    // 1. User-defined path
+                    def userDefinedRnDirPath = safeExtGet("REACT_NATIVE_NODE_MODULES_DIR", null)
+                    if (userDefinedRnDirPath != null) {
+                        return file(userDefinedRnDirPath)
+                    }
+                    
+                    // 2. Standard monorepo location
+                    def standardRnDirFile = file("$rootDir/../node_modules/react-native/")
+                    if (standardRnDirFile.exists()) {
+                        return standardRnDirFile
+                    }
+                    
+                    // 3. Legacy location
+                    def legacyRnDirFile = file("$projectDir/../node_modules/react-native/")
+                    if (legacyRnDirFile.exists()) {
+                        return legacyRnDirFile
+                    }
+                    
+                    // 4. Try Node resolution as fallback
+                    try {
+                        def maybeRnPackagePath = providers.exec {
+                            workingDir(rootDir)
+                            commandLine("node", "--print", "require.resolve('react-native/package.json')")
+                        }.standardOutput.asText.get().trim()
+                        
+                        if (maybeRnPackagePath != null && !maybeRnPackagePath.isBlank()) {
+                            def maybeRnPackageFile = file(maybeRnPackagePath)
+                            if (maybeRnPackageFile.exists()) {
+                                return maybeRnPackageFile.parentFile
+                            }
+                        }
+                    } catch (Exception e) {
+                        logger.debug("@rnmapbox/maps: Node resolution for react-native failed: ${e.message}")
+                    }
+                    
+                    return null
+                }
+                
+                def detectReactNativeVersion = {
+                    def rnDir = resolveReactNativeDirectory()
+                    if (rnDir == null) {
+                        return null
+                    }
+                    
+                    // Try gradle.properties first (like react-native-screens)
+                    def gradlePropertiesFile = file("$rnDir/ReactAndroid/gradle.properties")
+                    if (gradlePropertiesFile.exists()) {
+                        try {
+                            def reactProperties = new Properties()
+                            gradlePropertiesFile.withInputStream { reactProperties.load(it) }
+                            def version = reactProperties.getProperty("VERSION_NAME")
+                            if (version != null) {
+                                return version
+                            }
+                        } catch (Exception e) {
+                            logger.debug("@rnmapbox/maps: Failed to read gradle.properties: ${e.message}")
+                        }
+                    }
+                    
+                    // Fallback to package.json
+                    def packageJsonFile = file("$rnDir/package.json")
+                    if (packageJsonFile.exists()) {
+                        try {
+                            def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text)
+                            return packageJson.version
+                        } catch (Exception e) {
+                            logger.debug("@rnmapbox/maps: Failed to read package.json: ${e.message}")
+                        }
+                    }
+                    
+                    return null
+                }
+                
                 // Add lifecycle compatibility source sets
-                // Apps targeting SDK 35+ typically use Lifecycle 2.6+ which changed from getLifecycle() to lifecycle property
-                def targetSdk = safeExtGet("targetSdkVersion", 28)
-                if (targetSdk >= 35) {
+                // Priority order:
+                // 1. User-defined override (RNMapboxMapsLifecycleCompat)
+                // 2. React Native version detection (0.78+ uses new API)
+                // 3. Conservative default (v25 for better compatibility)
+                
+                def lifecycleCompat = safeExtGet("RNMapboxMapsLifecycleCompat", null)
+                
+                if (lifecycleCompat == "v25" || lifecycleCompat == "old") {
+                    logger.info("@rnmapbox/maps: Using v25 lifecycle compatibility (ViewTreeLifecycleOwner.set) - user override")
+                    java.srcDirs += 'src/main/lifecycle-compat/v25'
+                } else if (lifecycleCompat == "v26" || lifecycleCompat == "new") {
+                    logger.info("@rnmapbox/maps: Using v26 lifecycle compatibility (setViewTreeLifecycleOwner) - user override")
                     java.srcDirs += 'src/main/lifecycle-compat/v26'
                 } else {
-                    java.srcDirs += 'src/main/lifecycle-compat/v25'
+                    // Auto-detect based on React Native version
+                    def rnVersion = null
+                    try {
+                        rnVersion = detectReactNativeVersion()
+                    } catch (Exception e) {
+                        logger.debug("@rnmapbox/maps: Failed to detect React Native version: ${e.message}")
+                    }
+                    
+                    if (rnVersion != null) {
+                        try {
+                            def versionParts = rnVersion.split("\\.")
+                            def majorVersion = versionParts[0].toInteger()
+                            def minorVersion = versionParts[1].toInteger()
+                            
+                            // React Native < 0.78 needs the old lifecycle API
+                            if (majorVersion == 0 && minorVersion < 78) {
+                                logger.info("@rnmapbox/maps: Detected React Native ${rnVersion} - using v25 lifecycle compatibility (old API)")
+                                java.srcDirs += 'src/main/lifecycle-compat/v25'
+                            } else {
+                                logger.info("@rnmapbox/maps: Detected React Native ${rnVersion} - using v26 lifecycle compatibility (new API)")
+                                java.srcDirs += 'src/main/lifecycle-compat/v26'
+                            }
+                        } catch (Exception e) {
+                            logger.warn("@rnmapbox/maps: Failed to parse React Native version '${rnVersion}', defaulting to v26 compatibility")
+                            java.srcDirs += 'src/main/lifecycle-compat/v26'
+                        }
+                    } else {
+                        // Cannot detect RN version, default to new API (v26) for future compatibility
+                        def targetSdk = safeExtGet("targetSdkVersion", 28)
+                        logger.info("@rnmapbox/maps: Unable to detect React Native version, using v26 lifecycle compatibility (new API, targetSdk=${targetSdk})")
+                        logger.info("@rnmapbox/maps: If you encounter issues with RN < 0.78, set RNMapboxMapsLifecycleCompat='v25' in your app's android/build.gradle ext block")
+                        java.srcDirs += 'src/main/lifecycle-compat/v26'
+                    }
                 }
 
                 if (safeExtGet("RNMapboxMapsUseV11", false)) {

package/ios/RNMBX/RNMBXLocationModuleV11.swift

@@ -11,8 +11,8 @@ class RNMBXLocation: NSObject {
 
   var timestamp: Date? = nil
 
-  func toJSON() -> [String:Any?] {
-    var coords: [String:Any?] = [:]
+  func toJSON() -> [String:Any] {
+    var coords: [String:Any] = [:]
     
     if let location = location {
       coords = coords.merging([
@@ -251,11 +251,11 @@ class RNMBXLocationModule: RCTEventEmitter {
     throttler.cancel()
   }
   
-  @objc func getLastKnownLocation() -> RNMBXLocation? {
+  @objc func getLastKnownLocation() -> [String: Any]? {
     let last = RNMBXLocation()
     last.heading = _locationProvider.latestHeading
     last.location = _locationProvider.getLastObservedLocation()
-    return last
+    return last.toJSON()
   }
   
   @objc

package/lib/commonjs/utils/index.js

@@ -68,7 +68,18 @@ function cloneReactChildrenWithProps(children, propsToAdd = {}) {
     foundChildren = children;
   }
   const filteredChildren = foundChildren.filter(child => !!child); // filter out falsy children, since some can be null
-  return _react.default.Children.map(filteredChildren, child => /*#__PURE__*/_react.default.cloneElement(child, propsToAdd));
+  return _react.default.Children.map(filteredChildren, child => {
+    if (! /*#__PURE__*/_react.default.isValidElement(child)) {
+      return child;
+    }
+    if (child.type === _react.default.Fragment) {
+      // If the child is a Fragment, return it without adding props
+      return child;
+    }
+
+    // Otherwise, clone and add props
+    return /*#__PURE__*/_react.default.cloneElement(child, propsToAdd);
+  });
 }
 function resolveImagePath(imageRef) {
   const res = _reactNative.Image.resolveAssetSource(imageRef);

package/lib/commonjs/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","e","__esModule","default","isAndroid","Platform","OS","existenceChange","cur","next","isFunction","fn","isNumber","num","Number","isNaN","isUndefined","obj","isString","str","isBoolean","bool","isPrimitive","value","runNativeMethod","turboModule","name","nativeRef","args","handle","findNodeHandle","Error","module","cloneReactChildrenWithProps","children","propsToAdd","foundChildren","Array","isArray","filteredChildren","filter","child","React","Children","map","cloneElement","resolveImagePath","imageRef","res","Image","resolveAssetSource","uri","toJSONString","json","JSON","stringify"],"sourceRoot":"../../../src","sources":["utils/index.ts"],"mappings":";;;;;;;;;;;;;;;;;AACA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAMsB,SAAAD,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AARtB;;AAUO,SAASG,SAASA,CAAA,EAAY;EACnC,OAAOC,qBAAQ,CAACC,EAAE,KAAK,SAAS;AAClC;AAEO,SAASC,eAAeA,CAACC,GAAY,EAAEC,IAAa,EAAW;EACpE,IAAI,CAACD,GAAG,IAAI,CAACC,IAAI,EAAE;IACjB,OAAO,KAAK;EACd;EACA,OAAQ,CAACD,GAAG,IAAIC,IAAI,IAAMD,GAAG,IAAI,CAACC,IAAK;AACzC;AAEO,SAASC,UAAUA,CAACC,EAAW,EAAiB;EACrD,OAAO,OAAOA,EAAE,KAAK,UAAU;AACjC;AAEO,SAASC,QAAQA,CAACC,GAAY,EAAiB;EACpD,OAAO,OAAOA,GAAG,KAAK,QAAQ,IAAI,CAACC,MAAM,CAACC,KAAK,CAACF,GAAG,CAAC;AACtD;AAEO,SAASG,WAAWA,CAACC,GAAY,EAAoB;EAC1D,OAAO,OAAOA,GAAG,KAAK,WAAW;AACnC;AAEO,SAASC,QAAQA,CAACC,GAAY,EAAiB;EACpD,OAAO,OAAOA,GAAG,KAAK,QAAQ;AAChC;AAEO,SAASC,SAASA,CAACC,IAAa,EAAmB;EACxD,OAAO,OAAOA,IAAI,KAAK,SAAS;AAClC;AAEO,SAASC,WAAWA,CACzBC,KAAc,EACsB;EACpC,OAAOL,QAAQ,CAACK,KAAK,CAAC,IAAIX,QAAQ,CAACW,KAAK,CAAC,IAAIH,SAAS,CAACG,KAAK,CAAC;AAC/D;AAUO,SAASC,eAAeA,CAC7BC,WAAwB,EACxBC,IAAY,EACZC,SAAc,EACdC,IAAiB,EACI;EACrB,MAAMC,MAAM,GAAG,IAAAC,2BAAc,EAACH,SAAS,CAAC;EACxC,IAAI,CAACE,MAAM,EAAE;IACX,MAAM,IAAIE,KAAK,CAAC,wCAAwCC,MAAM,IAAIN,IAAI,EAAE,CAAC;EAC3E;;EAEA;EACA;EACA,OAAOD,WAAW,CAACC,IAAI,CAAC,CAACG,MAAM,EAAE,GAAGD,IAAI,CAAC;AAC3C;AAEO,SAASK,2BAA2BA,CACzCC,QAAkD,EAClDC,UAAqC,GAAG,CAAC,CAAC,EAC1C;EACA,IAAI,CAACD,QAAQ,EAAE;IACb,OAAO,IAAI;EACb;EAEA,IAAIE,aAAa,GAAG,IAAI;EAExB,IAAI,CAACC,KAAK,CAACC,OAAO,CAACJ,QAAQ,CAAC,EAAE;IAC5BE,aAAa,GAAG,CAACF,QAAQ,CAAC;EAC5B,CAAC,MAAM;IACLE,aAAa,GAAGF,QAAQ;EAC1B;EAEA,MAAMK,gBAAgB,GAAGH,aAAa,CAACI,MAAM,CAAEC,KAAK,IAAK,CAAC,CAACA,KAAK,CAAC,CAAC,CAAC;EACnE,OAAOC,cAAK,CAACC,QAAQ,CAACC,GAAG,CAACL,gBAAgB,EAAGE,KAAK,iBAChDC,cAAK,CAACG,YAAY,CAACJ,KAAK,EAAEN,UAAU,CACtC,CAAC;AACH;AAEO,SAASW,gBAAgBA,CAACC,QAA6B,EAAU;EACtE,MAAMC,GAAG,GAAGC,kBAAK,CAACC,kBAAkB,CAACH,QAAQ,CAAC;EAC9C,OAAOC,GAAG,CAACG,GAAG;AAChB;AAEO,SAASC,YAAYA,CAACC,IAAS,GAAG,EAAE,EAAE;EAC3C,OAAOC,IAAI,CAACC,SAAS,CAACF,IAAI,CAAC;AAC7B","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","e","__esModule","default","isAndroid","Platform","OS","existenceChange","cur","next","isFunction","fn","isNumber","num","Number","isNaN","isUndefined","obj","isString","str","isBoolean","bool","isPrimitive","value","runNativeMethod","turboModule","name","nativeRef","args","handle","findNodeHandle","Error","module","cloneReactChildrenWithProps","children","propsToAdd","foundChildren","Array","isArray","filteredChildren","filter","child","React","Children","map","isValidElement","type","Fragment","cloneElement","resolveImagePath","imageRef","res","Image","resolveAssetSource","uri","toJSONString","json","JSON","stringify"],"sourceRoot":"../../../src","sources":["utils/index.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/utils/index.js

@@ -51,7 +51,18 @@ export function cloneReactChildrenWithProps(children, propsToAdd = {}) {
     foundChildren = children;
   }
   const filteredChildren = foundChildren.filter(child => !!child); // filter out falsy children, since some can be null
-  return React.Children.map(filteredChildren, child => /*#__PURE__*/React.cloneElement(child, propsToAdd));
+  return React.Children.map(filteredChildren, child => {
+    if (! /*#__PURE__*/React.isValidElement(child)) {
+      return child;
+    }
+    if (child.type === React.Fragment) {
+      // If the child is a Fragment, return it without adding props
+      return child;
+    }
+
+    // Otherwise, clone and add props
+    return /*#__PURE__*/React.cloneElement(child, propsToAdd);
+  });
 }
 export function resolveImagePath(imageRef) {
   const res = Image.resolveAssetSource(imageRef);

package/lib/module/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","findNodeHandle","Platform","Image","isAndroid","OS","existenceChange","cur","next","isFunction","fn","isNumber","num","Number","isNaN","isUndefined","obj","isString","str","isBoolean","bool","isPrimitive","value","runNativeMethod","turboModule","name","nativeRef","args","handle","Error","module","cloneReactChildrenWithProps","children","propsToAdd","foundChildren","Array","isArray","filteredChildren","filter","child","Children","map","cloneElement","resolveImagePath","imageRef","res","resolveAssetSource","uri","toJSONString","json","JSON","stringify"],"sourceRoot":"../../../src","sources":["utils/index.ts"],"mappings":";;AAAA;AACA,OAAOA,KAAK,MAAM,OAAO;AACzB,SACEC,cAAc,EACdC,QAAQ,EACRC,KAAK,QAGA,cAAc;AAErB,OAAO,SAASC,SAASA,CAAA,EAAY;EACnC,OAAOF,QAAQ,CAACG,EAAE,KAAK,SAAS;AAClC;AAEA,OAAO,SAASC,eAAeA,CAACC,GAAY,EAAEC,IAAa,EAAW;EACpE,IAAI,CAACD,GAAG,IAAI,CAACC,IAAI,EAAE;IACjB,OAAO,KAAK;EACd;EACA,OAAQ,CAACD,GAAG,IAAIC,IAAI,IAAMD,GAAG,IAAI,CAACC,IAAK;AACzC;AAEA,OAAO,SAASC,UAAUA,CAACC,EAAW,EAAiB;EACrD,OAAO,OAAOA,EAAE,KAAK,UAAU;AACjC;AAEA,OAAO,SAASC,QAAQA,CAACC,GAAY,EAAiB;EACpD,OAAO,OAAOA,GAAG,KAAK,QAAQ,IAAI,CAACC,MAAM,CAACC,KAAK,CAACF,GAAG,CAAC;AACtD;AAEA,OAAO,SAASG,WAAWA,CAACC,GAAY,EAAoB;EAC1D,OAAO,OAAOA,GAAG,KAAK,WAAW;AACnC;AAEA,OAAO,SAASC,QAAQA,CAACC,GAAY,EAAiB;EACpD,OAAO,OAAOA,GAAG,KAAK,QAAQ;AAChC;AAEA,OAAO,SAASC,SAASA,CAACC,IAAa,EAAmB;EACxD,OAAO,OAAOA,IAAI,KAAK,SAAS;AAClC;AAEA,OAAO,SAASC,WAAWA,CACzBC,KAAc,EACsB;EACpC,OAAOL,QAAQ,CAACK,KAAK,CAAC,IAAIX,QAAQ,CAACW,KAAK,CAAC,IAAIH,SAAS,CAACG,KAAK,CAAC;AAC/D;AAUA,OAAO,SAASC,eAAeA,CAC7BC,WAAwB,EACxBC,IAAY,EACZC,SAAc,EACdC,IAAiB,EACI;EACrB,MAAMC,MAAM,GAAG3B,cAAc,CAACyB,SAAS,CAAC;EACxC,IAAI,CAACE,MAAM,EAAE;IACX,MAAM,IAAIC,KAAK,CAAC,wCAAwCC,MAAM,IAAIL,IAAI,EAAE,CAAC;EAC3E;;EAEA;EACA;EACA,OAAOD,WAAW,CAACC,IAAI,CAAC,CAACG,MAAM,EAAE,GAAGD,IAAI,CAAC;AAC3C;AAEA,OAAO,SAASI,2BAA2BA,CACzCC,QAAkD,EAClDC,UAAqC,GAAG,CAAC,CAAC,EAC1C;EACA,IAAI,CAACD,QAAQ,EAAE;IACb,OAAO,IAAI;EACb;EAEA,IAAIE,aAAa,GAAG,IAAI;EAExB,IAAI,CAACC,KAAK,CAACC,OAAO,CAACJ,QAAQ,CAAC,EAAE;IAC5BE,aAAa,GAAG,CAACF,QAAQ,CAAC;EAC5B,CAAC,MAAM;IACLE,aAAa,GAAGF,QAAQ;EAC1B;EAEA,MAAMK,gBAAgB,GAAGH,aAAa,CAACI,MAAM,CAAEC,KAAK,IAAK,CAAC,CAACA,KAAK,CAAC,CAAC,CAAC;EACnE,OAAOvC,KAAK,CAACwC,QAAQ,CAACC,GAAG,CAACJ,gBAAgB,EAAGE,KAAK,iBAChDvC,KAAK,CAAC0C,YAAY,CAACH,KAAK,EAAEN,UAAU,CACtC,CAAC;AACH;AAEA,OAAO,SAASU,gBAAgBA,CAACC,QAA6B,EAAU;EACtE,MAAMC,GAAG,GAAG1C,KAAK,CAAC2C,kBAAkB,CAACF,QAAQ,CAAC;EAC9C,OAAOC,GAAG,CAACE,GAAG;AAChB;AAEA,OAAO,SAASC,YAAYA,CAACC,IAAS,GAAG,EAAE,EAAE;EAC3C,OAAOC,IAAI,CAACC,SAAS,CAACF,IAAI,CAAC;AAC7B","ignoreList":[]}
+{"version":3,"names":["React","findNodeHandle","Platform","Image","isAndroid","OS","existenceChange","cur","next","isFunction","fn","isNumber","num","Number","isNaN","isUndefined","obj","isString","str","isBoolean","bool","isPrimitive","value","runNativeMethod","turboModule","name","nativeRef","args","handle","Error","module","cloneReactChildrenWithProps","children","propsToAdd","foundChildren","Array","isArray","filteredChildren","filter","child","Children","map","isValidElement","type","Fragment","cloneElement","resolveImagePath","imageRef","res","resolveAssetSource","uri","toJSONString","json","JSON","stringify"],"sourceRoot":"../../../src","sources":["utils/index.ts"],"mappings":"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","ignoreList":[]}

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { ImageSourcePropType, TurboModule } from 'react-native';
 export declare function isAndroid(): boolean;
 export declare function existenceChange(cur: boolean, next: boolean): boolean;
@@ -12,9 +12,9 @@ export 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?: {
+export declare function cloneReactChildrenWithProps(children: ReactNode, propsToAdd?: {
     [key: string]: string;
-}): any;
+}): (string | number | bigint | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | React.ReactPortal | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined>)[] | null;
 export declare function resolveImagePath(imageRef: ImageSourcePropType): string;
 export declare function toJSONString(json?: any): string;
 export type OrnamentPositonProp = {

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

@@ -1 +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,MAAM,MAAM,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,MAAM,MAAM,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,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,MAAM,MAAM,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,SAAS,EACnB,UAAU,GAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAO,sUA4B3C;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,MAAM,CAGtE;AAED,wBAAgB,YAAY,CAAC,IAAI,GAAE,GAAQ,UAE1C;AAED,MAAM,MAAM,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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.1.41-rc.2",
+  "version": "10.1.41-rc.3",
   "publishConfig": {
     "access": "public"
   },

package/src/utils/index.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import React from 'react';
+import React, { ReactNode } from 'react';
 import {
   findNodeHandle,
   Platform,
@@ -70,14 +70,14 @@ export function runNativeMethod<ReturnType = NativeArg>(
 }
 
 export function cloneReactChildrenWithProps(
-  children: Parameters<typeof React.Children.map>[0],
+  children: ReactNode,
   propsToAdd: { [key: string]: string } = {},
 ) {
   if (!children) {
     return null;
   }
 
-  let foundChildren = null;
+  let foundChildren: typeof children[] | null = null;
 
   if (!Array.isArray(children)) {
     foundChildren = [children];
@@ -86,9 +86,19 @@ export function cloneReactChildrenWithProps(
   }
 
   const filteredChildren = foundChildren.filter((child) => !!child); // filter out falsy children, since some can be null
-  return React.Children.map(filteredChildren, (child) =>
-    React.cloneElement(child, propsToAdd),
-  );
+  return React.Children.map(filteredChildren, (child) => {
+    if (!React.isValidElement(child)) {
+      return child;
+    }
+
+    if (child.type === React.Fragment) {
+      // If the child is a Fragment, return it without adding props
+      return child;
+    }
+
+    // Otherwise, clone and add props
+    return React.cloneElement(child, propsToAdd);
+  });
 }
 
 export function resolveImagePath(imageRef: ImageSourcePropType): string {