@rnmapbox/maps 10.1.0-beta.24 → 10.1.0-beta.26

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

@@ -0,0 +1,65 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class RNMBXModelLayerManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNMBXModelLayerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMBXModelLayerManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "sourceID":
+        mViewManager.setSourceID(view, new DynamicFromObject(value));
+        break;
+      case "existing":
+        mViewManager.setExisting(view, new DynamicFromObject(value));
+        break;
+      case "filter":
+        mViewManager.setFilter(view, new DynamicFromObject(value));
+        break;
+      case "aboveLayerID":
+        mViewManager.setAboveLayerID(view, new DynamicFromObject(value));
+        break;
+      case "belowLayerID":
+        mViewManager.setBelowLayerID(view, new DynamicFromObject(value));
+        break;
+      case "layerIndex":
+        mViewManager.setLayerIndex(view, new DynamicFromObject(value));
+        break;
+      case "maxZoomLevel":
+        mViewManager.setMaxZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "minZoomLevel":
+        mViewManager.setMinZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "sourceLayerID":
+        mViewManager.setSourceLayerID(view, new DynamicFromObject(value));
+        break;
+      case "slot":
+        mViewManager.setSlot(view, new DynamicFromObject(value));
+        break;
+      case "id":
+        mViewManager.setId(view, new DynamicFromObject(value));
+        break;
+      case "reactStyle":
+        mViewManager.setReactStyle(view, new DynamicFromObject(value));
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

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

@@ -0,0 +1,28 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import com.facebook.react.bridge.Dynamic;
+
+public interface RNMBXModelLayerManagerInterface<T extends View> {
+  void setSourceID(T view, Dynamic value);
+  void setExisting(T view, Dynamic value);
+  void setFilter(T view, Dynamic value);
+  void setAboveLayerID(T view, Dynamic value);
+  void setBelowLayerID(T view, Dynamic value);
+  void setLayerIndex(T view, Dynamic value);
+  void setMaxZoomLevel(T view, Dynamic value);
+  void setMinZoomLevel(T view, Dynamic value);
+  void setSourceLayerID(T view, Dynamic value);
+  void setSlot(T view, Dynamic value);
+  void setId(T view, Dynamic value);
+  void setReactStyle(T view, Dynamic value);
+}

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

@@ -0,0 +1,32 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class RNMBXModelsManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNMBXModelsManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMBXModelsManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "models":
+        mViewManager.setModels(view, new DynamicFromObject(value));
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

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

@@ -0,0 +1,17 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import com.facebook.react.bridge.Dynamic;
+
+public interface RNMBXModelsManagerInterface<T extends View> {
+  void setModels(T view, Dynamic value);
+}

package/ios/RNMBX/CustomHttpHeaders.swift

@@ -46,23 +46,16 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
     return request
   }
 
+  #if !RNMBX_11
   func onDownload(forDownload download: DownloadOptions) -> DownloadOptions {
     customHeaders.forEach {(key,value) in
       download.request.headers[key] = value
     }
     return download
   }
+  #endif
 
   func onResponse(for response: HttpResponse) -> HttpResponse {
     return response
   }
-  
-  #if RNMBX_11
-  func onUpload(forUpload upload: UploadOptions) -> UploadOptions {
-    customHeaders.forEach {(key,value) in
-      upload.headers[key] = value
-    }
-    return upload
-  }
-  #endif
 }

package/ios/RNMBX/RNMBXModelLayer.swift

