From 64a0dbd5334129b5644a6b185542c3e14c63448b Mon Sep 17 00:00:00 2001 From: mariusud Date: Wed, 22 Apr 2026 14:02:56 +0200 Subject: [PATCH 01/32] consume map events after longpress --- .../rnmbx/components/mapview/RNMBXMapView.kt | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt b/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt index b05cdbe74d..04df022211 100644 --- a/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt +++ b/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt @@ -8,6 +8,7 @@ import android.os.Handler import android.os.Looper import android.util.Log import android.view.Gravity +import android.view.MotionEvent import android.view.View import android.view.View.OnLayoutChangeListener import android.view.ViewGroup @@ -180,6 +181,18 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie private var wasGestureActive = false private var isGestureActive = false + private var mAfterLongPress = false + + override fun dispatchTouchEvent(ev: MotionEvent): Boolean { + if (mAfterLongPress) { + val action = ev.actionMasked + if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { + mAfterLongPress = false + } + } + return super.dispatchTouchEvent(ev) + } + var mapViewImpl: String? = null val mapView: MapView @@ -297,10 +310,17 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie } override fun onMove(moveGestureDetector: MoveGestureDetector): Boolean { + if (mAfterLongPress) { + return true // consume the move events that come after a long press, to prevent the map from moving when the user is trying to long press on something + } return mapGesture(MapGestureType.Move, moveGestureDetector) } override fun onMoveEnd(moveGestureDetector: MoveGestureDetector) { + if (mAfterLongPress) { + mAfterLongPress = false + return + } mapGestureEnd(MapGestureType.Move, moveGestureDetector) } }) @@ -734,6 +754,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie } val screenPoint = mMap?.pixelForCoordinate(point) if (screenPoint != null) { + mAfterLongPress = true val event = MapClickEvent(_this, LatLng(point), screenPoint, EventTypes.MAP_LONG_CLICK) mManager.handleEvent(event) } From ab7a775e2e1dbbf10d86e86ed4f39a1fd1907abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikl=C3=B3s=20Fazekas?= Date: Sun, 18 Jan 2026 22:06:39 +0100 Subject: [PATCH 02/32] chore(ios): remove old architecture code (#4130) * chore(ios): remove old architecture code Remove React Native old architecture (Paper/Bridge) code from iOS, keeping only new architecture (Fabric/TurboModules) code. Changes: - Delete all *ViewManager.m and *ViewManager.swift files (old arch view managers) - Remove #ifdef RCT_NEW_ARCH_ENABLED guards from ComponentView files - Simplify Module.h files to only conform to TurboModule protocols - Remove old arch conditionals from Module.mm files - Update RNMBXViewResolver to remove old arch code paths - Remove unused RCTViewManager imports from Bridge/RNMBX.h and Swift.pre.h - Remove guards from RNMBXFabricPropConvert.mm and RNMBXFollyConvert.h This is a follow-up to the Android old architecture removal (#4128) and continues the 10.3.0 cleanup work (#4118). * fix(ios): add __cplusplus guard to ComponentView.h files The umbrella header is compiled as Objective-C (not Objective-C++), which causes errors when ComponentView.h files import Fabric headers that transitively include C++ code like . Use #ifdef __cplusplus guard instead of RCT_NEW_ARCH_ENABLED to: - Allow content when compiled as Objective-C++ (.mm files) - Hide content when compiled as Objective-C (umbrella header) * fix(ios): add module wrapper methods to RNMBXMapView Move 16 module methods from static RNMBXMapViewManager methods to instance methods on RNMBXMapView, fixing build errors after old architecture removal. * fix(ios): restructure Module.h files for Swift compilation Move Foundation/UIKit imports outside __cplusplus guard and provide plain NSObject interface for non-C++ contexts (Swift). * fix(ios): add module wrapper methods to RNMBXViewport and RNMBXShapeSource Call methods directly on view instances instead of through Manager classes. --------- Co-authored-by: Claude --- ios/RNMBX/Bridge/RNMBX.h | 1 - ios/RNMBX/RNMBXAtmosphereComponentView.h | 5 +- ios/RNMBX/RNMBXAtmosphereComponentView.mm | 2 - ios/RNMBX/RNMBXAtmosphereViewManager.m | 8 - ios/RNMBX/RNMBXAtmosphereViewManager.swift | 13 - ios/RNMBX/RNMBXBackgroundLayerComponentView.h | 5 +- .../RNMBXBackgroundLayerComponentView.mm | 2 - ios/RNMBX/RNMBXBackgroundLayerViewManager.m | 9 - .../RNMBXBackgroundLayerViewManager.swift | 13 - ios/RNMBX/RNMBXCalloutComponentView.h | 5 +- ios/RNMBX/RNMBXCalloutComponentView.mm | 2 - ios/RNMBX/RNMBXCalloutViewManager.m | 8 - ios/RNMBX/RNMBXCalloutViewManager.swift | 14 - ios/RNMBX/RNMBXCameraComponentView.h | 5 +- ios/RNMBX/RNMBXCameraComponentView.mm | 2 - .../RNMBXCameraGestureObserverComponentView.h | 5 +- ...RNMBXCameraGestureObserverComponentView.mm | 2 - ios/RNMBX/RNMBXCameraModule.h | 15 +- ios/RNMBX/RNMBXCameraModule.mm | 7 - ios/RNMBX/RNMBXCameraViewManager.m | 27 -- ios/RNMBX/RNMBXCameraViewManager.swift | 16 - ios/RNMBX/RNMBXCircleLayerComponentView.h | 5 +- ios/RNMBX/RNMBXCircleLayerComponentView.mm | 2 - ios/RNMBX/RNMBXCircleLayerViewManager.m | 14 - ios/RNMBX/RNMBXCircleLayerViewManager.swift | 15 - ...RNMBXCustomLocationProviderComponentView.h | 5 +- ...NMBXCustomLocationProviderComponentView.mm | 2 - ...MBXCustomLocationProviderVIewManager.swift | 13 - .../RNMBXCustomLocationProviderViewManager.m | 10 - ios/RNMBX/RNMBXFabricPropConvert.mm | 4 - .../RNMBXFillExtrusionLayerComponentView.h | 5 +- .../RNMBXFillExtrusionLayerComponentView.mm | 2 - .../RNMBXFillExtrusionLayerViewManager.m | 12 - .../RNMBXFillExtrusionLayerViewManager.swift | 13 - ios/RNMBX/RNMBXFillLayerComponentView.h | 5 +- ios/RNMBX/RNMBXFillLayerComponentView.mm | 2 - ios/RNMBX/RNMBXFillLayerViewManager.m | 12 - ios/RNMBX/RNMBXFillLayerViewManager.swift | 13 - ios/RNMBX/RNMBXHeatmapLayerComponentView.h | 5 +- ios/RNMBX/RNMBXHeatmapLayerComponentView.mm | 2 - ios/RNMBX/RNMBXHeatmapLayerViewManager.m | 12 - ios/RNMBX/RNMBXHeatmapLayerViewManager.swift | 13 - ios/RNMBX/RNMBXImageComponentView.h | 5 +- ios/RNMBX/RNMBXImageComponentView.mm | 2 - ios/RNMBX/RNMBXImageManager.m | 30 -- ios/RNMBX/RNMBXImageManager.swift | 13 - ios/RNMBX/RNMBXImageModule.h | 16 +- ios/RNMBX/RNMBXImageModule.mm | 7 - ios/RNMBX/RNMBXImageSourceComponentView.h | 5 +- ios/RNMBX/RNMBXImageSourceComponentView.mm | 2 - ios/RNMBX/RNMBXImageSourceViewManager.m | 11 - ios/RNMBX/RNMBXImageSourceViewManager.swift | 11 - ios/RNMBX/RNMBXImagesComponentView.h | 5 +- ios/RNMBX/RNMBXImagesComponentView.mm | 2 - ios/RNMBX/RNMBXImagesViewManager.m | 10 - ios/RNMBX/RNMBXImagesViewManager.swift | 14 - ios/RNMBX/RNMBXLightComponentView.h | 5 +- ios/RNMBX/RNMBXLightComponentView.mm | 2 - ios/RNMBX/RNMBXLightViewManager.m | 9 - ios/RNMBX/RNMBXLightViewManager.swift | 13 - ios/RNMBX/RNMBXLineLayerComponentView.h | 5 +- ios/RNMBX/RNMBXLineLayerComponentView.mm | 2 - ios/RNMBX/RNMBXLineLayerViewManager.m | 12 - ios/RNMBX/RNMBXLineLayerViewManager.swift | 13 - ios/RNMBX/RNMBXMapView.swift | 298 +++++++++++++++ ios/RNMBX/RNMBXMapViewComponentView.h | 5 +- ios/RNMBX/RNMBXMapViewComponentView.mm | 2 - ios/RNMBX/RNMBXMapViewManager.m | 46 --- ios/RNMBX/RNMBXMapViewManager.swift | 347 ------------------ ios/RNMBX/RNMBXMapViewModule.h | 15 +- ios/RNMBX/RNMBXMapViewModule.mm | 39 +- ios/RNMBX/RNMBXMarkerViewComponentView.h | 5 +- ios/RNMBX/RNMBXMarkerViewComponentView.mm | 2 - .../RNMBXMarkerViewContentComponentView.h | 5 +- .../RNMBXMarkerViewContentComponentView.mm | 2 - ios/RNMBX/RNMBXMarkerViewContentManager.m | 6 - ios/RNMBX/RNMBXMarkerViewContentManager.swift | 14 - ios/RNMBX/RNMBXMarkerViewManager.m | 13 - ios/RNMBX/RNMBXMarkerViewManager.swift | 14 - ios/RNMBX/RNMBXModelLayerComponentView.h | 5 +- ios/RNMBX/RNMBXModelLayerComponentView.mm | 2 - ios/RNMBX/RNMBXModelLayerViewManager.m | 12 - ios/RNMBX/RNMBXModelLayerViewManager.swift | 13 - ios/RNMBX/RNMBXModelsComponentView.h | 5 +- ios/RNMBX/RNMBXModelsComponentView.mm | 2 - ios/RNMBX/RNMBXModelsManager.mm | 9 - ios/RNMBX/RNMBXModelsManager.swift | 13 - .../RNMBXNativeUserLocationComponentView.h | 5 +- .../RNMBXNativeUserLocationComponentView.mm | 2 - .../RNMBXNativeUserLocationViewManager.m | 17 - .../RNMBXNativeUserLocationViewManager.swift | 11 - ios/RNMBX/RNMBXPointAnnotationComponentView.h | 5 +- .../RNMBXPointAnnotationComponentView.mm | 2 - ios/RNMBX/RNMBXPointAnnotationModule.h | 16 +- ios/RNMBX/RNMBXPointAnnotationModule.mm | 7 - ios/RNMBX/RNMBXPointAnnotationViewManager.m | 18 - .../RNMBXPointAnnotationViewManager.swift | 14 - .../RNMBXRasterArraySourceComponentView.h | 5 +- .../RNMBXRasterArraySourceComponentView.mm | 2 - .../RNMBXRasterArraySourceViewManager.swift | 14 - ios/RNMBX/RNMBXRasterDemSourceComponentView.h | 5 +- .../RNMBXRasterDemSourceComponentView.mm | 2 - ios/RNMBX/RNMBXRasterDemSourceViewManager.m | 15 - .../RNMBXRasterDemSourceViewManager.swift | 11 - ios/RNMBX/RNMBXRasterLayerComponentView.h | 5 +- ios/RNMBX/RNMBXRasterLayerComponentView.mm | 2 - ios/RNMBX/RNMBXRasterLayerViewManager.m | 12 - ios/RNMBX/RNMBXRasterLayerViewManager.swift | 13 - .../RNMBXRasterParticleLayerComponentView.h | 5 +- .../RNMBXRasterParticleLayerComponentView.mm | 2 - .../RNMBXRasterParticleLayerViewManager.swift | 15 - ios/RNMBX/RNMBXRasterSourceComponentView.h | 5 +- ios/RNMBX/RNMBXRasterSourceComponentView.mm | 2 - ios/RNMBX/RNMBXRasterSourceViewManager.m | 19 - ios/RNMBX/RNMBXRasterSourceViewManager.swift | 14 - ios/RNMBX/RNMBXShapeSource.swift | 59 +++ ios/RNMBX/RNMBXShapeSourceComponentView.h | 5 +- ios/RNMBX/RNMBXShapeSourceComponentView.mm | 2 - ios/RNMBX/RNMBXShapeSourceModule.h | 15 +- ios/RNMBX/RNMBXShapeSourceModule.mm | 17 +- ios/RNMBX/RNMBXShapeSourceViewManager.m | 28 -- ios/RNMBX/RNMBXShapeSourceViewManager.swift | 81 ---- ios/RNMBX/RNMBXSkyLayerComponentView.h | 5 +- ios/RNMBX/RNMBXSkyLayerComponentView.mm | 2 - ios/RNMBX/RNMBXSkyLayerViewManager.m | 9 - ios/RNMBX/RNMBXSkyLayerViewManager.swift | 13 - ios/RNMBX/RNMBXSnapshotModule.m | 1 - ios/RNMBX/RNMBXStyleImportComponentView.h | 5 +- ios/RNMBX/RNMBXStyleImportComponentView.mm | 2 - ios/RNMBX/RNMBXStyleImportManager.m | 10 - ios/RNMBX/RNMBXStyleImportManager.swift | 12 - ios/RNMBX/RNMBXSymbolLayerComponentView.h | 5 +- ios/RNMBX/RNMBXSymbolLayerComponentView.mm | 2 - ios/RNMBX/RNMBXSymbolLayerViewManager.m | 12 - ios/RNMBX/RNMBXSymbolLayerViewManager.swift | 13 - ios/RNMBX/RNMBXTerrainComponentView.h | 5 +- ios/RNMBX/RNMBXTerrainComponentView.mm | 2 - ios/RNMBX/RNMBXTerrainViewManager.m | 15 - ios/RNMBX/RNMBXTerrainViewManager.swift | 13 - ios/RNMBX/RNMBXVectorSourceComponentView.h | 5 +- ios/RNMBX/RNMBXVectorSourceComponentView.mm | 2 - ios/RNMBX/RNMBXVectorSourceViewManager.m | 22 -- ios/RNMBX/RNMBXVectorSourceViewManager.swift | 11 - ios/RNMBX/RNMBXViewport.swift | 6 +- ios/RNMBX/RNMBXViewportComponentView.h | 5 +- ios/RNMBX/RNMBXViewportComponentView.mm | 2 - ios/RNMBX/RNMBXViewportManager.m | 12 - ios/RNMBX/RNMBXViewportManager.swift | 38 -- ios/RNMBX/RNMBXViewportModule.h | 15 +- ios/RNMBX/RNMBXViewportModule.mm | 17 +- ...MBXChangeLineOffsetsShapeAnimatorModule.mm | 16 +- .../RNMBXMovePointShapeAnimatorModule.mm | 18 +- ios/RNMBX/Utils/RNMBXFollyConvert.h | 4 - ios/RNMBX/Utils/RNMBXViewResolver.h | 4 +- ios/RNMBX/Utils/RNMBXViewResolver.mm | 21 +- ios/RNMBX/rnmapbox_maps-Swift.pre.h | 1 - 156 files changed, 497 insertions(+), 1680 deletions(-) delete mode 100644 ios/RNMBX/RNMBXAtmosphereViewManager.m delete mode 100644 ios/RNMBX/RNMBXAtmosphereViewManager.swift delete mode 100644 ios/RNMBX/RNMBXBackgroundLayerViewManager.m delete mode 100644 ios/RNMBX/RNMBXBackgroundLayerViewManager.swift delete mode 100644 ios/RNMBX/RNMBXCalloutViewManager.m delete mode 100644 ios/RNMBX/RNMBXCalloutViewManager.swift delete mode 100644 ios/RNMBX/RNMBXCameraViewManager.m delete mode 100644 ios/RNMBX/RNMBXCameraViewManager.swift delete mode 100644 ios/RNMBX/RNMBXCircleLayerViewManager.m delete mode 100644 ios/RNMBX/RNMBXCircleLayerViewManager.swift delete mode 100644 ios/RNMBX/RNMBXCustomLocationProviderVIewManager.swift delete mode 100644 ios/RNMBX/RNMBXCustomLocationProviderViewManager.m delete mode 100644 ios/RNMBX/RNMBXFillExtrusionLayerViewManager.m delete mode 100644 ios/RNMBX/RNMBXFillExtrusionLayerViewManager.swift delete mode 100644 ios/RNMBX/RNMBXFillLayerViewManager.m delete mode 100644 ios/RNMBX/RNMBXFillLayerViewManager.swift delete mode 100644 ios/RNMBX/RNMBXHeatmapLayerViewManager.m delete mode 100644 ios/RNMBX/RNMBXHeatmapLayerViewManager.swift delete mode 100644 ios/RNMBX/RNMBXImageManager.m delete mode 100644 ios/RNMBX/RNMBXImageManager.swift delete mode 100644 ios/RNMBX/RNMBXImageSourceViewManager.m delete mode 100644 ios/RNMBX/RNMBXImageSourceViewManager.swift delete mode 100644 ios/RNMBX/RNMBXImagesViewManager.m delete mode 100644 ios/RNMBX/RNMBXImagesViewManager.swift delete mode 100644 ios/RNMBX/RNMBXLightViewManager.m delete mode 100644 ios/RNMBX/RNMBXLightViewManager.swift delete mode 100644 ios/RNMBX/RNMBXLineLayerViewManager.m delete mode 100644 ios/RNMBX/RNMBXLineLayerViewManager.swift delete mode 100644 ios/RNMBX/RNMBXMapViewManager.m delete mode 100644 ios/RNMBX/RNMBXMapViewManager.swift delete mode 100644 ios/RNMBX/RNMBXMarkerViewContentManager.m delete mode 100644 ios/RNMBX/RNMBXMarkerViewContentManager.swift delete mode 100644 ios/RNMBX/RNMBXMarkerViewManager.m delete mode 100644 ios/RNMBX/RNMBXMarkerViewManager.swift delete mode 100644 ios/RNMBX/RNMBXModelLayerViewManager.m delete mode 100644 ios/RNMBX/RNMBXModelLayerViewManager.swift delete mode 100644 ios/RNMBX/RNMBXModelsManager.mm delete mode 100644 ios/RNMBX/RNMBXModelsManager.swift delete mode 100644 ios/RNMBX/RNMBXNativeUserLocationViewManager.m delete mode 100644 ios/RNMBX/RNMBXNativeUserLocationViewManager.swift delete mode 100644 ios/RNMBX/RNMBXPointAnnotationViewManager.m delete mode 100644 ios/RNMBX/RNMBXPointAnnotationViewManager.swift delete mode 100644 ios/RNMBX/RNMBXRasterArraySourceViewManager.swift delete mode 100644 ios/RNMBX/RNMBXRasterDemSourceViewManager.m delete mode 100644 ios/RNMBX/RNMBXRasterDemSourceViewManager.swift delete mode 100644 ios/RNMBX/RNMBXRasterLayerViewManager.m delete mode 100644 ios/RNMBX/RNMBXRasterLayerViewManager.swift delete mode 100644 ios/RNMBX/RNMBXRasterParticleLayerViewManager.swift delete mode 100644 ios/RNMBX/RNMBXRasterSourceViewManager.m delete mode 100644 ios/RNMBX/RNMBXRasterSourceViewManager.swift delete mode 100644 ios/RNMBX/RNMBXShapeSourceViewManager.m delete mode 100644 ios/RNMBX/RNMBXShapeSourceViewManager.swift delete mode 100644 ios/RNMBX/RNMBXSkyLayerViewManager.m delete mode 100644 ios/RNMBX/RNMBXSkyLayerViewManager.swift delete mode 100644 ios/RNMBX/RNMBXStyleImportManager.m delete mode 100644 ios/RNMBX/RNMBXStyleImportManager.swift delete mode 100644 ios/RNMBX/RNMBXSymbolLayerViewManager.m delete mode 100644 ios/RNMBX/RNMBXSymbolLayerViewManager.swift delete mode 100644 ios/RNMBX/RNMBXTerrainViewManager.m delete mode 100644 ios/RNMBX/RNMBXTerrainViewManager.swift delete mode 100644 ios/RNMBX/RNMBXVectorSourceViewManager.m delete mode 100644 ios/RNMBX/RNMBXVectorSourceViewManager.swift delete mode 100644 ios/RNMBX/RNMBXViewportManager.m delete mode 100644 ios/RNMBX/RNMBXViewportManager.swift diff --git a/ios/RNMBX/Bridge/RNMBX.h b/ios/RNMBX/Bridge/RNMBX.h index 56185b9707..947d14359e 100644 --- a/ios/RNMBX/Bridge/RNMBX.h +++ b/ios/RNMBX/Bridge/RNMBX.h @@ -1,6 +1,5 @@ /* Those will be available for Swift */ #import -#import #import #import diff --git a/ios/RNMBX/RNMBXAtmosphereComponentView.h b/ios/RNMBX/RNMBXAtmosphereComponentView.h index 588575069a..62db2e86c2 100644 --- a/ios/RNMBX/RNMBXAtmosphereComponentView.h +++ b/ios/RNMBX/RNMBXAtmosphereComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXAtmosphereComponentView.mm b/ios/RNMBX/RNMBXAtmosphereComponentView.mm index 63fc5d539f..7eea4dcf48 100644 --- a/ios/RNMBX/RNMBXAtmosphereComponentView.mm +++ b/ios/RNMBX/RNMBXAtmosphereComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXAtmosphereComponentView.h" #import "RNMBXFabricHelpers.h" @@ -79,4 +78,3 @@ - (void)prepareForRecycle return RNMBXAtmosphereComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXAtmosphereViewManager.m b/ios/RNMBX/RNMBXAtmosphereViewManager.m deleted file mode 100644 index 3965eb7c41..0000000000 --- a/ios/RNMBX/RNMBXAtmosphereViewManager.m +++ /dev/null @@ -1,8 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXAtmosphere, RNMBXAtmosphereViewManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary); - -@end diff --git a/ios/RNMBX/RNMBXAtmosphereViewManager.swift b/ios/RNMBX/RNMBXAtmosphereViewManager.swift deleted file mode 100644 index 5cfa1bea87..0000000000 --- a/ios/RNMBX/RNMBXAtmosphereViewManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXAtmosphereViewManager) -class RNMBXAtmosphereViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let atmosphere = RNMBXAtmosphere() - //atmosphere.bridge = self.bridge - return atmosphere - } -} diff --git a/ios/RNMBX/RNMBXBackgroundLayerComponentView.h b/ios/RNMBX/RNMBXBackgroundLayerComponentView.h index 378ec383e8..134014edc2 100644 --- a/ios/RNMBX/RNMBXBackgroundLayerComponentView.h +++ b/ios/RNMBX/RNMBXBackgroundLayerComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXBackgroundLayerComponentView.mm b/ios/RNMBX/RNMBXBackgroundLayerComponentView.mm index 1bb49fcccc..f3fc7f14b0 100644 --- a/ios/RNMBX/RNMBXBackgroundLayerComponentView.mm +++ b/ios/RNMBX/RNMBXBackgroundLayerComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXBackgroundLayerComponentView.h" #import "RNMBXFabricHelpers.h" @@ -74,4 +73,3 @@ - (void)prepareForRecycle return RNMBXBackgroundLayerComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXBackgroundLayerViewManager.m b/ios/RNMBX/RNMBXBackgroundLayerViewManager.m deleted file mode 100644 index cc6cd314a9..0000000000 --- a/ios/RNMBX/RNMBXBackgroundLayerViewManager.m +++ /dev/null @@ -1,9 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXBackgroundLayer, RNMBXBackgroundLayerViewManager, RCTViewManager) - -// standard layer props -#include "CommonLayerProperties.H" - -@end diff --git a/ios/RNMBX/RNMBXBackgroundLayerViewManager.swift b/ios/RNMBX/RNMBXBackgroundLayerViewManager.swift deleted file mode 100644 index 271bf0c728..0000000000 --- a/ios/RNMBX/RNMBXBackgroundLayerViewManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXBackgroundLayerViewManager) -class RNMBXBackgroundLayerViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXBackgroundLayer() - layer.bridge = self.bridge - return layer - } -} diff --git a/ios/RNMBX/RNMBXCalloutComponentView.h b/ios/RNMBX/RNMBXCalloutComponentView.h index 340e639bde..001bce046a 100644 --- a/ios/RNMBX/RNMBXCalloutComponentView.h +++ b/ios/RNMBX/RNMBXCalloutComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXCalloutComponentView.mm b/ios/RNMBX/RNMBXCalloutComponentView.mm index 83e6642a74..69fc9241a6 100644 --- a/ios/RNMBX/RNMBXCalloutComponentView.mm +++ b/ios/RNMBX/RNMBXCalloutComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXCalloutComponentView.h" #import "RNMBXFabricHelpers.h" @@ -60,4 +59,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & return RNMBXCalloutComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXCalloutViewManager.m b/ios/RNMBX/RNMBXCalloutViewManager.m deleted file mode 100644 index 62205d5b75..0000000000 --- a/ios/RNMBX/RNMBXCalloutViewManager.m +++ /dev/null @@ -1,8 +0,0 @@ -#import "React/RCTBridgeModule.h" -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXCallout, RNMBXCalloutViewManager, RCTViewManager) - -@end - diff --git a/ios/RNMBX/RNMBXCalloutViewManager.swift b/ios/RNMBX/RNMBXCalloutViewManager.swift deleted file mode 100644 index bc74e3af31..0000000000 --- a/ios/RNMBX/RNMBXCalloutViewManager.swift +++ /dev/null @@ -1,14 +0,0 @@ -import Foundation -import MapboxMaps - -@objc(RNMBXCalloutViewManager) -class RNMBXCalloutViewManager : RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - return RNMBXCallout() - } -} diff --git a/ios/RNMBX/RNMBXCameraComponentView.h b/ios/RNMBX/RNMBXCameraComponentView.h index 809c5b3940..e7bafb295c 100644 --- a/ios/RNMBX/RNMBXCameraComponentView.h +++ b/ios/RNMBX/RNMBXCameraComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXCameraComponentView.mm b/ios/RNMBX/RNMBXCameraComponentView.mm index abc8b4a904..a1a6596127 100644 --- a/ios/RNMBX/RNMBXCameraComponentView.mm +++ b/ios/RNMBX/RNMBXCameraComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXCameraComponentView.h" #import "RNMBXFabricHelpers.h" @@ -148,4 +147,3 @@ - (void)prepareForRecycle return RNMBXCameraComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXCameraGestureObserverComponentView.h b/ios/RNMBX/RNMBXCameraGestureObserverComponentView.h index 3dbe912522..cc8b2f6a17 100644 --- a/ios/RNMBX/RNMBXCameraGestureObserverComponentView.h +++ b/ios/RNMBX/RNMBXCameraGestureObserverComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXCameraGestureObserverComponentView.mm b/ios/RNMBX/RNMBXCameraGestureObserverComponentView.mm index 9a8a2ec07e..7f017b0160 100644 --- a/ios/RNMBX/RNMBXCameraGestureObserverComponentView.mm +++ b/ios/RNMBX/RNMBXCameraGestureObserverComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXCameraGestureObserverComponentView.h" #import "RNMBXFabricHelpers.h" @@ -116,4 +115,3 @@ - (void)prepareForRecycle return RNMBXCameraGestureObserverComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXCameraModule.h b/ios/RNMBX/RNMBXCameraModule.h index 7d59deeb6f..96e8c7af37 100644 --- a/ios/RNMBX/RNMBXCameraModule.h +++ b/ios/RNMBX/RNMBXCameraModule.h @@ -2,18 +2,15 @@ #import #import "RNMBXViewResolver.h" -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import "rnmapbox_maps_specs.h" -#else -#import -#endif -@interface RNMBXCameraModule : NSObject -#ifdef RCT_NEW_ARCH_ENABLED - +@interface RNMBXCameraModule : NSObject +@end + #else - -#endif +@interface RNMBXCameraModule : NSObject @end +#endif diff --git a/ios/RNMBX/RNMBXCameraModule.mm b/ios/RNMBX/RNMBXCameraModule.mm index 356e853905..e68b7e80b3 100644 --- a/ios/RNMBX/RNMBXCameraModule.mm +++ b/ios/RNMBX/RNMBXCameraModule.mm @@ -3,9 +3,7 @@ #import #import "RNMBXCameraModule.h" -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXCameraComponentView.h" -#endif // RCT_NEW_ARCH_ENABLED #import "rnmapbox_maps-Swift.pre.h" @@ -13,9 +11,7 @@ @implementation RNMBXCameraModule RCT_EXPORT_MODULE(); -#ifdef RCT_NEW_ARCH_ENABLED @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED; -#endif // RCT_NEW_ARCH_ENABLED @synthesize bridge = _bridge; - (dispatch_queue_t)methodQueue @@ -25,14 +21,11 @@ - (dispatch_queue_t)methodQueue return RCTGetUIManagerQueue(); } -// Thanks to this guard, we won't compile this code when we build for the old architecture. -#ifdef RCT_NEW_ARCH_ENABLED - (std::shared_ptr)getTurboModule: (const facebook::react::ObjCTurboModule::InitParams &)params { return std::make_shared(params); } -#endif // RCT_NEW_ARCH_ENABLED - (void)withCamera:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXCamera *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName { diff --git a/ios/RNMBX/RNMBXCameraViewManager.m b/ios/RNMBX/RNMBXCameraViewManager.m deleted file mode 100644 index 70027938e4..0000000000 --- a/ios/RNMBX/RNMBXCameraViewManager.m +++ /dev/null @@ -1,27 +0,0 @@ -#if !RCT_NEW_ARCH_ENABLED - -#import "React/RCTBridgeModule.h" -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXCamera, RNMBXCameraViewManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(maxBounds, NSString) -RCT_EXPORT_VIEW_PROPERTY(animationDuration, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(animationMode, NSString) -RCT_EXPORT_VIEW_PROPERTY(defaultStop, NSDictionary) - -RCT_EXPORT_VIEW_PROPERTY(followUserLocation, BOOL) -RCT_EXPORT_VIEW_PROPERTY(followUserMode, NSString) -RCT_EXPORT_VIEW_PROPERTY(followZoomLevel, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(followPitch, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(followHeading, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(followPadding, NSDictionary) - -RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(onUserTrackingModeChange, RCTBubblingEventBlock) -RCT_EXPORT_VIEW_PROPERTY(stop, NSDictionary) - -@end -#endif diff --git a/ios/RNMBX/RNMBXCameraViewManager.swift b/ios/RNMBX/RNMBXCameraViewManager.swift deleted file mode 100644 index 2f5fc06a76..0000000000 --- a/ios/RNMBX/RNMBXCameraViewManager.swift +++ /dev/null @@ -1,16 +0,0 @@ -#if !RCT_NEW_ARCH_ENABLED - import Foundation - import MapboxMaps - - @objc(RNMBXCameraViewManager) - class RNMBXCameraViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - return RNMBXCamera() - } - } -#endif diff --git a/ios/RNMBX/RNMBXCircleLayerComponentView.h b/ios/RNMBX/RNMBXCircleLayerComponentView.h index 066944a7e5..9e6678ea45 100644 --- a/ios/RNMBX/RNMBXCircleLayerComponentView.h +++ b/ios/RNMBX/RNMBXCircleLayerComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXCircleLayerComponentView.mm b/ios/RNMBX/RNMBXCircleLayerComponentView.mm index 556a5047d3..909a831139 100644 --- a/ios/RNMBX/RNMBXCircleLayerComponentView.mm +++ b/ios/RNMBX/RNMBXCircleLayerComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXCircleLayerComponentView.h" #import "RNMBXFabricHelpers.h" @@ -73,4 +72,3 @@ - (void)prepareForRecycle return RNMBXCircleLayerComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXCircleLayerViewManager.m b/ios/RNMBX/RNMBXCircleLayerViewManager.m deleted file mode 100644 index 81f8512e77..0000000000 --- a/ios/RNMBX/RNMBXCircleLayerViewManager.m +++ /dev/null @@ -1,14 +0,0 @@ -#if !RCT_NEW_ARCH_ENABLED -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXCircleLayer, RNMBXCircleLayerViewManager, RCTViewManager) - -// circle layer props -RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString) - -// standard layer props -#include "CommonLayerProperties.H" - -@end -#endif diff --git a/ios/RNMBX/RNMBXCircleLayerViewManager.swift b/ios/RNMBX/RNMBXCircleLayerViewManager.swift deleted file mode 100644 index 9c37472547..0000000000 --- a/ios/RNMBX/RNMBXCircleLayerViewManager.swift +++ /dev/null @@ -1,15 +0,0 @@ -#if !RCT_NEW_ARCH_ENABLED -@objc(RNMBXCircleLayerViewManager) -class RNMBXCircleLayerViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXCircleLayer() - layer.bridge = self.bridge - return layer - } -} -#endif diff --git a/ios/RNMBX/RNMBXCustomLocationProviderComponentView.h b/ios/RNMBX/RNMBXCustomLocationProviderComponentView.h index c5bfc36fb9..0119d58ab1 100644 --- a/ios/RNMBX/RNMBXCustomLocationProviderComponentView.h +++ b/ios/RNMBX/RNMBXCustomLocationProviderComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXCustomLocationProviderComponentView.mm b/ios/RNMBX/RNMBXCustomLocationProviderComponentView.mm index df320e0c4c..30f2eef40d 100644 --- a/ios/RNMBX/RNMBXCustomLocationProviderComponentView.mm +++ b/ios/RNMBX/RNMBXCustomLocationProviderComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXCustomLocationProviderComponentView.h" #import "RNMBXFabricHelpers.h" @@ -80,4 +79,3 @@ - (void)prepareForRecycle return RNMBXCustomLocationProviderComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXCustomLocationProviderVIewManager.swift b/ios/RNMBX/RNMBXCustomLocationProviderVIewManager.swift deleted file mode 100644 index d6fe1ffc1b..0000000000 --- a/ios/RNMBX/RNMBXCustomLocationProviderVIewManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXCustomLocationProviderViewManager) -class RNMBXCustomLocationProviderViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXCustomLocationProvider() - //layer.bridge = self.bridge - return layer - } -} diff --git a/ios/RNMBX/RNMBXCustomLocationProviderViewManager.m b/ios/RNMBX/RNMBXCustomLocationProviderViewManager.m deleted file mode 100644 index 87ceaa89f3..0000000000 --- a/ios/RNMBX/RNMBXCustomLocationProviderViewManager.m +++ /dev/null @@ -1,10 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXCustomLocationProvider, RNMBXCustomLocationProviderViewManager, RCTViewManager) - -// circle layer props -RCT_EXPORT_VIEW_PROPERTY(coordinate, NSArray) -RCT_EXPORT_VIEW_PROPERTY(heading, NSNumber) - -@end diff --git a/ios/RNMBX/RNMBXFabricPropConvert.mm b/ios/RNMBX/RNMBXFabricPropConvert.mm index 025c29db6d..8762b37b5e 100644 --- a/ios/RNMBX/RNMBXFabricPropConvert.mm +++ b/ios/RNMBX/RNMBXFabricPropConvert.mm @@ -1,5 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED - #import #import #import @@ -156,5 +154,3 @@ id RNMBXPropConvert_Optional_ExpressionDouble(const folly::dynamic &dyn, NSStrin NSArray * RNMBXPropConvert_Optional_NumberArray(const folly::dynamic &dyn, NSString* propertyName) { return RNMBXPropConvert_ID(dyn); } - -#endif diff --git a/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.h b/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.h index 06e9a297a9..4a046c0b15 100644 --- a/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.h +++ b/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.mm b/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.mm index 99a6b9019c..176699039e 100644 --- a/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.mm +++ b/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXFillExtrusionLayerComponentView.h" #import "RNMBXFabricHelpers.h" @@ -74,4 +73,3 @@ - (void)prepareForRecycle return RNMBXFillExtrusionLayerComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXFillExtrusionLayerViewManager.m b/ios/RNMBX/RNMBXFillExtrusionLayerViewManager.m deleted file mode 100644 index 2ed9a38ed2..0000000000 --- a/ios/RNMBX/RNMBXFillExtrusionLayerViewManager.m +++ /dev/null @@ -1,12 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXFillExtrusionLayer, RNMBXFillExtrusionLayerViewManager, RCTViewManager) - -// fill extrusion layer props -RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString) - -// standard layer props -#include "CommonLayerProperties.H" - -@end diff --git a/ios/RNMBX/RNMBXFillExtrusionLayerViewManager.swift b/ios/RNMBX/RNMBXFillExtrusionLayerViewManager.swift deleted file mode 100644 index 92ce746dac..0000000000 --- a/ios/RNMBX/RNMBXFillExtrusionLayerViewManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXFillExtrusionLayerViewManager) -class RNMBXFillExtrusionLayerViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXFillExtrusionLayer() - layer.bridge = self.bridge - return layer - } -} diff --git a/ios/RNMBX/RNMBXFillLayerComponentView.h b/ios/RNMBX/RNMBXFillLayerComponentView.h index 24b0e3c4d4..fd6a5d07f5 100644 --- a/ios/RNMBX/RNMBXFillLayerComponentView.h +++ b/ios/RNMBX/RNMBXFillLayerComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXFillLayerComponentView.mm b/ios/RNMBX/RNMBXFillLayerComponentView.mm index c70f0afe28..e081e226a2 100644 --- a/ios/RNMBX/RNMBXFillLayerComponentView.mm +++ b/ios/RNMBX/RNMBXFillLayerComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXFillLayerComponentView.h" #import "RNMBXFabricHelpers.h" @@ -73,4 +72,3 @@ - (void)prepareForRecycle return RNMBXFillLayerComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXFillLayerViewManager.m b/ios/RNMBX/RNMBXFillLayerViewManager.m deleted file mode 100644 index 30608a5e8d..0000000000 --- a/ios/RNMBX/RNMBXFillLayerViewManager.m +++ /dev/null @@ -1,12 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXFillLayer, RNMBXFillLayerViewManager, RCTViewManager) - -// circle layer props -RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString) - -// standard layer props -#include "CommonLayerProperties.H" - -@end diff --git a/ios/RNMBX/RNMBXFillLayerViewManager.swift b/ios/RNMBX/RNMBXFillLayerViewManager.swift deleted file mode 100644 index 4f36c59a2c..0000000000 --- a/ios/RNMBX/RNMBXFillLayerViewManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXFillLayerViewManager) -class RNMBXFillLayerViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXFillLayer() - layer.bridge = self.bridge - return layer - } -} diff --git a/ios/RNMBX/RNMBXHeatmapLayerComponentView.h b/ios/RNMBX/RNMBXHeatmapLayerComponentView.h index edbce57898..9f4ebffb54 100644 --- a/ios/RNMBX/RNMBXHeatmapLayerComponentView.h +++ b/ios/RNMBX/RNMBXHeatmapLayerComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXHeatmapLayerComponentView.mm b/ios/RNMBX/RNMBXHeatmapLayerComponentView.mm index d453992b3b..25c2dd73c4 100644 --- a/ios/RNMBX/RNMBXHeatmapLayerComponentView.mm +++ b/ios/RNMBX/RNMBXHeatmapLayerComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXHeatmapLayerComponentView.h" #import "RNMBXFabricHelpers.h" @@ -73,4 +72,3 @@ - (void)prepareForRecycle return RNMBXHeatmapLayerComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXHeatmapLayerViewManager.m b/ios/RNMBX/RNMBXHeatmapLayerViewManager.m deleted file mode 100644 index 2972f0c59d..0000000000 --- a/ios/RNMBX/RNMBXHeatmapLayerViewManager.m +++ /dev/null @@ -1,12 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXHeatmapLayer, RNMBXHeatmapLayerViewManager, RCTViewManager) - -// circle layer props -RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString) - -// standard layer props -#include "CommonLayerProperties.H" - -@end diff --git a/ios/RNMBX/RNMBXHeatmapLayerViewManager.swift b/ios/RNMBX/RNMBXHeatmapLayerViewManager.swift deleted file mode 100644 index ae517e2444..0000000000 --- a/ios/RNMBX/RNMBXHeatmapLayerViewManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXHeatmapLayerViewManager) -class RNMBXHeatmapLayerViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXHeatmapLayer() - layer.bridge = self.bridge - return layer - } -} diff --git a/ios/RNMBX/RNMBXImageComponentView.h b/ios/RNMBX/RNMBXImageComponentView.h index 1df1363634..6b6ed18c83 100644 --- a/ios/RNMBX/RNMBXImageComponentView.h +++ b/ios/RNMBX/RNMBXImageComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXImageComponentView.mm b/ios/RNMBX/RNMBXImageComponentView.mm index 52d5630bc5..ff9ab8c3ce 100644 --- a/ios/RNMBX/RNMBXImageComponentView.mm +++ b/ios/RNMBX/RNMBXImageComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXImageComponentView.h" #import "RNMBXFabricHelpers.h" @@ -102,4 +101,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & return RNMBXImageComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXImageManager.m b/ios/RNMBX/RNMBXImageManager.m deleted file mode 100644 index 0dd80b091c..0000000000 --- a/ios/RNMBX/RNMBXImageManager.m +++ /dev/null @@ -1,30 +0,0 @@ -#import -#import - - -@interface RCTConvert (NSNumberArrayArray) - -+ (NSArray*> *)NSNumberArrayArray:(id)json; - -@end - -@implementation RCTConvert (NSNumberArrayArray) - -+(NSArray*> *)NSNumberArrayArray : (id)json RCT_DYNAMIC -{ - return json; -} - -@end - - -@interface RCT_EXTERN_MODULE(RNMBXImageManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(stretchX, NSArray>) -RCT_EXPORT_VIEW_PROPERTY(stretchY, NSArray>) -RCT_EXPORT_VIEW_PROPERTY(content, NSArray) -RCT_EXPORT_VIEW_PROPERTY(sdf, BOOL) -RCT_EXPORT_VIEW_PROPERTY(name, NSString) - -@end - diff --git a/ios/RNMBX/RNMBXImageManager.swift b/ios/RNMBX/RNMBXImageManager.swift deleted file mode 100644 index ffa4b3e966..0000000000 --- a/ios/RNMBX/RNMBXImageManager.swift +++ /dev/null @@ -1,13 +0,0 @@ - -@objc(RNMBXImageManager) -class RNMBXImageManager : RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXImage() - return layer - } -} diff --git a/ios/RNMBX/RNMBXImageModule.h b/ios/RNMBX/RNMBXImageModule.h index 2710488108..9c89de3d3c 100644 --- a/ios/RNMBX/RNMBXImageModule.h +++ b/ios/RNMBX/RNMBXImageModule.h @@ -2,17 +2,15 @@ #import #import "RNMBXViewResolver.h" -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import "rnmapbox_maps_specs.h" -#else -#import -#endif -@interface RNMBXImageModule : NSObject -#ifdef RCT_NEW_ARCH_ENABLED - +@interface RNMBXImageModule : NSObject +@end + #else - -#endif +@interface RNMBXImageModule : NSObject @end + +#endif diff --git a/ios/RNMBX/RNMBXImageModule.mm b/ios/RNMBX/RNMBXImageModule.mm index 677b22a428..e21b4ff216 100644 --- a/ios/RNMBX/RNMBXImageModule.mm +++ b/ios/RNMBX/RNMBXImageModule.mm @@ -3,9 +3,7 @@ #import #import "RNMBXImageModule.h" -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXImageComponentView.h" -#endif // RCT_NEW_ARCH_ENABLED #import "rnmapbox_maps-Swift.pre.h" @@ -13,9 +11,7 @@ @implementation RNMBXImageModule RCT_EXPORT_MODULE(); -#ifdef RCT_NEW_ARCH_ENABLED @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED; -#endif // RCT_NEW_ARCH_ENABLED @synthesize bridge = _bridge; - (dispatch_queue_t)methodQueue @@ -47,13 +43,10 @@ - (void)withImage:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXImage *))block } -// Thanks to this guard, we won't compile this code when we build for the old architecture. -#ifdef RCT_NEW_ARCH_ENABLED - (std::shared_ptr)getTurboModule: (const facebook::react::ObjCTurboModule::InitParams &)params { return std::make_shared(params); } -#endif // RCT_NEW_ARCH_ENABLED @end diff --git a/ios/RNMBX/RNMBXImageSourceComponentView.h b/ios/RNMBX/RNMBXImageSourceComponentView.h index be6a0404bf..448230667a 100644 --- a/ios/RNMBX/RNMBXImageSourceComponentView.h +++ b/ios/RNMBX/RNMBXImageSourceComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXImageSourceComponentView.mm b/ios/RNMBX/RNMBXImageSourceComponentView.mm index c211f93ff5..f6efc42616 100644 --- a/ios/RNMBX/RNMBXImageSourceComponentView.mm +++ b/ios/RNMBX/RNMBXImageSourceComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXImageSourceComponentView.h" #import "RNMBXFabricHelpers.h" @@ -103,4 +102,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & return RNMBXImageSourceComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXImageSourceViewManager.m b/ios/RNMBX/RNMBXImageSourceViewManager.m deleted file mode 100644 index 5d4bc4a2b0..0000000000 --- a/ios/RNMBX/RNMBXImageSourceViewManager.m +++ /dev/null @@ -1,11 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXImageSource, RNMBXImageSourceViewManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(id, NSString) -RCT_EXPORT_VIEW_PROPERTY(existing, BOOL) -RCT_EXPORT_VIEW_PROPERTY(url, NSString) -RCT_EXPORT_VIEW_PROPERTY(coordinates, NSArray) - -@end diff --git a/ios/RNMBX/RNMBXImageSourceViewManager.swift b/ios/RNMBX/RNMBXImageSourceViewManager.swift deleted file mode 100644 index 919563888c..0000000000 --- a/ios/RNMBX/RNMBXImageSourceViewManager.swift +++ /dev/null @@ -1,11 +0,0 @@ -@objc(RNMBXImageSourceViewManager) -class RNMBXImageSourceViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - @objc override func view() -> UIView { - return RNMBXImageSource() - } -} diff --git a/ios/RNMBX/RNMBXImagesComponentView.h b/ios/RNMBX/RNMBXImagesComponentView.h index 5e3a9e820a..2deeb54bdb 100644 --- a/ios/RNMBX/RNMBXImagesComponentView.h +++ b/ios/RNMBX/RNMBXImagesComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXImagesComponentView.mm b/ios/RNMBX/RNMBXImagesComponentView.mm index 97e566da6d..52203aa52a 100644 --- a/ios/RNMBX/RNMBXImagesComponentView.mm +++ b/ios/RNMBX/RNMBXImagesComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXImagesComponentView.h" #import "RNMBXFabricHelpers.h" @@ -112,4 +111,3 @@ - (void)unmountChildComponentView:(UIView *)childCompo return RNMBXImagesComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXImagesViewManager.m b/ios/RNMBX/RNMBXImagesViewManager.m deleted file mode 100644 index e6034b4d25..0000000000 --- a/ios/RNMBX/RNMBXImagesViewManager.m +++ /dev/null @@ -1,10 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXImages, RNMBXImagesViewManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(images, NSDictionary) -RCT_EXPORT_VIEW_PROPERTY(nativeImages, NSArray) -RCT_REMAP_VIEW_PROPERTY(onImageMissing, onImageMissing, RCTBubblingEventBlock) - -@end diff --git a/ios/RNMBX/RNMBXImagesViewManager.swift b/ios/RNMBX/RNMBXImagesViewManager.swift deleted file mode 100644 index 2461a9231f..0000000000 --- a/ios/RNMBX/RNMBXImagesViewManager.swift +++ /dev/null @@ -1,14 +0,0 @@ - -@objc(RNMBXImagesViewManager) -class RNMBXImagesViewManager : RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXImages() - layer.bridge = self.bridge - return layer - } -} diff --git a/ios/RNMBX/RNMBXLightComponentView.h b/ios/RNMBX/RNMBXLightComponentView.h index f8551fba59..41169efaca 100644 --- a/ios/RNMBX/RNMBXLightComponentView.h +++ b/ios/RNMBX/RNMBXLightComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXLightComponentView.mm b/ios/RNMBX/RNMBXLightComponentView.mm index 61d0196c1e..f0dc33b605 100644 --- a/ios/RNMBX/RNMBXLightComponentView.mm +++ b/ios/RNMBX/RNMBXLightComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXLightComponentView.h" #import "RNMBXFabricHelpers.h" @@ -71,4 +70,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & return RNMBXLightComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXLightViewManager.m b/ios/RNMBX/RNMBXLightViewManager.m deleted file mode 100644 index 0e76abe43b..0000000000 --- a/ios/RNMBX/RNMBXLightViewManager.m +++ /dev/null @@ -1,9 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXLight, RNMBXLightViewManager, RCTViewManager) - -// light props -RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary); - -@end diff --git a/ios/RNMBX/RNMBXLightViewManager.swift b/ios/RNMBX/RNMBXLightViewManager.swift deleted file mode 100644 index 53bbc8ef60..0000000000 --- a/ios/RNMBX/RNMBXLightViewManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXLightViewManager) -class RNMBXLightViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let light = RNMBXLight() - light.bridge = self.bridge - return light - } -} diff --git a/ios/RNMBX/RNMBXLineLayerComponentView.h b/ios/RNMBX/RNMBXLineLayerComponentView.h index 249cc13c17..129d96dbf8 100644 --- a/ios/RNMBX/RNMBXLineLayerComponentView.h +++ b/ios/RNMBX/RNMBXLineLayerComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXLineLayerComponentView.mm b/ios/RNMBX/RNMBXLineLayerComponentView.mm index 85b8563bd8..d85a9fc3e5 100644 --- a/ios/RNMBX/RNMBXLineLayerComponentView.mm +++ b/ios/RNMBX/RNMBXLineLayerComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXLineLayerComponentView.h" #import "RNMBXFabricHelpers.h" @@ -73,4 +72,3 @@ - (void)prepareForRecycle return RNMBXLineLayerComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXLineLayerViewManager.m b/ios/RNMBX/RNMBXLineLayerViewManager.m deleted file mode 100644 index 8fcb255922..0000000000 --- a/ios/RNMBX/RNMBXLineLayerViewManager.m +++ /dev/null @@ -1,12 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXLineLayer, RNMBXLineLayerViewManager, RCTViewManager) - -// circle layer props -RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString) - -// standard layer props -#include "CommonLayerProperties.H" - -@end diff --git a/ios/RNMBX/RNMBXLineLayerViewManager.swift b/ios/RNMBX/RNMBXLineLayerViewManager.swift deleted file mode 100644 index 525885e248..0000000000 --- a/ios/RNMBX/RNMBXLineLayerViewManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXLineLayerViewManager) -class RNMBXLineLayerViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXLineLayer() - layer.bridge = self.bridge - return layer - } -} diff --git a/ios/RNMBX/RNMBXMapView.swift b/ios/RNMBX/RNMBXMapView.swift index 817dcb38a5..9757490882 100644 --- a/ios/RNMBX/RNMBXMapView.swift +++ b/ios/RNMBX/RNMBXMapView.swift @@ -1586,6 +1586,304 @@ extension RNMBXMapView { } } +// MARK: - Module methods + +extension QueriedSourceFeature { + var feature: Feature { return self.queriedFeature.feature } +} + +extension RNMBXMapView { + @objc public func takeSnapWithWriteToDisk( + _ writeToDisk: Bool, + resolver: @escaping RCTPromiseResolveBlock + ) { + let uri = self.takeSnap(writeToDisk: writeToDisk) + resolver(["uri": uri.absoluteString]) + } + + @objc public func queryTerrainElevationWithCoordinates( + _ coordinates: [NSNumber], + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + let result = self.queryTerrainElevation(coordinates: coordinates) + if let result = result { + resolver(["data": NSNumber(value: result)]) + } else { + resolver(nil) + } + } + + @objc public func setSourceVisibilityWithVisible( + _ visible: Bool, + sourceId: String, + sourceLayerId: String?, + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + self.setSourceVisibility(visible, sourceId: sourceId, sourceLayerId: sourceLayerId) + resolver(nil) + } + + @objc public func getCenterWithResolver( + _ resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + self.withMapboxMap { map in + resolver([ + "center": [ + map.cameraState.center.longitude, + map.cameraState.center.latitude, + ] + ]) + } + } + + @objc public func getCoordinateFromViewWithAtPoint( + _ point: CGPoint, + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + self.withMapboxMap { map in + let coordinates = map.coordinate(for: point) + resolver(["coordinateFromView": [coordinates.longitude, coordinates.latitude]]) + } + } + + @objc public func getPointInViewWithAtCoordinate( + _ coordinate: [NSNumber], + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + self.withMapboxMap { map in + let coordinate = CLLocationCoordinate2DMake( + coordinate[1].doubleValue, coordinate[0].doubleValue) + let point = map.point(for: coordinate) + resolver(["pointInView": [(point.x), (point.y)]]) + } + } + + @objc public func setHandledMapChangedEventsWithEvents( + _ events: [String], + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + self.handleMapChangedEvents = Set( + events.compactMap { + RNMBXEvent.EventType(rawValue: $0) + }) + resolver(nil) + } + + @objc public func getZoomWithResolver( + _ resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + self.withMapboxMap { map in + resolver(["zoom": map.cameraState.zoom]) + } + } + + @objc public func getVisibleBoundsWithResolver( + _ resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + self.withMapboxMap { map in + resolver(["visibleBounds": map.coordinateBounds(for: self.bounds).toArray()]) + } + } + + @objc public func setFeatureStateWithFeatureId( + _ featureId: String, + state: [String: Any], + sourceId: String, + sourceLayerId: String?, + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + self.withMapboxMap { map in + map.setFeatureState( + sourceId: sourceId, + sourceLayerId: sourceLayerId, + featureId: featureId, + state: state + ) { result in + switch result { + case .success: resolver(nil) + case .failure(let error): rejecter("setFeatureState", "failed to set feature state", error) + } + } + } + } + + @objc public func getFeatureStateWithFeatureId( + _ featureId: String, + sourceId: String, + sourceLayerId: String?, + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + self.withMapboxMap { map in + map.getFeatureState( + sourceId: sourceId, + sourceLayerId: sourceLayerId, + featureId: featureId + ) { result in + switch result { + case .success(let featureState): + resolver(["featureState": featureState]) + case .failure(let error): + rejecter("getFeatureState", "failed to get feature state", error) + } + } + } + } + + @objc public func removeFeatureStateWithFeatureId( + _ featureId: String, + stateKey: String?, + sourceId: String, + sourceLayerId: String?, + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + self.withMapboxMap { map in + map.removeFeatureState( + sourceId: sourceId, + sourceLayerId: sourceLayerId, + featureId: featureId, + stateKey: stateKey + ) { result in + switch result { + case .success: resolver(nil) + case .failure(let error): rejecter("removeFeatureState", "failed to remove feature state", error) + } + } + } + } + + @objc public func queryRenderedFeaturesAtPointWithAtPoint( + _ point: [NSNumber], + withFilter filter: [Any]?, + withLayerIDs layerIDs: [String]?, + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + self.withMapboxMap { map in + let point = CGPoint(x: CGFloat(point[0].floatValue), y: CGFloat(point[1].floatValue)) + + logged("queryRenderedFeaturesAtPoint.option", rejecter: rejecter) { + let options = try RenderedQueryOptions( + layerIds: (layerIDs ?? []).isEmpty ? nil : layerIDs, filter: filter?.asExpression()) + + map.queryRenderedFeatures(with: point, options: options) { result in + switch result { + case .success(let features): + resolver([ + "data": [ + "type": "FeatureCollection", + "features": features.compactMap { queriedFeature in + logged("queryRenderedFeaturesAtPoint.feature.toJSON") { + try queriedFeature.feature.toJSON() + } + }, + ] + ]) + case .failure(let error): + rejecter("queryRenderedFeaturesAtPoint", "failed to query features", error) + } + } + } + } + } + + @objc public func queryRenderedFeaturesInRectWithBBox( + _ bbox: [NSNumber], + withFilter filter: [Any]?, + withLayerIDs layerIDs: [String]?, + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + let top = bbox.isEmpty ? 0.0 : CGFloat(bbox[0].floatValue) + let right = bbox.isEmpty ? 0.0 : CGFloat(bbox[1].floatValue) + let bottom = bbox.isEmpty ? 0.0 : CGFloat(bbox[2].floatValue) + let left = bbox.isEmpty ? 0.0 : CGFloat(bbox[3].floatValue) + let rect = + bbox.isEmpty + ? CGRect(x: 0.0, y: 0.0, width: self.bounds.size.width, height: self.bounds.size.height) + : CGRect( + x: [left, right].min()!, y: [top, bottom].min()!, width: abs(right - left), + height: abs(bottom - top)) + logged("queryRenderedFeaturesInRect.option", rejecter: rejecter) { + let options = try RenderedQueryOptions( + layerIds: layerIDs?.isEmpty ?? true ? nil : layerIDs, filter: filter?.asExpression()) + self.mapboxMap.queryRenderedFeatures(with: rect, options: options) { result in + switch result { + case .success(let features): + resolver([ + "data": [ + "type": "FeatureCollection", + "features": features.compactMap { queriedFeature in + logged("queryRenderedFeaturesInRect.queriedfeature.map") { + try queriedFeature.feature.toJSON() + } + }, + ] + ]) + case .failure(let error): + rejecter("queryRenderedFeaturesInRect", "failed to query features", error) + } + } + } + } + + @objc public func querySourceFeaturesWithSourceId( + _ sourceId: String, + withFilter filter: [Any]?, + withSourceLayerIds sourceLayerIds: [String]?, + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + let sourceLayerIds = sourceLayerIds?.isEmpty ?? true ? nil : sourceLayerIds + logged("querySourceFeatures.option", rejecter: rejecter) { + let options = SourceQueryOptions( + sourceLayerIds: sourceLayerIds, filter: filter ?? Exp(arguments: [])) + self.mapboxMap.querySourceFeatures(for: sourceId, options: options) { result in + switch result { + case .success(let features): + resolver([ + "data": [ + "type": "FeatureCollection", + "features": features.compactMap { queriedFeature in + logged("querySourceFeatures.queriedfeature.map") { + try queriedFeature.feature.toJSON() + } + }, + ] as [String: Any] + ]) + case .failure(let error): + rejecter( + "querySourceFeatures", + "failed to query source features: \(error.localizedDescription)", error) + } + } + } + } + + @objc public func clearDataWithResolver( + _ resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + MapboxMap.clearData { error in + if let error = error { + rejecter("clearData", "failed to clearData: \(error.localizedDescription)", error) + } else { + resolver(nil) + } + } + } +} + class RNMBXPointAnnotationManager : AnnotationInteractionDelegate { weak var selected : RNMBXPointAnnotation? = nil private var draggedAnnotation: PointAnnotation? diff --git a/ios/RNMBX/RNMBXMapViewComponentView.h b/ios/RNMBX/RNMBXMapViewComponentView.h index 9bbffe9271..b1e21150c7 100644 --- a/ios/RNMBX/RNMBXMapViewComponentView.h +++ b/ios/RNMBX/RNMBXMapViewComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -14,5 +14,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXMapViewComponentView.mm b/ios/RNMBX/RNMBXMapViewComponentView.mm index 2d18a04986..3dcffb8888 100644 --- a/ios/RNMBX/RNMBXMapViewComponentView.mm +++ b/ios/RNMBX/RNMBXMapViewComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXMapViewComponentView.h" #import "RNMBXFabricHelpers.h" @@ -237,4 +236,3 @@ - (void)prepareForRecycle return RNMBXMapViewComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXMapViewManager.m b/ios/RNMBX/RNMBXMapViewManager.m deleted file mode 100644 index 11371b9b09..0000000000 --- a/ios/RNMBX/RNMBXMapViewManager.m +++ /dev/null @@ -1,46 +0,0 @@ -#if !RCT_NEW_ARCH_ENABLED -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXMapView, RNMBXMapViewManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(onCameraChanged, RCTDirectEventBlock) - -RCT_REMAP_VIEW_PROPERTY(attributionEnabled, reactAttributionEnabled, BOOL) -RCT_REMAP_VIEW_PROPERTY(attributionPosition, reactAttributionPosition, NSDictionary) - -RCT_REMAP_VIEW_PROPERTY(logoEnabled, reactLogoEnabled, BOOL) -RCT_REMAP_VIEW_PROPERTY(logoPosition, reactLogoPosition, NSDictionary) - -RCT_REMAP_VIEW_PROPERTY(compassEnabled, reactCompassEnabled, BOOL) -RCT_REMAP_VIEW_PROPERTY(compassFadeWhenNorth, reactCompassFadeWhenNorth, BOOL) -RCT_REMAP_VIEW_PROPERTY(compassPosition, reactCompassPosition, NSDictionary) -RCT_REMAP_VIEW_PROPERTY(compassViewPosition, reactCompassViewPosition, NSInteger) -RCT_REMAP_VIEW_PROPERTY(compassViewMargins, reactCompassViewMargins, CGPoint) -RCT_REMAP_VIEW_PROPERTY(compassImage, reactCompassImage, NSString) - -RCT_REMAP_VIEW_PROPERTY(scaleBarEnabled, reactScaleBarEnabled, BOOL) -RCT_REMAP_VIEW_PROPERTY(scaleBarPosition, reactScaleBarPosition, NSDictionary) - -RCT_REMAP_VIEW_PROPERTY(zoomEnabled, reactZoomEnabled, BOOL) -RCT_REMAP_VIEW_PROPERTY(scrollEnabled, reactScrollEnabled, BOOL) -RCT_REMAP_VIEW_PROPERTY(rotateEnabled, reactRotateEnabled, BOOL) -RCT_REMAP_VIEW_PROPERTY(pitchEnabled, reactPitchEnabled, BOOL) -RCT_REMAP_VIEW_PROPERTY(maxPitch, reactMaxPitch, NSNumber) -RCT_REMAP_VIEW_PROPERTY(preferredFramesPerSecond, reactPreferredFramesPerSecond, NSInteger) -RCT_EXPORT_VIEW_PROPERTY(deselectAnnotationOnTap, BOOL) - -RCT_REMAP_VIEW_PROPERTY(projection, reactProjection, NSString) -RCT_REMAP_VIEW_PROPERTY(localizeLabels, reactLocalizeLabels, NSDictionary) - -RCT_REMAP_VIEW_PROPERTY(gestureSettings, reactGestureSettings, NSDictionary) - -RCT_REMAP_VIEW_PROPERTY(styleURL, reactStyleURL, NSString) -RCT_REMAP_VIEW_PROPERTY(onPress, reactOnPress, RCTBubblingEventBlock) -RCT_REMAP_VIEW_PROPERTY(onLongPress, reactOnLongPress, RCTBubblingEventBlock) -RCT_REMAP_VIEW_PROPERTY(onMapChange, reactOnMapChange, RCTBubblingEventBlock) - -RCT_EXPORT_VIEW_PROPERTY(mapViewImpl, NSString) - -@end -#endif diff --git a/ios/RNMBX/RNMBXMapViewManager.swift b/ios/RNMBX/RNMBXMapViewManager.swift deleted file mode 100644 index f5a46de9a5..0000000000 --- a/ios/RNMBX/RNMBXMapViewManager.swift +++ /dev/null @@ -1,347 +0,0 @@ -import MapboxMaps - -extension QueriedSourceFeature { - var feature: Feature { return self.queriedFeature.feature } -} - -#if !RCT_NEW_ARCH_ENABLED - - @objc(RNMBXMapViewManager) - open class RNMBXMapViewManager: RCTViewManager { - @objc - override public static func requiresMainQueueSetup() -> Bool { - return false - } - - func defaultFrame() -> CGRect { - return UIScreen.main.bounds - } - - override open func view() -> UIView! { - let result = RNMBXMapView( - frame: self.defaultFrame(), eventDispatcher: self.bridge.eventDispatcher()) - return result - } - } -#else - @objc(RNMBXMapViewManager) - open class RNMBXMapViewManager: NSObject { - - } -#endif - -// MARK: - react methods - -extension RNMBXMapViewManager { - @objc public static func takeSnap( - _ view: RNMBXMapView, - writeToDisk: Bool, - resolver: @escaping RCTPromiseResolveBlock - ) { - let uri = view.takeSnap(writeToDisk: writeToDisk) - resolver(["uri": uri.absoluteString]) - } - - @objc public static func queryTerrainElevation( - _ view: RNMBXMapView, - coordinates: [NSNumber], - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - let result = view.queryTerrainElevation(coordinates: coordinates) - if let result = result { - resolver(["data": NSNumber(value: result)]) - } else { - resolver(nil) - } - } - - @objc public static func setSourceVisibility( - _ view: RNMBXMapView, - visible: Bool, - sourceId: String, - sourceLayerId: String?, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - view.setSourceVisibility(visible, sourceId: sourceId, sourceLayerId: sourceLayerId) - resolver(nil) - } - - @objc public static func getCenter( - _ view: RNMBXMapView, resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - view.withMapboxMap { map in - resolver([ - "center": [ - map.cameraState.center.longitude, - map.cameraState.center.latitude, - ] - ]) - } - } - - @objc public static func getCoordinateFromView( - _ view: RNMBXMapView, - atPoint point: CGPoint, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - view.withMapboxMap { map in - let coordinates = map.coordinate(for: point) - resolver(["coordinateFromView": [coordinates.longitude, coordinates.latitude]]) - } - - } - - @objc public static func getPointInView( - _ view: RNMBXMapView, - atCoordinate coordinate: [NSNumber], - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - view.withMapboxMap { map in - let coordinate = CLLocationCoordinate2DMake( - coordinate[1].doubleValue, coordinate[0].doubleValue) - let point = map.point(for: coordinate) - resolver(["pointInView": [(point.x), (point.y)]]) - } - } - - @objc public static func setHandledMapChangedEvents( - _ view: RNMBXMapView, - events: [String], - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - view.handleMapChangedEvents = Set( - events.compactMap { - RNMBXEvent.EventType(rawValue: $0) - }) - resolver(nil) - } - - @objc public static func getZoom( - _ view: RNMBXMapView, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - view.withMapboxMap { map in - resolver(["zoom": map.cameraState.zoom]) - } - } - - @objc public static func getVisibleBounds( - _ view: RNMBXMapView, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - view.withMapboxMap { map in - resolver(["visibleBounds": map.coordinateBounds(for: view.bounds).toArray()]) - } - } - - - @objc public static func setFeatureState( - _ view: RNMBXMapView, - featureId: String, - state: [String : Any], - sourceId: String, - sourceLayerId: String?, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock) { - view.withMapboxMap { map in - map.setFeatureState( - sourceId: sourceId, - sourceLayerId: sourceLayerId, - featureId: featureId, - state: state - ) { result in - switch result { - case .success: resolver(nil) - case .failure(let error): rejecter("setFeatureState", "failed to set feature state", error) - } - } - } - } - - @objc public static func getFeatureState( - _ view: RNMBXMapView, - featureId: String, - sourceId: String, - sourceLayerId: String?, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock) { - view.withMapboxMap { map in - map.getFeatureState( - sourceId: sourceId, - sourceLayerId: sourceLayerId, - featureId: featureId - ) { result in - switch (result) { - case .success(let featureState): - resolver(["featureState": featureState]) - case .failure(let error): - rejecter("getFeatureState", "failed to get feature state", error) - } - } - } - } - - @objc public static func removeFeatureState( - _ view: RNMBXMapView, - featureId: String, - stateKey: String?, - sourceId: String, - sourceLayerId: String?, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock) { - view.withMapboxMap { map in - map.removeFeatureState( - sourceId: sourceId, - sourceLayerId: sourceLayerId, - featureId: featureId, - stateKey: stateKey - ) { result in - switch result { - case .success: resolver(nil) - case .failure(let error): rejecter("removeFeatureState", "failed to remove feature state", error) - } - } - } - } -} - -// MARK: - queryRenderedFeatures - -extension RNMBXMapViewManager { - @objc public static func queryRenderedFeaturesAtPoint( - _ view: RNMBXMapView, - atPoint point: [NSNumber], - withFilter filter: [Any]?, - withLayerIDs layerIDs: [String]?, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - view.withMapboxMap { map in - let point = CGPoint(x: CGFloat(point[0].floatValue), y: CGFloat(point[1].floatValue)) - - logged("queryRenderedFeaturesAtPoint.option", rejecter: rejecter) { - let options = try RenderedQueryOptions( - layerIds: (layerIDs ?? []).isEmpty ? nil : layerIDs, filter: filter?.asExpression()) - - map.queryRenderedFeatures(with: point, options: options) { result in - switch result { - case .success(let features): - resolver([ - "data": [ - "type": "FeatureCollection", - "features": features.compactMap { queriedFeature in - logged("queryRenderedFeaturesAtPoint.feature.toJSON") { - try queriedFeature.feature.toJSON() - } - }, - ] - ]) - case .failure(let error): - rejecter("queryRenderedFeaturesAtPoint", "failed to query features", error) - } - } - } - } - } - - @objc public static func queryRenderedFeaturesInRect( - _ map: RNMBXMapView, - withBBox bbox: [NSNumber], - withFilter filter: [Any]?, - withLayerIDs layerIDs: [String]?, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - let top = bbox.isEmpty ? 0.0 : CGFloat(bbox[0].floatValue) - let right = bbox.isEmpty ? 0.0 : CGFloat(bbox[1].floatValue) - let bottom = bbox.isEmpty ? 0.0 : CGFloat(bbox[2].floatValue) - let left = bbox.isEmpty ? 0.0 : CGFloat(bbox[3].floatValue) - let rect = - bbox.isEmpty - ? CGRect(x: 0.0, y: 0.0, width: map.bounds.size.width, height: map.bounds.size.height) - : CGRect( - x: [left, right].min()!, y: [top, bottom].min()!, width: abs(right - left), - height: abs(bottom - top)) - logged("queryRenderedFeaturesInRect.option", rejecter: rejecter) { - let options = try RenderedQueryOptions( - layerIds: layerIDs?.isEmpty ?? true ? nil : layerIDs, filter: filter?.asExpression()) - map.mapboxMap.queryRenderedFeatures(with: rect, options: options) { result in - switch result { - case .success(let features): - resolver([ - "data": [ - "type": "FeatureCollection", - "features": features.compactMap { queriedFeature in - logged("queryRenderedFeaturesInRect.queriedfeature.map") { - try queriedFeature.feature.toJSON() - } - }, - ] - ]) - case .failure(let error): - rejecter("queryRenderedFeaturesInRect", "failed to query features", error) - } - } - } - } - - @objc public static func querySourceFeatures( - _ map: RNMBXMapView, - withSourceId sourceId: String, - withFilter filter: [Any]?, - withSourceLayerIds sourceLayerIds: [String]?, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - let sourceLayerIds = sourceLayerIds?.isEmpty ?? true ? nil : sourceLayerIds - logged("querySourceFeatures.option", rejecter: rejecter) { - let options = SourceQueryOptions( - sourceLayerIds: sourceLayerIds, filter: filter ?? Exp(arguments: [])) - map.mapboxMap.querySourceFeatures(for: sourceId, options: options) { result in - switch result { - case .success(let features): - resolver([ - "data": [ - "type": "FeatureCollection", - "features": features.compactMap { queriedFeature in - logged("querySourceFeatures.queriedfeature.map") { - try queriedFeature.feature.toJSON() - } - }, - ] as [String: Any] - ]) - case .failure(let error): - rejecter( - "querySourceFeatures", - "failed to query source features: \(error.localizedDescription)", error) - } - } - } - } - - static func clearData(_ view: RNMBXMapView, completion: @escaping (Error?) -> Void) { - MapboxMap.clearData(completion: completion) - } - - @objc public static func clearData( - _ mapView: RNMBXMapView, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - self.clearData(mapView) { error in - if let error = error { - rejecter("clearData", "failed to clearData: \(error.localizedDescription)", error) - } else { - resolver(nil) - } - } - } -} diff --git a/ios/RNMBX/RNMBXMapViewModule.h b/ios/RNMBX/RNMBXMapViewModule.h index 73b4b3c25a..a826c22452 100644 --- a/ios/RNMBX/RNMBXMapViewModule.h +++ b/ios/RNMBX/RNMBXMapViewModule.h @@ -2,18 +2,15 @@ #import #import "RNMBXViewResolver.h" -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import "rnmapbox_maps_specs.h" -#else -#import -#endif -@interface RNMBXMapViewModule : NSObject -#ifdef RCT_NEW_ARCH_ENABLED - +@interface RNMBXMapViewModule : NSObject +@end + #else - -#endif +@interface RNMBXMapViewModule : NSObject @end +#endif diff --git a/ios/RNMBX/RNMBXMapViewModule.mm b/ios/RNMBX/RNMBXMapViewModule.mm index 878c4c32eb..8ba4dbbacb 100644 --- a/ios/RNMBX/RNMBXMapViewModule.mm +++ b/ios/RNMBX/RNMBXMapViewModule.mm @@ -3,9 +3,7 @@ #import #import "RNMBXMapViewModule.h" -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXMapViewComponentView.h" -#endif // RCT_NEW_ARCH_ENABLED #import "rnmapbox_maps-Swift.pre.h" #import "RNMBXViewResolver.h" @@ -14,9 +12,7 @@ @implementation RNMBXMapViewModule RCT_EXPORT_MODULE(); -#ifdef RCT_NEW_ARCH_ENABLED @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED; -#endif // RCT_NEW_ARCH_ENABLED @synthesize bridge = _bridge; - (dispatch_queue_t)methodQueue @@ -41,20 +37,20 @@ - (void)withMapView:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXMapView *))b RCT_EXPORT_METHOD(takeSnap:(nonnull NSNumber*)viewRef writeToDisk:(BOOL)writeToDisk resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager takeSnap:view writeToDisk:writeToDisk resolver:resolve]; + [view takeSnapWithWriteToDisk:writeToDisk resolver:resolve]; } reject:reject methodName:@"takeSnap"]; } RCT_EXPORT_METHOD(clearData:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager clearData:view resolver:resolve rejecter:reject]; + [view clearDataWithResolver:resolve rejecter:reject]; } reject:reject methodName:@"clearData"]; } RCT_EXPORT_METHOD(getCenter:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager getCenter:view resolver:resolve rejecter:reject]; + [view getCenterWithResolver:resolve rejecter:reject]; } reject:reject methodName:@"getCenter"]; } @@ -64,97 +60,94 @@ - (void)withMapView:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXMapView *))b NSNumber* a = [atPoint objectAtIndex:0]; NSNumber* b = [atPoint objectAtIndex:1]; - [RNMBXMapViewManager getCoordinateFromView:view atPoint:CGPointMake(a.floatValue, b.floatValue) resolver:resolve rejecter:reject]; + [view getCoordinateFromViewWithAtPoint:CGPointMake(a.floatValue, b.floatValue) resolver:resolve rejecter:reject]; } reject:reject methodName:@"getCoordinateFromView"]; } RCT_EXPORT_METHOD(getPointInView:(nonnull NSNumber*)viewRef atCoordinate:(NSArray *)atCoordinate resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager getPointInView:view atCoordinate:atCoordinate resolver:resolve rejecter:reject]; + [view getPointInViewWithAtCoordinate:atCoordinate resolver:resolve rejecter:reject]; } reject:reject methodName:@"getPointInView"]; } RCT_EXPORT_METHOD(getVisibleBounds:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager getVisibleBounds:view resolver:resolve rejecter:reject]; + [view getVisibleBoundsWithResolver:resolve rejecter:reject]; } reject:reject methodName:@"getVisibleBounds"]; } RCT_EXPORT_METHOD(getZoom:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager getZoom:view resolver:resolve rejecter:reject]; + [view getZoomWithResolver:resolve rejecter:reject]; } reject:reject methodName:@"getZoom"]; } RCT_EXPORT_METHOD(queryRenderedFeaturesAtPoint:(nonnull NSNumber*)viewRef atPoint:(nonnull NSArray *)atPoint withFilter:(NSArray *)withFilter withLayerIDs:(NSArray *)withLayerIDs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager queryRenderedFeaturesAtPoint:view atPoint:atPoint withFilter:withFilter withLayerIDs:withLayerIDs resolver:resolve rejecter:reject]; + [view queryRenderedFeaturesAtPointWithAtPoint:atPoint withFilter:withFilter withLayerIDs:withLayerIDs resolver:resolve rejecter:reject]; } reject:reject methodName:@"queryRenderedFeaturesAtPoint"]; } RCT_EXPORT_METHOD(queryRenderedFeaturesInRect:(nonnull NSNumber*)viewRef withBBox:(NSArray *)withBBox withFilter:(NSArray *)withFilter withLayerIDs:(NSArray *)withLayerIDs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager queryRenderedFeaturesInRect:view withBBox:withBBox withFilter:withFilter withLayerIDs:withLayerIDs resolver:resolve rejecter:reject]; + [view queryRenderedFeaturesInRectWithBBox:withBBox withFilter:withFilter withLayerIDs:withLayerIDs resolver:resolve rejecter:reject]; } reject:reject methodName:@"queryRenderedFeaturesInRect"]; } RCT_EXPORT_METHOD(queryTerrainElevation:(nonnull NSNumber*)viewRef coordinates:(NSArray *)coordinates resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager queryTerrainElevation:view coordinates:coordinates resolver:resolve rejecter:reject]; + [view queryTerrainElevationWithCoordinates:coordinates resolver:resolve rejecter:reject]; } reject:reject methodName:@"queryTerrainElevation"]; } RCT_EXPORT_METHOD(setHandledMapChangedEvents:(nonnull NSNumber*)viewRef events:(NSArray *)events resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager setHandledMapChangedEvents:view events:events resolver:resolve rejecter:reject]; + [view setHandledMapChangedEventsWithEvents:events resolver:resolve rejecter:reject]; } reject:reject methodName:@"setHandledMapChangedEvents"]; } RCT_EXPORT_METHOD(setSourceVisibility:(nonnull NSNumber*)viewRef visible:(BOOL)visible sourceId:(NSString *)sourceId sourceLayerId:(NSString *)sourceLayerId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager setSourceVisibility:view visible:visible sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject]; + [view setSourceVisibilityWithVisible:visible sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject]; } reject:reject methodName:@"setSourceVisibility"]; } RCT_EXPORT_METHOD(setFeatureState:(nonnull NSNumber*)viewRef featureId:(nonnull NSString *)featureId state:(nonnull NSDictionary *)state sourceId:(NSString *)sourceId sourceLayerId:(NSString *)sourceLayerId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager setFeatureState:view featureId:featureId state:state sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject]; + [view setFeatureStateWithFeatureId:featureId state:state sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject]; } reject:reject methodName:@"setFeatureState"]; } RCT_EXPORT_METHOD(getFeatureState:(nonnull NSNumber*)viewRef featureId:(nonnull NSString *)featureId sourceId:(nonnull NSString *)sourceId sourceLayerId:(NSString *)sourceLayerId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager getFeatureState:view featureId:featureId sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject]; + [view getFeatureStateWithFeatureId:featureId sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject]; } reject:reject methodName:@"getFeatureState"]; } RCT_EXPORT_METHOD(removeFeatureState:(nonnull NSNumber*)viewRef featureId:(nonnull NSString *)featureId stateKey:(NSString*)stateKey sourceId:(NSString *)sourceId sourceLayerId:(NSString *)sourceLayerId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager removeFeatureState:view featureId:featureId stateKey:stateKey sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject]; + [view removeFeatureStateWithFeatureId:featureId stateKey:stateKey sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject]; } reject:reject methodName:@"removeFeatureState"]; } RCT_EXPORT_METHOD(querySourceFeatures:(nonnull NSNumber*)viewRef sourceId:(NSString*)sourceId withFilter:(NSArray*)withFilter withSourceLayerIDs:(NSArray*)withSourceLayerIDs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withMapView:viewRef block:^(RNMBXMapView *view) { - [RNMBXMapViewManager querySourceFeatures:view withSourceId:sourceId withFilter:withFilter withSourceLayerIds:withSourceLayerIDs resolver:resolve rejecter:reject]; + [view querySourceFeaturesWithSourceId:sourceId withFilter:withFilter withSourceLayerIds:withSourceLayerIDs resolver:resolve rejecter:reject]; } reject:reject methodName:@"querySourceFeatures"]; } -// Thanks to this guard, we won't compile this code when we build for the old architecture. -#ifdef RCT_NEW_ARCH_ENABLED - (std::shared_ptr)getTurboModule: (const facebook::react::ObjCTurboModule::InitParams &)params { return std::make_shared(params); } -#endif // RCT_NEW_ARCH_ENABLED @end diff --git a/ios/RNMBX/RNMBXMarkerViewComponentView.h b/ios/RNMBX/RNMBXMarkerViewComponentView.h index f9213df7ca..2580c7beb8 100644 --- a/ios/RNMBX/RNMBXMarkerViewComponentView.h +++ b/ios/RNMBX/RNMBXMarkerViewComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXMarkerViewComponentView.mm b/ios/RNMBX/RNMBXMarkerViewComponentView.mm index 31ad30ba2b..871bbe4f65 100644 --- a/ios/RNMBX/RNMBXMarkerViewComponentView.mm +++ b/ios/RNMBX/RNMBXMarkerViewComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXMarkerViewComponentView.h" #import "RNMBXFabricHelpers.h" @@ -126,4 +125,3 @@ - (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics return RNMBXMarkerViewComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXMarkerViewContentComponentView.h b/ios/RNMBX/RNMBXMarkerViewContentComponentView.h index 6cfb4734f2..e7b1fc510b 100644 --- a/ios/RNMBX/RNMBXMarkerViewContentComponentView.h +++ b/ios/RNMBX/RNMBXMarkerViewContentComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXMarkerViewContentComponentView.mm b/ios/RNMBX/RNMBXMarkerViewContentComponentView.mm index fe15b9e942..b7c3810005 100644 --- a/ios/RNMBX/RNMBXMarkerViewContentComponentView.mm +++ b/ios/RNMBX/RNMBXMarkerViewContentComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXMarkerViewContentComponentView.h" #import "RNMBXFabricHelpers.h" @@ -51,4 +50,3 @@ + (ComponentDescriptorProvider)componentDescriptorProvider return RNMBXMarkerViewContentComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXMarkerViewContentManager.m b/ios/RNMBX/RNMBXMarkerViewContentManager.m deleted file mode 100644 index 72f9928792..0000000000 --- a/ios/RNMBX/RNMBXMarkerViewContentManager.m +++ /dev/null @@ -1,6 +0,0 @@ -#import "React/RCTBridgeModule.h" -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXMarkerViewContent, RNMBXMarkerViewContentManager, RCTViewManager) -@end diff --git a/ios/RNMBX/RNMBXMarkerViewContentManager.swift b/ios/RNMBX/RNMBXMarkerViewContentManager.swift deleted file mode 100644 index a8df29e8b1..0000000000 --- a/ios/RNMBX/RNMBXMarkerViewContentManager.swift +++ /dev/null @@ -1,14 +0,0 @@ -import Foundation -import MapboxMaps - -@objc(RNMBXMarkerViewContentManager) -class RNMBXMarkerViewContentManager : RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - return UIView() - } -} diff --git a/ios/RNMBX/RNMBXMarkerViewManager.m b/ios/RNMBX/RNMBXMarkerViewManager.m deleted file mode 100644 index c0ab14dce9..0000000000 --- a/ios/RNMBX/RNMBXMarkerViewManager.m +++ /dev/null @@ -1,13 +0,0 @@ -#import "React/RCTBridgeModule.h" -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXMarkerView, RNMBXMarkerViewManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(coordinate, NSArray) -RCT_EXPORT_VIEW_PROPERTY(anchor, NSDictionary) -RCT_EXPORT_VIEW_PROPERTY(allowOverlap, BOOL) -RCT_EXPORT_VIEW_PROPERTY(allowOverlapWithPuck, BOOL) -RCT_EXPORT_VIEW_PROPERTY(isSelected, BOOL) - -@end diff --git a/ios/RNMBX/RNMBXMarkerViewManager.swift b/ios/RNMBX/RNMBXMarkerViewManager.swift deleted file mode 100644 index 86f47973b5..0000000000 --- a/ios/RNMBX/RNMBXMarkerViewManager.swift +++ /dev/null @@ -1,14 +0,0 @@ -import Foundation -import MapboxMaps - -@objc(RNMBXMarkerViewManager) -class RNMBXMarkerViewManager : RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - return RNMBXMarkerView() - } -} diff --git a/ios/RNMBX/RNMBXModelLayerComponentView.h b/ios/RNMBX/RNMBXModelLayerComponentView.h index acc6f934d9..6d7d11b1b5 100644 --- a/ios/RNMBX/RNMBXModelLayerComponentView.h +++ b/ios/RNMBX/RNMBXModelLayerComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXModelLayerComponentView.mm b/ios/RNMBX/RNMBXModelLayerComponentView.mm index a754fc7dfb..25c72bfd7d 100644 --- a/ios/RNMBX/RNMBXModelLayerComponentView.mm +++ b/ios/RNMBX/RNMBXModelLayerComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXModelLayerComponentView.h" #import "RNMBXFabricHelpers.h" @@ -73,4 +72,3 @@ - (void)prepareForRecycle return RNMBXModelLayerComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXModelLayerViewManager.m b/ios/RNMBX/RNMBXModelLayerViewManager.m deleted file mode 100644 index ba4fc31ab8..0000000000 --- a/ios/RNMBX/RNMBXModelLayerViewManager.m +++ /dev/null @@ -1,12 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXModelLayer, RNMBXModelLayerViewManager, RCTViewManager) - -// circle layer props -RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString) - -// standard layer props -#include "CommonLayerProperties.H" - -@end diff --git a/ios/RNMBX/RNMBXModelLayerViewManager.swift b/ios/RNMBX/RNMBXModelLayerViewManager.swift deleted file mode 100644 index 1623101f18..0000000000 --- a/ios/RNMBX/RNMBXModelLayerViewManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXModelLayerViewManager) -class RNMBXModelLayerViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXModelLayer() - layer.bridge = self.bridge - return layer - } -} diff --git a/ios/RNMBX/RNMBXModelsComponentView.h b/ios/RNMBX/RNMBXModelsComponentView.h index cd2d1a7639..f719dc2ee0 100644 --- a/ios/RNMBX/RNMBXModelsComponentView.h +++ b/ios/RNMBX/RNMBXModelsComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -13,5 +13,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXModelsComponentView.mm b/ios/RNMBX/RNMBXModelsComponentView.mm index 9d562bc8e9..68b4f41731 100644 --- a/ios/RNMBX/RNMBXModelsComponentView.mm +++ b/ios/RNMBX/RNMBXModelsComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXModelsComponentView.h" @@ -70,4 +69,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & return RNMBXModelsComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXModelsManager.mm b/ios/RNMBX/RNMBXModelsManager.mm deleted file mode 100644 index 4817170b35..0000000000 --- a/ios/RNMBX/RNMBXModelsManager.mm +++ /dev/null @@ -1,9 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXModels, RNMBXModelsManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(models, NSDictionary) - -@end - diff --git a/ios/RNMBX/RNMBXModelsManager.swift b/ios/RNMBX/RNMBXModelsManager.swift deleted file mode 100644 index b8d154cf6f..0000000000 --- a/ios/RNMBX/RNMBXModelsManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXModelsManager) -public class RNMBXModelsManager : RCTViewManager { - @objc - public override static func requiresMainQueueSetup() -> Bool { - return false - } - - public override func view() -> UIView! { - let layer = RNMBXModels() - return layer - } -} - diff --git a/ios/RNMBX/RNMBXNativeUserLocationComponentView.h b/ios/RNMBX/RNMBXNativeUserLocationComponentView.h index 5cf6979930..13a0e86ede 100644 --- a/ios/RNMBX/RNMBXNativeUserLocationComponentView.h +++ b/ios/RNMBX/RNMBXNativeUserLocationComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXNativeUserLocationComponentView.mm b/ios/RNMBX/RNMBXNativeUserLocationComponentView.mm index 5889c8a228..fb5b0ae8c8 100644 --- a/ios/RNMBX/RNMBXNativeUserLocationComponentView.mm +++ b/ios/RNMBX/RNMBXNativeUserLocationComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXNativeUserLocationComponentView.h" #import "RNMBXFabricHelpers.h" @@ -84,4 +83,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & return RNMBXNativeUserLocationComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXNativeUserLocationViewManager.m b/ios/RNMBX/RNMBXNativeUserLocationViewManager.m deleted file mode 100644 index 64526b37c1..0000000000 --- a/ios/RNMBX/RNMBXNativeUserLocationViewManager.m +++ /dev/null @@ -1,17 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXNativeUserLocation, RNMBXNativeUserLocationViewManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(iosShowsUserHeadingIndicator, BOOL); -RCT_EXPORT_VIEW_PROPERTY(topImage, NSString); -RCT_EXPORT_VIEW_PROPERTY(bearingImage, NSString); -RCT_EXPORT_VIEW_PROPERTY(shadowImage, NSString); -RCT_EXPORT_VIEW_PROPERTY(scale, NSArray); -RCT_EXPORT_VIEW_PROPERTY(visible, BOOL); -RCT_EXPORT_VIEW_PROPERTY(puckBearing, NSString); -RCT_EXPORT_VIEW_PROPERTY(puckBearingEnabled, BOOL); -RCT_EXPORT_VIEW_PROPERTY(pulsing, NSDictionary); - -@end - diff --git a/ios/RNMBX/RNMBXNativeUserLocationViewManager.swift b/ios/RNMBX/RNMBXNativeUserLocationViewManager.swift deleted file mode 100644 index 83b1f3a43f..0000000000 --- a/ios/RNMBX/RNMBXNativeUserLocationViewManager.swift +++ /dev/null @@ -1,11 +0,0 @@ -@objc(RNMBXNativeUserLocationViewManager) -class RNMBXNativeUserLocationViewManager : RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - @objc override func view() -> UIView { - return RNMBXNativeUserLocation() - } -} diff --git a/ios/RNMBX/RNMBXPointAnnotationComponentView.h b/ios/RNMBX/RNMBXPointAnnotationComponentView.h index 9ee60055a6..b81c52c285 100644 --- a/ios/RNMBX/RNMBXPointAnnotationComponentView.h +++ b/ios/RNMBX/RNMBXPointAnnotationComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXPointAnnotationComponentView.mm b/ios/RNMBX/RNMBXPointAnnotationComponentView.mm index 1737f49b85..993b897cb5 100644 --- a/ios/RNMBX/RNMBXPointAnnotationComponentView.mm +++ b/ios/RNMBX/RNMBXPointAnnotationComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXPointAnnotationComponentView.h" #import "RNMBXFabricHelpers.h" @@ -142,4 +141,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & return RNMBXPointAnnotationComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXPointAnnotationModule.h b/ios/RNMBX/RNMBXPointAnnotationModule.h index fa65c63444..00afaeb941 100644 --- a/ios/RNMBX/RNMBXPointAnnotationModule.h +++ b/ios/RNMBX/RNMBXPointAnnotationModule.h @@ -2,17 +2,15 @@ #import #import "RNMBXViewResolver.h" -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import "rnmapbox_maps_specs.h" -#else -#import -#endif -@interface RNMBXPointAnnotationModule : NSObject -#ifdef RCT_NEW_ARCH_ENABLED - +@interface RNMBXPointAnnotationModule : NSObject +@end + #else - -#endif +@interface RNMBXPointAnnotationModule : NSObject @end + +#endif diff --git a/ios/RNMBX/RNMBXPointAnnotationModule.mm b/ios/RNMBX/RNMBXPointAnnotationModule.mm index 487c23f167..b90e2fe0f5 100644 --- a/ios/RNMBX/RNMBXPointAnnotationModule.mm +++ b/ios/RNMBX/RNMBXPointAnnotationModule.mm @@ -3,9 +3,7 @@ #import #import "RNMBXPointAnnotationModule.h" -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXPointAnnotationComponentView.h" -#endif // RCT_NEW_ARCH_ENABLED #import "rnmapbox_maps-Swift.pre.h" @@ -13,9 +11,7 @@ @implementation RNMBXPointAnnotationModule RCT_EXPORT_MODULE(); -#ifdef RCT_NEW_ARCH_ENABLED @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED; -#endif // RCT_NEW_ARCH_ENABLED @synthesize bridge = _bridge; - (dispatch_queue_t)methodQueue @@ -46,13 +42,10 @@ - (void)withPointAnnotation:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXPoin } -// Thanks to this guard, we won't compile this code when we build for the old architecture. -#ifdef RCT_NEW_ARCH_ENABLED - (std::shared_ptr)getTurboModule: (const facebook::react::ObjCTurboModule::InitParams &)params { return std::make_shared(params); } -#endif // RCT_NEW_ARCH_ENABLED @end diff --git a/ios/RNMBX/RNMBXPointAnnotationViewManager.m b/ios/RNMBX/RNMBXPointAnnotationViewManager.m deleted file mode 100644 index 6fa19e57c8..0000000000 --- a/ios/RNMBX/RNMBXPointAnnotationViewManager.m +++ /dev/null @@ -1,18 +0,0 @@ -#import "React/RCTBridgeModule.h" -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXPointAnnotation, RNMBXPointAnnotationViewManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(coordinate, NSString) -RCT_EXPORT_VIEW_PROPERTY(draggable, BOOL) -RCT_EXPORT_VIEW_PROPERTY(id, NSString) -RCT_EXPORT_VIEW_PROPERTY(anchor, NSDictionary) - -RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDeselected, onDeselected, RCTBubblingEventBlock) -RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDrag, onDrag, RCTBubblingEventBlock) -RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDragEnd, onDragEnd, RCTBubblingEventBlock) -RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDragStart, onDragStart, RCTBubblingEventBlock) -RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationSelected, onSelected, RCTBubblingEventBlock) - -@end diff --git a/ios/RNMBX/RNMBXPointAnnotationViewManager.swift b/ios/RNMBX/RNMBXPointAnnotationViewManager.swift deleted file mode 100644 index 8e92b954c4..0000000000 --- a/ios/RNMBX/RNMBXPointAnnotationViewManager.swift +++ /dev/null @@ -1,14 +0,0 @@ -import Foundation -import MapboxMaps - -@objc(RNMBXPointAnnotationViewManager) -class RNMBXPointAnnotationViewManager : RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - return RNMBXPointAnnotation() - } -} diff --git a/ios/RNMBX/RNMBXRasterArraySourceComponentView.h b/ios/RNMBX/RNMBXRasterArraySourceComponentView.h index 94286306ac..107dfce23e 100644 --- a/ios/RNMBX/RNMBXRasterArraySourceComponentView.h +++ b/ios/RNMBX/RNMBXRasterArraySourceComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXRasterArraySourceComponentView.mm b/ios/RNMBX/RNMBXRasterArraySourceComponentView.mm index d2fbd01018..800290bad0 100644 --- a/ios/RNMBX/RNMBXRasterArraySourceComponentView.mm +++ b/ios/RNMBX/RNMBXRasterArraySourceComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXRasterArraySourceComponentView.h" #import "RNMBXFabricHelpers.h" @@ -121,4 +120,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXRasterArraySourceViewManager.swift b/ios/RNMBX/RNMBXRasterArraySourceViewManager.swift deleted file mode 100644 index d5b3e13d08..0000000000 --- a/ios/RNMBX/RNMBXRasterArraySourceViewManager.swift +++ /dev/null @@ -1,14 +0,0 @@ -import Foundation -import MapboxMaps - -@objc(RNMBXRasterArraySourceViewManager) -class RNMBXRasterArraySourceViewManager : RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - return RNMBXRasterArraySource() - } -} diff --git a/ios/RNMBX/RNMBXRasterDemSourceComponentView.h b/ios/RNMBX/RNMBXRasterDemSourceComponentView.h index 0d66f525cf..110db07f5c 100644 --- a/ios/RNMBX/RNMBXRasterDemSourceComponentView.h +++ b/ios/RNMBX/RNMBXRasterDemSourceComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXRasterDemSourceComponentView.mm b/ios/RNMBX/RNMBXRasterDemSourceComponentView.mm index aefd8c179c..cef43c1692 100644 --- a/ios/RNMBX/RNMBXRasterDemSourceComponentView.mm +++ b/ios/RNMBX/RNMBXRasterDemSourceComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXRasterDemSourceComponentView.h" #import "RNMBXFabricHelpers.h" @@ -116,4 +115,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & return RNMBXRasterDemSourceComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXRasterDemSourceViewManager.m b/ios/RNMBX/RNMBXRasterDemSourceViewManager.m deleted file mode 100644 index 5bbfd3b23c..0000000000 --- a/ios/RNMBX/RNMBXRasterDemSourceViewManager.m +++ /dev/null @@ -1,15 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXRasterDemSource, RNMBXRasterDemSourceViewManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(id, NSString) -RCT_EXPORT_VIEW_PROPERTY(existing, BOOL) -RCT_EXPORT_VIEW_PROPERTY(url, NSString) -RCT_EXPORT_VIEW_PROPERTY(tileUrlTemplates, NSArray) -RCT_EXPORT_VIEW_PROPERTY(bounds, NSArray) -RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(tileSize, NSNumber) - -@end diff --git a/ios/RNMBX/RNMBXRasterDemSourceViewManager.swift b/ios/RNMBX/RNMBXRasterDemSourceViewManager.swift deleted file mode 100644 index 6fe423dff5..0000000000 --- a/ios/RNMBX/RNMBXRasterDemSourceViewManager.swift +++ /dev/null @@ -1,11 +0,0 @@ -@objc(RNMBXRasterDemSourceViewManager) -class RNMBXRasterDemSourceViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - @objc override func view() -> UIView { - return RNMBXRasterDemSource() - } -} diff --git a/ios/RNMBX/RNMBXRasterLayerComponentView.h b/ios/RNMBX/RNMBXRasterLayerComponentView.h index f6e20cd6d8..804559eb8f 100644 --- a/ios/RNMBX/RNMBXRasterLayerComponentView.h +++ b/ios/RNMBX/RNMBXRasterLayerComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXRasterLayerComponentView.mm b/ios/RNMBX/RNMBXRasterLayerComponentView.mm index deb4828768..a63025161e 100644 --- a/ios/RNMBX/RNMBXRasterLayerComponentView.mm +++ b/ios/RNMBX/RNMBXRasterLayerComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXRasterLayerComponentView.h" #import "RNMBXFabricHelpers.h" @@ -73,4 +72,3 @@ - (void)prepareForRecycle return RNMBXRasterLayerComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXRasterLayerViewManager.m b/ios/RNMBX/RNMBXRasterLayerViewManager.m deleted file mode 100644 index c1cb84cd86..0000000000 --- a/ios/RNMBX/RNMBXRasterLayerViewManager.m +++ /dev/null @@ -1,12 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXRasterLayer, RNMBXRasterLayerViewManager, RCTViewManager) - -// symbol layer props -RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString) - -// standard layer props -#include "CommonLayerProperties.H" - -@end diff --git a/ios/RNMBX/RNMBXRasterLayerViewManager.swift b/ios/RNMBX/RNMBXRasterLayerViewManager.swift deleted file mode 100644 index 217d452d43..0000000000 --- a/ios/RNMBX/RNMBXRasterLayerViewManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXRasterLayerViewManager) -class RNMBXRasterLayerViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXRasterLayer() - layer.bridge = self.bridge - return layer - } -} diff --git a/ios/RNMBX/RNMBXRasterParticleLayerComponentView.h b/ios/RNMBX/RNMBXRasterParticleLayerComponentView.h index 9b1839b529..dcc0dc9f70 100644 --- a/ios/RNMBX/RNMBXRasterParticleLayerComponentView.h +++ b/ios/RNMBX/RNMBXRasterParticleLayerComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXRasterParticleLayerComponentView.mm b/ios/RNMBX/RNMBXRasterParticleLayerComponentView.mm index 537e7d034a..0b10b22227 100644 --- a/ios/RNMBX/RNMBXRasterParticleLayerComponentView.mm +++ b/ios/RNMBX/RNMBXRasterParticleLayerComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXRasterParticleLayerComponentView.h" #import "RNMBXFabricHelpers.h" @@ -73,4 +72,3 @@ - (void)prepareForRecycle return RNMBXRasterParticleLayerComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXRasterParticleLayerViewManager.swift b/ios/RNMBX/RNMBXRasterParticleLayerViewManager.swift deleted file mode 100644 index e2023d4f78..0000000000 --- a/ios/RNMBX/RNMBXRasterParticleLayerViewManager.swift +++ /dev/null @@ -1,15 +0,0 @@ -import Foundation - -@objc(RNMBXRasterParticleLayerViewManager) -class RNMBXRasterParticleLayerViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXRasterParticleLayer() - layer.bridge = self.bridge - return layer - } -} diff --git a/ios/RNMBX/RNMBXRasterSourceComponentView.h b/ios/RNMBX/RNMBXRasterSourceComponentView.h index 0a482952b5..b7dcf254f9 100644 --- a/ios/RNMBX/RNMBXRasterSourceComponentView.h +++ b/ios/RNMBX/RNMBXRasterSourceComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXRasterSourceComponentView.mm b/ios/RNMBX/RNMBXRasterSourceComponentView.mm index e4a3db777a..d007a56f69 100644 --- a/ios/RNMBX/RNMBXRasterSourceComponentView.mm +++ b/ios/RNMBX/RNMBXRasterSourceComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXRasterSourceComponentView.h" #import "RNMBXFabricHelpers.h" @@ -128,4 +127,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & return RNMBXRasterSourceComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXRasterSourceViewManager.m b/ios/RNMBX/RNMBXRasterSourceViewManager.m deleted file mode 100644 index 6c95668e9e..0000000000 --- a/ios/RNMBX/RNMBXRasterSourceViewManager.m +++ /dev/null @@ -1,19 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXRasterSource, RNMBXRasterSourceViewManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(id, NSString) -RCT_EXPORT_VIEW_PROPERTY(existing, BOOL) -RCT_EXPORT_VIEW_PROPERTY(url, NSString) -RCT_EXPORT_VIEW_PROPERTY(tileUrlTemplates, NSArray) - -RCT_EXPORT_VIEW_PROPERTY(tileSize, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber) - -RCT_EXPORT_VIEW_PROPERTY(tms, BOOL) -RCT_EXPORT_VIEW_PROPERTY(attribution, NSString) -RCT_EXPORT_VIEW_PROPERTY(sourceBounds, NSArray) - -@end diff --git a/ios/RNMBX/RNMBXRasterSourceViewManager.swift b/ios/RNMBX/RNMBXRasterSourceViewManager.swift deleted file mode 100644 index 800ab7024a..0000000000 --- a/ios/RNMBX/RNMBXRasterSourceViewManager.swift +++ /dev/null @@ -1,14 +0,0 @@ -import Foundation -import MapboxMaps - -@objc(RNMBXRasterSourceViewManager) -class RNMBXRasterSourceViewManager : RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - return RNMBXRasterSource() - } -} diff --git a/ios/RNMBX/RNMBXShapeSource.swift b/ios/RNMBX/RNMBXShapeSource.swift index 0a33d4c267..b680f8c602 100644 --- a/ios/RNMBX/RNMBXShapeSource.swift +++ b/ios/RNMBX/RNMBXShapeSource.swift @@ -364,6 +364,65 @@ extension RNMBXShapeSource } } } + + @objc public func getClusterChildren( + featureJSON: String, + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + getClusterChildren(featureJSON) { result in + switch result { + case .success(let features): + logged("getClusterChildren", rejecter: rejecter) { + let featuresJSON: Any = try features.features.toJSON() + resolver([ + "data": ["type": "FeatureCollection", "features": featuresJSON] + ]) + } + case .failure(let error): + rejecter(error.localizedDescription, "Error.getClusterChildren", error) + } + } + } + + @objc public func getClusterLeaves( + featureJSON: String, + number: uint, + offset: uint, + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + getClusterLeaves(featureJSON, number: number, offset: offset) { result in + switch result { + case .success(let features): + logged("getClusterLeaves", rejecter: rejecter) { + let featuresJSON: Any = try features.features.toJSON() + resolver([ + "data": ["type": "FeatureCollection", "features": featuresJSON] + ]) + } + case .failure(let error): + rejecter(error.localizedDescription, "Error.getClusterLeaves", error) + } + } + } + + @objc public func getClusterExpansionZoom( + featureJSON: String, + resolver: @escaping RCTPromiseResolveBlock, + rejecter: @escaping RCTPromiseRejectBlock + ) { + getClusterExpansionZoom(featureJSON) { result in + switch result { + case .success(let zoom): + resolver([ + "data": NSNumber(value: zoom) + ]) + case .failure(let error): + rejecter(error.localizedDescription, "Error.getClusterExpansionZoom", error) + } + } + } } // MARK: shape animation diff --git a/ios/RNMBX/RNMBXShapeSourceComponentView.h b/ios/RNMBX/RNMBXShapeSourceComponentView.h index fe2b39f9f0..6f9bff0f37 100644 --- a/ios/RNMBX/RNMBXShapeSourceComponentView.h +++ b/ios/RNMBX/RNMBXShapeSourceComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXShapeSourceComponentView.mm b/ios/RNMBX/RNMBXShapeSourceComponentView.mm index 46e01c59b0..7dd1e39064 100644 --- a/ios/RNMBX/RNMBXShapeSourceComponentView.mm +++ b/ios/RNMBX/RNMBXShapeSourceComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXShapeSourceComponentView.h" #import "RNMBXFabricHelpers.h" @@ -119,4 +118,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & return RNMBXShapeSourceComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXShapeSourceModule.h b/ios/RNMBX/RNMBXShapeSourceModule.h index 8389d4fe09..90479f0265 100644 --- a/ios/RNMBX/RNMBXShapeSourceModule.h +++ b/ios/RNMBX/RNMBXShapeSourceModule.h @@ -2,18 +2,15 @@ #import #import "RNMBXViewResolver.h" -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import "rnmapbox_maps_specs.h" -#else -#import -#endif -@interface RNMBXShapeSourceModule : NSObject -#ifdef RCT_NEW_ARCH_ENABLED - +@interface RNMBXShapeSourceModule : NSObject +@end + #else - -#endif +@interface RNMBXShapeSourceModule : NSObject @end +#endif diff --git a/ios/RNMBX/RNMBXShapeSourceModule.mm b/ios/RNMBX/RNMBXShapeSourceModule.mm index b47d52c326..11a7d707d7 100644 --- a/ios/RNMBX/RNMBXShapeSourceModule.mm +++ b/ios/RNMBX/RNMBXShapeSourceModule.mm @@ -3,9 +3,7 @@ #import #import "RNMBXShapeSourceModule.h" -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXShapeSourceComponentView.h" -#endif // RCT_NEW_ARCH_ENABLED #import "rnmapbox_maps-Swift.pre.h" @@ -13,9 +11,7 @@ @implementation RNMBXShapeSourceModule RCT_EXPORT_MODULE(); -#ifdef RCT_NEW_ARCH_ENABLED @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED; -#endif // RCT_NEW_ARCH_ENABLED @synthesize bridge = _bridge; - (dispatch_queue_t)methodQueue @@ -41,31 +37,28 @@ - (void)withShapeSource:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXShapeSou RCT_EXPORT_METHOD(getClusterChildren:(nonnull NSNumber *)viewRef featureJSON:(NSString *)featureJSON resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withShapeSource:viewRef block:^(RNMBXShapeSource *view) { - [RNMBXShapeSourceViewManager getClusterChildrenWithShapeSource:view featureJSON:featureJSON resolver:resolve rejecter:reject]; + [view getClusterChildrenWithFeatureJSON:featureJSON resolver:resolve rejecter:reject]; } reject:reject methodName:@"getClusterChildren"]; } - + RCT_EXPORT_METHOD(getClusterLeaves:(nonnull NSNumber *)viewRef featureJSON:(NSString *)featureJSON number:(NSInteger)number offset:(NSInteger)offset resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withShapeSource:viewRef block:^(RNMBXShapeSource *view) { - [RNMBXShapeSourceViewManager getClusterLeavesWithShapeSource:view featureJSON:featureJSON number:number offset:offset resolver:resolve rejecter:reject]; + [view getClusterLeavesWithFeatureJSON:featureJSON number:number offset:offset resolver:resolve rejecter:reject]; } reject:reject methodName:@"getClusterLeaves"]; } - + RCT_EXPORT_METHOD(getClusterExpansionZoom:(nonnull NSNumber *)viewRef featureJSON:(NSString *)featureJSON resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { [self withShapeSource:viewRef block:^(RNMBXShapeSource *view) { - [RNMBXShapeSourceViewManager getClusterExpansionZoomWithShapeSource:view featureJSON:featureJSON resolver:resolve rejecter:reject]; + [view getClusterExpansionZoomWithFeatureJSON:featureJSON resolver:resolve rejecter:reject]; } reject:reject methodName:@"getClusterExpansionZoom"]; } -// Thanks to this guard, we won't compile this code when we build for the old architecture. -#ifdef RCT_NEW_ARCH_ENABLED - (std::shared_ptr)getTurboModule: (const facebook::react::ObjCTurboModule::InitParams &)params { return std::make_shared(params); } -#endif // RCT_NEW_ARCH_ENABLED @end diff --git a/ios/RNMBX/RNMBXShapeSourceViewManager.m b/ios/RNMBX/RNMBXShapeSourceViewManager.m deleted file mode 100644 index 7ef003d886..0000000000 --- a/ios/RNMBX/RNMBXShapeSourceViewManager.m +++ /dev/null @@ -1,28 +0,0 @@ -#if !RCT_NEW_ARCH_ENABLED -#import -#import - -@interface -RCT_EXTERN_REMAP_MODULE(RNMBXShapeSource, RNMBXShapeSourceViewManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(id, NSString) -RCT_EXPORT_VIEW_PROPERTY(existing, BOOL) -RCT_EXPORT_VIEW_PROPERTY(url, NSString) -RCT_EXPORT_VIEW_PROPERTY(shape, NSString) - -RCT_EXPORT_VIEW_PROPERTY(cluster, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(clusterRadius, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(clusterMaxZoomLevel, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(clusterProperties, NSDictionary) -RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(buffer, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(tolerance, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(lineMetrics, BOOL) -RCT_EXPORT_VIEW_PROPERTY(images, NSDictionary) -RCT_EXPORT_VIEW_PROPERTY(nativeImages, NSArray) -RCT_EXPORT_VIEW_PROPERTY(hasPressListener, BOOL) -RCT_EXPORT_VIEW_PROPERTY(hitbox, NSDictionary) -RCT_REMAP_VIEW_PROPERTY(onMapboxShapeSourcePress, onPress, RCTBubblingEventBlock) - -@end -#endif diff --git a/ios/RNMBX/RNMBXShapeSourceViewManager.swift b/ios/RNMBX/RNMBXShapeSourceViewManager.swift deleted file mode 100644 index f44e2d6944..0000000000 --- a/ios/RNMBX/RNMBXShapeSourceViewManager.swift +++ /dev/null @@ -1,81 +0,0 @@ -#if !RCT_NEW_ARCH_ENABLED - @objc(RNMBXShapeSourceViewManager) - public class RNMBXShapeSourceViewManager: RCTViewManager { - @objc - override public static func requiresMainQueueSetup() -> Bool { - return false - } - - @objc override public func view() -> UIView { - return RNMBXShapeSource() - } - } -#else - @objc(RNMBXShapeSourceViewManager) - public class RNMBXShapeSourceViewManager: NSObject {} -#endif -// MARK: - react methods - -extension RNMBXShapeSourceViewManager { - @objc public static func getClusterExpansionZoom( - shapeSource: RNMBXShapeSource, - featureJSON: String, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - shapeSource.getClusterExpansionZoom(featureJSON) { result in - switch result { - case .success(let zoom): - resolver([ - "data": NSNumber(value: zoom) - ]) - case .failure(let error): - rejecter(error.localizedDescription, "Error.getClusterExpansionZoom", error) - } - } - } - - @objc public static func getClusterLeaves( - shapeSource: RNMBXShapeSource, - featureJSON: String, - number: uint, - offset: uint, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - shapeSource.getClusterLeaves(featureJSON, number: number, offset: offset) { result in - switch result { - case .success(let features): - logged("getClusterLeaves", rejecter: rejecter) { - let featuresJSON: Any = try features.features.toJSON() - resolver([ - "data": ["type": "FeatureCollection", "features": featuresJSON] - ]) - } - case .failure(let error): - rejecter(error.localizedDescription, "Error.getClusterLeaves", error) - } - } - } - - @objc public static func getClusterChildren( - shapeSource: RNMBXShapeSource, - featureJSON: String, - resolver: @escaping RCTPromiseResolveBlock, - rejecter: @escaping RCTPromiseRejectBlock - ) { - shapeSource.getClusterChildren(featureJSON) { result in - switch result { - case .success(let features): - logged("getClusterChildren", rejecter: rejecter) { - let featuresJSON: Any = try features.features.toJSON() - resolver([ - "data": ["type": "FeatureCollection", "features": featuresJSON] - ]) - } - case .failure(let error): - rejecter(error.localizedDescription, "Error.getClusterChildren", error) - } - } - } -} diff --git a/ios/RNMBX/RNMBXSkyLayerComponentView.h b/ios/RNMBX/RNMBXSkyLayerComponentView.h index a0f73fddd0..5aaf17cf0d 100644 --- a/ios/RNMBX/RNMBXSkyLayerComponentView.h +++ b/ios/RNMBX/RNMBXSkyLayerComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXSkyLayerComponentView.mm b/ios/RNMBX/RNMBXSkyLayerComponentView.mm index 9dcdef5bfc..8adb75f9d4 100644 --- a/ios/RNMBX/RNMBXSkyLayerComponentView.mm +++ b/ios/RNMBX/RNMBXSkyLayerComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXSkyLayerComponentView.h" #import "RNMBXFabricHelpers.h" @@ -73,4 +72,3 @@ - (void)prepareForRecycle return RNMBXSkyLayerComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXSkyLayerViewManager.m b/ios/RNMBX/RNMBXSkyLayerViewManager.m deleted file mode 100644 index 6c9ec2262d..0000000000 --- a/ios/RNMBX/RNMBXSkyLayerViewManager.m +++ /dev/null @@ -1,9 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXSkyLayer, RNMBXSkyLayerViewManager, RCTViewManager) - -// standard layer props -#include "CommonLayerProperties.H" - -@end diff --git a/ios/RNMBX/RNMBXSkyLayerViewManager.swift b/ios/RNMBX/RNMBXSkyLayerViewManager.swift deleted file mode 100644 index c94e116079..0000000000 --- a/ios/RNMBX/RNMBXSkyLayerViewManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXSkyLayerViewManager) -class RNMBXSkyLayerViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXSkyLayer() - layer.bridge = self.bridge - return layer - } -} diff --git a/ios/RNMBX/RNMBXSnapshotModule.m b/ios/RNMBX/RNMBXSnapshotModule.m index 934547df09..4282035d3a 100644 --- a/ios/RNMBX/RNMBXSnapshotModule.m +++ b/ios/RNMBX/RNMBXSnapshotModule.m @@ -1,5 +1,4 @@ #import -#import @interface RCT_EXTERN_MODULE(RNMBXSnapshotModule, NSObject) diff --git a/ios/RNMBX/RNMBXStyleImportComponentView.h b/ios/RNMBX/RNMBXStyleImportComponentView.h index 1763d21869..89bfd04d87 100644 --- a/ios/RNMBX/RNMBXStyleImportComponentView.h +++ b/ios/RNMBX/RNMBXStyleImportComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -13,5 +13,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXStyleImportComponentView.mm b/ios/RNMBX/RNMBXStyleImportComponentView.mm index ae6b833690..b247f9cd33 100644 --- a/ios/RNMBX/RNMBXStyleImportComponentView.mm +++ b/ios/RNMBX/RNMBXStyleImportComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXStyleImportComponentView.h" #import "RNMBXFabricHelpers.h" @@ -83,4 +82,3 @@ - (void)prepareForRecycle { return RNMBXStyleImportComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXStyleImportManager.m b/ios/RNMBX/RNMBXStyleImportManager.m deleted file mode 100644 index 7b34cb6466..0000000000 --- a/ios/RNMBX/RNMBXStyleImportManager.m +++ /dev/null @@ -1,10 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXStyleImport, RNMBXStyleImportManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(id, NSString) -RCT_EXPORT_VIEW_PROPERTY(existing, BOOL) -RCT_EXPORT_VIEW_PROPERTY(config, NSDictionary) - -@end diff --git a/ios/RNMBX/RNMBXStyleImportManager.swift b/ios/RNMBX/RNMBXStyleImportManager.swift deleted file mode 100644 index ad5c3505dc..0000000000 --- a/ios/RNMBX/RNMBXStyleImportManager.swift +++ /dev/null @@ -1,12 +0,0 @@ -@objc(RNMBXStyleImportManager) -class RNMBXStyleImportManager : RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXStyleImport() - return layer - } -} diff --git a/ios/RNMBX/RNMBXSymbolLayerComponentView.h b/ios/RNMBX/RNMBXSymbolLayerComponentView.h index 23838ba666..5336580e42 100644 --- a/ios/RNMBX/RNMBXSymbolLayerComponentView.h +++ b/ios/RNMBX/RNMBXSymbolLayerComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXSymbolLayerComponentView.mm b/ios/RNMBX/RNMBXSymbolLayerComponentView.mm index edf57f4458..3aa4a59f4c 100644 --- a/ios/RNMBX/RNMBXSymbolLayerComponentView.mm +++ b/ios/RNMBX/RNMBXSymbolLayerComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXSymbolLayerComponentView.h" #import "RNMBXFabricHelpers.h" @@ -73,4 +72,3 @@ - (void)prepareForRecycle return RNMBXSymbolLayerComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXSymbolLayerViewManager.m b/ios/RNMBX/RNMBXSymbolLayerViewManager.m deleted file mode 100644 index 917105d063..0000000000 --- a/ios/RNMBX/RNMBXSymbolLayerViewManager.m +++ /dev/null @@ -1,12 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXSymbolLayer, RNMBXSymbolLayerViewManager, RCTViewManager) - -// symbol layer props -RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString) - -// standard layer props -#include "CommonLayerProperties.H" - -@end diff --git a/ios/RNMBX/RNMBXSymbolLayerViewManager.swift b/ios/RNMBX/RNMBXSymbolLayerViewManager.swift deleted file mode 100644 index 718b3b18c8..0000000000 --- a/ios/RNMBX/RNMBXSymbolLayerViewManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXSymbolLayerViewManager) -class RNMBXSymbolLayerViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let layer = RNMBXSymbolLayer() - layer.bridge = self.bridge - return layer - } -} diff --git a/ios/RNMBX/RNMBXTerrainComponentView.h b/ios/RNMBX/RNMBXTerrainComponentView.h index f2602ed33f..9eb9bc332b 100644 --- a/ios/RNMBX/RNMBXTerrainComponentView.h +++ b/ios/RNMBX/RNMBXTerrainComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXTerrainComponentView.mm b/ios/RNMBX/RNMBXTerrainComponentView.mm index 8940b8ff56..2b84d500df 100644 --- a/ios/RNMBX/RNMBXTerrainComponentView.mm +++ b/ios/RNMBX/RNMBXTerrainComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXTerrainComponentView.h" #import "RNMBXFabricHelpers.h" @@ -81,4 +80,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & return RNMBXTerrainComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXTerrainViewManager.m b/ios/RNMBX/RNMBXTerrainViewManager.m deleted file mode 100644 index 359ed8423b..0000000000 --- a/ios/RNMBX/RNMBXTerrainViewManager.m +++ /dev/null @@ -1,15 +0,0 @@ -#import -#import - -@interface RNMBXTerrain : UIView -{} -@property (nonatomic) NSObject* exaggeration; -@end - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXTerrain, RNMBXTerrainViewManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(sourceID, NSString); - -RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary); - -@end diff --git a/ios/RNMBX/RNMBXTerrainViewManager.swift b/ios/RNMBX/RNMBXTerrainViewManager.swift deleted file mode 100644 index ac2d68dd9f..0000000000 --- a/ios/RNMBX/RNMBXTerrainViewManager.swift +++ /dev/null @@ -1,13 +0,0 @@ -@objc(RNMBXTerrainViewManager) -class RNMBXTerrainViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - override func view() -> UIView! { - let terrain = RNMBXTerrain() - terrain.bridge = self.bridge - return terrain - } -} diff --git a/ios/RNMBX/RNMBXVectorSourceComponentView.h b/ios/RNMBX/RNMBXVectorSourceComponentView.h index 288256e97b..472cb46305 100644 --- a/ios/RNMBX/RNMBXVectorSourceComponentView.h +++ b/ios/RNMBX/RNMBXVectorSourceComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXVectorSourceComponentView.mm b/ios/RNMBX/RNMBXVectorSourceComponentView.mm index 332701b043..a8bf74c389 100644 --- a/ios/RNMBX/RNMBXVectorSourceComponentView.mm +++ b/ios/RNMBX/RNMBXVectorSourceComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXVectorSourceComponentView.h" #import "RNMBXFabricHelpers.h" @@ -141,4 +140,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & return RNMBXVectorSourceComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXVectorSourceViewManager.m b/ios/RNMBX/RNMBXVectorSourceViewManager.m deleted file mode 100644 index 4b1ebbe9a9..0000000000 --- a/ios/RNMBX/RNMBXVectorSourceViewManager.m +++ /dev/null @@ -1,22 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXVectorSource, RNMBXVectorSourceViewManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(id, NSString) -RCT_EXPORT_VIEW_PROPERTY(existing, BOOL) -RCT_EXPORT_VIEW_PROPERTY(url, NSString) - -RCT_EXPORT_VIEW_PROPERTY(tileUrlTemplates, NSArray) - -RCT_EXPORT_VIEW_PROPERTY(attribution, NSString) - -RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber) -RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber) - -RCT_EXPORT_VIEW_PROPERTY(tms, BOOL) -RCT_EXPORT_VIEW_PROPERTY(hasPressListener, BOOL) -RCT_EXPORT_VIEW_PROPERTY(hitbox, NSDictionary) -RCT_REMAP_VIEW_PROPERTY(onMapboxVectorSourcePress, onPress, RCTBubblingEventBlock) - -@end diff --git a/ios/RNMBX/RNMBXVectorSourceViewManager.swift b/ios/RNMBX/RNMBXVectorSourceViewManager.swift deleted file mode 100644 index 6da74d869b..0000000000 --- a/ios/RNMBX/RNMBXVectorSourceViewManager.swift +++ /dev/null @@ -1,11 +0,0 @@ -@objc(RNMBXVectorSourceViewManager) -class RNMBXVectorSourceViewManager: RCTViewManager { - @objc - override static func requiresMainQueueSetup() -> Bool { - return false - } - - @objc override func view() -> UIView { - return RNMBXVectorSource() - } -} diff --git a/ios/RNMBX/RNMBXViewport.swift b/ios/RNMBX/RNMBXViewport.swift index ae47311a1d..1c41e21bca 100644 --- a/ios/RNMBX/RNMBXViewport.swift +++ b/ios/RNMBX/RNMBXViewport.swift @@ -126,7 +126,7 @@ open class RNMBXViewport : UIView, RNMBXMapAndMapViewComponent, ViewportStatusOb } } - func getState() -> [String:Any] { + @objc public func getState() -> [String:Any] { guard let mapView = mapView else { Logger.log(level:.error, message: "mapView is null in RNMBXViewport.getState") return [:] @@ -134,7 +134,7 @@ open class RNMBXViewport : UIView, RNMBXMapAndMapViewComponent, ViewportStatusOb return statusToMap(mapView.viewport.status) } - func idle() { + @objc public func idle() { guard let mapView = mapView else { Logger.log(level:.error, message: "mapView is null in RNMBXViewport.idle") return @@ -297,7 +297,7 @@ open class RNMBXViewport : UIView, RNMBXMapAndMapViewComponent, ViewportStatusOb } } - func transitionTo( + @objc public func transitionTo( state: [String: Any], transition: [String: Any], resolve: @escaping (NSNumber) -> Void diff --git a/ios/RNMBX/RNMBXViewportComponentView.h b/ios/RNMBX/RNMBXViewportComponentView.h index e614dd2d1a..33b97e21ea 100644 --- a/ios/RNMBX/RNMBXViewportComponentView.h +++ b/ios/RNMBX/RNMBXViewportComponentView.h @@ -1,4 +1,4 @@ -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import @@ -13,5 +13,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - -#endif // RCT_NEW_ARCH_ENABLED +#endif // __cplusplus diff --git a/ios/RNMBX/RNMBXViewportComponentView.mm b/ios/RNMBX/RNMBXViewportComponentView.mm index 5d3ff077d5..00ed1b4efe 100644 --- a/ios/RNMBX/RNMBXViewportComponentView.mm +++ b/ios/RNMBX/RNMBXViewportComponentView.mm @@ -1,4 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXViewportComponentView.h" @@ -123,4 +122,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & return RNMBXViewportComponentView.class; } -#endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RNMBX/RNMBXViewportManager.m b/ios/RNMBX/RNMBXViewportManager.m deleted file mode 100644 index 7f14e3b9d5..0000000000 --- a/ios/RNMBX/RNMBXViewportManager.m +++ /dev/null @@ -1,12 +0,0 @@ -#import -#import - -@interface RCT_EXTERN_REMAP_MODULE(RNMBXViewport, RNMBXViewportManager, RCTViewManager) - -RCT_EXPORT_VIEW_PROPERTY(transitionsToIdleUponUserInteraction, NSNumber) - -RCT_EXPORT_VIEW_PROPERTY(hasStatusChanged, BOOL) - -RCT_EXPORT_VIEW_PROPERTY(onStatusChanged, RCTBubblingEventBlock) - -@end diff --git a/ios/RNMBX/RNMBXViewportManager.swift b/ios/RNMBX/RNMBXViewportManager.swift deleted file mode 100644 index 7bc46a9154..0000000000 --- a/ios/RNMBX/RNMBXViewportManager.swift +++ /dev/null @@ -1,38 +0,0 @@ -@objc(RNMBXViewportManager) -public class RNMBXViewportManager : RCTViewManager { - @objc - public override static func requiresMainQueueSetup() -> Bool { - return false - } - - public override func view() -> UIView! { - let layer = RNMBXViewport() - return layer - } - - @objc public static func getState( - _ view: RNMBXViewport, - resolve: @escaping RCTPromiseResolveBlock, - reject: @escaping RCTPromiseRejectBlock) { - resolve(view.getState()) - } - - @objc public static func idle( - _ view: RNMBXViewport, - resolve: @escaping RCTPromiseResolveBlock, - reject: @escaping RCTPromiseRejectBlock) { - resolve(view.idle()) - } - - @objc public static func transitionTo( - _ view: RNMBXViewport, - state: [String: Any], - transition: [String: Any], - resolve: @escaping RCTPromiseResolveBlock, - reject: @escaping RCTPromiseRejectBlock - ) { - view.transitionTo(state: state, transition: transition) { finished in - resolve(finished) - } - } -} diff --git a/ios/RNMBX/RNMBXViewportModule.h b/ios/RNMBX/RNMBXViewportModule.h index ae43fb2fcd..410a907d1c 100644 --- a/ios/RNMBX/RNMBXViewportModule.h +++ b/ios/RNMBX/RNMBXViewportModule.h @@ -2,18 +2,15 @@ #import #import "RNMBXViewResolver.h" -#ifdef RCT_NEW_ARCH_ENABLED +#ifdef __cplusplus #import "rnmapbox_maps_specs.h" -#else -#import -#endif -@interface RNMBXViewportModule : NSObject -#ifdef RCT_NEW_ARCH_ENABLED - +@interface RNMBXViewportModule : NSObject +@end + #else - -#endif +@interface RNMBXViewportModule : NSObject @end +#endif diff --git a/ios/RNMBX/RNMBXViewportModule.mm b/ios/RNMBX/RNMBXViewportModule.mm index 2e0b39b9d1..8fd1c956fb 100644 --- a/ios/RNMBX/RNMBXViewportModule.mm +++ b/ios/RNMBX/RNMBXViewportModule.mm @@ -3,9 +3,7 @@ #import #import "RNMBXViewportModule.h" -#ifdef RCT_NEW_ARCH_ENABLED #import "RNMBXViewportComponentView.h" -#endif // RCT_NEW_ARCH_ENABLED #import "rnmapbox_maps-Swift.pre.h" @@ -13,9 +11,7 @@ @implementation RNMBXViewportModule RCT_EXPORT_MODULE(); -#ifdef RCT_NEW_ARCH_ENABLED @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED; -#endif // RCT_NEW_ARCH_ENABLED @synthesize bridge = _bridge; - (dispatch_queue_t)methodQueue @@ -25,14 +21,11 @@ - (dispatch_queue_t)methodQueue return RCTGetUIManagerQueue(); } -// Thanks to this guard, we won't compile this code when we build for the old architecture. -#ifdef RCT_NEW_ARCH_ENABLED - (std::shared_ptr)getTurboModule: (const facebook::react::ObjCTurboModule::InitParams &)params { return std::make_shared(params); } -#endif // RCT_NEW_ARCH_ENABLED - (void)withViewport:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXViewport *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName { @@ -51,7 +44,7 @@ - (void)withViewport:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXViewport *) reject:(RCTPromiseRejectBlock)reject) { [self withViewport:viewRef block:^(RNMBXViewport *view) { - [RNMBXViewportManager getState:view resolve:resolve reject:reject]; + resolve([view getState]); } reject:reject methodName:@"getState"]; } @@ -60,7 +53,8 @@ - (void)withViewport:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXViewport *) reject:(RCTPromiseRejectBlock)reject) { [self withViewport:viewRef block:^(RNMBXViewport *view) { - [RNMBXViewportManager idle:view resolve:resolve reject:reject]; + [view idle]; + resolve(nil); } reject:reject methodName:@"idle"]; } @@ -71,9 +65,8 @@ - (void)withViewport:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXViewport *) reject:(RCTPromiseRejectBlock)reject) { [self withViewport:viewRef block:^(RNMBXViewport *view) { - [RNMBXViewportManager transitionTo:view state:state transition:transition - resolve:resolve reject:reject]; - } reject:reject methodName:@"idle"]; + [view transitionToState:state transition:transition resolve:resolve]; + } reject:reject methodName:@"transitionTo"]; } @end diff --git a/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.mm b/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.mm index d8a96a4a1b..b103459c7d 100644 --- a/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.mm +++ b/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.mm @@ -7,27 +7,16 @@ #import "rnmapbox_maps-Swift.pre.h" -#ifdef RCT_NEW_ARCH_ENABLED #import "rnmapbox_maps_specs.h" -#else -#import -#endif -@interface RNMBXChangeLineOffsetsShapeAnimatorModule: NSObject -#ifdef RCT_NEW_ARCH_ENABLED - -#else - -#endif +@interface RNMBXChangeLineOffsetsShapeAnimatorModule: NSObject @end @implementation RNMBXChangeLineOffsetsShapeAnimatorModule RCT_EXPORT_MODULE(); -#ifdef RCT_NEW_ARCH_ENABLED @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED; -#endif // RCT_NEW_ARCH_ENABLED @synthesize bridge = _bridge; - (dispatch_queue_t)methodQueue { @@ -52,13 +41,10 @@ - (dispatch_queue_t)methodQueue { [ChangeLineOffsetsShapeAnimator setEndOffsetWithTag:tag offset:offset durationMs:durationMs resolve:resolve reject:reject]; } -// Thanks to this guard, we won't compile this code when we build for the old architecture. -#ifdef RCT_NEW_ARCH_ENABLED - (std::shared_ptr)getTurboModule: (const facebook::react::ObjCTurboModule::InitParams &)params { return std::make_shared(params); } -#endif // RCT_NEW_ARCH_ENABLED @end diff --git a/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm b/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm index 197a6cefa6..20f8f2eb8b 100644 --- a/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm +++ b/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm @@ -7,27 +7,16 @@ #import "rnmapbox_maps-Swift.pre.h" -#ifdef RCT_NEW_ARCH_ENABLED #import "rnmapbox_maps_specs.h" -#else -#import -#endif - -@interface RNMBXMovePointShapeAnimatorModule: NSObject -#ifdef RCT_NEW_ARCH_ENABLED - -#else - -#endif + +@interface RNMBXMovePointShapeAnimatorModule: NSObject @end @implementation RNMBXMovePointShapeAnimatorModule RCT_EXPORT_MODULE(); -#ifdef RCT_NEW_ARCH_ENABLED @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED; -#endif // RCT_NEW_ARCH_ENABLED @synthesize bridge = _bridge; - (dispatch_queue_t)methodQueue { @@ -44,13 +33,10 @@ - (dispatch_queue_t)methodQueue { [MovePointShapeAnimator moveToTag:tag coordinate:coordinate durationMs:durationMs resolve:resolve reject:reject]; } -// Thanks to this guard, we won't compile this code when we build for the old architecture. -#ifdef RCT_NEW_ARCH_ENABLED - (std::shared_ptr)getTurboModule: (const facebook::react::ObjCTurboModule::InitParams &)params { return std::make_shared(params); } -#endif // RCT_NEW_ARCH_ENABLED @end diff --git a/ios/RNMBX/Utils/RNMBXFollyConvert.h b/ios/RNMBX/Utils/RNMBXFollyConvert.h index 6a5d4c0381..913cc9bb5e 100644 --- a/ios/RNMBX/Utils/RNMBXFollyConvert.h +++ b/ios/RNMBX/Utils/RNMBXFollyConvert.h @@ -1,5 +1,3 @@ -#ifdef RCT_NEW_ARCH_ENABLED - #if __has_include() // static libs / header maps (no use_frameworks!) #import @@ -11,5 +9,3 @@ #else #error "FollyConvert.h not found. Ensure React-utils & RCT-Folly pods are installed." #endif - -#endif \ No newline at end of file diff --git a/ios/RNMBX/Utils/RNMBXViewResolver.h b/ios/RNMBX/Utils/RNMBXViewResolver.h index f080f7d439..634c48a5e2 100644 --- a/ios/RNMBX/Utils/RNMBXViewResolver.h +++ b/ios/RNMBX/Utils/RNMBXViewResolver.h @@ -1,7 +1,7 @@ // // RNMBXViewResolver.h // -// A utility class for resolving React Native views across both old and new architecture +// A utility class for resolving React Native views. // This eliminates code duplication found in multiple RNMBX modules. // @@ -14,9 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @protocol RNMBXViewResolverDelegate -#ifdef RCT_NEW_ARCH_ENABLED @property (nonatomic, weak, nullable) RCTViewRegistry *viewRegistry_DEPRECATED; -#endif @property (nonatomic, weak, nullable) RCTBridge *bridge; @end diff --git a/ios/RNMBX/Utils/RNMBXViewResolver.mm b/ios/RNMBX/Utils/RNMBXViewResolver.mm index de663a356e..d6afc16a7d 100644 --- a/ios/RNMBX/Utils/RNMBXViewResolver.mm +++ b/ios/RNMBX/Utils/RNMBXViewResolver.mm @@ -1,7 +1,7 @@ // // RNMBXViewResolver.mm // -// Implementation of cross-architecture view resolver utility +// Implementation of view resolver utility // #import "RNMBXViewResolver.h" @@ -36,7 +36,6 @@ + (void)withViewRef:(NSNumber *)viewRef return; } -#ifdef RCT_NEW_ARCH_ENABLED [delegate.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) { [self resolveViewWithPolling:viewRef delegate:delegate @@ -47,18 +46,6 @@ + (void)withViewRef:(NSNumber *)viewRef attemptCount:0 startTime:nil]; }]; -#else - [delegate.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary *viewRegistry) { - [self resolveViewWithPolling:viewRef - delegate:delegate - expectedClass:expectedClass - block:block - reject:reject - methodName:methodName - attemptCount:0 - startTime:nil]; - }]; -#endif } + (void)resolveViewWithPolling:(NSNumber *)viewRef @@ -121,7 +108,6 @@ + (void)resolveViewWithPolling:(NSNumber *)viewRef #pragma mark - Private Methods + (UIView *)resolveView:(NSNumber *)viewRef delegate:(id)delegate { -#ifdef RCT_NEW_ARCH_ENABLED if (delegate.viewRegistry_DEPRECATED) { UIView *componentView = [delegate.viewRegistry_DEPRECATED viewForReactTag:viewRef]; if (componentView) { @@ -135,11 +121,6 @@ + (UIView *)resolveView:(NSNumber *)viewRef delegate:(id #import -#import @interface MapView : UIView @end From 514f25ec5451724ac63a90ef2173a04a474bf919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0hsan=20Er=C5=9Fen?= Date: Sun, 15 Feb 2026 19:28:31 +0300 Subject: [PATCH 03/32] Fix (AnimatedPoint): support key-value object listeners for RN < 0.83 and Map listeners for RN >= 0.83 (#4113) --- src/classes/AnimatedPoint.js | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/classes/AnimatedPoint.js b/src/classes/AnimatedPoint.js index bf4d440651..112c90749f 100644 --- a/src/classes/AnimatedPoint.js +++ b/src/classes/AnimatedPoint.js @@ -24,7 +24,12 @@ export class AnimatedPoint extends AnimatedWithChildren { this.latitude = new Animated.Value(this.latitude); } - this._listeners = {}; + // React Native < 0.83 uses object, >= 0.83 uses Map + // We only initialize to object if super didn't initialize it (or initiated it to empty object/null) + // and we want to preserve the type if it is a Map. + if (!this._listeners) { + this._listeners = {}; + } } setValue(point = DEFAULT_POINT) { @@ -61,18 +66,36 @@ export class AnimatedPoint extends AnimatedWithChildren { } }; - this._listeners[id] = { + const listener = { longitude: this.longitude.addListener(completeCB), latitude: this.latitude.addListener(completeCB), }; + if (this._listeners instanceof Map) { + this._listeners.set(id, listener); + } else { + this._listeners[id] = listener; + } + return id; } removeListener(id) { - this.longitude.removeListener(this._listeners[id].longitude); - this.latitude.removeListener(this._listeners[id].latitude); - delete this._listeners[id]; + if (this._listeners instanceof Map) { + const listener = this._listeners.get(id); + if (listener) { + this.longitude.removeListener(listener.longitude); + this.latitude.removeListener(listener.latitude); + this._listeners.delete(id); + } + } else { + const listener = this._listeners[id]; + if (listener) { + this.longitude.removeListener(listener.longitude); + this.latitude.removeListener(listener.latitude); + delete this._listeners[id]; + } + } } spring(config = { coordinates: DEFAULT_COORD }) { From 9e29003a3d6c6c91e24bb4322249a2a65fcbe5c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikl=C3=B3s=20Fazekas?= Date: Sun, 15 Feb 2026 21:46:00 +0100 Subject: [PATCH 04/32] chore: upgade example to rn 0.82.0 (#4033) * chore: upgade example to rn 0.82.0 * fix main application * update yarn.lock after rebase --- .../com/rnmapboxexample/MainApplication.kt | 25 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/gradlew | 2 +- example/babel.config.js | 13 +- example/ios/Podfile | 3 +- example/ios/Podfile.lock | 857 ++++++++++++------ .../RNMapboxExample.xcodeproj/project.pbxproj | 4 +- example/ios/RNMapboxExample/Info.plist | 2 + example/package.json | 20 +- yarn.lock | 707 +++++++++++++-- 10 files changed, 1219 insertions(+), 416 deletions(-) diff --git a/example/android/app/src/main/java/com/rnmapboxexample/MainApplication.kt b/example/android/app/src/main/java/com/rnmapboxexample/MainApplication.kt index 6e141f6054..bfca9bdccc 100644 --- a/example/android/app/src/main/java/com/rnmapboxexample/MainApplication.kt +++ b/example/android/app/src/main/java/com/rnmapboxexample/MainApplication.kt @@ -9,20 +9,17 @@ import com.facebook.react.ReactPackage import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost import com.facebook.react.defaults.DefaultReactNativeHost class MainApplication : Application(), ReactApplication { - override val reactNativeHost: ReactNativeHost = - object : DefaultReactNativeHost(this) { - override fun getPackages(): List = - PackageList(this).packages.apply { - // Packages that cannot be autolinked yet can be added manually here, for example: - // add(MyReactNativePackage()) - } - override fun getJSMainModuleName(): String = "index" - override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG - override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED - override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED - } - override val reactHost: ReactHost - get() = getDefaultReactHost(applicationContext, reactNativeHost) + override val reactHost: ReactHost by lazy { + getDefaultReactHost( + context = applicationContext, + packageList = + PackageList(this).packages.apply { + // Packages that cannot be autolinked yet can be added manually here, for example: // Packages that cannot be autolinked yet can be added manually here, for example: + // add(MyReactNativePackage()) + }, + ) + } + override fun onCreate() { super.onCreate() loadReactNative(this) diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index d4081da476..2a84e188b8 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/example/android/gradlew b/example/android/gradlew index 23d15a9367..ef07e0162b 100755 --- a/example/android/gradlew +++ b/example/android/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/example/babel.config.js b/example/babel.config.js index 4354ce3f62..c6d8e9b7c7 100644 --- a/example/babel.config.js +++ b/example/babel.config.js @@ -10,20 +10,11 @@ module.exports = getConfig( { presets: ['babel-preset-expo'], plugins: [ + 'react-native-reanimated/plugin', [ 'babel-plugin-react-compiler', { - // Log what the compiler is doing (set to false to disable logging) - // When enabled, you'll see "React Compiler: compiled X functions" in Metro logs - compilationMode: 'infer', // 'annotation' | 'all' | 'infer' - - /* - panicThreshold: 'all_errors', // Show all compilation errors/warnings - logger: { - logEvent(filename, event) { - console.log(`[React Compiler] ${filename}: ${event}`); - }, - }*/ + compilationMode: 'infer', }, ], ], diff --git a/example/ios/Podfile b/example/ios/Podfile index ce3fffc3ee..0306fededd 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -92,8 +92,7 @@ target 'RNMapboxExample' do end react_native_post_install( installer, - # Set `mac_catalyst_enabled` to `true` in order to apply patches - # necessary for Mac Catalyst builds + config[:reactNativePath], :mac_catalyst_enabled => false, # :ccache_enabled => true ) diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index e1e86b7d4b..74f9eb4d09 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -2,12 +2,12 @@ PODS: - boost (1.84.0) - DoubleConversion (1.1.6) - fast_float (8.0.0) - - FBLazyVector (0.81.1) + - FBLazyVector (0.82.0) - fmt (11.0.2) - glog (0.3.5) - - hermes-engine (0.81.1): - - hermes-engine/Pre-built (= 0.81.1) - - hermes-engine/Pre-built (0.81.1) + - hermes-engine (0.82.0): + - hermes-engine/Pre-built (= 0.82.0) + - hermes-engine/Pre-built (0.82.0) - MapboxCommon (24.15.2): - Turf (= 4.0.0) - MapboxCoreMaps (11.15.2): @@ -35,27 +35,27 @@ PODS: - fast_float (= 8.0.0) - fmt (= 11.0.2) - glog - - RCTDeprecation (0.81.1) - - RCTRequired (0.81.1) - - RCTTypeSafety (0.81.1): - - FBLazyVector (= 0.81.1) - - RCTRequired (= 0.81.1) - - React-Core (= 0.81.1) - - React (0.81.1): - - React-Core (= 0.81.1) - - React-Core/DevSupport (= 0.81.1) - - React-Core/RCTWebSocket (= 0.81.1) - - React-RCTActionSheet (= 0.81.1) - - React-RCTAnimation (= 0.81.1) - - React-RCTBlob (= 0.81.1) - - React-RCTImage (= 0.81.1) - - React-RCTLinking (= 0.81.1) - - React-RCTNetwork (= 0.81.1) - - React-RCTSettings (= 0.81.1) - - React-RCTText (= 0.81.1) - - React-RCTVibration (= 0.81.1) - - React-callinvoker (0.81.1) - - React-Core (0.81.1): + - RCTDeprecation (0.82.0) + - RCTRequired (0.82.0) + - RCTTypeSafety (0.82.0): + - FBLazyVector (= 0.82.0) + - RCTRequired (= 0.82.0) + - React-Core (= 0.82.0) + - React (0.82.0): + - React-Core (= 0.82.0) + - React-Core/DevSupport (= 0.82.0) + - React-Core/RCTWebSocket (= 0.82.0) + - React-RCTActionSheet (= 0.82.0) + - React-RCTAnimation (= 0.82.0) + - React-RCTBlob (= 0.82.0) + - React-RCTImage (= 0.82.0) + - React-RCTLinking (= 0.82.0) + - React-RCTNetwork (= 0.82.0) + - React-RCTSettings (= 0.82.0) + - React-RCTText (= 0.82.0) + - React-RCTVibration (= 0.82.0) + - React-callinvoker (0.82.0) + - React-Core (0.82.0): - boost - DoubleConversion - fast_float @@ -65,7 +65,7 @@ PODS: - RCT-Folly - RCT-Folly/Fabric - RCTDeprecation - - React-Core/Default (= 0.81.1) + - React-Core/Default (= 0.82.0) - React-cxxreact - React-featureflags - React-hermes @@ -80,7 +80,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-Core/CoreModulesHeaders (0.81.1): + - React-Core/CoreModulesHeaders (0.82.0): - boost - DoubleConversion - fast_float @@ -105,7 +105,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-Core/Default (0.81.1): + - React-Core/Default (0.82.0): - boost - DoubleConversion - fast_float @@ -129,7 +129,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-Core/DevSupport (0.81.1): + - React-Core/DevSupport (0.82.0): - boost - DoubleConversion - fast_float @@ -139,8 +139,8 @@ PODS: - RCT-Folly - RCT-Folly/Fabric - RCTDeprecation - - React-Core/Default (= 0.81.1) - - React-Core/RCTWebSocket (= 0.81.1) + - React-Core/Default (= 0.82.0) + - React-Core/RCTWebSocket (= 0.82.0) - React-cxxreact - React-featureflags - React-hermes @@ -155,7 +155,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-Core/RCTActionSheetHeaders (0.81.1): + - React-Core/RCTActionSheetHeaders (0.82.0): - boost - DoubleConversion - fast_float @@ -180,7 +180,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-Core/RCTAnimationHeaders (0.81.1): + - React-Core/RCTAnimationHeaders (0.82.0): - boost - DoubleConversion - fast_float @@ -205,7 +205,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-Core/RCTBlobHeaders (0.81.1): + - React-Core/RCTBlobHeaders (0.82.0): - boost - DoubleConversion - fast_float @@ -230,7 +230,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-Core/RCTImageHeaders (0.81.1): + - React-Core/RCTImageHeaders (0.82.0): - boost - DoubleConversion - fast_float @@ -255,7 +255,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-Core/RCTLinkingHeaders (0.81.1): + - React-Core/RCTLinkingHeaders (0.82.0): - boost - DoubleConversion - fast_float @@ -280,7 +280,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-Core/RCTNetworkHeaders (0.81.1): + - React-Core/RCTNetworkHeaders (0.82.0): - boost - DoubleConversion - fast_float @@ -305,7 +305,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-Core/RCTSettingsHeaders (0.81.1): + - React-Core/RCTSettingsHeaders (0.82.0): - boost - DoubleConversion - fast_float @@ -330,7 +330,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-Core/RCTTextHeaders (0.81.1): + - React-Core/RCTTextHeaders (0.82.0): - boost - DoubleConversion - fast_float @@ -355,7 +355,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-Core/RCTVibrationHeaders (0.81.1): + - React-Core/RCTVibrationHeaders (0.82.0): - boost - DoubleConversion - fast_float @@ -380,7 +380,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-Core/RCTWebSocket (0.81.1): + - React-Core/RCTWebSocket (0.82.0): - boost - DoubleConversion - fast_float @@ -390,7 +390,7 @@ PODS: - RCT-Folly - RCT-Folly/Fabric - RCTDeprecation - - React-Core/Default (= 0.81.1) + - React-Core/Default (= 0.82.0) - React-cxxreact - React-featureflags - React-hermes @@ -405,7 +405,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-CoreModules (0.81.1): + - React-CoreModules (0.82.0): - boost - DoubleConversion - fast_float @@ -413,20 +413,21 @@ PODS: - glog - RCT-Folly - RCT-Folly/Fabric - - RCTTypeSafety (= 0.81.1) - - React-Core/CoreModulesHeaders (= 0.81.1) - - React-jsi (= 0.81.1) + - RCTTypeSafety (= 0.82.0) + - React-Core/CoreModulesHeaders (= 0.82.0) + - React-debug + - React-jsi (= 0.82.0) - React-jsinspector - React-jsinspectorcdp - React-jsinspectortracing - React-NativeModulesApple - React-RCTBlob - React-RCTFBReactNativeSpec - - React-RCTImage (= 0.81.1) + - React-RCTImage (= 0.82.0) - React-runtimeexecutor - ReactCommon - SocketRocket - - React-cxxreact (0.81.1): + - React-cxxreact (0.82.0): - boost - DoubleConversion - fast_float @@ -435,19 +436,19 @@ PODS: - hermes-engine - RCT-Folly - RCT-Folly/Fabric - - React-callinvoker (= 0.81.1) - - React-debug (= 0.81.1) - - React-jsi (= 0.81.1) + - React-callinvoker (= 0.82.0) + - React-debug (= 0.82.0) + - React-jsi (= 0.82.0) - React-jsinspector - React-jsinspectorcdp - React-jsinspectortracing - - React-logger (= 0.81.1) - - React-perflogger (= 0.81.1) + - React-logger (= 0.82.0) + - React-perflogger (= 0.82.0) - React-runtimeexecutor - - React-timing (= 0.81.1) + - React-timing (= 0.82.0) - SocketRocket - - React-debug (0.81.1) - - React-defaultsnativemodule (0.81.1): + - React-debug (0.82.0) + - React-defaultsnativemodule (0.82.0): - boost - DoubleConversion - fast_float @@ -463,8 +464,9 @@ PODS: - React-jsiexecutor - React-microtasksnativemodule - React-RCTFBReactNativeSpec + - React-webperformancenativemodule - SocketRocket - - React-domnativemodule (0.81.1): + - React-domnativemodule (0.82.0): - boost - DoubleConversion - fast_float @@ -484,7 +486,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-Fabric (0.81.1): + - React-Fabric (0.82.0): - boost - DoubleConversion - fast_float @@ -498,23 +500,23 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/animations (= 0.81.1) - - React-Fabric/attributedstring (= 0.81.1) - - React-Fabric/bridging (= 0.81.1) - - React-Fabric/componentregistry (= 0.81.1) - - React-Fabric/componentregistrynative (= 0.81.1) - - React-Fabric/components (= 0.81.1) - - React-Fabric/consistency (= 0.81.1) - - React-Fabric/core (= 0.81.1) - - React-Fabric/dom (= 0.81.1) - - React-Fabric/imagemanager (= 0.81.1) - - React-Fabric/leakchecker (= 0.81.1) - - React-Fabric/mounting (= 0.81.1) - - React-Fabric/observers (= 0.81.1) - - React-Fabric/scheduler (= 0.81.1) - - React-Fabric/telemetry (= 0.81.1) - - React-Fabric/templateprocessor (= 0.81.1) - - React-Fabric/uimanager (= 0.81.1) + - React-Fabric/animations (= 0.82.0) + - React-Fabric/attributedstring (= 0.82.0) + - React-Fabric/bridging (= 0.82.0) + - React-Fabric/componentregistry (= 0.82.0) + - React-Fabric/componentregistrynative (= 0.82.0) + - React-Fabric/components (= 0.82.0) + - React-Fabric/consistency (= 0.82.0) + - React-Fabric/core (= 0.82.0) + - React-Fabric/dom (= 0.82.0) + - React-Fabric/imagemanager (= 0.82.0) + - React-Fabric/leakchecker (= 0.82.0) + - React-Fabric/mounting (= 0.82.0) + - React-Fabric/observers (= 0.82.0) + - React-Fabric/scheduler (= 0.82.0) + - React-Fabric/telemetry (= 0.82.0) + - React-Fabric/templateprocessor (= 0.82.0) + - React-Fabric/uimanager (= 0.82.0) - React-featureflags - React-graphics - React-jsi @@ -526,7 +528,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/animations (0.81.1): + - React-Fabric/animations (0.82.0): - boost - DoubleConversion - fast_float @@ -551,7 +553,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/attributedstring (0.81.1): + - React-Fabric/attributedstring (0.82.0): - boost - DoubleConversion - fast_float @@ -576,7 +578,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/bridging (0.81.1): + - React-Fabric/bridging (0.82.0): - boost - DoubleConversion - fast_float @@ -601,7 +603,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/componentregistry (0.81.1): + - React-Fabric/componentregistry (0.82.0): - boost - DoubleConversion - fast_float @@ -626,7 +628,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/componentregistrynative (0.81.1): + - React-Fabric/componentregistrynative (0.82.0): - boost - DoubleConversion - fast_float @@ -651,7 +653,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/components (0.81.1): + - React-Fabric/components (0.82.0): - boost - DoubleConversion - fast_float @@ -665,10 +667,10 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/components/legacyviewmanagerinterop (= 0.81.1) - - React-Fabric/components/root (= 0.81.1) - - React-Fabric/components/scrollview (= 0.81.1) - - React-Fabric/components/view (= 0.81.1) + - React-Fabric/components/legacyviewmanagerinterop (= 0.82.0) + - React-Fabric/components/root (= 0.82.0) + - React-Fabric/components/scrollview (= 0.82.0) + - React-Fabric/components/view (= 0.82.0) - React-featureflags - React-graphics - React-jsi @@ -680,7 +682,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/components/legacyviewmanagerinterop (0.81.1): + - React-Fabric/components/legacyviewmanagerinterop (0.82.0): - boost - DoubleConversion - fast_float @@ -705,7 +707,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/components/root (0.81.1): + - React-Fabric/components/root (0.82.0): - boost - DoubleConversion - fast_float @@ -730,7 +732,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/components/scrollview (0.81.1): + - React-Fabric/components/scrollview (0.82.0): - boost - DoubleConversion - fast_float @@ -755,7 +757,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/components/view (0.81.1): + - React-Fabric/components/view (0.82.0): - boost - DoubleConversion - fast_float @@ -782,7 +784,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-Fabric/consistency (0.81.1): + - React-Fabric/consistency (0.82.0): - boost - DoubleConversion - fast_float @@ -807,7 +809,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/core (0.81.1): + - React-Fabric/core (0.82.0): - boost - DoubleConversion - fast_float @@ -832,7 +834,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/dom (0.81.1): + - React-Fabric/dom (0.82.0): - boost - DoubleConversion - fast_float @@ -857,7 +859,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/imagemanager (0.81.1): + - React-Fabric/imagemanager (0.82.0): - boost - DoubleConversion - fast_float @@ -882,7 +884,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/leakchecker (0.81.1): + - React-Fabric/leakchecker (0.82.0): - boost - DoubleConversion - fast_float @@ -907,7 +909,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/mounting (0.81.1): + - React-Fabric/mounting (0.82.0): - boost - DoubleConversion - fast_float @@ -932,7 +934,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/observers (0.81.1): + - React-Fabric/observers (0.82.0): - boost - DoubleConversion - fast_float @@ -946,7 +948,7 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/observers/events (= 0.81.1) + - React-Fabric/observers/events (= 0.82.0) - React-featureflags - React-graphics - React-jsi @@ -958,7 +960,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/observers/events (0.81.1): + - React-Fabric/observers/events (0.82.0): - boost - DoubleConversion - fast_float @@ -983,7 +985,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/scheduler (0.81.1): + - React-Fabric/scheduler (0.82.0): - boost - DoubleConversion - fast_float @@ -1003,6 +1005,7 @@ PODS: - React-jsi - React-jsiexecutor - React-logger + - React-performancecdpmetrics - React-performancetimeline - React-rendererdebug - React-runtimeexecutor @@ -1010,7 +1013,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/telemetry (0.81.1): + - React-Fabric/telemetry (0.82.0): - boost - DoubleConversion - fast_float @@ -1035,7 +1038,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/templateprocessor (0.81.1): + - React-Fabric/templateprocessor (0.82.0): - boost - DoubleConversion - fast_float @@ -1060,7 +1063,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/uimanager (0.81.1): + - React-Fabric/uimanager (0.82.0): - boost - DoubleConversion - fast_float @@ -1074,7 +1077,7 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/uimanager/consistency (= 0.81.1) + - React-Fabric/uimanager/consistency (= 0.82.0) - React-featureflags - React-graphics - React-jsi @@ -1087,7 +1090,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-Fabric/uimanager/consistency (0.81.1): + - React-Fabric/uimanager/consistency (0.82.0): - boost - DoubleConversion - fast_float @@ -1113,7 +1116,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - SocketRocket - - React-FabricComponents (0.81.1): + - React-FabricComponents (0.82.0): - boost - DoubleConversion - fast_float @@ -1128,8 +1131,8 @@ PODS: - React-cxxreact - React-debug - React-Fabric - - React-FabricComponents/components (= 0.81.1) - - React-FabricComponents/textlayoutmanager (= 0.81.1) + - React-FabricComponents/components (= 0.82.0) + - React-FabricComponents/textlayoutmanager (= 0.82.0) - React-featureflags - React-graphics - React-jsi @@ -1142,7 +1145,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/components (0.81.1): + - React-FabricComponents/components (0.82.0): - boost - DoubleConversion - fast_float @@ -1157,17 +1160,18 @@ PODS: - React-cxxreact - React-debug - React-Fabric - - React-FabricComponents/components/inputaccessory (= 0.81.1) - - React-FabricComponents/components/iostextinput (= 0.81.1) - - React-FabricComponents/components/modal (= 0.81.1) - - React-FabricComponents/components/rncore (= 0.81.1) - - React-FabricComponents/components/safeareaview (= 0.81.1) - - React-FabricComponents/components/scrollview (= 0.81.1) - - React-FabricComponents/components/switch (= 0.81.1) - - React-FabricComponents/components/text (= 0.81.1) - - React-FabricComponents/components/textinput (= 0.81.1) - - React-FabricComponents/components/unimplementedview (= 0.81.1) - - React-FabricComponents/components/virtualview (= 0.81.1) + - React-FabricComponents/components/inputaccessory (= 0.82.0) + - React-FabricComponents/components/iostextinput (= 0.82.0) + - React-FabricComponents/components/modal (= 0.82.0) + - React-FabricComponents/components/rncore (= 0.82.0) + - React-FabricComponents/components/safeareaview (= 0.82.0) + - React-FabricComponents/components/scrollview (= 0.82.0) + - React-FabricComponents/components/switch (= 0.82.0) + - React-FabricComponents/components/text (= 0.82.0) + - React-FabricComponents/components/textinput (= 0.82.0) + - React-FabricComponents/components/unimplementedview (= 0.82.0) + - React-FabricComponents/components/virtualview (= 0.82.0) + - React-FabricComponents/components/virtualviewexperimental (= 0.82.0) - React-featureflags - React-graphics - React-jsi @@ -1180,7 +1184,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/components/inputaccessory (0.81.1): + - React-FabricComponents/components/inputaccessory (0.82.0): - boost - DoubleConversion - fast_float @@ -1207,7 +1211,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/components/iostextinput (0.81.1): + - React-FabricComponents/components/iostextinput (0.82.0): - boost - DoubleConversion - fast_float @@ -1234,7 +1238,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/components/modal (0.81.1): + - React-FabricComponents/components/modal (0.82.0): - boost - DoubleConversion - fast_float @@ -1261,7 +1265,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/components/rncore (0.81.1): + - React-FabricComponents/components/rncore (0.82.0): - boost - DoubleConversion - fast_float @@ -1288,7 +1292,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/components/safeareaview (0.81.1): + - React-FabricComponents/components/safeareaview (0.82.0): - boost - DoubleConversion - fast_float @@ -1315,7 +1319,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/components/scrollview (0.81.1): + - React-FabricComponents/components/scrollview (0.82.0): - boost - DoubleConversion - fast_float @@ -1342,7 +1346,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/components/switch (0.81.1): + - React-FabricComponents/components/switch (0.82.0): - boost - DoubleConversion - fast_float @@ -1369,7 +1373,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/components/text (0.81.1): + - React-FabricComponents/components/text (0.82.0): - boost - DoubleConversion - fast_float @@ -1396,7 +1400,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/components/textinput (0.81.1): + - React-FabricComponents/components/textinput (0.82.0): - boost - DoubleConversion - fast_float @@ -1423,7 +1427,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/components/unimplementedview (0.81.1): + - React-FabricComponents/components/unimplementedview (0.82.0): - boost - DoubleConversion - fast_float @@ -1450,7 +1454,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/components/virtualview (0.81.1): + - React-FabricComponents/components/virtualview (0.82.0): - boost - DoubleConversion - fast_float @@ -1477,7 +1481,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/textlayoutmanager (0.81.1): + - React-FabricComponents/components/virtualviewexperimental (0.82.0): - boost - DoubleConversion - fast_float @@ -1504,7 +1508,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricImage (0.81.1): + - React-FabricComponents/textlayoutmanager (0.82.0): - boost - DoubleConversion - fast_float @@ -1513,21 +1517,48 @@ PODS: - hermes-engine - RCT-Folly - RCT-Folly/Fabric - - RCTRequired (= 0.81.1) - - RCTTypeSafety (= 0.81.1) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-RCTFBReactNativeSpec + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - SocketRocket + - Yoga + - React-FabricImage (0.82.0): + - boost + - DoubleConversion + - fast_float + - fmt + - glog + - hermes-engine + - RCT-Folly + - RCT-Folly/Fabric + - RCTRequired (= 0.82.0) + - RCTTypeSafety (= 0.82.0) - React-Fabric - React-featureflags - React-graphics - React-ImageManager - React-jsi - - React-jsiexecutor (= 0.81.1) + - React-jsiexecutor (= 0.82.0) - React-logger - React-rendererdebug - React-utils - ReactCommon - SocketRocket - Yoga - - React-featureflags (0.81.1): + - React-featureflags (0.82.0): - boost - DoubleConversion - fast_float @@ -1536,7 +1567,7 @@ PODS: - RCT-Folly - RCT-Folly/Fabric - SocketRocket - - React-featureflagsnativemodule (0.81.1): + - React-featureflagsnativemodule (0.82.0): - boost - DoubleConversion - fast_float @@ -1551,7 +1582,7 @@ PODS: - React-RCTFBReactNativeSpec - ReactCommon/turbomodule/core - SocketRocket - - React-graphics (0.81.1): + - React-graphics (0.82.0): - boost - DoubleConversion - fast_float @@ -1564,7 +1595,7 @@ PODS: - React-jsiexecutor - React-utils - SocketRocket - - React-hermes (0.81.1): + - React-hermes (0.82.0): - boost - DoubleConversion - fast_float @@ -1573,16 +1604,17 @@ PODS: - hermes-engine - RCT-Folly - RCT-Folly/Fabric - - React-cxxreact (= 0.81.1) + - React-cxxreact (= 0.82.0) - React-jsi - - React-jsiexecutor (= 0.81.1) + - React-jsiexecutor (= 0.82.0) - React-jsinspector - React-jsinspectorcdp - React-jsinspectortracing - - React-perflogger (= 0.81.1) + - React-oscompat + - React-perflogger (= 0.82.0) - React-runtimeexecutor - SocketRocket - - React-idlecallbacksnativemodule (0.81.1): + - React-idlecallbacksnativemodule (0.82.0): - boost - DoubleConversion - fast_float @@ -1598,7 +1630,7 @@ PODS: - React-runtimescheduler - ReactCommon/turbomodule/core - SocketRocket - - React-ImageManager (0.81.1): + - React-ImageManager (0.82.0): - boost - DoubleConversion - fast_float @@ -1613,7 +1645,7 @@ PODS: - React-rendererdebug - React-utils - SocketRocket - - React-jserrorhandler (0.81.1): + - React-jserrorhandler (0.82.0): - boost - DoubleConversion - fast_float @@ -1628,7 +1660,7 @@ PODS: - React-jsi - ReactCommon/turbomodule/bridging - SocketRocket - - React-jsi (0.81.1): + - React-jsi (0.82.0): - boost - DoubleConversion - fast_float @@ -1638,7 +1670,7 @@ PODS: - RCT-Folly - RCT-Folly/Fabric - SocketRocket - - React-jsiexecutor (0.81.1): + - React-jsiexecutor (0.82.0): - boost - DoubleConversion - fast_float @@ -1647,15 +1679,16 @@ PODS: - hermes-engine - RCT-Folly - RCT-Folly/Fabric - - React-cxxreact (= 0.81.1) - - React-jsi (= 0.81.1) + - React-cxxreact + - React-debug + - React-jsi - React-jsinspector - React-jsinspectorcdp - React-jsinspectortracing - - React-perflogger (= 0.81.1) + - React-perflogger - React-runtimeexecutor - SocketRocket - - React-jsinspector (0.81.1): + - React-jsinspector (0.82.0): - boost - DoubleConversion - fast_float @@ -1670,10 +1703,10 @@ PODS: - React-jsinspectornetwork - React-jsinspectortracing - React-oscompat - - React-perflogger (= 0.81.1) + - React-perflogger (= 0.82.0) - React-runtimeexecutor - SocketRocket - - React-jsinspectorcdp (0.81.1): + - React-jsinspectorcdp (0.82.0): - boost - DoubleConversion - fast_float @@ -1682,7 +1715,7 @@ PODS: - RCT-Folly - RCT-Folly/Fabric - SocketRocket - - React-jsinspectornetwork (0.81.1): + - React-jsinspectornetwork (0.82.0): - boost - DoubleConversion - fast_float @@ -1695,7 +1728,7 @@ PODS: - React-performancetimeline - React-timing - SocketRocket - - React-jsinspectortracing (0.81.1): + - React-jsinspectortracing (0.82.0): - boost - DoubleConversion - fast_float @@ -1706,7 +1739,7 @@ PODS: - React-oscompat - React-timing - SocketRocket - - React-jsitooling (0.81.1): + - React-jsitooling (0.82.0): - boost - DoubleConversion - fast_float @@ -1714,16 +1747,17 @@ PODS: - glog - RCT-Folly - RCT-Folly/Fabric - - React-cxxreact (= 0.81.1) - - React-jsi (= 0.81.1) + - React-cxxreact (= 0.82.0) + - React-debug + - React-jsi (= 0.82.0) - React-jsinspector - React-jsinspectorcdp - React-jsinspectortracing - React-runtimeexecutor - SocketRocket - - React-jsitracing (0.81.1): + - React-jsitracing (0.82.0): - React-jsi - - React-logger (0.81.1): + - React-logger (0.82.0): - boost - DoubleConversion - fast_float @@ -1732,7 +1766,7 @@ PODS: - RCT-Folly - RCT-Folly/Fabric - SocketRocket - - React-Mapbuffer (0.81.1): + - React-Mapbuffer (0.82.0): - boost - DoubleConversion - fast_float @@ -1742,7 +1776,7 @@ PODS: - RCT-Folly/Fabric - React-debug - SocketRocket - - React-microtasksnativemodule (0.81.1): + - React-microtasksnativemodule (0.82.0): - boost - DoubleConversion - fast_float @@ -1843,7 +1877,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-NativeModulesApple (0.81.1): + - React-NativeModulesApple (0.82.0): - boost - DoubleConversion - fast_float @@ -1855,6 +1889,7 @@ PODS: - React-callinvoker - React-Core - React-cxxreact + - React-debug - React-featureflags - React-jsi - React-jsinspector @@ -1863,8 +1898,8 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - SocketRocket - - React-oscompat (0.81.1) - - React-perflogger (0.81.1): + - React-oscompat (0.82.0) + - React-perflogger (0.82.0): - boost - DoubleConversion - fast_float @@ -1873,7 +1908,21 @@ PODS: - RCT-Folly - RCT-Folly/Fabric - SocketRocket - - React-performancetimeline (0.81.1): + - React-performancecdpmetrics (0.82.0): + - boost + - DoubleConversion + - fast_float + - fmt + - glog + - hermes-engine + - RCT-Folly + - RCT-Folly/Fabric + - React-jsi + - React-performancetimeline + - React-runtimeexecutor + - React-timing + - SocketRocket + - React-performancetimeline (0.82.0): - boost - DoubleConversion - fast_float @@ -1886,9 +1935,9 @@ PODS: - React-perflogger - React-timing - SocketRocket - - React-RCTActionSheet (0.81.1): - - React-Core/RCTActionSheetHeaders (= 0.81.1) - - React-RCTAnimation (0.81.1): + - React-RCTActionSheet (0.82.0): + - React-Core/RCTActionSheetHeaders (= 0.82.0) + - React-RCTAnimation (0.82.0): - boost - DoubleConversion - fast_float @@ -1904,7 +1953,7 @@ PODS: - React-RCTFBReactNativeSpec - ReactCommon - SocketRocket - - React-RCTAppDelegate (0.81.1): + - React-RCTAppDelegate (0.82.0): - boost - DoubleConversion - fast_float @@ -1938,7 +1987,7 @@ PODS: - React-utils - ReactCommon - SocketRocket - - React-RCTBlob (0.81.1): + - React-RCTBlob (0.82.0): - boost - DoubleConversion - fast_float @@ -1957,7 +2006,7 @@ PODS: - React-RCTNetwork - ReactCommon - SocketRocket - - React-RCTFabric (0.81.1): + - React-RCTFabric (0.82.0): - boost - DoubleConversion - fast_float @@ -1979,6 +2028,7 @@ PODS: - React-jsinspectorcdp - React-jsinspectornetwork - React-jsinspectortracing + - React-performancecdpmetrics - React-performancetimeline - React-RCTAnimation - React-RCTFBReactNativeSpec @@ -1992,7 +2042,7 @@ PODS: - React-utils - SocketRocket - Yoga - - React-RCTFBReactNativeSpec (0.81.1): + - React-RCTFBReactNativeSpec (0.82.0): - boost - DoubleConversion - fast_float @@ -2006,10 +2056,10 @@ PODS: - React-Core - React-jsi - React-NativeModulesApple - - React-RCTFBReactNativeSpec/components (= 0.81.1) + - React-RCTFBReactNativeSpec/components (= 0.82.0) - ReactCommon - SocketRocket - - React-RCTFBReactNativeSpec/components (0.81.1): + - React-RCTFBReactNativeSpec/components (0.82.0): - boost - DoubleConversion - fast_float @@ -2032,7 +2082,7 @@ PODS: - ReactCommon - SocketRocket - Yoga - - React-RCTImage (0.81.1): + - React-RCTImage (0.82.0): - boost - DoubleConversion - fast_float @@ -2048,14 +2098,14 @@ PODS: - React-RCTNetwork - ReactCommon - SocketRocket - - React-RCTLinking (0.81.1): - - React-Core/RCTLinkingHeaders (= 0.81.1) - - React-jsi (= 0.81.1) + - React-RCTLinking (0.82.0): + - React-Core/RCTLinkingHeaders (= 0.82.0) + - React-jsi (= 0.82.0) - React-NativeModulesApple - React-RCTFBReactNativeSpec - ReactCommon - - ReactCommon/turbomodule/core (= 0.81.1) - - React-RCTNetwork (0.81.1): + - ReactCommon/turbomodule/core (= 0.82.0) + - React-RCTNetwork (0.82.0): - boost - DoubleConversion - fast_float @@ -2065,6 +2115,7 @@ PODS: - RCT-Folly/Fabric - RCTTypeSafety - React-Core/RCTNetworkHeaders + - React-debug - React-featureflags - React-jsi - React-jsinspectorcdp @@ -2073,7 +2124,7 @@ PODS: - React-RCTFBReactNativeSpec - ReactCommon - SocketRocket - - React-RCTRuntime (0.81.1): + - React-RCTRuntime (0.82.0): - boost - DoubleConversion - fast_float @@ -2083,6 +2134,7 @@ PODS: - RCT-Folly - RCT-Folly/Fabric - React-Core + - React-debug - React-jsi - React-jsinspector - React-jsinspectorcdp @@ -2093,7 +2145,7 @@ PODS: - React-runtimeexecutor - React-RuntimeHermes - SocketRocket - - React-RCTSettings (0.81.1): + - React-RCTSettings (0.82.0): - boost - DoubleConversion - fast_float @@ -2108,10 +2160,10 @@ PODS: - React-RCTFBReactNativeSpec - ReactCommon - SocketRocket - - React-RCTText (0.81.1): - - React-Core/RCTTextHeaders (= 0.81.1) + - React-RCTText (0.82.0): + - React-Core/RCTTextHeaders (= 0.82.0) - Yoga - - React-RCTVibration (0.81.1): + - React-RCTVibration (0.82.0): - boost - DoubleConversion - fast_float @@ -2125,11 +2177,11 @@ PODS: - React-RCTFBReactNativeSpec - ReactCommon - SocketRocket - - React-rendererconsistency (0.81.1) - - React-renderercss (0.81.1): + - React-rendererconsistency (0.82.0) + - React-renderercss (0.82.0): - React-debug - React-utils - - React-rendererdebug (0.81.1): + - React-rendererdebug (0.82.0): - boost - DoubleConversion - fast_float @@ -2139,7 +2191,7 @@ PODS: - RCT-Folly/Fabric - React-debug - SocketRocket - - React-RuntimeApple (0.81.1): + - React-RuntimeApple (0.82.0): - boost - DoubleConversion - fast_float @@ -2168,7 +2220,7 @@ PODS: - React-runtimescheduler - React-utils - SocketRocket - - React-RuntimeCore (0.81.1): + - React-RuntimeCore (0.82.0): - boost - DoubleConversion - fast_float @@ -2190,7 +2242,7 @@ PODS: - React-runtimescheduler - React-utils - SocketRocket - - React-runtimeexecutor (0.81.1): + - React-runtimeexecutor (0.82.0): - boost - DoubleConversion - fast_float @@ -2200,10 +2252,10 @@ PODS: - RCT-Folly/Fabric - React-debug - React-featureflags - - React-jsi (= 0.81.1) + - React-jsi (= 0.82.0) - React-utils - SocketRocket - - React-RuntimeHermes (0.81.1): + - React-RuntimeHermes (0.82.0): - boost - DoubleConversion - fast_float @@ -2224,7 +2276,7 @@ PODS: - React-runtimeexecutor - React-utils - SocketRocket - - React-runtimescheduler (0.81.1): + - React-runtimescheduler (0.82.0): - boost - DoubleConversion - fast_float @@ -2246,9 +2298,9 @@ PODS: - React-timing - React-utils - SocketRocket - - React-timing (0.81.1): + - React-timing (0.82.0): - React-debug - - React-utils (0.81.1): + - React-utils (0.82.0): - boost - DoubleConversion - fast_float @@ -2258,11 +2310,27 @@ PODS: - RCT-Folly - RCT-Folly/Fabric - React-debug - - React-jsi (= 0.81.1) + - React-jsi (= 0.82.0) + - SocketRocket + - React-webperformancenativemodule (0.82.0): + - boost + - DoubleConversion + - fast_float + - fmt + - glog + - hermes-engine + - RCT-Folly + - RCT-Folly/Fabric + - React-jsi + - React-jsiexecutor + - React-performancetimeline + - React-RCTFBReactNativeSpec + - React-runtimeexecutor + - ReactCommon/turbomodule/core - SocketRocket - - ReactAppDependencyProvider (0.81.1): + - ReactAppDependencyProvider (0.82.0): - ReactCodegen - - ReactCodegen (0.81.1): + - ReactCodegen (0.82.0): - boost - DoubleConversion - fast_float @@ -2288,7 +2356,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - SocketRocket - - ReactCommon (0.81.1): + - ReactCommon (0.82.0): - boost - DoubleConversion - fast_float @@ -2296,9 +2364,9 @@ PODS: - glog - RCT-Folly - RCT-Folly/Fabric - - ReactCommon/turbomodule (= 0.81.1) + - ReactCommon/turbomodule (= 0.82.0) - SocketRocket - - ReactCommon/turbomodule (0.81.1): + - ReactCommon/turbomodule (0.82.0): - boost - DoubleConversion - fast_float @@ -2307,15 +2375,15 @@ PODS: - hermes-engine - RCT-Folly - RCT-Folly/Fabric - - React-callinvoker (= 0.81.1) - - React-cxxreact (= 0.81.1) - - React-jsi (= 0.81.1) - - React-logger (= 0.81.1) - - React-perflogger (= 0.81.1) - - ReactCommon/turbomodule/bridging (= 0.81.1) - - ReactCommon/turbomodule/core (= 0.81.1) + - React-callinvoker (= 0.82.0) + - React-cxxreact (= 0.82.0) + - React-jsi (= 0.82.0) + - React-logger (= 0.82.0) + - React-perflogger (= 0.82.0) + - ReactCommon/turbomodule/bridging (= 0.82.0) + - ReactCommon/turbomodule/core (= 0.82.0) - SocketRocket - - ReactCommon/turbomodule/bridging (0.81.1): + - ReactCommon/turbomodule/bridging (0.82.0): - boost - DoubleConversion - fast_float @@ -2324,13 +2392,13 @@ PODS: - hermes-engine - RCT-Folly - RCT-Folly/Fabric - - React-callinvoker (= 0.81.1) - - React-cxxreact (= 0.81.1) - - React-jsi (= 0.81.1) - - React-logger (= 0.81.1) - - React-perflogger (= 0.81.1) + - React-callinvoker (= 0.82.0) + - React-cxxreact (= 0.82.0) + - React-jsi (= 0.82.0) + - React-logger (= 0.82.0) + - React-perflogger (= 0.82.0) - SocketRocket - - ReactCommon/turbomodule/core (0.81.1): + - ReactCommon/turbomodule/core (0.82.0): - boost - DoubleConversion - fast_float @@ -2339,14 +2407,14 @@ PODS: - hermes-engine - RCT-Folly - RCT-Folly/Fabric - - React-callinvoker (= 0.81.1) - - React-cxxreact (= 0.81.1) - - React-debug (= 0.81.1) - - React-featureflags (= 0.81.1) - - React-jsi (= 0.81.1) - - React-logger (= 0.81.1) - - React-perflogger (= 0.81.1) - - React-utils (= 0.81.1) + - React-callinvoker (= 0.82.0) + - React-cxxreact (= 0.82.0) + - React-debug (= 0.82.0) + - React-featureflags (= 0.82.0) + - React-jsi (= 0.82.0) + - React-logger (= 0.82.0) + - React-perflogger (= 0.82.0) + - React-utils (= 0.82.0) - SocketRocket - RNCAsyncStorage (2.2.0): - boost @@ -2376,13 +2444,13 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - rnmapbox-maps (10.2.7): + - rnmapbox-maps (10.2.0): - MapboxMaps (~> 11.15.2) - React - React-Core - - rnmapbox-maps/DynamicLibrary (= 10.2.7) + - rnmapbox-maps/DynamicLibrary (= 10.2.0) - Turf - - rnmapbox-maps/DynamicLibrary (10.2.7): + - rnmapbox-maps/DynamicLibrary (10.2.0): - boost - DoubleConversion - fast_float @@ -2408,6 +2476,98 @@ PODS: - SocketRocket - Turf - Yoga + - RNReanimated (4.1.3): + - boost + - DoubleConversion + - fast_float + - fmt + - glog + - hermes-engine + - RCT-Folly + - RCT-Folly/Fabric + - RCTRequired + - RCTTypeSafety + - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-hermes + - React-ImageManager + - React-jsi + - React-NativeModulesApple + - React-RCTFabric + - React-renderercss + - React-rendererdebug + - React-utils + - ReactCodegen + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - RNReanimated/reanimated (= 4.1.3) + - RNWorklets + - SocketRocket + - Yoga + - RNReanimated/reanimated (4.1.3): + - boost + - DoubleConversion + - fast_float + - fmt + - glog + - hermes-engine + - RCT-Folly + - RCT-Folly/Fabric + - RCTRequired + - RCTTypeSafety + - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-hermes + - React-ImageManager + - React-jsi + - React-NativeModulesApple + - React-RCTFabric + - React-renderercss + - React-rendererdebug + - React-utils + - ReactCodegen + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - RNReanimated/reanimated/apple (= 4.1.3) + - RNWorklets + - SocketRocket + - Yoga + - RNReanimated/reanimated/apple (4.1.3): + - boost + - DoubleConversion + - fast_float + - fmt + - glog + - hermes-engine + - RCT-Folly + - RCT-Folly/Fabric + - RCTRequired + - RCTTypeSafety + - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-hermes + - React-ImageManager + - React-jsi + - React-NativeModulesApple + - React-RCTFabric + - React-renderercss + - React-rendererdebug + - React-utils + - ReactCodegen + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - RNWorklets + - SocketRocket + - Yoga - RNScreens (4.16.0): - boost - DoubleConversion @@ -2495,6 +2655,95 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga + - RNWorklets (0.6.1): + - boost + - DoubleConversion + - fast_float + - fmt + - glog + - hermes-engine + - RCT-Folly + - RCT-Folly/Fabric + - RCTRequired + - RCTTypeSafety + - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-hermes + - React-ImageManager + - React-jsi + - React-NativeModulesApple + - React-RCTFabric + - React-renderercss + - React-rendererdebug + - React-utils + - ReactCodegen + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - RNWorklets/worklets (= 0.6.1) + - SocketRocket + - Yoga + - RNWorklets/worklets (0.6.1): + - boost + - DoubleConversion + - fast_float + - fmt + - glog + - hermes-engine + - RCT-Folly + - RCT-Folly/Fabric + - RCTRequired + - RCTTypeSafety + - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-hermes + - React-ImageManager + - React-jsi + - React-NativeModulesApple + - React-RCTFabric + - React-renderercss + - React-rendererdebug + - React-utils + - ReactCodegen + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - RNWorklets/worklets/apple (= 0.6.1) + - SocketRocket + - Yoga + - RNWorklets/worklets/apple (0.6.1): + - boost + - DoubleConversion + - fast_float + - fmt + - glog + - hermes-engine + - RCT-Folly + - RCT-Folly/Fabric + - RCTRequired + - RCTTypeSafety + - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-hermes + - React-ImageManager + - React-jsi + - React-NativeModulesApple + - React-RCTFabric + - React-renderercss + - React-rendererdebug + - React-utils + - ReactCodegen + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - SocketRocket + - Yoga - SocketRocket (0.7.1) - Turf (4.0.0) - Yoga (0.0.0) @@ -2545,6 +2794,7 @@ DEPENDENCIES: - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`) - React-oscompat (from `../node_modules/react-native/ReactCommon/oscompat`) - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) + - React-performancecdpmetrics (from `../node_modules/react-native/ReactCommon/react/performance/cdpmetrics`) - React-performancetimeline (from `../node_modules/react-native/ReactCommon/react/performance/timeline`) - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) @@ -2569,13 +2819,16 @@ DEPENDENCIES: - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`) - React-timing (from `../node_modules/react-native/ReactCommon/react/timing`) - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`) + - React-webperformancenativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/webperformance`) - ReactAppDependencyProvider (from `build/generated/ios`) - ReactCodegen (from `build/generated/ios`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" - rnmapbox-maps (from `../..`) + - RNReanimated (from `../node_modules/react-native-reanimated`) - RNScreens (from `../node_modules/react-native-screens`) - RNVectorIcons (from `../node_modules/react-native-vector-icons`) + - RNWorklets (from `../node_modules/react-native-worklets`) - SocketRocket (~> 0.7.1) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) @@ -2602,7 +2855,7 @@ EXTERNAL SOURCES: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" hermes-engine: :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec" - :tag: hermes-2025-07-07-RNv0.81.0-e0fc67142ec0763c6b6153ca2bf96df815539782 + :tag: hermes-2025-09-01-RNv0.82.0-265ef62ff3eb7289d17e366664ac0da82303e101 RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTDeprecation: @@ -2677,6 +2930,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/oscompat" React-perflogger: :path: "../node_modules/react-native/ReactCommon/reactperflogger" + React-performancecdpmetrics: + :path: "../node_modules/react-native/ReactCommon/react/performance/cdpmetrics" React-performancetimeline: :path: "../node_modules/react-native/ReactCommon/react/performance/timeline" React-RCTActionSheet: @@ -2725,6 +2980,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/react/timing" React-utils: :path: "../node_modules/react-native/ReactCommon/react/utils" + React-webperformancenativemodule: + :path: "../node_modules/react-native/ReactCommon/react/nativemodule/webperformance" ReactAppDependencyProvider: :path: build/generated/ios ReactCodegen: @@ -2735,10 +2992,14 @@ EXTERNAL SOURCES: :path: "../node_modules/@react-native-async-storage/async-storage" rnmapbox-maps: :path: "../.." + RNReanimated: + :path: "../node_modules/react-native-reanimated" RNScreens: :path: "../node_modules/react-native-screens" RNVectorIcons: :path: "../node_modules/react-native-vector-icons" + RNWorklets: + :path: "../node_modules/react-native-worklets" Yoga: :path: "../node_modules/react-native/ReactCommon/yoga" @@ -2746,85 +3007,89 @@ SPEC CHECKSUMS: boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90 DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb fast_float: b32c788ed9c6a8c584d114d0047beda9664e7cc6 - FBLazyVector: b8f1312d48447cca7b4abc21ed155db14742bd03 + FBLazyVector: 41b4dd99afd0aad861444ee141abdedaa6c3d238 fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd glog: 5683914934d5b6e4240e497e0f4a3b42d1854183 - hermes-engine: 4f8246b1f6d79f625e0d99472d1f3a71da4d28ca + hermes-engine: 8642d8f14a548ab718ec112e9bebdfdd154138b5 MapboxCommon: 5b702d1562a1bc56a8a9d141ebbbaa72390536c9 MapboxCoreMaps: ae6fcbe255e3fa9f290ee9cd72d125d1a2ecabfa MapboxMaps: 7627bc07bcad10259668d83a3f0ed3920ee0eaf7 RCT-Folly: 59ec0ac1f2f39672a0c6e6cecdd39383b764646f - RCTDeprecation: c4b9e2fd0ab200e3af72b013ed6113187c607077 - RCTRequired: e97dd5dafc1db8094e63bc5031e0371f092ae92a - RCTTypeSafety: 720403058b7c1380c6a3ae5706981d6362962c89 - React: f1486d005993b0af01943af1850d3d4f3b597545 - React-callinvoker: 133f69368c8559e744efa345223625d412f5dfbe - React-Core: d6d8c1fd33697cec596d33b820456505ee305686 - React-CoreModules: 81ab751a7668ba161440f9623b994e1a6a3019fe - React-cxxreact: 16f2a2751d0dce8b569f23c1914edc90f655b01b - React-debug: e01581e1589f329e61c95b332bf7f4969b10564b - React-defaultsnativemodule: e956b1d8fe15cc79d23061db229bf88170565f2f - React-domnativemodule: a18b0f7a31b9c75f12fa369baece5542d1265b36 - React-Fabric: c0237a32c3c0dbea2d2b294c8e95605e1dfe2f57 - React-FabricComponents: 65b03884bd5d9f24c79a631d7d26f0fa079bc4aa - React-FabricImage: de1ea2f2a0b32ad02e5cbb64827d1eec0439cf0d - React-featureflags: 02de9c35256cc624269b01d670d99e1fd706ea8d - React-featureflagsnativemodule: 8b84e67edbaa7b9318390c5bd3ae19790a74f356 - React-graphics: 004b40c1b236ea3bb8de6693439bef9797922ba9 - React-hermes: 2179a018b2f86652f6f33ef23efd9e5ac284b247 - React-idlecallbacksnativemodule: f54ea68f984b12e42feed1e7110623b2c38df4d1 - React-ImageManager: 9dd04b7b62bc5397f876ca5fb1b712e700ce390c - React-jserrorhandler: 2f90bf50fffea1d012e7f3d717c6adf748b1813d - React-jsi: b27208f8866e53238534f65f304903e4eff25e05 - React-jsiexecutor: 1d3e827797f592c393860dea91aaa6d53c7715e7 - React-jsinspector: bda319277ae779bc476b736fe3a497c6aed304cd - React-jsinspectorcdp: 69e1736edfd5420037680b7b4557fa748c3c8216 - React-jsinspectornetwork: 7aa707b057c6129b4af59e0c9160436bbab25022 - React-jsinspectortracing: b4a8a328ad2697f9638daa4b7cc054e0303fa47f - React-jsitooling: a6c7e2829437b28665e97a398b3374d443125e24 - React-jsitracing: d87ae17dd0eef7844e605945da926c5433fe2b51 - React-logger: d27dd2000f520bf891d24f6e141cde34df41f0ee - React-Mapbuffer: 0746ffab5ac0f49b7c9347338e3d0c1d9dd634c8 - React-microtasksnativemodule: b0fb3f97372df39bda3e657536039f1af227cc29 + RCTDeprecation: 22bf66112da540a7d40e536366ddd8557934fca1 + RCTRequired: a0ed4dc41b35f79fbb6d8ba320e06882a8c792cf + RCTTypeSafety: 59a046ff1e602409a86b89fcd6edff367a5b14af + React: ade831e2e38887292c2c7d40f2f4098826a9dda4 + React-callinvoker: fb097304922c5da47152147a5fb0712713438575 + React-Core: 2f7181fccf31a895720bb0668ac9f67985d6a4a1 + React-CoreModules: 3f7a8f9d28ba287fc07240c5bc53aa4d5e23450a + React-cxxreact: dca5689d4332bbf71495302103bb24f73fa1de00 + React-debug: c855f7565d8c4aeceb23219ca3baa0e1ebfb578a + React-defaultsnativemodule: e1770db1c0e635b2dd8545616dd22962c6315c24 + React-domnativemodule: a3a0a508c6f13565e1d042e1ee682ef5881325ef + React-Fabric: 4630570529e467827e40398626e95340734020cc + React-FabricComponents: 95b3ec1f3b9398ad75e78f69e612a6093a99d737 + React-FabricImage: 96ec67d419d4d036ecc987bc14378afcd34d0653 + React-featureflags: 8cbf892b2c12fc0e9cc08039287385dfcf2f3de6 + React-featureflagsnativemodule: 7428b30d83749445157a8c253a77852e17217347 + React-graphics: f1ad789bd076f99a76640d7f49a799ddf81b231d + React-hermes: b2c927f43e28ea4e8c915b7acdd907b24bfa9cdb + React-idlecallbacksnativemodule: 9392f0359575b41a42a71dcf5a2ada0c74dacb6f + React-ImageManager: 1736dbd4b93d78ae34cda2837c2da521a9feccb7 + React-jserrorhandler: aad40898954bbc65c21a2e4524709e492675a750 + React-jsi: 7d348c6ad689f8d044f5dbfea343d88e18cd6d57 + React-jsiexecutor: 41b2cfc540fbe0eaa0d205a85c4f665c1d8b8683 + React-jsinspector: 8559a86427c4b09546fb61cb96b4e60ab7490508 + React-jsinspectorcdp: 0d3e1839d4cb22013e77f62834fff071b154d290 + React-jsinspectornetwork: 5e2919805485b0b1f8acf16a6e508a5807eca7e5 + React-jsinspectortracing: 123a7cf440721def804b188fb86b2f47366448d6 + React-jsitooling: 9d0d29865180ecd51002986a60f89ca6897a10b7 + React-jsitracing: fe4c3ca546e438a923add79d37a864546caba75f + React-logger: 2021eb67660b673cc654635832136fbbf2c79103 + React-Mapbuffer: 9bda44c983f9c683047546a338ebe9a21020babd + React-microtasksnativemodule: 9b52faf56750d7e3c67d9cf96b650f14c31524c2 react-native-safe-area-context: 6d8a7b750e496e37bda47c938320bf2c734d441f - React-NativeModulesApple: 9ec9240159974c94886ebbe4caec18e3395f6aef - React-oscompat: b12c633e9c00f1f99467b1e0e0b8038895dae436 - React-perflogger: ccf4fd2664b00818645e588623c7531a8b32d114 - React-performancetimeline: a866ba759d8e06e9ba174b4421677edcae487baf - React-RCTActionSheet: 3f741a3712653611a6bfc5abceb8260af9d0b218 - React-RCTAnimation: 2edeebfba175cc2e937e2752209ab605d3c48f21 - React-RCTAppDelegate: e292321e83ee966897244a032216a70930b758d6 - React-RCTBlob: 8dfb24b6dd4a5af45e1e59e2fd925b2df1e44d08 - React-RCTFabric: b25b02a2016f5cb15926a60c77a8d75865aa3558 - React-RCTFBReactNativeSpec: 20338571a1ed853d01da6c68576aa6e8e107b6f6 - React-RCTImage: c7fe8c2f2ae8bad98ab4d944d5d50a889da4b652 - React-RCTLinking: 9ac21ce9f1af914bb01c06af3752db2ec840d0ee - React-RCTNetwork: 09a5de71d757dbad4b3fe3615839290200b932aa - React-RCTRuntime: da3f1e0ce088c20350044cdf1efcd7f8d9b9b40c - React-RCTSettings: fee112652ac7569ea9abe910206e1685f5f9adba - React-RCTText: 7ee9d0bc16b3a8149f8df6d70c48e724d0db1d89 - React-RCTVibration: 619d613abaeb05f6fbc2b2e5e33f724f05df8eb8 - React-rendererconsistency: a05f6c37f9389c53213d1e28798e441fa6fbdbcd - React-renderercss: 3decb27a81648fcdee837c59994b51fff5be5a67 - React-rendererdebug: 3b9a92d36932af52e1b473f2a89ea4b05dbdecdf - React-RuntimeApple: 4e35fb74be4b721c2e1fd6d54ec66456fa7043e9 - React-RuntimeCore: 0fd7ac6e3e9dd20cb47e87c6b9f35832dd445d5e - React-runtimeexecutor: 7680156c9f3a5a49c688bc33f9ec5ea1b00527f5 - React-RuntimeHermes: 435b7104a3c749af6251353dcb7317a8e53cbd73 - React-runtimescheduler: 8056b916168e446ea44531883928034e62e76a81 - React-timing: 36da85e32e53008ce73f87528818191e7f2508ba - React-utils: 71e53d55ce778c6e7c7c9db4b1b9d63ef8f55289 - ReactAppDependencyProvider: 448b422f8af1dedf81374eacc90a15439a0ed7f5 - ReactCodegen: 3baedb0c33f963250c866151b825a3c5194b12f1 - ReactCommon: e897f9a1b4afab370cfefaaf5fb3c80371bc3937 + React-NativeModulesApple: 1b4d9722d8df62e881684abadf320e7a8fa1b7f6 + React-oscompat: 80ca388c4831481cd03a6b45ecfc82739ca9a95e + React-perflogger: 2e155343fa744b02ec2eab0f134639beb8fff659 + React-performancecdpmetrics: b626b58b66880204b88428cd0f07f185910731ef + React-performancetimeline: 544c6abb44a10c47f10874aec41ae80693109875 + React-RCTActionSheet: 2f0a844b3f4b749ce54bee10e5006aacbcb754e0 + React-RCTAnimation: 3cda5b35147099142a3f4850da4b28e9cd6992a8 + React-RCTAppDelegate: 7d0daf291219f3fca0d4e8a46f8042e977d94fcb + React-RCTBlob: 4e9cf72bbe40c2da7d358197c2f8d104d4aeba7a + React-RCTFabric: aa6982c39f6133fb280a5e401ea2e8438c3ba4c8 + React-RCTFBReactNativeSpec: f388594e3dd33e67652c5e2339d299de06fcceba + React-RCTImage: d0dca6c29f03b5dc913be8a92f486d242997741f + React-RCTLinking: e3deaaa812a549c8410a413b44b6a2eb6027ddf9 + React-RCTNetwork: 820ba7697a8c90ea66e339e9bd63a879010bdecf + React-RCTRuntime: 9bf02501880b487e921675db600bd4797dfd9743 + React-RCTSettings: d887be78c915d0a51c91bffe1a39120a65a0e564 + React-RCTText: 857ec084500001382d6bfe981e68373ca8178af6 + React-RCTVibration: 02b4437b8b05ad7219c5e129a85e121d0b97635d + React-rendererconsistency: 74f53d2a1fa3bd87ed3fdbc83ad69cecf4bd0cb7 + React-renderercss: 9530312be5919a6100391d7d920fb80e9303aafd + React-rendererdebug: afd65121fd0cfa79c62620085718424d481ca739 + React-RuntimeApple: 702d4db49dc81193688132355709993009e73f86 + React-RuntimeCore: 021216f96d7ef9e8b9ba5d8ffc0631410967f9ac + React-runtimeexecutor: 1a27868c5ef637814a55e1e0b46df71f7d102ed3 + React-RuntimeHermes: 71b757553eb2f2c32ce796c88c0af8732fde9f58 + React-runtimescheduler: 8f1fb375b46f4e34faf0caa2893f6d7585bb4e89 + React-timing: 7a90be5e49292f093b8b1f5cbf87c0d0e8539699 + React-utils: f840cea5cd05fdc26711327b522fb8de1b65cbe4 + React-webperformancenativemodule: 365f718ced9c8b7042dea17f360a0a7ea49dfbb7 + ReactAppDependencyProvider: d5f21b5da644b33685d4f2685cba86e3c7ea64ff + ReactCodegen: 1efedd581339e9ff5365e66fcf6522ae9f1be6cb + ReactCommon: 17f21c8e189e290113e40fd8652758ec9694897b RNCAsyncStorage: 302f2fac014fd450046c120567ca364632da682b - rnmapbox-maps: 7269bdcd5cb3716d27e07d3632384792f655be32 + rnmapbox-maps: 973edbd156fff1485500f1281a0844715f9361dd + RNReanimated: c76d99de4022813a27dc3745d8d2de4230ac5fef RNScreens: 74985ca8e102294a60cec7513fa84c936fa0b20b RNVectorIcons: 6acc19c833be864e9c70894e101a587fe491150a + RNWorklets: daa0a3e7946a9c4042f3a962c87a12dc5bc0badd SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 Turf: c9eb11a65d96af58cac523460fd40fec5061b081 - Yoga: fa23995c18b65978347b096d0836f4f5093df545 + Yoga: 93bc00d78638987f9ffd928f4a9f895d3e601bc3 -PODFILE CHECKSUM: 4d32367122d25b7d1454f5251323be49f7228d81 +PODFILE CHECKSUM: a8d0bcee36da1ae6663f56323461c0f72eac22a6 COCOAPODS: 1.16.2 diff --git a/example/ios/RNMapboxExample.xcodeproj/project.pbxproj b/example/ios/RNMapboxExample.xcodeproj/project.pbxproj index 7fc22cd973..3e65c85b82 100644 --- a/example/ios/RNMapboxExample.xcodeproj/project.pbxproj +++ b/example/ios/RNMapboxExample.xcodeproj/project.pbxproj @@ -264,7 +264,7 @@ "${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxCommon/MapboxCommon.framework/MapboxCommon", "${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxCoreMaps/MapboxCoreMaps.framework/MapboxCoreMaps", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Turf/Turf.framework/Turf", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermesvm.framework/hermesvm", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -272,7 +272,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxCommon.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxCoreMaps.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Turf.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermesvm.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/example/ios/RNMapboxExample/Info.plist b/example/ios/RNMapboxExample/Info.plist index 8e8c9a2fd2..aeea131590 100644 --- a/example/ios/RNMapboxExample/Info.plist +++ b/example/ios/RNMapboxExample/Info.plist @@ -2,6 +2,8 @@ + CADisableMinimumFrameDurationOnPhone + CFBundleDevelopmentRegion en CFBundleDisplayName diff --git a/example/package.json b/example/package.json index 9a058a9ea3..3e75cc821b 100644 --- a/example/package.json +++ b/example/package.json @@ -37,11 +37,13 @@ "lodash.isequal": "^4.5.0", "moment": "^2.30.1", "prop-types": "^15.8.1", - "react": "19.1.0", - "react-native": "0.81.1", + "react": "19.1.1", + "react-native": "0.82.0", + "react-native-reanimated": "^4.1.3", "react-native-safe-area-context": "^5.6.1", "react-native-screens": "^4.15.2", - "react-native-vector-icons": "^10.3.0" + "react-native-vector-icons": "^10.3.0", + "react-native-worklets": "^0.6.1" }, "optionalDependencies": { "@expo/metro-runtime": "~6.1.2", @@ -58,13 +60,13 @@ "@react-native-community/cli": "^20.0.1", "@react-native-community/cli-platform-android": "^20.0.1", "@react-native-community/cli-platform-ios": "^20.0.1", - "@react-native/babel-preset": "^0.81.1", - "@react-native/eslint-config": "^0.81.1", - "@react-native/metro-config": "^0.81.1", - "@react-native/typescript-config": "^0.81.1", + "@react-native/babel-preset": "^0.82.0", + "@react-native/eslint-config": "^0.82.0", + "@react-native/metro-config": "^0.82.0", + "@react-native/typescript-config": "^0.82.0", "@types/lodash.isequal": "^4.5.8", "@types/prop-types": "^15.7.15", - "@types/react": "^19.1.10", + "@types/react": "^19.1.1", "@types/react-test-renderer": "^19.1.0", "babel-jest": "^30.1.2", "babel-plugin-module-resolver": "^5.0.2", @@ -79,7 +81,7 @@ "prettier": "^2.8.8", "react-native-builder-bob": "^0.40.13", "react-native-monorepo-config": "^0.1.9", - "react-test-renderer": "19.1.0", + "react-test-renderer": "19.1.1", "typescript": "^5.8.3" }, "engines": { diff --git a/yarn.lock b/yarn.lock index a669a6bceb..71dd3e2cf8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -80,6 +80,17 @@ __metadata: languageName: node linkType: hard +"@babel/code-frame@npm:^7.28.6, @babel/code-frame@npm:^7.29.0": + version: 7.29.0 + resolution: "@babel/code-frame@npm:7.29.0" + dependencies: + "@babel/helper-validator-identifier": ^7.28.5 + js-tokens: ^4.0.0 + picocolors: ^1.1.1 + checksum: 39f5b303757e4d63bbff8133e251094cd4f952b46e3fa9febc7368d907583911d6a1eded6090876dc1feeff5cf6e134fb19b706f8d58d26c5402cd50e5e1aeb2 + languageName: node + linkType: hard + "@babel/compat-data@npm:^7.27.2, @babel/compat-data@npm:^7.27.7, @babel/compat-data@npm:^7.28.0": version: 7.28.4 resolution: "@babel/compat-data@npm:7.28.4" @@ -87,6 +98,13 @@ __metadata: languageName: node linkType: hard +"@babel/compat-data@npm:^7.28.6": + version: 7.29.0 + resolution: "@babel/compat-data@npm:7.29.0" + checksum: ad19db279dfd06cbe91b505d03be00d603c6d3fcc141cfc14f4ace5c558193e9b6aae4788cb01fd209c4c850e52d73c8f3c247680e3c0d84fa17ab8b3d50c808 + languageName: node + linkType: hard + "@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.18.10, @babel/core@npm:^7.18.9, @babel/core@npm:^7.20.0, @babel/core@npm:^7.23.9, @babel/core@npm:^7.25.2, @babel/core@npm:^7.27.4, @babel/core@npm:^7.28.3": version: 7.28.4 resolution: "@babel/core@npm:7.28.4" @@ -111,25 +129,25 @@ __metadata: linkType: hard "@babel/core@npm:^7.24.4": - version: 7.28.5 - resolution: "@babel/core@npm:7.28.5" - dependencies: - "@babel/code-frame": ^7.27.1 - "@babel/generator": ^7.28.5 - "@babel/helper-compilation-targets": ^7.27.2 - "@babel/helper-module-transforms": ^7.28.3 - "@babel/helpers": ^7.28.4 - "@babel/parser": ^7.28.5 - "@babel/template": ^7.27.2 - "@babel/traverse": ^7.28.5 - "@babel/types": ^7.28.5 + version: 7.29.0 + resolution: "@babel/core@npm:7.29.0" + dependencies: + "@babel/code-frame": ^7.29.0 + "@babel/generator": ^7.29.0 + "@babel/helper-compilation-targets": ^7.28.6 + "@babel/helper-module-transforms": ^7.28.6 + "@babel/helpers": ^7.28.6 + "@babel/parser": ^7.29.0 + "@babel/template": ^7.28.6 + "@babel/traverse": ^7.29.0 + "@babel/types": ^7.29.0 "@jridgewell/remapping": ^2.3.5 convert-source-map: ^2.0.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.2.3 semver: ^6.3.1 - checksum: 1ee35b20448f73e9d531091ad4f9e8198dc8f0cebb783263fbff1807342209882ddcaf419be04111326b6f0e494222f7055d71da316c437a6a784d230c11ab9f + checksum: 85e1df6e213382c46dee27bcd07ed9202fa108a85bb74eb37be656308fd949349171ad2aa17cc84cf0720c908dc9ea6309d25e64d2a7fcdaa63721ce0c67c10b languageName: node linkType: hard @@ -160,16 +178,16 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.28.5": - version: 7.28.5 - resolution: "@babel/generator@npm:7.28.5" +"@babel/generator@npm:^7.29.0": + version: 7.29.1 + resolution: "@babel/generator@npm:7.29.1" dependencies: - "@babel/parser": ^7.28.5 - "@babel/types": ^7.28.5 + "@babel/parser": ^7.29.0 + "@babel/types": ^7.29.0 "@jridgewell/gen-mapping": ^0.3.12 "@jridgewell/trace-mapping": ^0.3.28 jsesc: ^3.0.2 - checksum: 3e86fa0197bb33394a85a73dbbca92bb1b3f250a30294c7e327359c0978ad90f36f3d71c7f2965a3fc349cfa82becc8f87e7421c75796c8bc48dd9010dd866d1 + checksum: d8e6863b2d04f684e65ad72731049ac7d754d3a3d1a67cdfc20807b109ba3180ed90d7ccef58ce5d38ded2eaeb71983a76c711eecb9b6266118262378f6c7226 languageName: node linkType: hard @@ -195,6 +213,19 @@ __metadata: languageName: node linkType: hard +"@babel/helper-compilation-targets@npm:^7.28.6": + version: 7.28.6 + resolution: "@babel/helper-compilation-targets@npm:7.28.6" + dependencies: + "@babel/compat-data": ^7.28.6 + "@babel/helper-validator-option": ^7.27.1 + browserslist: ^4.24.0 + lru-cache: ^5.1.1 + semver: ^6.3.1 + checksum: 8151e36b74eb1c5e414fe945c189436421f7bfa011884de5be3dd7fd77f12f1f733ff7c982581dfa0a49d8af724450243c2409427114b4a6cfeb8333259d001c + languageName: node + linkType: hard + "@babel/helper-create-class-features-plugin@npm:^7.27.1, @babel/helper-create-class-features-plugin@npm:^7.28.3": version: 7.28.3 resolution: "@babel/helper-create-class-features-plugin@npm:7.28.3" @@ -267,6 +298,16 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-imports@npm:^7.28.6": + version: 7.28.6 + resolution: "@babel/helper-module-imports@npm:7.28.6" + dependencies: + "@babel/traverse": ^7.28.6 + "@babel/types": ^7.28.6 + checksum: 437513aa029898b588a38f7991d7656c539b22f595207d85d0c407240c9e3f2aff8b9d0d7115fdedc91e7fdce4465100549a052024e2fba6a810bcbb7584296b + languageName: node + linkType: hard + "@babel/helper-module-transforms@npm:^7.27.1, @babel/helper-module-transforms@npm:^7.28.3": version: 7.28.3 resolution: "@babel/helper-module-transforms@npm:7.28.3" @@ -280,6 +321,19 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-transforms@npm:^7.28.6": + version: 7.28.6 + resolution: "@babel/helper-module-transforms@npm:7.28.6" + dependencies: + "@babel/helper-module-imports": ^7.28.6 + "@babel/helper-validator-identifier": ^7.28.5 + "@babel/traverse": ^7.28.6 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 522f7d1d08b5e2ccd4ec912aca879bd1506af78d1fb30f46e3e6b4bb69c6ae6ab4e379a879723844230d27dc6d04a55b03f5215cd3141b7a2b40bb4a02f71a9f + languageName: node + linkType: hard + "@babel/helper-optimise-call-expression@npm:^7.27.1": version: 7.27.1 resolution: "@babel/helper-optimise-call-expression@npm:7.27.1" @@ -381,6 +435,16 @@ __metadata: languageName: node linkType: hard +"@babel/helpers@npm:^7.28.6": + version: 7.28.6 + resolution: "@babel/helpers@npm:7.28.6" + dependencies: + "@babel/template": ^7.28.6 + "@babel/types": ^7.28.6 + checksum: 4f3d555ec20dde40a2fcb244c86bfd9ec007b57ec9b30a9d04334c1ea2c1670bb82c151024124e1ab27ccf0b1f5ad30167633457a7c9ffbf4064fad2643f12fc + languageName: node + linkType: hard + "@babel/highlight@npm:^7.10.4": version: 7.25.9 resolution: "@babel/highlight@npm:7.25.9" @@ -404,14 +468,14 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.24.4, @babel/parser@npm:^7.28.5": - version: 7.28.5 - resolution: "@babel/parser@npm:7.28.5" +"@babel/parser@npm:^7.24.4, @babel/parser@npm:^7.28.6, @babel/parser@npm:^7.29.0": + version: 7.29.0 + resolution: "@babel/parser@npm:7.29.0" dependencies: - "@babel/types": ^7.28.5 + "@babel/types": ^7.29.0 bin: parser: ./bin/babel-parser.js - checksum: 5c2456e3f26c70d4a3ce1a220b529a91a2df26c54a2894fd0dea2342699ea1067ffdda9f0715eeab61da46ff546fd5661bc70be6d8d11977cbe21f5f0478819a + checksum: b4a1bd3cf46712e439286db9a4105dfa741b5a7720fa1f38f33719cf4f1da9df9fc5b6686128890bd6a62debba287d8d472af153dd629fd4a0a44fe55413cd68 languageName: node linkType: hard @@ -761,7 +825,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-arrow-functions@npm:^7.24.7, @babel/plugin-transform-arrow-functions@npm:^7.27.1": +"@babel/plugin-transform-arrow-functions@npm:^7.0.0-0, @babel/plugin-transform-arrow-functions@npm:^7.24.7, @babel/plugin-transform-arrow-functions@npm:^7.27.1": version: 7.27.1 resolution: "@babel/plugin-transform-arrow-functions@npm:7.27.1" dependencies: @@ -820,7 +884,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-class-properties@npm:^7.25.4, @babel/plugin-transform-class-properties@npm:^7.27.1": +"@babel/plugin-transform-class-properties@npm:^7.0.0-0, @babel/plugin-transform-class-properties@npm:^7.25.4, @babel/plugin-transform-class-properties@npm:^7.27.1": version: 7.27.1 resolution: "@babel/plugin-transform-class-properties@npm:7.27.1" dependencies: @@ -844,7 +908,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-classes@npm:^7.25.4, @babel/plugin-transform-classes@npm:^7.28.3": +"@babel/plugin-transform-classes@npm:^7.0.0-0, @babel/plugin-transform-classes@npm:^7.25.4, @babel/plugin-transform-classes@npm:^7.28.3": version: 7.28.4 resolution: "@babel/plugin-transform-classes@npm:7.28.4" dependencies: @@ -1118,7 +1182,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.7, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.27.1": +"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.0.0-0, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.7, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.27.1": version: 7.27.1 resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.27.1" dependencies: @@ -1178,7 +1242,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-optional-chaining@npm:^7.24.8, @babel/plugin-transform-optional-chaining@npm:^7.27.1": +"@babel/plugin-transform-optional-chaining@npm:^7.0.0-0, @babel/plugin-transform-optional-chaining@npm:^7.24.8, @babel/plugin-transform-optional-chaining@npm:^7.27.1": version: 7.27.1 resolution: "@babel/plugin-transform-optional-chaining@npm:7.27.1" dependencies: @@ -1358,7 +1422,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-shorthand-properties@npm:^7.24.7, @babel/plugin-transform-shorthand-properties@npm:^7.27.1": +"@babel/plugin-transform-shorthand-properties@npm:^7.0.0-0, @babel/plugin-transform-shorthand-properties@npm:^7.24.7, @babel/plugin-transform-shorthand-properties@npm:^7.27.1": version: 7.27.1 resolution: "@babel/plugin-transform-shorthand-properties@npm:7.27.1" dependencies: @@ -1403,7 +1467,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-template-literals@npm:^7.27.1": +"@babel/plugin-transform-template-literals@npm:^7.0.0-0, @babel/plugin-transform-template-literals@npm:^7.27.1": version: 7.27.1 resolution: "@babel/plugin-transform-template-literals@npm:7.27.1" dependencies: @@ -1463,7 +1527,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-unicode-regex@npm:^7.24.7, @babel/plugin-transform-unicode-regex@npm:^7.27.1": +"@babel/plugin-transform-unicode-regex@npm:^7.0.0-0, @babel/plugin-transform-unicode-regex@npm:^7.24.7, @babel/plugin-transform-unicode-regex@npm:^7.27.1": version: 7.27.1 resolution: "@babel/plugin-transform-unicode-regex@npm:7.27.1" dependencies: @@ -1596,7 +1660,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-typescript@npm:^7.23.0, @babel/preset-typescript@npm:^7.23.3, @babel/preset-typescript@npm:^7.24.7": +"@babel/preset-typescript@npm:^7.16.7, @babel/preset-typescript@npm:^7.23.0, @babel/preset-typescript@npm:^7.23.3, @babel/preset-typescript@npm:^7.24.7": version: 7.27.1 resolution: "@babel/preset-typescript@npm:7.27.1" dependencies: @@ -1629,6 +1693,17 @@ __metadata: languageName: node linkType: hard +"@babel/template@npm:^7.28.6": + version: 7.28.6 + resolution: "@babel/template@npm:7.28.6" + dependencies: + "@babel/code-frame": ^7.28.6 + "@babel/parser": ^7.28.6 + "@babel/types": ^7.28.6 + checksum: 8ab6383053e226025d9491a6e795293f2140482d14f60c1244bece6bf53610ed1e251d5e164de66adab765629881c7d9416e1e540c716541d2fd0f8f36a013d7 + languageName: node + linkType: hard + "@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3, @babel/traverse@npm:^7.10.5, @babel/traverse@npm:^7.18.11, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.25.3, @babel/traverse@npm:^7.27.1, @babel/traverse@npm:^7.28.0, @babel/traverse@npm:^7.28.3, @babel/traverse@npm:^7.28.4": version: 7.28.4 resolution: "@babel/traverse@npm:7.28.4" @@ -1644,18 +1719,18 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.28.5": - version: 7.28.5 - resolution: "@babel/traverse@npm:7.28.5" +"@babel/traverse@npm:^7.28.6, @babel/traverse@npm:^7.29.0": + version: 7.29.0 + resolution: "@babel/traverse@npm:7.29.0" dependencies: - "@babel/code-frame": ^7.27.1 - "@babel/generator": ^7.28.5 + "@babel/code-frame": ^7.29.0 + "@babel/generator": ^7.29.0 "@babel/helper-globals": ^7.28.0 - "@babel/parser": ^7.28.5 - "@babel/template": ^7.27.2 - "@babel/types": ^7.28.5 + "@babel/parser": ^7.29.0 + "@babel/template": ^7.28.6 + "@babel/types": ^7.29.0 debug: ^4.3.1 - checksum: e028ee9654f44be7c2a2df268455cee72d5c424c9ae536785f8f7c8680356f7b977c77ad76909d07eeed09ff1e125ce01cf783011f66b56c838791a85fa6af04 + checksum: fbb5085aa525b5d4ecd9fe2f5885d88413fff6ad9c0fac244c37f96069b6d3af9ce825750cd16af1d97d26fa3d354b38dbbdb5f31430e0d99ed89660ab65430e languageName: node linkType: hard @@ -1669,13 +1744,13 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.28.5": - version: 7.28.5 - resolution: "@babel/types@npm:7.28.5" +"@babel/types@npm:^7.28.6, @babel/types@npm:^7.29.0": + version: 7.29.0 + resolution: "@babel/types@npm:7.29.0" dependencies: "@babel/helper-string-parser": ^7.27.1 "@babel/helper-validator-identifier": ^7.28.5 - checksum: 5bc266af9e55ff92f9ddf33d83a42c9de1a87f9579d0ed62ef94a741a081692dd410a4fbbab18d514b83e135083ff05bc0e37003834801c9514b9d8ad748070d + checksum: 83f190438e94c22b2574aaeef7501830311ef266eaabfb06523409f64e2fe855e522951607085d71cad286719adef14e1ba37b671f334a7cd25b0f8506a01e0b languageName: node linkType: hard @@ -1741,7 +1816,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/eslint-utils@npm:^4.1.2, @eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0, @eslint-community/eslint-utils@npm:^4.5.0, @eslint-community/eslint-utils@npm:^4.8.0": +"@eslint-community/eslint-utils@npm:^4.1.2, @eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0, @eslint-community/eslint-utils@npm:^4.5.0, @eslint-community/eslint-utils@npm:^4.7.0, @eslint-community/eslint-utils@npm:^4.8.0": version: 4.9.0 resolution: "@eslint-community/eslint-utils@npm:4.9.0" dependencies: @@ -4030,6 +4105,13 @@ __metadata: languageName: node linkType: hard +"@react-native/assets-registry@npm:0.82.0": + version: 0.82.0 + resolution: "@react-native/assets-registry@npm:0.82.0" + checksum: 21416e3f4c088aeb56bd9f19ce88950ee629d7b4d044f36fde63757d9fbe2a81b4688538ae7d81bb046d922cfc3c4e1f51a2815fcfb7f0af2bb380f7e8c1bde8 + languageName: node + linkType: hard + "@react-native/babel-plugin-codegen@npm:0.81.1": version: 0.81.1 resolution: "@react-native/babel-plugin-codegen@npm:0.81.1" @@ -4050,6 +4132,16 @@ __metadata: languageName: node linkType: hard +"@react-native/babel-plugin-codegen@npm:0.82.0": + version: 0.82.0 + resolution: "@react-native/babel-plugin-codegen@npm:0.82.0" + dependencies: + "@babel/traverse": ^7.25.3 + "@react-native/codegen": 0.82.0 + checksum: f9b8b64a325dc69dd6fe83682443f95cdb6c5d81a259ffbdedab1d5408bca5f144489ea04d250d0b23f5c6175ddb1fac4419a8a8339a0c2b673f0a8e079a83bd + languageName: node + linkType: hard + "@react-native/babel-preset@npm:0.81.1": version: 0.81.1 resolution: "@react-native/babel-preset@npm:0.81.1" @@ -4105,7 +4197,7 @@ __metadata: languageName: node linkType: hard -"@react-native/babel-preset@npm:0.81.4, @react-native/babel-preset@npm:^0.81.1": +"@react-native/babel-preset@npm:0.81.4": version: 0.81.4 resolution: "@react-native/babel-preset@npm:0.81.4" dependencies: @@ -4160,6 +4252,61 @@ __metadata: languageName: node linkType: hard +"@react-native/babel-preset@npm:0.82.0, @react-native/babel-preset@npm:^0.82.0": + version: 0.82.0 + resolution: "@react-native/babel-preset@npm:0.82.0" + dependencies: + "@babel/core": ^7.25.2 + "@babel/plugin-proposal-export-default-from": ^7.24.7 + "@babel/plugin-syntax-dynamic-import": ^7.8.3 + "@babel/plugin-syntax-export-default-from": ^7.24.7 + "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 + "@babel/plugin-syntax-optional-chaining": ^7.8.3 + "@babel/plugin-transform-arrow-functions": ^7.24.7 + "@babel/plugin-transform-async-generator-functions": ^7.25.4 + "@babel/plugin-transform-async-to-generator": ^7.24.7 + "@babel/plugin-transform-block-scoping": ^7.25.0 + "@babel/plugin-transform-class-properties": ^7.25.4 + "@babel/plugin-transform-classes": ^7.25.4 + "@babel/plugin-transform-computed-properties": ^7.24.7 + "@babel/plugin-transform-destructuring": ^7.24.8 + "@babel/plugin-transform-flow-strip-types": ^7.25.2 + "@babel/plugin-transform-for-of": ^7.24.7 + "@babel/plugin-transform-function-name": ^7.25.1 + "@babel/plugin-transform-literals": ^7.25.2 + "@babel/plugin-transform-logical-assignment-operators": ^7.24.7 + "@babel/plugin-transform-modules-commonjs": ^7.24.8 + "@babel/plugin-transform-named-capturing-groups-regex": ^7.24.7 + "@babel/plugin-transform-nullish-coalescing-operator": ^7.24.7 + "@babel/plugin-transform-numeric-separator": ^7.24.7 + "@babel/plugin-transform-object-rest-spread": ^7.24.7 + "@babel/plugin-transform-optional-catch-binding": ^7.24.7 + "@babel/plugin-transform-optional-chaining": ^7.24.8 + "@babel/plugin-transform-parameters": ^7.24.7 + "@babel/plugin-transform-private-methods": ^7.24.7 + "@babel/plugin-transform-private-property-in-object": ^7.24.7 + "@babel/plugin-transform-react-display-name": ^7.24.7 + "@babel/plugin-transform-react-jsx": ^7.25.2 + "@babel/plugin-transform-react-jsx-self": ^7.24.7 + "@babel/plugin-transform-react-jsx-source": ^7.24.7 + "@babel/plugin-transform-regenerator": ^7.24.7 + "@babel/plugin-transform-runtime": ^7.24.7 + "@babel/plugin-transform-shorthand-properties": ^7.24.7 + "@babel/plugin-transform-spread": ^7.24.7 + "@babel/plugin-transform-sticky-regex": ^7.24.7 + "@babel/plugin-transform-typescript": ^7.25.2 + "@babel/plugin-transform-unicode-regex": ^7.24.7 + "@babel/template": ^7.25.0 + "@react-native/babel-plugin-codegen": 0.82.0 + babel-plugin-syntax-hermes-parser: 0.32.0 + babel-plugin-transform-flow-enums: ^0.0.2 + react-refresh: ^0.14.0 + peerDependencies: + "@babel/core": "*" + checksum: f869a10d0dc3be8f6b43d7fd8dc3cb0f7ebe708ea275f847f665d0cba13c347b6100175e052f65d1eda56b30ec0c2f025e22443fc97b9888f7b4e4a37d3a7dbf + languageName: node + linkType: hard + "@react-native/codegen@npm:0.81.1": version: 0.81.1 resolution: "@react-native/codegen@npm:0.81.1" @@ -4194,6 +4341,23 @@ __metadata: languageName: node linkType: hard +"@react-native/codegen@npm:0.82.0": + version: 0.82.0 + resolution: "@react-native/codegen@npm:0.82.0" + dependencies: + "@babel/core": ^7.25.2 + "@babel/parser": ^7.25.3 + glob: ^7.1.1 + hermes-parser: 0.32.0 + invariant: ^2.2.4 + nullthrows: ^1.1.1 + yargs: ^17.6.2 + peerDependencies: + "@babel/core": "*" + checksum: 939092807e511d2cd9c3110230644135deace8eaf80f389985549be3713ce8783168e51e9fc7037ce0f71c3f2a3261410f0abf37341e9675c820b2f70459c62b + languageName: node + linkType: hard + "@react-native/community-cli-plugin@npm:0.81.1": version: 0.81.1 resolution: "@react-native/community-cli-plugin@npm:0.81.1" @@ -4217,6 +4381,29 @@ __metadata: languageName: node linkType: hard +"@react-native/community-cli-plugin@npm:0.82.0": + version: 0.82.0 + resolution: "@react-native/community-cli-plugin@npm:0.82.0" + dependencies: + "@react-native/dev-middleware": 0.82.0 + debug: ^4.4.0 + invariant: ^2.2.4 + metro: ^0.83.1 + metro-config: ^0.83.1 + metro-core: ^0.83.1 + semver: ^7.1.3 + peerDependencies: + "@react-native-community/cli": "*" + "@react-native/metro-config": "*" + peerDependenciesMeta: + "@react-native-community/cli": + optional: true + "@react-native/metro-config": + optional: true + checksum: b62e337a88edab5c57cd4d50442184766950d91b27afdea9886f79e09609d09461d32e042caf9adcdcb325467cdaac04384296940da755261e6d138a255e65c6 + languageName: node + linkType: hard + "@react-native/debugger-frontend@npm:0.81.1": version: 0.81.1 resolution: "@react-native/debugger-frontend@npm:0.81.1" @@ -4231,6 +4418,23 @@ __metadata: languageName: node linkType: hard +"@react-native/debugger-frontend@npm:0.82.0": + version: 0.82.0 + resolution: "@react-native/debugger-frontend@npm:0.82.0" + checksum: 2f7a9e97eded22e093e8d8475efbfa571a139e01239e9917839bab23f564620f7ae84abe9589780f4aaf54ae059af0a0a896664c382a1ccd80ce2373c61de91a + languageName: node + linkType: hard + +"@react-native/debugger-shell@npm:0.82.0": + version: 0.82.0 + resolution: "@react-native/debugger-shell@npm:0.82.0" + dependencies: + cross-spawn: ^7.0.6 + fb-dotslash: 0.5.8 + checksum: 2b0be80d3d6a1d794edb6cade641dec10b8b34634cdb05ff7be864d95bf53d4ed801b9f8e3b03999bbc138b41e0b9669fe6cd641c25bfdcdfcada3f4fa4a47f7 + languageName: node + linkType: hard + "@react-native/dev-middleware@npm:0.81.1": version: 0.81.1 resolution: "@react-native/dev-middleware@npm:0.81.1" @@ -4269,6 +4473,26 @@ __metadata: languageName: node linkType: hard +"@react-native/dev-middleware@npm:0.82.0": + version: 0.82.0 + resolution: "@react-native/dev-middleware@npm:0.82.0" + dependencies: + "@isaacs/ttlcache": ^1.4.1 + "@react-native/debugger-frontend": 0.82.0 + "@react-native/debugger-shell": 0.82.0 + chrome-launcher: ^0.15.2 + chromium-edge-launcher: ^0.2.0 + connect: ^3.6.5 + debug: ^4.4.0 + invariant: ^2.2.4 + nullthrows: ^1.1.1 + open: ^7.0.3 + serve-static: ^1.16.2 + ws: ^6.2.3 + checksum: d6b57ed8a96082c99802aa64d4d826f4750996e6259f0b724715f9688de39f41e426d3da5ef4732a595b517f691cc2896b599ebc6fca3e4026f5e72d92fea304 + languageName: node + linkType: hard + "@react-native/eslint-config@npm:^0.81.1": version: 0.81.4 resolution: "@react-native/eslint-config@npm:0.81.4" @@ -4292,6 +4516,29 @@ __metadata: languageName: node linkType: hard +"@react-native/eslint-config@npm:^0.82.0": + version: 0.82.0 + resolution: "@react-native/eslint-config@npm:0.82.0" + dependencies: + "@babel/core": ^7.25.2 + "@babel/eslint-parser": ^7.25.1 + "@react-native/eslint-plugin": 0.82.0 + "@typescript-eslint/eslint-plugin": ^8.36.0 + "@typescript-eslint/parser": ^8.36.0 + eslint-config-prettier: ^8.5.0 + eslint-plugin-eslint-comments: ^3.2.0 + eslint-plugin-ft-flow: ^2.0.1 + eslint-plugin-jest: ^29.0.1 + eslint-plugin-react: ^7.30.1 + eslint-plugin-react-hooks: ^5.2.0 + eslint-plugin-react-native: ^4.0.0 + peerDependencies: + eslint: ">=8" + prettier: ">=2" + checksum: 2728a97fa1f784e3ee154e3a00b3b08821cd8d2fef9354a58508076be98be43bd8f8084e95c6a8e23654e583990cb5bcedc70fb10608b63220168ea9176c0c90 + languageName: node + linkType: hard + "@react-native/eslint-plugin@npm:0.81.4": version: 0.81.4 resolution: "@react-native/eslint-plugin@npm:0.81.4" @@ -4299,6 +4546,13 @@ __metadata: languageName: node linkType: hard +"@react-native/eslint-plugin@npm:0.82.0": + version: 0.82.0 + resolution: "@react-native/eslint-plugin@npm:0.82.0" + checksum: b456cde2911a90745ab811a577535a4c8afe602ff4f706dce6812fd5c2d5de7d2e426e2fc240aac405675065fc622983db83c657f54ca33eeda6d6c6440d8cdc + languageName: node + linkType: hard + "@react-native/gradle-plugin@npm:0.81.1": version: 0.81.1 resolution: "@react-native/gradle-plugin@npm:0.81.1" @@ -4306,6 +4560,13 @@ __metadata: languageName: node linkType: hard +"@react-native/gradle-plugin@npm:0.82.0": + version: 0.82.0 + resolution: "@react-native/gradle-plugin@npm:0.82.0" + checksum: 58cf9e293a4c8b038d262d0e8b1a3c0800793e3103ce0c0437f23318c3ea1a8aeea1747b506edbd4a450fa2b7b0fe5d7501a2e69cd74459ac418f785cf6acca4 + languageName: node + linkType: hard + "@react-native/js-polyfills@npm:0.81.1": version: 0.81.1 resolution: "@react-native/js-polyfills@npm:0.81.1" @@ -4313,36 +4574,36 @@ __metadata: languageName: node linkType: hard -"@react-native/js-polyfills@npm:0.81.4": - version: 0.81.4 - resolution: "@react-native/js-polyfills@npm:0.81.4" - checksum: 5a2d6e2e0c588f39570a826d8632f5ac70607f69939c4961fbe26bd104a71aec83c5503f87a02f160ee8e5174c8e3e309c106e8634bd5f706c53acfd1dea4631 +"@react-native/js-polyfills@npm:0.82.0": + version: 0.82.0 + resolution: "@react-native/js-polyfills@npm:0.82.0" + checksum: 364a8711a888e0cedf9b624eb594ddcd7e84c7bee63e7e46d7986c8306e91f4ad6673d562ba620ad3267f6d297d9c4a3a0c27e27d5eadd72ba2c14b5aeb3faa9 languageName: node linkType: hard -"@react-native/metro-babel-transformer@npm:0.81.4": - version: 0.81.4 - resolution: "@react-native/metro-babel-transformer@npm:0.81.4" +"@react-native/metro-babel-transformer@npm:0.82.0": + version: 0.82.0 + resolution: "@react-native/metro-babel-transformer@npm:0.82.0" dependencies: "@babel/core": ^7.25.2 - "@react-native/babel-preset": 0.81.4 - hermes-parser: 0.29.1 + "@react-native/babel-preset": 0.82.0 + hermes-parser: 0.32.0 nullthrows: ^1.1.1 peerDependencies: "@babel/core": "*" - checksum: 46f2793a1190becedaebc7a85070e03cd386180805d1082af1e206255b6395e7f749d82ba6736f343f8c9b447755c79d6c5ab11cde36688c45add9d56388db88 + checksum: fb9decb29afa210157265df58f29d9ffba4fd990544db1f721e526f0b608e51f4915322103e229f0f6b15d9e15ff744d2ecf79c74f4207f4fe12397da517a8f6 languageName: node linkType: hard -"@react-native/metro-config@npm:^0.81.1": - version: 0.81.4 - resolution: "@react-native/metro-config@npm:0.81.4" +"@react-native/metro-config@npm:^0.82.0": + version: 0.82.0 + resolution: "@react-native/metro-config@npm:0.82.0" dependencies: - "@react-native/js-polyfills": 0.81.4 - "@react-native/metro-babel-transformer": 0.81.4 + "@react-native/js-polyfills": 0.82.0 + "@react-native/metro-babel-transformer": 0.82.0 metro-config: ^0.83.1 metro-runtime: ^0.83.1 - checksum: 3ae2a2c55cb988da8a35f5f119b19a476dd85388d4c4970e33fc9af7886d2bba7d894743b997a4cac7389125b87ed1aac436cd0e2426d3ea06bc1cde4838d866 + checksum: 850213a281ee27a9fd9f7cfeb4372bb3427d1775417041293b6833e65e637ea87731752cfb124a61ed7a9e738b46f60a98c3420248915fb47792a028c135f03b languageName: node linkType: hard @@ -4360,6 +4621,13 @@ __metadata: languageName: node linkType: hard +"@react-native/normalize-colors@npm:0.82.0": + version: 0.82.0 + resolution: "@react-native/normalize-colors@npm:0.82.0" + checksum: 850d79cc62b2230d374aa764e7d550dbeb30f32de1e7c5153a06c9b9231fa87c6331c627831a98469c3c3a3dbbec3a48096c9c78d91da6f12c36fc7acbd62f40 + languageName: node + linkType: hard + "@react-native/normalize-colors@npm:^0.74.1": version: 0.74.89 resolution: "@react-native/normalize-colors@npm:0.74.89" @@ -4367,10 +4635,10 @@ __metadata: languageName: node linkType: hard -"@react-native/typescript-config@npm:^0.81.1": - version: 0.81.4 - resolution: "@react-native/typescript-config@npm:0.81.4" - checksum: 21e517036fe5e423d4bb67739168743374c40641dfb2dde080b13bdd68126f280707ebf7d2780df23f5cf7805c759f1db2705473de35f1d3b7761256d2694c7e +"@react-native/typescript-config@npm:^0.82.0": + version: 0.82.0 + resolution: "@react-native/typescript-config@npm:0.82.0" + checksum: 85ab797177854e01f7599c6deca933591b83232a818bce0f2e48eec79ca90a43e29be68ed704f09e345664c003723051f8aa95e2312f8506a055a40297163ba3 languageName: node linkType: hard @@ -4391,6 +4659,23 @@ __metadata: languageName: node linkType: hard +"@react-native/virtualized-lists@npm:0.82.0": + version: 0.82.0 + resolution: "@react-native/virtualized-lists@npm:0.82.0" + dependencies: + invariant: ^2.2.4 + nullthrows: ^1.1.1 + peerDependencies: + "@types/react": ^19.1.1 + react: "*" + react-native: "*" + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 5188b5d6163aad7dd5f635df940c06702035978b41e69fcb5341e8c8c73f4d8805ff927897512a237416ab71295bac93defd15bed4b0864339a2a32506c9e6a2 + languageName: node + linkType: hard + "@react-navigation/core@npm:^7.12.4": version: 7.12.4 resolution: "@react-navigation/core@npm:7.12.4" @@ -4500,10 +4785,10 @@ __metadata: "@react-native-community/cli": ^20.0.1 "@react-native-community/cli-platform-android": ^20.0.1 "@react-native-community/cli-platform-ios": ^20.0.1 - "@react-native/babel-preset": ^0.81.1 - "@react-native/eslint-config": ^0.81.1 - "@react-native/metro-config": ^0.81.1 - "@react-native/typescript-config": ^0.81.1 + "@react-native/babel-preset": ^0.82.0 + "@react-native/eslint-config": ^0.82.0 + "@react-native/metro-config": ^0.82.0 + "@react-native/typescript-config": ^0.82.0 "@react-navigation/native": ^7.1.17 "@react-navigation/native-stack": ^7.3.25 "@rneui/base": 4.0.0-rc.8 @@ -4517,7 +4802,7 @@ __metadata: "@types/lodash.isequal": ^4.5.8 "@types/mapbox__geo-viewport": ^0.5.3 "@types/prop-types": ^15.7.15 - "@types/react": ^19.1.10 + "@types/react": ^19.1.1 "@types/react-test-renderer": ^19.1.0 "@types/responselike": 1.0.3 babel-jest: ^30.1.2 @@ -4538,16 +4823,18 @@ __metadata: pod-install: ^1.0.1 prettier: ^2.8.8 prop-types: ^15.8.1 - react: 19.1.0 + react: 19.1.1 react-dom: 19.1.0 - react-native: 0.81.1 + react-native: 0.82.0 react-native-builder-bob: ^0.40.13 react-native-monorepo-config: ^0.1.9 + react-native-reanimated: ^4.1.3 react-native-safe-area-context: ^5.6.1 react-native-screens: ^4.15.2 react-native-vector-icons: ^10.3.0 react-native-web: ~0.21.0 - react-test-renderer: 19.1.0 + react-native-worklets: ^0.6.1 + react-test-renderer: 19.1.1 typescript: ^5.8.3 dependenciesMeta: "@expo/metro-runtime": @@ -5379,7 +5666,7 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:^19.1.0, @types/react@npm:^19.1.10": +"@types/react@npm:*, @types/react@npm:^19.1.0": version: 19.1.16 resolution: "@types/react@npm:19.1.16" dependencies: @@ -5388,6 +5675,15 @@ __metadata: languageName: node linkType: hard +"@types/react@npm:^19.1.1": + version: 19.2.2 + resolution: "@types/react@npm:19.2.2" + dependencies: + csstype: ^3.0.2 + checksum: 7eb2d316dd5a6c02acb416524b50bae932c38d055d26e0f561ca23c009c686d16a2b22fcbb941eecbe2ecb167f119e29b9d0142d9d056dd381352c43413b60da + languageName: node + linkType: hard + "@types/resolve@npm:^1.20.2": version: 1.20.6 resolution: "@types/resolve@npm:1.20.6" @@ -5519,6 +5815,19 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/project-service@npm:8.46.0": + version: 8.46.0 + resolution: "@typescript-eslint/project-service@npm:8.46.0" + dependencies: + "@typescript-eslint/tsconfig-utils": ^8.46.0 + "@typescript-eslint/types": ^8.46.0 + debug: ^4.3.4 + peerDependencies: + typescript: ">=4.8.4 <6.0.0" + checksum: ae8365cdbae5c8ee622727295f7cb59c42ccb0a4672d72692f2f31b26a052b7a9e46f58326740ca8d471a7e85998b885858be6c21921d465ce57de1d3ea7355f + languageName: node + linkType: hard + "@typescript-eslint/scope-manager@npm:5.62.0": version: 5.62.0 resolution: "@typescript-eslint/scope-manager@npm:5.62.0" @@ -5539,6 +5848,25 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/scope-manager@npm:8.46.0": + version: 8.46.0 + resolution: "@typescript-eslint/scope-manager@npm:8.46.0" + dependencies: + "@typescript-eslint/types": 8.46.0 + "@typescript-eslint/visitor-keys": 8.46.0 + checksum: 0995be736f153314b7744594b7b5e27e63cf7b00b64b3a8cf23b4f01fc9cc01b9e652e433da438fe93efe63e505d61adb5c25319fe25e9f0ccdfea1ad7848fba + languageName: node + linkType: hard + +"@typescript-eslint/tsconfig-utils@npm:8.46.0, @typescript-eslint/tsconfig-utils@npm:^8.46.0": + version: 8.46.0 + resolution: "@typescript-eslint/tsconfig-utils@npm:8.46.0" + peerDependencies: + typescript: ">=4.8.4 <6.0.0" + checksum: d4516fb18c577a47f614efe6233354efefc582eaa4e915ae3d20c23f3b17e098b254594aa26d9c51eec1116d18665f06d9ed51229600df3ce3daecae83c76865 + languageName: node + linkType: hard + "@typescript-eslint/type-utils@npm:7.18.0": version: 7.18.0 resolution: "@typescript-eslint/type-utils@npm:7.18.0" @@ -5570,6 +5898,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:8.46.0, @typescript-eslint/types@npm:^8.46.0": + version: 8.46.0 + resolution: "@typescript-eslint/types@npm:8.46.0" + checksum: 71b7e0845da160cbd8ef1a5f853a1b8626f5bd00a1db56b75218eb94d5f3433f7815635e70df52118657c57109458f2e0d2bec8dcca0c620af10c66205fe54cd + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:5.62.0": version: 5.62.0 resolution: "@typescript-eslint/typescript-estree@npm:5.62.0" @@ -5607,6 +5942,26 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:8.46.0": + version: 8.46.0 + resolution: "@typescript-eslint/typescript-estree@npm:8.46.0" + dependencies: + "@typescript-eslint/project-service": 8.46.0 + "@typescript-eslint/tsconfig-utils": 8.46.0 + "@typescript-eslint/types": 8.46.0 + "@typescript-eslint/visitor-keys": 8.46.0 + debug: ^4.3.4 + fast-glob: ^3.3.2 + is-glob: ^4.0.3 + minimatch: ^9.0.4 + semver: ^7.6.0 + ts-api-utils: ^2.1.0 + peerDependencies: + typescript: ">=4.8.4 <6.0.0" + checksum: 70f5523d266097c96e5de2cf28c86c5bb3c9d4f48ba129a9c13e620733d395008dc809c77f1af19fc4617133c0665bf65a6a688fbf40da29d5a6ebe137ea41ae + languageName: node + linkType: hard + "@typescript-eslint/utils@npm:7.18.0": version: 7.18.0 resolution: "@typescript-eslint/utils@npm:7.18.0" @@ -5639,6 +5994,21 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/utils@npm:^8.0.0": + version: 8.46.0 + resolution: "@typescript-eslint/utils@npm:8.46.0" + dependencies: + "@eslint-community/eslint-utils": ^4.7.0 + "@typescript-eslint/scope-manager": 8.46.0 + "@typescript-eslint/types": 8.46.0 + "@typescript-eslint/typescript-estree": 8.46.0 + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + typescript: ">=4.8.4 <6.0.0" + checksum: 63c9f4df8f823ef7f83fe2c53f85fd5e278d60240d41414f69c8ecb37061fec74ad34851faf28283042a1a0b983ddca57dbd97a7e653073068c7f22e919f84ea + languageName: node + linkType: hard + "@typescript-eslint/visitor-keys@npm:5.62.0": version: 5.62.0 resolution: "@typescript-eslint/visitor-keys@npm:5.62.0" @@ -5659,6 +6029,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:8.46.0": + version: 8.46.0 + resolution: "@typescript-eslint/visitor-keys@npm:8.46.0" + dependencies: + "@typescript-eslint/types": 8.46.0 + eslint-visitor-keys: ^4.2.1 + checksum: 888adc68bd8d80adb185520f2016b81a934f793db323cd62452027fad2e76a5ab64ed9500c4e5a2be2e5d2458e071776ea86a62e40e32faa4348ca4ab84dddda + languageName: node + linkType: hard + "@ungap/structured-clone@npm:^1.0.0, @ungap/structured-clone@npm:^1.2.0, @ungap/structured-clone@npm:^1.3.0": version: 1.3.0 resolution: "@ungap/structured-clone@npm:1.3.0" @@ -6607,6 +6987,15 @@ __metadata: languageName: node linkType: hard +"babel-plugin-syntax-hermes-parser@npm:0.32.0": + version: 0.32.0 + resolution: "babel-plugin-syntax-hermes-parser@npm:0.32.0" + dependencies: + hermes-parser: 0.32.0 + checksum: ec76abeefabf940e2d571db3b47d022a9be7602286133291e8e047d4855af6a8afc079e4631bc9a56209d751fad54b5199932a55753b1e2b56a719d20e2d5065 + languageName: node + linkType: hard + "babel-plugin-syntax-hermes-parser@npm:^0.28.0": version: 0.28.1 resolution: "babel-plugin-syntax-hermes-parser@npm:0.28.1" @@ -9136,6 +9525,24 @@ __metadata: languageName: node linkType: hard +"eslint-plugin-jest@npm:^29.0.1": + version: 29.0.1 + resolution: "eslint-plugin-jest@npm:29.0.1" + dependencies: + "@typescript-eslint/utils": ^8.0.0 + peerDependencies: + "@typescript-eslint/eslint-plugin": ^8.0.0 + eslint: ^8.57.0 || ^9.0.0 + jest: "*" + peerDependenciesMeta: + "@typescript-eslint/eslint-plugin": + optional: true + jest: + optional: true + checksum: 329604c479280ed6345cd9f18c971a885ae74d4bd06edb4ae11bd60603f1897070dda8625444012c84d8c1fb8cee4d5d6817ed8beefd3106e917756518ed69ef + languageName: node + linkType: hard + "eslint-plugin-n@npm:^17.17.0": version: 17.23.1 resolution: "eslint-plugin-n@npm:17.23.1" @@ -9972,6 +10379,15 @@ __metadata: languageName: node linkType: hard +"fb-dotslash@npm:0.5.8": + version: 0.5.8 + resolution: "fb-dotslash@npm:0.5.8" + bin: + dotslash: bin/dotslash + checksum: 5678efe96898294e41c983cb8ea28952539566df5f8bfd2913e8e146425d7d9999d2c458bb4f3e0b07b36b5bcd23cada0868d94509c8b2d4b17de8bf0641775a + languageName: node + linkType: hard + "fb-watchman@npm:^2.0.0, fb-watchman@npm:^2.0.2": version: 2.0.2 resolution: "fb-watchman@npm:2.0.2" @@ -11048,6 +11464,13 @@ __metadata: languageName: node linkType: hard +"hermes-compiler@npm:0.0.0": + version: 0.0.0 + resolution: "hermes-compiler@npm:0.0.0" + checksum: 8b6fc8a64c2fa18c9aa6ddb8831c92253b6a2f10adf7d5d8f361b574f07e91b64f0c44b1370665075c33c17dd71c02fd19422124a3d2aa1717c37006ab12a1f0 + languageName: node + linkType: hard + "hermes-estree@npm:0.25.1": version: 0.25.1 resolution: "hermes-estree@npm:0.25.1" @@ -17406,6 +17829,13 @@ __metadata: languageName: node linkType: hard +"react-is@npm:^19.1.1": + version: 19.2.0 + resolution: "react-is@npm:19.2.0" + checksum: 9a23e1c2d0bbc13b383bc59a05f54e6eb95dd87e01aec8aa92a88618364b7b0ee8a5b057ad813cf61e2f7ae7d24503b624706acb609d07c54754e5ad2c522568 + languageName: node + linkType: hard + "react-native-builder-bob@npm:^0.40.13": version: 0.40.13 resolution: "react-native-builder-bob@npm:0.40.13" @@ -17470,6 +17900,21 @@ __metadata: languageName: node linkType: hard +"react-native-reanimated@npm:^4.1.3": + version: 4.1.3 + resolution: "react-native-reanimated@npm:4.1.3" + dependencies: + react-native-is-edge-to-edge: ^1.2.1 + semver: 7.7.2 + peerDependencies: + "@babel/core": ^7.0.0-0 + react: "*" + react-native: "*" + react-native-worklets: ">=0.5.0" + checksum: 5f3b7298dd721b5da7f8bab64c557624d08b8715502f4ba2ff9118f31d852e3d9734ffbfaacd1302468ba68d4790689eead39605645a80f737802c8de0008064 + languageName: node + linkType: hard + "react-native-safe-area-context@npm:^5.6.1": version: 5.6.1 resolution: "react-native-safe-area-context@npm:5.6.1" @@ -17537,6 +17982,29 @@ __metadata: languageName: node linkType: hard +"react-native-worklets@npm:^0.6.1": + version: 0.6.1 + resolution: "react-native-worklets@npm:0.6.1" + dependencies: + "@babel/plugin-transform-arrow-functions": ^7.0.0-0 + "@babel/plugin-transform-class-properties": ^7.0.0-0 + "@babel/plugin-transform-classes": ^7.0.0-0 + "@babel/plugin-transform-nullish-coalescing-operator": ^7.0.0-0 + "@babel/plugin-transform-optional-chaining": ^7.0.0-0 + "@babel/plugin-transform-shorthand-properties": ^7.0.0-0 + "@babel/plugin-transform-template-literals": ^7.0.0-0 + "@babel/plugin-transform-unicode-regex": ^7.0.0-0 + "@babel/preset-typescript": ^7.16.7 + convert-source-map: ^2.0.0 + semver: 7.7.2 + peerDependencies: + "@babel/core": ^7.0.0-0 + react: "*" + react-native: "*" + checksum: fee8de844ef2286dee9f81a53f9cf309424d26251953c8524204342c8531fef403c625a23632a6bb65ea57409d6f8522a60e02de772322bebb5ff4aa4cccf569 + languageName: node + linkType: hard + "react-native@npm:0.81.1": version: 0.81.1 resolution: "react-native@npm:0.81.1" @@ -17587,6 +18055,57 @@ __metadata: languageName: node linkType: hard +"react-native@npm:0.82.0": + version: 0.82.0 + resolution: "react-native@npm:0.82.0" + dependencies: + "@jest/create-cache-key-function": ^29.7.0 + "@react-native/assets-registry": 0.82.0 + "@react-native/codegen": 0.82.0 + "@react-native/community-cli-plugin": 0.82.0 + "@react-native/gradle-plugin": 0.82.0 + "@react-native/js-polyfills": 0.82.0 + "@react-native/normalize-colors": 0.82.0 + "@react-native/virtualized-lists": 0.82.0 + abort-controller: ^3.0.0 + anser: ^1.4.9 + ansi-regex: ^5.0.0 + babel-jest: ^29.7.0 + babel-plugin-syntax-hermes-parser: 0.32.0 + base64-js: ^1.5.1 + commander: ^12.0.0 + flow-enums-runtime: ^0.0.6 + glob: ^7.1.1 + hermes-compiler: 0.0.0 + invariant: ^2.2.4 + jest-environment-node: ^29.7.0 + memoize-one: ^5.0.0 + metro-runtime: ^0.83.1 + metro-source-map: ^0.83.1 + nullthrows: ^1.1.1 + pretty-format: ^29.7.0 + promise: ^8.3.0 + react-devtools-core: ^6.1.5 + react-refresh: ^0.14.0 + regenerator-runtime: ^0.13.2 + scheduler: 0.26.0 + semver: ^7.1.3 + stacktrace-parser: ^0.1.10 + whatwg-fetch: ^3.0.0 + ws: ^6.2.3 + yargs: ^17.6.2 + peerDependencies: + "@types/react": ^19.1.1 + react: ^19.1.1 + peerDependenciesMeta: + "@types/react": + optional: true + bin: + react-native: cli.js + checksum: 05a4c66a2f54e8ee9d2a8dd4e63b39298cc432672c9d975d1472398562bb8f26424027194e926ee854cf14b331a6c255bd206f00bd87bb2e119b2fc7ac3f8ea7 + languageName: node + linkType: hard + "react-refresh@npm:^0.14.0, react-refresh@npm:^0.14.2": version: 0.14.2 resolution: "react-refresh@npm:0.14.2" @@ -17621,6 +18140,18 @@ __metadata: languageName: node linkType: hard +"react-test-renderer@npm:19.1.1": + version: 19.1.1 + resolution: "react-test-renderer@npm:19.1.1" + dependencies: + react-is: ^19.1.1 + scheduler: ^0.26.0 + peerDependencies: + react: ^19.1.1 + checksum: 0587d123e3b5299c7f8fabd195549ea45ac4b66a1a446ade6411db1cc077f4b74591ce843d6698100f1602b32dd077c03b4001ba6f22c3c73f583d2bd7def7ee + languageName: node + linkType: hard + "react@npm:19.1.0": version: 19.1.0 resolution: "react@npm:19.1.0" @@ -17628,6 +18159,13 @@ __metadata: languageName: node linkType: hard +"react@npm:19.1.1": + version: 19.1.1 + resolution: "react@npm:19.1.1" + checksum: f2f18fea5deac87b1167365bd5160bcba64d383c26a37afa905b714ca424f423ef97d8daf53f041ab9ac25a06357fafcf0b5d3b6b84c9d1eace0e621bfeae629 + languageName: node + linkType: hard + "read-input@npm:^0.3.1": version: 0.3.1 resolution: "read-input@npm:0.3.1" @@ -19706,6 +20244,15 @@ __metadata: languageName: node linkType: hard +"ts-api-utils@npm:^2.1.0": + version: 2.1.0 + resolution: "ts-api-utils@npm:2.1.0" + peerDependencies: + typescript: ">=4.8.4" + checksum: 5b1ef89105654d93d67582308bd8dfe4bbf6874fccbcaa729b08fbb00a940fd4c691ca6d0d2b18c3c70878d9a7e503421b7cc473dbc3d0d54258b86401d4b15d + languageName: node + linkType: hard + "ts-declaration-location@npm:^1.0.6": version: 1.0.7 resolution: "ts-declaration-location@npm:1.0.7" @@ -21303,9 +21850,9 @@ __metadata: linkType: hard "zod@npm:^3.25.0 || ^4.0.0": - version: 4.1.12 - resolution: "zod@npm:4.1.12" - checksum: 91174acc7d2ca5572ad522643474ddd60640cf6877b5d76e5d583eb25e3c4072c6f5eb92ab94f231ec5ce61c6acdfc3e0166de45fb1005b1ea54986b026b765f + version: 4.3.6 + resolution: "zod@npm:4.3.6" + checksum: 19cec761b46bae4b6e7e861ea740f3f248e50a6671825afc8a5758e27b35d6f20ccde9942422fd5cf6f8b697f18bd05ef8bb33f5f2db112ab25cc628de2fae47 languageName: node linkType: hard From 52a88fa6bf5804c70dd1a8fa36e572824fe0d9ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikl=C3=B3s=20Fazekas?= Date: Mon, 16 Feb 2026 08:22:51 +0100 Subject: [PATCH 05/32] fix(ci): use generic iOS Simulator destination for CI build (#4152) The CI build was failing because the xcodebuild destination specified OS=18.6 which may not have simulators pre-created on all macos-15 runner instances. Use generic/platform=iOS Simulator for the build step, and drop the pinned os version from the detox device config so it picks whatever is available. --- example/.detoxrc.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/example/.detoxrc.js b/example/.detoxrc.js index 195e5d232c..e239b5c7ad 100644 --- a/example/.detoxrc.js +++ b/example/.detoxrc.js @@ -23,7 +23,7 @@ module.exports = { 'ios.debug.ci': { type: 'ios.app', build: - "FORCE_BUNDLING=1 xcodebuild -quiet -workspace ios/RNMapboxExample.xcworkspace -configuration Debug -scheme RNMapboxExample DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING=1 GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS DEBUG_RCT_BUNDLE=1' -sdk iphonesimulator -derivedDataPath ios/build -destination 'platform=iOS Simulator,OS=18.6,arch=arm64,name=iPhone SE (3rd generation)'", + "FORCE_BUNDLING=1 xcodebuild -quiet -workspace ios/RNMapboxExample.xcworkspace -configuration Debug -scheme RNMapboxExample DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING=1 GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS DEBUG_RCT_BUNDLE=1' -sdk iphonesimulator -derivedDataPath ios/build -destination 'generic/platform=iOS Simulator'", binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/RNMapboxExample.app', }, @@ -40,7 +40,6 @@ module.exports = { type: 'ios.simulator', device: { type: 'iPhone SE (3rd generation)', - os: '18.2', }, }, }, From f7c998bcf7c37c01775f3ad63429ce9c1259df0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikl=C3=B3s=20Fazekas?= Date: Mon, 16 Feb 2026 15:21:47 +0100 Subject: [PATCH 06/32] chore: upgrade detox to 20.47.0 (#4153) Update simulator device to iPhone 16 and use generic iOS Simulator build destination for local builds (consistent with CI). --- example/.detoxrc.js | 7 +- example/ios/Podfile.lock | 154 +++++++++++++++++++-------------------- example/package.json | 2 +- yarn.lock | 10 +-- 4 files changed, 86 insertions(+), 87 deletions(-) diff --git a/example/.detoxrc.js b/example/.detoxrc.js index e239b5c7ad..5b841feee6 100644 --- a/example/.detoxrc.js +++ b/example/.detoxrc.js @@ -9,14 +9,14 @@ module.exports = { ios: { type: 'ios.app', build: - "xcodebuild -quiet -workspace ios/RNMapboxExample.xcworkspace -configuration Release -scheme RNMapboxExample -sdk iphonesimulator -derivedDataPath ios/build -destination 'platform=iOS Simulator,OS=16.4,name=iPhone SE (3rd generation)'", + "xcodebuild -quiet -workspace ios/RNMapboxExample.xcworkspace -configuration Release -scheme RNMapboxExample -sdk iphonesimulator -derivedDataPath ios/build -destination 'generic/platform=iOS Simulator'", binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/RNMapboxExample.app', }, 'ios.debug': { type: 'ios.app', build: - "FORCE_BUNDLING=1 xcodebuild -quiet -workspace ios/RNMapboxExample.xcworkspace -configuration Debug -scheme RNMapboxExample DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING=1 GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS DEBUG_RCT_BUNDLE=1' -sdk iphonesimulator -derivedDataPath ios/build -destination 'platform=iOS Simulator,OS=16.4,name=iPhone SE (3rd generation)'", + "FORCE_BUNDLING=1 xcodebuild -quiet -workspace ios/RNMapboxExample.xcworkspace -configuration Debug -scheme RNMapboxExample DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING=1 GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS DEBUG_RCT_BUNDLE=1' -sdk iphonesimulator -derivedDataPath ios/build -destination 'generic/platform=iOS Simulator'", binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/RNMapboxExample.app', }, @@ -32,8 +32,7 @@ module.exports = { simulator: { type: 'ios.simulator', device: { - type: 'iPhone 14 Pro', - os: '16.4', + type: 'iPhone 16', }, }, 'simulator.ci': { diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 74f9eb4d09..af881ad44d 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -8,13 +8,13 @@ PODS: - hermes-engine (0.82.0): - hermes-engine/Pre-built (= 0.82.0) - hermes-engine/Pre-built (0.82.0) - - MapboxCommon (24.15.2): + - MapboxCommon (24.16.6): - Turf (= 4.0.0) - - MapboxCoreMaps (11.15.2): - - MapboxCommon (= 24.15.2) - - MapboxMaps (11.15.2): - - MapboxCommon (= 24.15.2) - - MapboxCoreMaps (= 11.15.2) + - MapboxCoreMaps (11.16.6): + - MapboxCommon (= 24.16.6) + - MapboxMaps (11.16.6): + - MapboxCommon (= 24.16.6) + - MapboxCoreMaps (= 11.16.6) - Turf (= 4.0.0) - RCT-Folly (2024.11.18.00): - boost @@ -2444,19 +2444,19 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - rnmapbox-maps (10.2.0): - - MapboxMaps (~> 11.15.2) + - rnmapbox-maps (10.3.0): + - MapboxMaps (~> 11.16.2) - React - React-Core - - rnmapbox-maps/DynamicLibrary (= 10.2.0) + - rnmapbox-maps/DynamicLibrary (= 10.3.0) - Turf - - rnmapbox-maps/DynamicLibrary (10.2.0): + - rnmapbox-maps/DynamicLibrary (10.3.0): - boost - DoubleConversion - fast_float - fmt - hermes-engine - - MapboxMaps (~> 11.15.2) + - MapboxMaps (~> 11.16.2) - RCT-Folly - RCT-Folly/Fabric - RCTRequired @@ -3011,81 +3011,81 @@ SPEC CHECKSUMS: fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd glog: 5683914934d5b6e4240e497e0f4a3b42d1854183 hermes-engine: 8642d8f14a548ab718ec112e9bebdfdd154138b5 - MapboxCommon: 5b702d1562a1bc56a8a9d141ebbbaa72390536c9 - MapboxCoreMaps: ae6fcbe255e3fa9f290ee9cd72d125d1a2ecabfa - MapboxMaps: 7627bc07bcad10259668d83a3f0ed3920ee0eaf7 - RCT-Folly: 59ec0ac1f2f39672a0c6e6cecdd39383b764646f + MapboxCommon: 10cbf74edb23c9abcfe2424899d804f288a47334 + MapboxCoreMaps: f19680d20681797067268284b2292349de861730 + MapboxMaps: 04c7bf46d66265ad0f4b98484a251777a926c423 + RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669 RCTDeprecation: 22bf66112da540a7d40e536366ddd8557934fca1 RCTRequired: a0ed4dc41b35f79fbb6d8ba320e06882a8c792cf RCTTypeSafety: 59a046ff1e602409a86b89fcd6edff367a5b14af React: ade831e2e38887292c2c7d40f2f4098826a9dda4 React-callinvoker: fb097304922c5da47152147a5fb0712713438575 - React-Core: 2f7181fccf31a895720bb0668ac9f67985d6a4a1 - React-CoreModules: 3f7a8f9d28ba287fc07240c5bc53aa4d5e23450a - React-cxxreact: dca5689d4332bbf71495302103bb24f73fa1de00 + React-Core: 60e3adb5af2863587d4a0650a0bbf8d5b1327502 + React-CoreModules: 8647d480cf788eb0e0ae353db836dbb5edb98eb0 + React-cxxreact: 2be8c8494b345bd1896f542bafc18dff72335c55 React-debug: c855f7565d8c4aeceb23219ca3baa0e1ebfb578a - React-defaultsnativemodule: e1770db1c0e635b2dd8545616dd22962c6315c24 - React-domnativemodule: a3a0a508c6f13565e1d042e1ee682ef5881325ef - React-Fabric: 4630570529e467827e40398626e95340734020cc - React-FabricComponents: 95b3ec1f3b9398ad75e78f69e612a6093a99d737 - React-FabricImage: 96ec67d419d4d036ecc987bc14378afcd34d0653 - React-featureflags: 8cbf892b2c12fc0e9cc08039287385dfcf2f3de6 - React-featureflagsnativemodule: 7428b30d83749445157a8c253a77852e17217347 - React-graphics: f1ad789bd076f99a76640d7f49a799ddf81b231d - React-hermes: b2c927f43e28ea4e8c915b7acdd907b24bfa9cdb - React-idlecallbacksnativemodule: 9392f0359575b41a42a71dcf5a2ada0c74dacb6f - React-ImageManager: 1736dbd4b93d78ae34cda2837c2da521a9feccb7 - React-jserrorhandler: aad40898954bbc65c21a2e4524709e492675a750 - React-jsi: 7d348c6ad689f8d044f5dbfea343d88e18cd6d57 - React-jsiexecutor: 41b2cfc540fbe0eaa0d205a85c4f665c1d8b8683 - React-jsinspector: 8559a86427c4b09546fb61cb96b4e60ab7490508 - React-jsinspectorcdp: 0d3e1839d4cb22013e77f62834fff071b154d290 - React-jsinspectornetwork: 5e2919805485b0b1f8acf16a6e508a5807eca7e5 - React-jsinspectortracing: 123a7cf440721def804b188fb86b2f47366448d6 - React-jsitooling: 9d0d29865180ecd51002986a60f89ca6897a10b7 - React-jsitracing: fe4c3ca546e438a923add79d37a864546caba75f - React-logger: 2021eb67660b673cc654635832136fbbf2c79103 - React-Mapbuffer: 9bda44c983f9c683047546a338ebe9a21020babd - React-microtasksnativemodule: 9b52faf56750d7e3c67d9cf96b650f14c31524c2 - react-native-safe-area-context: 6d8a7b750e496e37bda47c938320bf2c734d441f - React-NativeModulesApple: 1b4d9722d8df62e881684abadf320e7a8fa1b7f6 + React-defaultsnativemodule: 88870580c41100965ead4ae46b7e6b47825e1c9a + React-domnativemodule: 5624a09547dbf9e01bd4274a4ec5666209bb96bf + React-Fabric: 95df97f2ee3469efa70f37d7e23109b43405c683 + React-FabricComponents: c2718daaee02101a4e4958e35abcf038c5f8525e + React-FabricImage: 46deb618808c5f211ac91ad8a417a955c96d3b93 + React-featureflags: 37120df645adeaa3d634f15bfb3f47bf3701147f + React-featureflagsnativemodule: 8afcb75324b1ba0d2174b88d4c413b0512345014 + React-graphics: 43dbe83e403ec3dec26b41f7c484c4d8a5fee656 + React-hermes: 5061dfbb68b7cc4a015302b4c9125c5d7426f9f9 + React-idlecallbacksnativemodule: 9e1782dce65fed2fb2f7b1049274dad9cbb76f9a + React-ImageManager: 119a820c7c207d7fcbdd3386f74856dc071d3040 + React-jserrorhandler: 2d2c2c3ac205ce415fc36d51c300bec6f74449d0 + React-jsi: a884efb76496c1492c8063918d5588f3e2ab8b42 + React-jsiexecutor: 47e858b79890e212469a76d61edd871b1444e869 + React-jsinspector: 80d4292bdf4163de86564ee7b8384f7d4e40df8c + React-jsinspectorcdp: 26ddf22f569bc8bf1ebd4d644de53614d68eba92 + React-jsinspectornetwork: c8a66abfc5928b00a1729a97314207e4c8a1790c + React-jsinspectortracing: bf319882c2ef5ec76bb2ba1632fbd388cfeea569 + React-jsitooling: fa5a0040eeb62e2340c2fad1732735ae449bcd38 + React-jsitracing: 2c6bf5ef2527c6fe1ee55faa950c70f1a5e7cd8e + React-logger: 30adf849117e87cf86e88dca1824bb0f18f87e10 + React-Mapbuffer: 499069c3dcd4b438a70fcc2a65e8a4185ea9170b + React-microtasksnativemodule: f0238469cb9894fd18c419137d312665b8fc05b3 + react-native-safe-area-context: c6e2edd1c1da07bdce287fa9d9e60c5f7b514616 + React-NativeModulesApple: 628df250681ccb569bd203494ed5187269580d6f React-oscompat: 80ca388c4831481cd03a6b45ecfc82739ca9a95e - React-perflogger: 2e155343fa744b02ec2eab0f134639beb8fff659 - React-performancecdpmetrics: b626b58b66880204b88428cd0f07f185910731ef - React-performancetimeline: 544c6abb44a10c47f10874aec41ae80693109875 + React-perflogger: 9725c8b401ca406f52e4bb59bf0b22ef9354f96a + React-performancecdpmetrics: b8bfac3d66e8ba7aede1e3629f786e6450838e99 + React-performancetimeline: 848b4852baa600174446670f9fab860da2bd1d88 React-RCTActionSheet: 2f0a844b3f4b749ce54bee10e5006aacbcb754e0 - React-RCTAnimation: 3cda5b35147099142a3f4850da4b28e9cd6992a8 - React-RCTAppDelegate: 7d0daf291219f3fca0d4e8a46f8042e977d94fcb - React-RCTBlob: 4e9cf72bbe40c2da7d358197c2f8d104d4aeba7a - React-RCTFabric: aa6982c39f6133fb280a5e401ea2e8438c3ba4c8 - React-RCTFBReactNativeSpec: f388594e3dd33e67652c5e2339d299de06fcceba - React-RCTImage: d0dca6c29f03b5dc913be8a92f486d242997741f - React-RCTLinking: e3deaaa812a549c8410a413b44b6a2eb6027ddf9 - React-RCTNetwork: 820ba7697a8c90ea66e339e9bd63a879010bdecf - React-RCTRuntime: 9bf02501880b487e921675db600bd4797dfd9743 - React-RCTSettings: d887be78c915d0a51c91bffe1a39120a65a0e564 - React-RCTText: 857ec084500001382d6bfe981e68373ca8178af6 - React-RCTVibration: 02b4437b8b05ad7219c5e129a85e121d0b97635d + React-RCTAnimation: 680cd054a53b6525b587e6e1f1aeb885135e28cd + React-RCTAppDelegate: 5f8969018d773b22ca0b4c9679c3bad73767c5c7 + React-RCTBlob: 9bcdb5549e877fc08684f129047fbf029e37eabe + React-RCTFabric: 06c4c93dffb204c9a54f8ab41c0a0a24ec209cdd + React-RCTFBReactNativeSpec: afd34c1c42b0f1d306a57c9d1c63e9993c41f3cf + React-RCTImage: 937d9ebf5b92f688c2c501de731af47a4df2c208 + React-RCTLinking: b0fde8f005ffd6bdbb9e274a8f132f0e61cb0185 + React-RCTNetwork: 0c23d5f6a3544c98065fed622ef7ed2bce593cb5 + React-RCTRuntime: 158407a5a2edfc3ab01aa4c301c8d246e234a328 + React-RCTSettings: 093d5fba8bfb4c80a409b06f1e99156e4b7ffa8b + React-RCTText: 286dc4b5314a45b8beb8d06d7fd46b0f9da264ac + React-RCTVibration: 080c11b0ec39f1202bbd91e468dba50894fe4233 React-rendererconsistency: 74f53d2a1fa3bd87ed3fdbc83ad69cecf4bd0cb7 - React-renderercss: 9530312be5919a6100391d7d920fb80e9303aafd - React-rendererdebug: afd65121fd0cfa79c62620085718424d481ca739 - React-RuntimeApple: 702d4db49dc81193688132355709993009e73f86 - React-RuntimeCore: 021216f96d7ef9e8b9ba5d8ffc0631410967f9ac - React-runtimeexecutor: 1a27868c5ef637814a55e1e0b46df71f7d102ed3 - React-RuntimeHermes: 71b757553eb2f2c32ce796c88c0af8732fde9f58 - React-runtimescheduler: 8f1fb375b46f4e34faf0caa2893f6d7585bb4e89 - React-timing: 7a90be5e49292f093b8b1f5cbf87c0d0e8539699 - React-utils: f840cea5cd05fdc26711327b522fb8de1b65cbe4 - React-webperformancenativemodule: 365f718ced9c8b7042dea17f360a0a7ea49dfbb7 - ReactAppDependencyProvider: d5f21b5da644b33685d4f2685cba86e3c7ea64ff - ReactCodegen: 1efedd581339e9ff5365e66fcf6522ae9f1be6cb - ReactCommon: 17f21c8e189e290113e40fd8652758ec9694897b - RNCAsyncStorage: 302f2fac014fd450046c120567ca364632da682b - rnmapbox-maps: 973edbd156fff1485500f1281a0844715f9361dd - RNReanimated: c76d99de4022813a27dc3745d8d2de4230ac5fef - RNScreens: 74985ca8e102294a60cec7513fa84c936fa0b20b - RNVectorIcons: 6acc19c833be864e9c70894e101a587fe491150a - RNWorklets: daa0a3e7946a9c4042f3a962c87a12dc5bc0badd + React-renderercss: 564483d161020cec10e91a364c2d4fabad91c13e + React-rendererdebug: bdf0a36e11247b67c8c13095c7512f0ad3197d2f + React-RuntimeApple: 881afe60c37cf1ce5af6e84952cb1bb05237222c + React-RuntimeCore: e796152403fee6a4ad7263e767ce78a4dd15a8d5 + React-runtimeexecutor: 5cd2fbb140e093ead45632e7558bda5e816acebd + React-RuntimeHermes: 113d9aca75644e8bbcf976d4b53e58c3f2666591 + React-runtimescheduler: c0a466837f8ac8e6f009aff038d2cedc4b401650 + React-timing: 89ea436bb6d784f3ec4648e40ffd0492f7b1ea33 + React-utils: 96191b0f5e02b57c70a4bbf7b6f6721958e1d369 + React-webperformancenativemodule: 9c76ddf8d1a243e2eecd7ce1aeadb46ceccbdbd2 + ReactAppDependencyProvider: c5c4f5280e4ae0f9f4a739c64c4260fe0b3edaf1 + ReactCodegen: 374f1c9242fbdd673b460d358b33860c0cc9d926 + ReactCommon: 25c7f94aee74ddd93a8287756a8ac0830a309544 + RNCAsyncStorage: 29f0230e1a25f36c20b05f65e2eb8958d6526e82 + rnmapbox-maps: bf6182eaabb29ac87350635ece7f38fe85dc7364 + RNReanimated: 732e7d1662f8cc0e533fa32791800de5b5934726 + RNScreens: 0bbf16c074ae6bb1058a7bf2d1ae017f4306797c + RNVectorIcons: 791f13226ec4a3fd13062eda9e892159f0981fae + RNWorklets: ab618bf7d1c7fd2cb793b9f0f39c3e29274b3ebf SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 Turf: c9eb11a65d96af58cac523460fd40fec5061b081 Yoga: 93bc00d78638987f9ffd928f4a9f895d3e601bc3 diff --git a/example/package.json b/example/package.json index 3e75cc821b..a670e798ca 100644 --- a/example/package.json +++ b/example/package.json @@ -71,7 +71,7 @@ "babel-jest": "^30.1.2", "babel-plugin-module-resolver": "^5.0.2", "babel-plugin-react-compiler": "^1.0.0", - "detox": "^20.40.2", + "detox": "^20.47.0", "eslint": "^8.19.0", "eslint-plugin-react-hooks": "latest", "glob-to-regexp": "^0.4.1", diff --git a/yarn.lock b/yarn.lock index 71dd3e2cf8..8824af48a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4809,7 +4809,7 @@ __metadata: babel-plugin-module-resolver: ^5.0.2 babel-plugin-react-compiler: ^1.0.0 debounce: ^2.2.0 - detox: ^20.40.2 + detox: ^20.47.0 eslint: ^8.19.0 eslint-plugin-react-hooks: latest expo: ~54.0.10 @@ -8658,9 +8658,9 @@ __metadata: languageName: node linkType: hard -"detox@npm:^20.40.2": - version: 20.42.0 - resolution: "detox@npm:20.42.0" +"detox@npm:^20.47.0": + version: 20.47.0 + resolution: "detox@npm:20.47.0" dependencies: "@wix-pilot/core": ^3.4.2 "@wix-pilot/detox": ^1.0.13 @@ -8706,7 +8706,7 @@ __metadata: optional: true bin: detox: local-cli/cli.js - checksum: 9f76a028610b04a62f7f212579494294a1a5bafe5a17014a275e1c8f4eaa172b66f9877d3888546a4c73a02692327cf4c27e3742cdb7806ba0201eacb29f3863 + checksum: 2063a66b7fcf915859a554395a5d6ad92d479a62f749b9fe4ba8daba8ccab6ea0a5a4ba6902a2b64704360535545b07e2d671e000653cb03b26636532d59e9d8 languageName: node linkType: hard From 059901b5ba57bca19dbec36d8a0287b5332f8316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikl=C3=B3s=20Fazekas?= Date: Mon, 16 Feb 2026 22:46:06 +0100 Subject: [PATCH 07/32] feat: add HillshadeLayer component (#4151) * feat: add HillshadeLayer component Add full HillshadeLayer support with iOS (Swift + Fabric) and Android native implementations. Uses raster-dem source for terrain visualization. * add HillshadeLayer example (Grand Canyon) --- __tests__/interface.test.js | 1 + .../java/com/rnmapbox/rnmbx/RNMBXPackage.kt | 2 + .../styles/layers/RNMBXHillshadeLayer.kt | 27 ++ .../layers/RNMBXHillshadeLayerManager.kt | 84 ++++ docs/HillshadeLayer.md | 383 ++++++++++++++++++ docs/docs.json | 273 +++++++++++++ docs/examples.json | 13 + .../FillRasterLayer/HillshadeSource.tsx | 60 +++ example/src/examples/FillRasterLayer/index.js | 1 + ios/RNMBX/RNMBXHillshadeLayer.swift | 96 +++++ ios/RNMBX/RNMBXHillshadeLayerComponentView.h | 14 + ios/RNMBX/RNMBXHillshadeLayerComponentView.mm | 73 ++++ package.json | 4 + src/Mapbox.native.ts | 1 + src/components/HillshadeLayer.tsx | 108 +++++ .../RNMBXHillshadeLayerNativeComponent.ts | 39 ++ 16 files changed, 1179 insertions(+) create mode 100644 android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHillshadeLayer.kt create mode 100644 android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHillshadeLayerManager.kt create mode 100644 docs/HillshadeLayer.md create mode 100644 example/src/examples/FillRasterLayer/HillshadeSource.tsx create mode 100644 ios/RNMBX/RNMBXHillshadeLayer.swift create mode 100644 ios/RNMBX/RNMBXHillshadeLayerComponentView.h create mode 100644 ios/RNMBX/RNMBXHillshadeLayerComponentView.mm create mode 100644 src/components/HillshadeLayer.tsx create mode 100644 src/specs/RNMBXHillshadeLayerNativeComponent.ts diff --git a/__tests__/interface.test.js b/__tests__/interface.test.js index 693f5d9eea..458d4ed914 100644 --- a/__tests__/interface.test.js +++ b/__tests__/interface.test.js @@ -40,6 +40,7 @@ describe('Public Interface', () => { 'BackgroundLayer', 'RasterLayer', 'RasterParticleLayer', + 'HillshadeLayer', 'SkyLayer', 'Terrain', 'Atmosphere', diff --git a/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt b/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt index 57c8cc6cff..b86218ce88 100644 --- a/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt +++ b/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt @@ -31,6 +31,7 @@ import com.rnmapbox.rnmbx.components.styles.layers.RNMBXCircleLayerManager import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillExtrusionLayerManager import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillLayerManager import com.rnmapbox.rnmbx.components.styles.layers.RNMBXHeatmapLayerManager +import com.rnmapbox.rnmbx.components.styles.layers.RNMBXHillshadeLayerManager import com.rnmapbox.rnmbx.components.styles.layers.RNMBXLineLayerManager import com.rnmapbox.rnmbx.components.styles.layers.RNMBXModelLayerManager import com.rnmapbox.rnmbx.components.styles.layers.RNMBXRasterLayerManager @@ -161,6 +162,7 @@ class RNMBXPackage : TurboReactPackage() { managers.add(RNMBXCircleLayerManager()) managers.add(RNMBXSymbolLayerManager()) managers.add(RNMBXRasterLayerManager()) + managers.add(RNMBXHillshadeLayerManager()) if (RNMBXRasterParticleLayerManager.isImplemented) { managers.add(RNMBXRasterParticleLayerManager()) } diff --git a/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHillshadeLayer.kt b/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHillshadeLayer.kt new file mode 100644 index 0000000000..7771e7993d --- /dev/null +++ b/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHillshadeLayer.kt @@ -0,0 +1,27 @@ +package com.rnmapbox.rnmbx.components.styles.layers + +import android.content.Context +import com.mapbox.maps.extension.style.layers.generated.HillshadeLayer +import com.rnmapbox.rnmbx.components.styles.RNMBXStyle +import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory +import com.rnmapbox.rnmbx.utils.Logger + +class RNMBXHillshadeLayer(context: Context?) : RNMBXLayer( + context!! +) { + override fun makeLayer(): HillshadeLayer { + return HillshadeLayer(iD!!, mSourceID!!) + } + + override fun addStyles() { + mLayer?.also { + RNMBXStyleFactory.setHillshadeLayerStyle(it, RNMBXStyle(context, mReactStyle, mMap!!)) + } ?: run { + Logger.e("RNMBXHillshadeLayer", "mLayer is null") + } + } + + fun setSourceLayerID(asString: String?) { + // no-op + } +} diff --git a/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHillshadeLayerManager.kt b/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHillshadeLayerManager.kt new file mode 100644 index 0000000000..fe6fcd1c2d --- /dev/null +++ b/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHillshadeLayerManager.kt @@ -0,0 +1,84 @@ +package com.rnmapbox.rnmbx.components.styles.layers + +import com.facebook.react.bridge.Dynamic +import com.facebook.react.uimanager.ThemedReactContext +import com.facebook.react.uimanager.ViewGroupManager +import com.facebook.react.uimanager.annotations.ReactProp +import com.facebook.react.viewmanagers.RNMBXHillshadeLayerManagerInterface + +class RNMBXHillshadeLayerManager : ViewGroupManager(), + RNMBXHillshadeLayerManagerInterface { + override fun getName(): String { + return REACT_CLASS + } + + override fun createViewInstance(reactContext: ThemedReactContext): RNMBXHillshadeLayer { + return RNMBXHillshadeLayer(reactContext) + } + + // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXHillshadeLayer"})} + @ReactProp(name = "id") + override fun setId(layer: RNMBXHillshadeLayer, id: Dynamic) { + layer.iD = id.asString() + } + + @ReactProp(name = "existing") + override fun setExisting(layer: RNMBXHillshadeLayer, existing: Dynamic) { + layer.setExisting(existing.asBoolean()) + } + + @ReactProp(name = "sourceID") + override fun setSourceID(layer: RNMBXHillshadeLayer, sourceID: Dynamic) { + layer.setSourceID(sourceID.asString()) + } + + @ReactProp(name = "aboveLayerID") + override fun setAboveLayerID(layer: RNMBXHillshadeLayer, aboveLayerID: Dynamic) { + layer.setAboveLayerID(aboveLayerID.asString()) + } + + @ReactProp(name = "belowLayerID") + override fun setBelowLayerID(layer: RNMBXHillshadeLayer, belowLayerID: Dynamic) { + layer.setBelowLayerID(belowLayerID.asString()) + } + + @ReactProp(name = "layerIndex") + override fun setLayerIndex(layer: RNMBXHillshadeLayer, layerIndex: Dynamic) { + layer.setLayerIndex(layerIndex.asInt()) + } + + @ReactProp(name = "minZoomLevel") + override fun setMinZoomLevel(layer: RNMBXHillshadeLayer, minZoomLevel: Dynamic) { + layer.setMinZoomLevel(minZoomLevel.asDouble()) + } + + @ReactProp(name = "maxZoomLevel") + override fun setMaxZoomLevel(layer: RNMBXHillshadeLayer, maxZoomLevel: Dynamic) { + layer.setMaxZoomLevel(maxZoomLevel.asDouble()) + } + + @ReactProp(name = "reactStyle") + override fun setReactStyle(layer: RNMBXHillshadeLayer, style: Dynamic) { + layer.setReactStyle(style.asMap()) + } + + @ReactProp(name = "sourceLayerID") + override fun setSourceLayerID(layer: RNMBXHillshadeLayer, sourceLayerID: Dynamic) { + layer.setSourceLayerID(sourceLayerID.asString()) + } + + @ReactProp(name = "filter") + override fun setFilter(layer: RNMBXHillshadeLayer, filterList: Dynamic) { + layer.setFilter(filterList.asArray()) + } + + @ReactProp(name = "slot") + override fun setSlot(layer: RNMBXHillshadeLayer, slot: Dynamic) { + layer.setSlot(slot.asString()) + } + // @{codepart-replace-end} + + companion object { + const val REACT_CLASS = "RNMBXHillshadeLayer" + } +} diff --git a/docs/HillshadeLayer.md b/docs/HillshadeLayer.md new file mode 100644 index 0000000000..2ca0a0e1f7 --- /dev/null +++ b/docs/HillshadeLayer.md @@ -0,0 +1,383 @@ + + + Mapbox spec: [hillshade](https://docs.mapbox.com/mapbox-gl-js/style-spec/layers/#hillshade) + + +```tsx +import { HillshadeLayer } from '@rnmapbox/maps'; + +HillshadeLayer + +``` + + +## props + + +### id + +```tsx +string +``` +_required_ +A string that uniquely identifies the source in the style to which it is added. + + + +### existing + +```tsx +boolean +``` +The id refers to an existing layer in the style. Does not create a new layer. + + + +### sourceID + +```tsx +string +``` +The source from which to obtain the data to style. +If the source has not yet been added to the current style, the behavior is undefined. +Inferred from parent source only if the layer is a direct child to it. + + _defaults to:_ `Mapbox.StyleSource.DefaultSourceID` + + +### sourceLayerID + +```tsx +string +``` +Identifier of the layer within the source identified by the sourceID property from which the receiver obtains the data to style. + + + +### aboveLayerID + +```tsx +string +``` +Inserts a layer above aboveLayerID. + + + +### belowLayerID + +```tsx +string +``` +Inserts a layer below belowLayerID + + + +### layerIndex + +```tsx +number +``` +Inserts a layer at a specified index + + + +### filter + +```tsx +FilterExpression +``` +Filter only the features in the source layer that satisfy a condition that you define + + + +### minZoomLevel + +```tsx +number +``` +The minimum zoom level at which the layer gets parsed and appears. + + + +### maxZoomLevel + +```tsx +number +``` +The maximum zoom level at which the layer gets parsed and appears. + + + +### slot + +```tsx +'bottom' | 'middle' | 'top' +``` +The slot this layer is assigned to. If specified, and a slot with that name exists, it will be placed at that position in the layer order. + +v11 only + + + +### style + +```tsx +HillshadeLayerStyleProps +``` +_required_ +Customizable style attributes + + + + + + + + + +## styles + +* visibility
+* hillshadeIlluminationDirection
+* hillshadeIlluminationAnchor
+* hillshadeExaggeration
+* hillshadeShadowColor
+* hillshadeHighlightColor
+* hillshadeAccentColor
+ +___ + +### visibility +Name: `visibility` + +Mapbox spec: [visibility](https://docs.mapbox.com/style-spec/reference/layers/#layout-hillshade-visibility) + +#### Description +Whether this layer is displayed. + +#### Type +`enum` +#### Default Value +`visible` + +#### Supported Values +**visible** - The layer is shown.
+**none** - The layer is not shown.
+ + +#### Expression + +Parameters: `` + +___ + +### hillshadeIlluminationDirection +Name: `hillshadeIlluminationDirection` + +Mapbox spec: [hillshade-illumination-direction](https://docs.mapbox.com/style-spec/reference/layers/#paint-hillshade-hillshade-illumination-direction) + +#### Description +The direction of the light source used to generate the hillshading with 0 as the top of the viewport if `hillshadeIlluminationAnchor` is set to `viewport` and due north if `hillshadeIlluminationAnchor` is set to `map` and no 3d lights enabled. If `hillshadeIlluminationAnchor` is set to `map` and 3d lights enabled, the direction from 3d lights is used instead. + +#### Type +`number` +#### Default Value +`335` + +#### Minimum +`0` + + +#### Maximum +`359` + +#### Expression + +Parameters: `zoom` + +___ + +### hillshadeIlluminationAnchor +Name: `hillshadeIlluminationAnchor` + +Mapbox spec: [hillshade-illumination-anchor](https://docs.mapbox.com/style-spec/reference/layers/#paint-hillshade-hillshade-illumination-anchor) + +#### Description +Direction of light source when map is rotated. + +#### Type +`enum` +#### Default Value +`viewport` + +#### Supported Values +**map** - The hillshade illumination is relative to the north direction.
+**viewport** - The hillshade illumination is relative to the top of the viewport.
+ + +#### Expression + +Parameters: `zoom` + +___ + +### hillshadeExaggeration +Name: `hillshadeExaggeration` + +Mapbox spec: [hillshade-exaggeration](https://docs.mapbox.com/style-spec/reference/layers/#paint-hillshade-hillshade-exaggeration) + +#### Description +Intensity of the hillshade + +#### Type +`number` +#### Default Value +`0.5` + +#### Minimum +`0` + + +#### Maximum +`1` + +#### Expression + +Parameters: `zoom` +___ + +### hillshadeExaggerationTransition +Name: `hillshadeExaggerationTransition` + +#### Description + +The transition affecting any changes to this layer’s hillshadeExaggeration property. + +#### Type + +`{ duration, delay }` + +#### Units +`milliseconds` + +#### Default Value +`{duration: 300, delay: 0}` + + +___ + +### hillshadeShadowColor +Name: `hillshadeShadowColor` + +Mapbox spec: [hillshade-shadow-color](https://docs.mapbox.com/style-spec/reference/layers/#paint-hillshade-hillshade-shadow-color) + +#### Description +The shading color of areas that face away from the light source. + +#### Type +`color` +#### Default Value +`#000000` + + +#### Expression + +Parameters: `zoom, measure-light` +___ + +### hillshadeShadowColorTransition +Name: `hillshadeShadowColorTransition` + +#### Description + +The transition affecting any changes to this layer’s hillshadeShadowColor property. + +#### Type + +`{ duration, delay }` + +#### Units +`milliseconds` + +#### Default Value +`{duration: 300, delay: 0}` + + +___ + +### hillshadeHighlightColor +Name: `hillshadeHighlightColor` + +Mapbox spec: [hillshade-highlight-color](https://docs.mapbox.com/style-spec/reference/layers/#paint-hillshade-hillshade-highlight-color) + +#### Description +The shading color of areas that faces towards the light source. + +#### Type +`color` +#### Default Value +`#FFFFFF` + + +#### Expression + +Parameters: `zoom, measure-light` +___ + +### hillshadeHighlightColorTransition +Name: `hillshadeHighlightColorTransition` + +#### Description + +The transition affecting any changes to this layer’s hillshadeHighlightColor property. + +#### Type + +`{ duration, delay }` + +#### Units +`milliseconds` + +#### Default Value +`{duration: 300, delay: 0}` + + +___ + +### hillshadeAccentColor +Name: `hillshadeAccentColor` + +Mapbox spec: [hillshade-accent-color](https://docs.mapbox.com/style-spec/reference/layers/#paint-hillshade-hillshade-accent-color) + +#### Description +The shading color used to accentuate rugged terrain like sharp cliffs and gorges. + +#### Type +`color` +#### Default Value +`#000000` + + +#### Expression + +Parameters: `zoom, measure-light` +___ + +### hillshadeAccentColorTransition +Name: `hillshadeAccentColorTransition` + +#### Description + +The transition affecting any changes to this layer’s hillshadeAccentColor property. + +#### Type + +`{ duration, delay }` + +#### Units +`milliseconds` + +#### Default Value +`{duration: 300, delay: 0}` + + diff --git a/docs/docs.json b/docs/docs.json index 6d6bd98b29..56060783ae 100644 --- a/docs/docs.json +++ b/docs/docs.json @@ -3038,6 +3038,279 @@ } ] }, + "HillshadeLayer": { + "description": "", + "displayName": "HillshadeLayer", + "methods": [], + "props": [ + { + "name": "id", + "required": true, + "type": "string", + "default": "none", + "description": "A string that uniquely identifies the source in the style to which it is added." + }, + { + "name": "existing", + "required": false, + "type": "boolean", + "default": "none", + "description": "The id refers to an existing layer in the style. Does not create a new layer." + }, + { + "name": "sourceID", + "required": false, + "type": "string", + "default": "Mapbox.StyleSource.DefaultSourceID", + "description": "The source from which to obtain the data to style.\nIf the source has not yet been added to the current style, the behavior is undefined.\nInferred from parent source only if the layer is a direct child to it." + }, + { + "name": "sourceLayerID", + "required": false, + "type": "string", + "default": "none", + "description": "Identifier of the layer within the source identified by the sourceID property from which the receiver obtains the data to style." + }, + { + "name": "aboveLayerID", + "required": false, + "type": "string", + "default": "none", + "description": "Inserts a layer above aboveLayerID." + }, + { + "name": "belowLayerID", + "required": false, + "type": "string", + "default": "none", + "description": "Inserts a layer below belowLayerID" + }, + { + "name": "layerIndex", + "required": false, + "type": "number", + "default": "none", + "description": "Inserts a layer at a specified index" + }, + { + "name": "filter", + "required": false, + "type": "FilterExpression", + "default": "none", + "description": "Filter only the features in the source layer that satisfy a condition that you define" + }, + { + "name": "minZoomLevel", + "required": false, + "type": "number", + "default": "none", + "description": "The minimum zoom level at which the layer gets parsed and appears." + }, + { + "name": "maxZoomLevel", + "required": false, + "type": "number", + "default": "none", + "description": "The maximum zoom level at which the layer gets parsed and appears." + }, + { + "name": "slot", + "required": false, + "type": "'bottom' \\| 'middle' \\| 'top'", + "default": "none", + "description": "The slot this layer is assigned to. If specified, and a slot with that name exists, it will be placed at that position in the layer order.\n\nv11 only" + }, + { + "name": "style", + "required": true, + "type": "HillshadeLayerStyleProps", + "default": "none", + "description": "Customizable style attributes" + } + ], + "fileNameWithExt": "HillshadeLayer.tsx", + "relPath": "src/components/HillshadeLayer.tsx", + "name": "HillshadeLayer", + "mbx": { + "name": "hillshade" + }, + "styles": [ + { + "name": "visibility", + "type": "enum", + "values": [ + { + "value": "visible", + "doc": "The layer is shown." + }, + { + "value": "none", + "doc": "The layer is not shown." + } + ], + "default": "visible", + "description": "Whether this layer is displayed.", + "requires": [], + "disabledBy": [], + "allowedFunctionTypes": [], + "expression": { + "interpolated": false + }, + "mbx": { + "fullName": "layout-hillshade-visibility", + "name": "visibility", + "namespace": "layout" + } + }, + { + "name": "hillshadeIlluminationDirection", + "type": "number", + "values": [], + "minimum": 0, + "maximum": 359, + "default": 335, + "description": "The direction of the light source used to generate the hillshading with 0 as the top of the viewport if `hillshadeIlluminationAnchor` is set to `viewport` and due north if `hillshadeIlluminationAnchor` is set to `map` and no 3d lights enabled. If `hillshadeIlluminationAnchor` is set to `map` and 3d lights enabled, the direction from 3d lights is used instead.", + "requires": [], + "disabledBy": [], + "allowedFunctionTypes": [], + "expression": { + "interpolated": true, + "parameters": [ + "zoom" + ] + }, + "transition": false, + "mbx": { + "fullName": "paint-hillshade-hillshade-illumination-direction", + "name": "hillshade-illumination-direction", + "namespace": "paint" + } + }, + { + "name": "hillshadeIlluminationAnchor", + "type": "enum", + "values": [ + { + "value": "map", + "doc": "The hillshade illumination is relative to the north direction." + }, + { + "value": "viewport", + "doc": "The hillshade illumination is relative to the top of the viewport." + } + ], + "default": "viewport", + "description": "Direction of light source when map is rotated.", + "requires": [], + "disabledBy": [], + "allowedFunctionTypes": [], + "expression": { + "interpolated": false, + "parameters": [ + "zoom" + ] + }, + "mbx": { + "fullName": "paint-hillshade-hillshade-illumination-anchor", + "name": "hillshade-illumination-anchor", + "namespace": "paint" + } + }, + { + "name": "hillshadeExaggeration", + "type": "number", + "values": [], + "minimum": 0, + "maximum": 1, + "default": 0.5, + "description": "Intensity of the hillshade", + "requires": [], + "disabledBy": [], + "allowedFunctionTypes": [], + "expression": { + "interpolated": true, + "parameters": [ + "zoom" + ] + }, + "transition": true, + "mbx": { + "fullName": "paint-hillshade-hillshade-exaggeration", + "name": "hillshade-exaggeration", + "namespace": "paint" + } + }, + { + "name": "hillshadeShadowColor", + "type": "color", + "values": [], + "default": "#000000", + "description": "The shading color of areas that face away from the light source.", + "requires": [], + "disabledBy": [], + "allowedFunctionTypes": [], + "expression": { + "interpolated": true, + "parameters": [ + "zoom", + "measure-light" + ] + }, + "transition": true, + "mbx": { + "fullName": "paint-hillshade-hillshade-shadow-color", + "name": "hillshade-shadow-color", + "namespace": "paint" + } + }, + { + "name": "hillshadeHighlightColor", + "type": "color", + "values": [], + "default": "#FFFFFF", + "description": "The shading color of areas that faces towards the light source.", + "requires": [], + "disabledBy": [], + "allowedFunctionTypes": [], + "expression": { + "interpolated": true, + "parameters": [ + "zoom", + "measure-light" + ] + }, + "transition": true, + "mbx": { + "fullName": "paint-hillshade-hillshade-highlight-color", + "name": "hillshade-highlight-color", + "namespace": "paint" + } + }, + { + "name": "hillshadeAccentColor", + "type": "color", + "values": [], + "default": "#000000", + "description": "The shading color used to accentuate rugged terrain like sharp cliffs and gorges.", + "requires": [], + "disabledBy": [], + "allowedFunctionTypes": [], + "expression": { + "interpolated": true, + "parameters": [ + "zoom", + "measure-light" + ] + }, + "transition": true, + "mbx": { + "fullName": "paint-hillshade-hillshade-accent-color", + "name": "hillshade-accent-color", + "namespace": "paint" + } + } + ] + }, "Image": { "description": "", "displayName": "Image", diff --git a/docs/examples.json b/docs/examples.json index 77b52e1e08..45a02129ee 100644 --- a/docs/examples.json +++ b/docs/examples.json @@ -709,6 +709,19 @@ "relPath": "FillRasterLayer/GeoJSONSource.js", "name": "GeoJSONSource" }, + { + "metadata": { + "title": "Hillshade Layer", + "tags": [ + "RasterDemSource", + "HillshadeLayer" + ], + "docs": "Renders terrain hillshading from a raster-dem source." + }, + "fullPath": "example/src/examples/FillRasterLayer/HillshadeSource.tsx", + "relPath": "FillRasterLayer/HillshadeSource.tsx", + "name": "HillshadeSource" + }, { "metadata": { "title": "Image Overlay", diff --git a/example/src/examples/FillRasterLayer/HillshadeSource.tsx b/example/src/examples/FillRasterLayer/HillshadeSource.tsx new file mode 100644 index 0000000000..6c70ced40b --- /dev/null +++ b/example/src/examples/FillRasterLayer/HillshadeSource.tsx @@ -0,0 +1,60 @@ +import { useState } from 'react'; +import { Button } from 'react-native'; +import { + MapView, + Camera, + RasterDemSource, + HillshadeLayer, +} from '@rnmapbox/maps'; + +const HillshadeSource = () => { + const [showHillshade, setShowHillshade] = useState(true); + + return ( + <> +