diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f516193d5246..58bae61afde8 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -274,15 +274,15 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - MapboxCommon (23.10.1) - - MapboxCoreMaps (10.18.0): - - MapboxCommon (~> 23.10) - - MapboxMaps (10.18.2): - - MapboxCommon (= 23.10.1) - - MapboxCoreMaps (= 10.18.0) - - MapboxMobileEvents (= 1.0.10) + - MapboxCommon (23.11.2) + - MapboxCoreMaps (10.19.2): + - MapboxCommon (~> 23.11) + - MapboxMaps (10.19.1): + - MapboxCommon (= 23.11.2) + - MapboxCoreMaps (= 10.19.2) + - MapboxMobileEvents (= 2.0.0) - Turf (= 2.8.0) - - MapboxMobileEvents (1.0.10) + - MapboxMobileEvents (2.0.0) - nanopb (2.30908.0): - nanopb/decode (= 2.30908.0) - nanopb/encode (= 2.30908.0) @@ -2517,16 +2517,16 @@ PODS: - Yoga - RNLocalize (2.2.6): - React-Core - - rnmapbox-maps (10.1.30): - - MapboxMaps (~> 10.18.2) + - rnmapbox-maps (10.1.33): + - MapboxMaps (~> 10.19.0) - React - React-Core - - rnmapbox-maps/DynamicLibrary (= 10.1.30) + - rnmapbox-maps/DynamicLibrary (= 10.1.33) - Turf - - rnmapbox-maps/DynamicLibrary (10.1.30): + - rnmapbox-maps/DynamicLibrary (10.1.33): - DoubleConversion - hermes-engine - - MapboxMaps (~> 10.18.2) + - MapboxMaps (~> 10.19.0) - RCT-Folly - RCTRequired - RCTTypeSafety @@ -3260,10 +3260,10 @@ SPEC CHECKSUMS: libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 lottie-ios: 3d98679b41fa6fd6aff2352b3953dbd3df8a397e lottie-react-native: e50d25429207f95045253c19fa7463e288594f87 - MapboxCommon: 0ff437e44988da6856e280d00ffb266564ed0487 - MapboxCoreMaps: f1bd9405f5b9d3e343f2fe4138775299699a22fb - MapboxMaps: e76b14f52c54c40b76ddecd04f40448e6f35a864 - MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6 + MapboxCommon: 873b75dd0e8c5d7029e0c849437eba365f4887e5 + MapboxCoreMaps: 35685edba03e44468aed57c3dfd7f8795edafda8 + MapboxMaps: 05822ab0ee74f7d626e6471572439afe35c1c116 + MapboxMobileEvents: d044b9edbe0ec7df60f6c2c9634fe9a7f449266b nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 Onfido: f3af62ea1c9a419589c133e3e511e5d2c4f3f8af onfido-react-native-sdk: 4ccfdeb10f9ccb4a5799d2555cdbc2a068a42c0d @@ -3360,7 +3360,7 @@ SPEC CHECKSUMS: RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0 RNLiveMarkdown: 19826569be35bada5c0f21a0c48b5bc780051501 RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81 - rnmapbox-maps: 460d6ff97ae49c7d5708c3212c6521697c36a0c4 + rnmapbox-maps: d184c8d3213acf4c97ec71fbbb6f9d4954552d80 RNPermissions: 0b1429b55af59d1d08b75a8be2459f65a8ac3f28 RNReactNativeHapticFeedback: 73756a3477a5a622fa16862a3ab0d0fc5e5edff5 RNReanimated: 1b622aa38321705e0865a0c156a2bdf0a85d7ebc diff --git a/package-lock.json b/package-lock.json index 75675a341003..12ccf5c363ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "@react-navigation/native-stack": "^6.9.26", "@react-navigation/stack": "6.3.29", "@react-ng/bounds-observer": "^0.2.1", - "@rnmapbox/maps": "10.1.30", + "@rnmapbox/maps": "10.1.33", "@shopify/flash-list": "1.7.1", "@ua/react-native-airship": "19.2.1", "awesome-phonenumber": "^5.4.0", @@ -9759,9 +9759,10 @@ } }, "node_modules/@rnmapbox/maps": { - "version": "10.1.30", - "resolved": "https://registry.npmjs.org/@rnmapbox/maps/-/maps-10.1.30.tgz", - "integrity": "sha512-3yl043+mpBldIHxTMMBU6Rdka6IjSww3kaIngltsUBTtnQI9NE1Yv3msC1X10E5bcfLHrhLxkiMSRhckCKBkPA==", + "version": "10.1.33", + "resolved": "https://registry.npmjs.org/@rnmapbox/maps/-/maps-10.1.33.tgz", + "integrity": "sha512-+J1aJnZ6q0N3044doCb6To/Eftpsn3Eq78AYPMa/Ig9x/u1eWpmbt5WbXJCehkOltGsjvTCenn+/gZKsXMZfww==", + "license": "MIT", "dependencies": { "@turf/along": "6.5.0", "@turf/distance": "6.5.0", diff --git a/package.json b/package.json index 5b9e19fc078f..b8ad30bfc86f 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "@react-navigation/native-stack": "^6.9.26", "@react-navigation/stack": "6.3.29", "@react-ng/bounds-observer": "^0.2.1", - "@rnmapbox/maps": "10.1.30", + "@rnmapbox/maps": "10.1.33", "@shopify/flash-list": "1.7.1", "@ua/react-native-airship": "19.2.1", "awesome-phonenumber": "^5.4.0", diff --git a/patches/@rnmapbox+maps+10.1.30+001+bridgeless.patch b/patches/@rnmapbox+maps+10.1.30+001+bridgeless.patch deleted file mode 100644 index b840e3da7b12..000000000000 --- a/patches/@rnmapbox+maps+10.1.30+001+bridgeless.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterSourceManager.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterSourceManager.kt -index 5bebc1b..80a4be4 100644 ---- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterSourceManager.kt -+++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterSourceManager.kt -@@ -5,6 +5,8 @@ import com.facebook.react.bridge.ReactApplicationContext - import com.facebook.react.uimanager.ThemedReactContext - import com.facebook.react.uimanager.annotations.ReactProp - import com.facebook.react.viewmanagers.RNMBXRasterSourceManagerInterface -+import com.rnmapbox.rnmbx.events.constants.EventKeys -+import com.rnmapbox.rnmbx.events.constants.eventMapOf - import javax.annotation.Nonnull - - class RNMBXRasterSourceManager(reactApplicationContext: ReactApplicationContext) : -@@ -26,7 +28,10 @@ class RNMBXRasterSourceManager(reactApplicationContext: ReactApplicationContext) - } - - override fun customEvents(): Map? { -- return null -+ return eventMapOf( -+ EventKeys.RASTER_SOURCE_LAYER_CLICK to "onMapboxRasterSourcePress", -+ EventKeys.MAP_ANDROID_CALLBACK to "onAndroidCallback" -+ ) - } - - companion object { -diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/events/constants/EventKeys.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/events/constants/EventKeys.kt -index d059b2c..3882f1e 100644 ---- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/events/constants/EventKeys.kt -+++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/events/constants/EventKeys.kt -@@ -4,35 +4,37 @@ private fun ns(name: String): String { - val namespace = "rct.mapbox" - return String.format("%s.%s", namespace, name) - } -+ - enum class EventKeys(val value: String) { - // map events -- MAP_CLICK(ns("map.press")), -- MAP_LONG_CLICK(ns("map.longpress")), -- MAP_ONCHANGE(ns("map.change")), -- MAP_ON_LOCATION_CHANGE(ns("map.location.change")), -- MAP_ANDROID_CALLBACK(ns("map.androidcallback")), -- MAP_USER_TRACKING_MODE_CHANGE(ns("map.usertrackingmodechange")), -+ MAP_CLICK("topPress"), -+ MAP_LONG_CLICK("topLongPress"), -+ MAP_ONCHANGE("topMapChange"), -+ MAP_ON_LOCATION_CHANGE("topLocationChange"), -+ MAP_ANDROID_CALLBACK("topAndroidCallback"), -+ MAP_USER_TRACKING_MODE_CHANGE("topUserTrackingModeChange"), - - // point annotation events -- POINT_ANNOTATION_SELECTED(ns("pointannotation.selected")), -- POINT_ANNOTATION_DESELECTED(ns("pointannotation.deselected")), -- POINT_ANNOTATION_DRAG_START(ns("pointannotation.dragstart")), -- POINT_ANNOTATION_DRAG(ns("pointannotation.drag")), -- POINT_ANNOTATION_DRAG_END(ns("pointannotation.dragend")), -+ POINT_ANNOTATION_SELECTED("topMapboxPointAnnotationSelected"), -+ POINT_ANNOTATION_DESELECTED("topMapboxPointAnnotationDeselected"), -+ POINT_ANNOTATION_DRAG_START("topMapboxPointAnnotationDragStart"), -+ POINT_ANNOTATION_DRAG("topMapboxPointAnnotationDrag"), -+ POINT_ANNOTATION_DRAG_END("topMapboxPointAnnotationDragEnd"), - - // source events -- SHAPE_SOURCE_LAYER_CLICK(ns("shapesource.layer.pressed")), -- VECTOR_SOURCE_LAYER_CLICK(ns("vectorsource.layer.pressed")), -- RASTER_SOURCE_LAYER_CLICK(ns("rastersource.layer.pressed")), -+ SHAPE_SOURCE_LAYER_CLICK("topMapboxShapeSourcePress"), -+ VECTOR_SOURCE_LAYER_CLICK("topMapboxVectorSourcePress"), -+ RASTER_SOURCE_LAYER_CLICK("topMapboxRasterSourcePress"), - - // images event -- IMAGES_MISSING(ns("images.missing")), -+ IMAGES_MISSING("topImageMissing"), - - // location events -+ // TODO: not sure about this one since it is not registered anywhere - USER_LOCATION_UPDATE(ns("user.location.update")), - - // viewport events -- VIEWPORT_STATUS_CHANGE(ns("viewport.statuschange")) -+ VIEWPORT_STATUS_CHANGE("topStatusChanged") - } - - fun eventMapOf(vararg values: Pair): Map { diff --git a/patches/@rnmapbox+maps+10.1.30+002+fix-nullable-types-0.76.patch b/patches/@rnmapbox+maps+10.1.30+002+fix-nullable-types-0.76.patch deleted file mode 100644 index 36c58b2db2e8..000000000000 --- a/patches/@rnmapbox+maps+10.1.30+002+fix-nullable-types-0.76.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt -index a9e2b68..1e08fdf 100644 ---- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt -+++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt -@@ -233,7 +233,7 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) : - parent.mImageViews.remove(view) - } - -- override fun removeAllViews(parent: RNMBXImages) { -+ override fun removeAllViews(parent: RNMBXImages?) { - if (parent == null) { - Logger.e("RNMBXImages", "removeAllViews parent is null") - return -diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt -index f45cc25..5b0bb86 100644 ---- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt -+++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt -@@ -30,7 +30,7 @@ open class ViewTagResolver(val context: ReactApplicationContext) { - if (list != null) { - context.runOnUiQueueThread { - try { -- val view = manager.resolveView(viewTag) -+ val view = manager.resolveView(viewTag)!! - - list.forEach { it.fn(view) } - } catch (err: IllegalViewOperationException) {