@@ -0,0 +1,59 @@
+@_spi(Experimental) import MapboxMaps
+
+@objc(RNMBXModelLayer)
+public class RNMBXModelLayer: RNMBXVectorLayer {
+  typealias LayerType = ModelLayer
+
+  override func makeLayer(style: Style) throws -> Layer {
+    let vectorSource : VectorSource = try self.layerWithSourceID(in: style)
+    #if RNMBX_11
+    var layer = LayerType(id: self.id!, source: sourceID!)
+    #else
+    var layer = LayerType(id: self.id!)
+    #endif
+    layer.sourceLayer = self.sourceLayerID
+    layer.source = sourceID
+    return layer
+  }
+
+  override func layerType() -> Layer.Type {
+    return LayerType.self
+  }
+
+  override func apply(style : Style) throws {
+    try style.updateLayer(withId: id, type: LayerType.self) { (layer : inout ModelLayer) in
+      if self.styleLayer != nil {
+        self.setOptions(&self.styleLayer!)
+      }
+      if let styleLayer = self.styleLayer as? ModelLayer {
+        layer = styleLayer
+      }
+    }
+  }
+  
+  override func addStyles() {
+    if let style : Style = self.style {
+      let styler =  RNMBXStyle(style: self.style!)
+      styler.bridge = self.bridge
+      
+      if var styleLayer = self.styleLayer as? LayerType,
+         let reactStyle = reactStyle {
+        styler.modelLayer(
+          layer: &styleLayer,
+          reactStyle: reactStyle,
+          oldReactStyle: oldReatStyle,
+          applyUpdater: { (updater) in logged("RNMBXModelLayer.updateLayer") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
+          }},
+          isValid: {
+            return self.isAddedToMap()
+          })
+        self.styleLayer = styleLayer
+      }
+    }
+  }
+  
+  func isAddedToMap() -> Bool {
+    return true
+  }
+}

package/ios/RNMBX/RNMBXModelLayerComponentView.h

@@ -0,0 +1,15 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTUIManager.h>
+#import <React/RCTViewComponentView.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNMBXModelLayerComponentView : RCTViewComponentView
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModelLayerComponentView.mm

