Added maxPitch support (#4108)

* Add maxPitch prop support

* MaxPitch docs

* Add maxPitch prop handler for MapView

Author: zamausa

android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt

@@ -160,6 +160,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     private var mQueuedFeatures: MutableList<AbstractMapFeature>? = ArrayList()
     private val mCameraChangeTracker = CameraChangeTracker()
     private var mPreferredFrameRate: Int? = null
+    private var mMaxPitch: Double? = null
     private lateinit var mMap: MapboxMap
 
     private lateinit var mMapView: MapView
@@ -513,7 +514,8 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         ATTRIBUTION(RNMBXMapView::applyAttribution),
         LOGO(RNMBXMapView::applyLogo),
         SCALEBAR(RNMBXMapView::applyScaleBar),
-        COMPASS(RNMBXMapView::applyCompass),;
+        COMPASS(RNMBXMapView::applyCompass),
+        MAX_PITCH(RNMBXMapView::applyMaxPitch),;
 
         override fun apply(mapView: RNMBXMapView) {
            _apply(mapView)
@@ -582,6 +584,28 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         }
     }
 
+    fun setReactMaxPitch(maxPitch: Double?) {
+        mMaxPitch = maxPitch
+        changes.add(Property.MAX_PITCH)
+    }
+
+    private fun applyMaxPitch() {
+        val maxPitch = mMaxPitch ?: return
+        if (!this::mMap.isInitialized) {
+            return
+        }
+
+        val currentBounds = mMap.getBounds()
+        val builder = CameraBoundsOptions.Builder()
+            .bounds(currentBounds.bounds)
+            .maxZoom(currentBounds.maxZoom)
+            .minZoom(currentBounds.minZoom)
+            .minPitch(currentBounds.minPitch)
+            .maxPitch(maxPitch)
+
+        mMap.setBounds(builder.build())
+    }
+
     fun setReactStyleURL(styleURL: String) {
         mStyleURL = styleURL
         changes.add(Property.STYLE_URL)

android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapViewManager.kt

@@ -252,6 +252,12 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
         }
     }
 
+    @ReactProp(name = "maxPitch")
+    override fun setMaxPitch(map: RNMBXMapView, maxPitch: Dynamic) {
+        // Allow clearing the limit by passing null from JS
+        map.setReactMaxPitch(if (maxPitch.type == ReadableType.Null) null else maxPitch.asDouble())
+    }
+
     @ReactProp(name = "rotateEnabled")
     override fun setRotateEnabled(map: RNMBXMapView, rotateEnabled: Dynamic) {
         map.withMapView {

android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerDelegate.java

@@ -68,6 +68,9 @@ public void setProperty(T view, String propName, @Nullable Object value) {
       case "pitchEnabled":
         mViewManager.setPitchEnabled(view, new DynamicFromObject(value));
         break;
+      case "maxPitch":
+        mViewManager.setMaxPitch(view, new DynamicFromObject(value));
+        break;
       case "deselectAnnotationOnTap":
         mViewManager.setDeselectAnnotationOnTap(view, new DynamicFromObject(value));
         break;

android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerInterface.java

@@ -27,6 +27,7 @@ public interface RNMBXMapViewManagerInterface<T extends View> {
   void setScrollEnabled(T view, Dynamic value);
   void setRotateEnabled(T view, Dynamic value);
   void setPitchEnabled(T view, Dynamic value);
+  void setMaxPitch(T view, Dynamic value);
   void setDeselectAnnotationOnTap(T view, Dynamic value);
   void setRequestDisallowInterceptTouchEvent(T view, Dynamic value);
   void setProjection(T view, Dynamic value);

docs/MapView.md

@@ -94,6 +94,15 @@ Enable/Disable pitch on map
   _defaults to:_ `true`
 
 
+### maxPitch
+
+```tsx
+number
+```
+Maximum allowed pitch in degrees. Mirrors the Mapbox map option `maxPitch`.
+
+
+  
 ### rotateEnabled
 
 ```tsx

docs/docs.json

@@ -4870,6 +4870,13 @@
         "default": "true",
         "description": "Enable/Disable pitch on map"
       },
+      {
+        "name": "maxPitch",
+        "required": false,
+        "type": "number",
+        "default": "none",
+        "description": "Maximum allowed pitch in degrees. Mirrors the Mapbox map option `maxPitch`."
+      },
       {
         "name": "rotateEnabled",
         "required": false,

ios/RNMBX/RNMBXMapView.swift

@@ -440,6 +440,7 @@ open class RNMBXMapView: UIView, RCTInvalidating {
     case scrollEnabled
     case rotateEnabled
     case pitchEnabled
+    case maxPitch
     case onMapChange
     case styleURL
     case gestureSettings
@@ -476,6 +477,8 @@ open class RNMBXMapView: UIView, RCTInvalidating {
         map.applyLocalizeLabels()
       case .pitchEnabled:
         map.applyPitchEnabled()
+      case .maxPitch:
+        map.applyMaxPitch()
       case .gestureSettings:
         map.applyGestureSettings()
       case .preferredFramesPerSecond:
@@ -538,6 +541,30 @@ open class RNMBXMapView: UIView, RCTInvalidating {
     }
   }
 
+  var maxPitch: Double? = nil
+
+  @objc public func setReactMaxPitch(_ value: NSNumber?) {
+    maxPitch = value?.doubleValue
+    changed(.maxPitch)
+  }
+
+  func applyMaxPitch() {
+    guard let maxPitch = maxPitch else { return }
+
+    withMapboxMap { mapboxMap in
+      logged("RNMBXMapView.applyMaxPitch") {
+        let current = mapboxMap.cameraBounds
+        var options = CameraBoundsOptions()
+        options.bounds = current.bounds
+        options.maxZoom = current.maxZoom
+        options.minZoom = current.minZoom
+        options.minPitch = current.minPitch
+        options.maxPitch = maxPitch
+        try mapboxMap.setCameraBounds(with: options)
+      }
+    }
+  }
+
   var locale: (layerIds: [String]?, locale: Locale)? = nil
 
   @objc public func setReactLocalizeLabels(_ value: NSDictionary?) {

ios/RNMBX/RNMBXMapViewManager.m

@@ -26,6 +26,7 @@ @interface RCT_EXTERN_REMAP_MODULE(RNMBXMapView, RNMBXMapViewManager, RCTViewMan
 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)
 

src/components/MapView.tsx

@@ -206,6 +206,11 @@ type Props = ViewProps & {
    */
   pitchEnabled?: boolean;
 
+  /**
+   * Maximum allowed pitch in degrees. Mirrors the Mapbox map option `maxPitch`.
+   */
+  maxPitch?: number;
+
   /**
    * Enable/Disable rotation on map
    */

src/specs/RNMBXMapViewNativeComponent.ts

@@ -4,6 +4,7 @@ import {
   BubblingEventHandler,
   DirectEventHandler,
   Int32,
+  Double,
   // @ts-ignore - CI environment type resolution issue for CodegenTypes
 } from 'react-native/Libraries/Types/CodegenTypes';
 
@@ -53,6 +54,7 @@ export interface NativeProps extends ViewProps {
   scrollEnabled?: OptionalProp<boolean>;
   rotateEnabled?: OptionalProp<boolean>;
   pitchEnabled?: OptionalProp<boolean>;
+  maxPitch?: OptionalProp<Double>;
 
   deselectAnnotationOnTap?: OptionalProp<boolean>;