@@ -0,0 +1,70 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXModelLayerComponentView.h"
+#import "RNMBXFabricHelpers.h"
+
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTBridge+Private.h>
+
+#import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
+#import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
+#import <react/renderer/components/rnmapbox_maps_specs/Props.h>
+#import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
+
+using namespace facebook::react;
+
+@interface RNMBXModelLayerComponentView () <RCTRNMBXModelLayerViewProtocol>
+@end
+
+@implementation RNMBXModelLayerComponentView {
+    RNMBXModelLayer *_view;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXModelLayerProps>();
+    _props = defaultProps;
+      [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+  _view =  [[RNMBXModelLayer alloc] init];
+  _view.bridge = [RCTBridge currentBridge];
+  self.contentView = _view;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXModelLayerComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = static_cast<const RNMBXModelLayerProps &>(*props);
+  RNMBXSetCommonLayerProps(newProps, _view);
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (void)prepareForRecycle
+{
+    [super prepareForRecycle];
+    [self prepareView];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXModelLayerCls(void)
+{
+  return RNMBXModelLayerComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModelLayerViewManager.m

@@ -0,0 +1,12 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXModelLayer, RNMBXModelLayerViewManager, RCTViewManager)
+
+// circle layer props
+RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString)
+
+// standard layer props
+#include "CommonLayerProperties.H"
+
+@end

package/ios/RNMBX/RNMBXModelLayerViewManager.swift

@@ -0,0 +1,13 @@
+@objc(RNMBXModelLayerViewManager)
+class RNMBXModelLayerViewManager: RCTViewManager {
+    @objc
+    override static func requiresMainQueueSetup() -> Bool {
+        return true
+    }
+  
+    override func view() -> UIView! {
+      let layer = RNMBXModelLayer()
+      layer.bridge = self.bridge
+      return layer
+    }
+}

package/ios/RNMBX/RNMBXModels.swift

@@ -0,0 +1,63 @@
+@_spi(Experimental) import MapboxMaps
+
+@objc(RNMBXModels)
+open class RNMBXModels : UIView, RNMBXMapComponent {
+  var modelIdToUrl: [String: String] = [:]
+  
+  @objc(models)
+  public var models: NSDictionary {
+    set {
+      var newModels: [String: String] = [:]
+      newValue.forEach { (key, value) in
+        if let value = value as? NSDictionary, let key = key as? String {
+          if let uri = value["uri"] as? String {
+            newModels[key] = uri
+          } else if let url = value["url"] as? String {
+            newModels[key] = url
+          } else {
+            Logger.log(level: .error, message: "Unexpected value for model key: \(key) \(value) - no uri or url found")
+          }
+        }
+      }
+      self.modelIdToUrl = newModels
+    }
+    get {
+      Logger.error("RNMBXModels.models.getter not implemented")
+      return NSDictionary()
+    }
+  }
+  
+  func setModels(_ models: NSDictionary) {
+
+  }
+  
+  func addToMap(_ map: RNMBXMapView, style: Style) {
+    modelIdToUrl.forEach { (id, uri) in
+      logged("Models.addStyleModel") {
+        if let link = URL(string: uri), let scheme = link.scheme, let host = link.host,
+            let port = link.port {
+
+          // https://github.com/mapbox/mapbox-maps-ios/issues/2067
+          let uriWithoutQuery = "\(scheme)://\(host):\(port)\(link.path)"
+
+          try style.addStyleModel(modelId: id, modelUri: uriWithoutQuery)
+        } else {
+          try style.addStyleModel(modelId: id, modelUri: uri)
+        }
+      }
+    }
+  }
+  
+  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+    modelIdToUrl.forEach { (id, _) in
+      #if RNMBX_11
+      try? map._mapView?.mapboxMap.removeStyleModel(modelId: id)
+      #endif
+    }
+    return true
+  }
+  
+  func waitForStyleLoad() -> Bool {
+    true
+  }
+}

package/ios/RNMBX/RNMBXModelsComponentView.h

@@ -0,0 +1,17 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTUIManager.h>
+#import <React/RCTViewComponentView.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+
+@interface RNMBXModelsComponentView : RCTViewComponentView
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModelsComponentView.mm

@@ -0,0 +1,67 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXModelsComponentView.h"
+
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+
+#import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
+#import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
+#import <react/renderer/components/rnmapbox_maps_specs/Props.h>
+#import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
+
+#import "rnmapbox_maps-Swift.pre.h"
+
+#import "RCTFollyConvert.h"
+#import "RNMBXFabricPropConvert.h"
+
+
+// TODO: use generated RNMBXModelsEventEmitter, but need 0.73+ for dynamic support
+using namespace facebook::react;
+
+@implementation RNMBXModelsComponentView {
+    RNMBXModels *_view;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXModelsProps>();
+    _props = defaultProps;
+    _view = [[RNMBXModels alloc] init];
+    [self prepareView];
+    
+    self.contentView = _view;
+  }
+  
+  return self;
+}
+
+- (void)prepareView
+{
+}
+
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXModelsComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &oldViewProps = static_cast<const RNMBXModelsProps &>(*oldProps);
+  const auto &newViewProps = static_cast<const RNMBXModelsProps &>(*props);
+
+  RNMBX_OPTIONAL_PROP_NSDictionary(models);
+  [super updateProps:props oldProps:oldProps];
+}
+@end
+
+Class<RCTComponentViewProtocol> RNMBXModelsCls(void)
+{
+  return RNMBXModelsComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModelsManager.mm

@@ -0,0 +1,9 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXModels, RNMBXModelsManager, RCTViewManager)
+
+RCT_EXPORT_VIEW_PROPERTY(models, NSDictionary)
+
+@end
+

package/ios/RNMBX/RNMBXModelsManager.swift

@@ -0,0 +1,13 @@
+@objc(RNMBXModelsManager)
+public class RNMBXModelsManager : RCTViewManager {
+  @objc
+  public override static func requiresMainQueueSetup() -> Bool {
+    return true
+  }
+
+  public override func view() -> UIView! {
+    let layer = RNMBXModels()
+    return layer
+  }
+}
+