@rnmapbox/maps 10.1.0-beta.13 → 10.1.0-beta.14

package/ios/RNMBX/RNMBXVectorSourceComponentView.mm

@@ -0,0 +1,141 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXVectorSourceComponentView.h"
+#import "RNMBXFabricHelpers.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>
+
+using namespace facebook::react;
+
+@interface RNMBXVectorSourceComponentView () <RCTRNMBXVectorSourceViewProtocol>
+@end
+
+@implementation RNMBXVectorSourceComponentView {
+    RNMBXVectorSource *_view;
+}
+
+@synthesize mapFeature;
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXVectorSourceProps>();
+    _props = defaultProps;
+    [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+    _view = [[RNMBXVectorSource alloc] init];
+      
+    // capture weak self reference to prevent retain cycle
+    __weak __typeof__(self) weakSelf = self;
+
+    [_view setOnPress:^(NSDictionary* event) {
+        __typeof__(self) strongSelf = weakSelf;
+
+        if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+            const auto [type, json] = RNMBXStringifyEventData(event);
+            std::dynamic_pointer_cast<const facebook::react::RNMBXVectorSourceEventEmitter>(strongSelf->_eventEmitter)->onMapboxVectorSourcePress({type, json});
+          }
+    }];
+
+    self.contentView = _view;
+    self.mapFeature = _view;
+}
+
+- (void)prepareForRecycle
+{
+  [super prepareForRecycle];
+  [self prepareView];
+}
+
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    if ([childComponentView isKindOfClass:[RCTViewComponentView class]]) {
+        [_view insertReactSubviewInternal:((RCTViewComponentView *)childComponentView).contentView at:index];
+    } else {
+        RCTLogError(@"Tried to add view that is not RCTViewComponentView: %@", childComponentView);
+    }
+}
+
+- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    if ([childComponentView isKindOfClass:[RCTViewComponentView class]]) {
+        [_view removeReactSubviewInternal:((RCTViewComponentView *)childComponentView).contentView];
+    } else {
+        RCTLogError(@"Tried to remove view that is not RCTViewComponentView: %@", childComponentView);
+    }
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXVectorSourceComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = *std::static_pointer_cast<const RNMBXVectorSourceProps>(props);
+    id idx = RNMBXConvertFollyDynamicToId(newProps.id);
+    if (idx != nil) {
+        _view.id = idx;
+    }
+    id existing = RNMBXConvertFollyDynamicToId(newProps.existing);
+    if (existing != nil) {
+        _view.existing = existing;
+    }
+    id url = RNMBXConvertFollyDynamicToId(newProps.url);
+    if (url != nil) {
+        _view.url = url;
+    }
+    id tileUrlTemplates = RNMBXConvertFollyDynamicToId(newProps.tileUrlTemplates);
+    if (tileUrlTemplates != nil) {
+        _view.tileUrlTemplates = tileUrlTemplates;
+    }
+    id minZoomLevel = RNMBXConvertFollyDynamicToId(newProps.minZoomLevel);
+    if (minZoomLevel != nil) {
+        _view.minZoomLevel = minZoomLevel;
+    }
+    id maxZoomLevel = RNMBXConvertFollyDynamicToId(newProps.maxZoomLevel);
+    if (maxZoomLevel != nil) {
+        _view.maxZoomLevel = maxZoomLevel;
+    }
+    id tms = RNMBXConvertFollyDynamicToId(newProps.tms);
+    if (tms != nil) {
+        _view.tms = tms;
+    }
+    id attribution = RNMBXConvertFollyDynamicToId(newProps.attribution);
+    if (attribution != nil) {
+        _view.attribution = attribution;
+    }
+    id hasPressListener = RNMBXConvertFollyDynamicToId(newProps.hasPressListener);
+    if (hasPressListener != nil) {
+        _view.hasPressListener = hasPressListener;
+    }
+    id hitbox = RNMBXConvertFollyDynamicToId(newProps.hitbox);
+    if (hitbox != nil) {
+        _view.hitbox = hitbox;
+    }
+    
+  [super updateProps:props oldProps:oldProps];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXVectorSourceCls(void)
+{
+  return RNMBXVectorSourceComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/{RNMBXVectorSourceManager.m → RNMBXVectorSourceViewManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RNMBXVectorSourceManager, RCTViewManager)
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXVectorSource, RNMBXVectorSourceViewManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(id, NSString)
 RCT_EXPORT_VIEW_PROPERTY(existing, BOOL)

package/ios/RNMBX/{RNMBXVectorSourceManager.swift → RNMBXVectorSourceViewManager.swift}

@@ -1,5 +1,5 @@
-@objc(RNMBXVectorSourceManager)
-class RNMBXVectorSourceManager: RCTViewManager {
+@objc(RNMBXVectorSourceViewManager)
+class RNMBXVectorSourceViewManager: RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true

package/ios/install.md

@@ -93,6 +93,7 @@ $RNMapboxMapsUseV11 = true # use 11 version
 $RNMapboxMapsVersion = '= 11.0.0-beta.5'
 ```
 
+If using expo managed workflow, set the "RNMapboxMapsVersion" variable and the "RNMapboxMapsUseV11" variable to `true`. See the [expo guide](/plugin/install.md)
 
 ## Troubleshooting
 

package/lib/commonjs/components/ImageSource.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.NATIVE_MODULE_NAME = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _reactNative = require("react-native");
 var _utils = require("../utils");
+var _RNMBXImageSourceNativeComponent = _interopRequireDefault(require("../specs/RNMBXImageSourceNativeComponent"));
 var _AbstractSource = _interopRequireDefault(require("./AbstractSource"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -34,13 +34,16 @@ class ImageSource extends _AbstractSource.default {
       ...this.props,
       url: this._getURL()
     };
-    return /*#__PURE__*/_react.default.createElement(RNMBXImageSource, _extends({
-      ref: this.setNativeRef
-    }, props), (0, _utils.cloneReactChildrenWithProps)(this.props.children, {
-      sourceID: this.props.id
-    }));
+    return (
+      /*#__PURE__*/
+      // @ts-expect-error just codegen stuff
+      _react.default.createElement(_RNMBXImageSourceNativeComponent.default, _extends({
+        ref: this.setNativeRef
+      }, props), (0, _utils.cloneReactChildrenWithProps)(this.props.children, {
+        sourceID: this.props.id
+      }))
+    );
   }
 }
-const RNMBXImageSource = (0, _reactNative.requireNativeComponent)(NATIVE_MODULE_NAME);
 var _default = exports.default = ImageSource;
 //# sourceMappingURL=ImageSource.js.map

package/lib/commonjs/components/ImageSource.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_utils","_AbstractSource","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","NATIVE_MODULE_NAME","exports","ImageSource","AbstractSource","_getURL","url","props","isNumber","resolveImagePath","render","coordinates","createElement","RNMBXImageSource","ref","setNativeRef","cloneReactChildrenWithProps","children","sourceID","id","requireNativeComponent","_default"],"sourceRoot":"../../../src","sources":["components/ImageSource.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAF,OAAA;AAOA,IAAAG,eAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAA8C,SAAAD,uBAAAK,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,SAAA,IAAAA,QAAA,GAAAC,MAAA,CAAAC,MAAA,GAAAD,MAAA,CAAAC,MAAA,CAAAC,IAAA,eAAAC,MAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAC,SAAA,CAAAC,MAAA,EAAAF,CAAA,UAAAG,MAAA,GAAAF,SAAA,CAAAD,CAAA,YAAAI,GAAA,IAAAD,MAAA,QAAAP,MAAA,CAAAS,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAJ,MAAA,EAAAC,GAAA,KAAAL,MAAA,CAAAK,GAAA,IAAAD,MAAA,CAAAC,GAAA,gBAAAL,MAAA,YAAAJ,QAAA,CAAAa,KAAA,OAAAP,SAAA;AAEvC,MAAMQ,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,GAAG,kBAAkB;AA+BpD;AACA;AACA;AACA;AACA,MAAME,WAAW,SAASC,uBAAc,CAAqB;EAC3DC,OAAOA,CAAA,EAAuB;IAC5B,MAAM;MAAEC;IAAI,CAAC,GAAG,IAAI,CAACC,KAAK;IAE1B,IAAI,IAAAC,eAAQ,EAACF,GAAG,CAAC,EAAE;MACjB,OAAO,IAAAG,uBAAgB,EAACH,GAAG,CAAC;IAC9B,CAAC,MAAM;MACL,OAAOA,GAAG;IACZ;EACF;EAEAI,MAAMA,CAAA,EAAG;IACP,IACE,CAAC,IAAI,CAACH,KAAK,CAACD,GAAG,IACf,CAAC,IAAI,CAACC,KAAK,CAACI,WAAW,IACvB,CAAC,IAAI,CAACJ,KAAK,CAACI,WAAW,CAACjB,MAAM,EAC9B;MACA,OAAO,IAAI;IACb;IAEA,MAAMa,KAAK,GAAG;MACZ,GAAG,IAAI,CAACA,KAAK;MACbD,GAAG,EAAE,IAAI,CAACD,OAAO,CAAC;IACpB,CAAC;IAED,oBACE3B,MAAA,CAAAQ,OAAA,CAAA0B,aAAA,CAACC,gBAAgB,EAAA1B,QAAA;MAAC2B,GAAG,EAAE,IAAI,CAACC;IAAa,GAAKR,KAAK,GAChD,IAAAS,kCAA2B,EAAC,IAAI,CAACT,KAAK,CAACU,QAAQ,EAAE;MAChDC,QAAQ,EAAE,IAAI,CAACX,KAAK,CAACY;IACvB,CAAC,CACe,CAAC;EAEvB;AACF;AAEA,MAAMN,gBAAgB,GACpB,IAAAO,mCAAsB,EAAcnB,kBAAkB,CAAC;AAAC,IAAAoB,QAAA,GAAAnB,OAAA,CAAAhB,OAAA,GAE3CiB,WAAW"}
+{"version":3,"names":["_react","_interopRequireDefault","require","_utils","_RNMBXImageSourceNativeComponent","_AbstractSource","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","NATIVE_MODULE_NAME","exports","ImageSource","AbstractSource","_getURL","url","props","isNumber","resolveImagePath","render","coordinates","createElement","ref","setNativeRef","cloneReactChildrenWithProps","children","sourceID","id","_default"],"sourceRoot":"../../../src","sources":["components/ImageSource.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AAMA,IAAAE,gCAAA,GAAAH,sBAAA,CAAAC,OAAA;AAEA,IAAAG,eAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAA8C,SAAAD,uBAAAK,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,SAAA,IAAAA,QAAA,GAAAC,MAAA,CAAAC,MAAA,GAAAD,MAAA,CAAAC,MAAA,CAAAC,IAAA,eAAAC,MAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAC,SAAA,CAAAC,MAAA,EAAAF,CAAA,UAAAG,MAAA,GAAAF,SAAA,CAAAD,CAAA,YAAAI,GAAA,IAAAD,MAAA,QAAAP,MAAA,CAAAS,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAJ,MAAA,EAAAC,GAAA,KAAAL,MAAA,CAAAK,GAAA,IAAAD,MAAA,CAAAC,GAAA,gBAAAL,MAAA,YAAAJ,QAAA,CAAAa,KAAA,OAAAP,SAAA;AAEvC,MAAMQ,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,GAAG,kBAAkB;AA+BpD;AACA;AACA;AACA;AACA,MAAME,WAAW,SAASC,uBAAc,CAAqB;EAC3DC,OAAOA,CAAA,EAAuB;IAC5B,MAAM;MAAEC;IAAI,CAAC,GAAG,IAAI,CAACC,KAAK;IAE1B,IAAI,IAAAC,eAAQ,EAACF,GAAG,CAAC,EAAE;MACjB,OAAO,IAAAG,uBAAgB,EAACH,GAAG,CAAC;IAC9B,CAAC,MAAM;MACL,OAAOA,GAAG;IACZ;EACF;EAEAI,MAAMA,CAAA,EAAG;IACP,IACE,CAAC,IAAI,CAACH,KAAK,CAACD,GAAG,IACf,CAAC,IAAI,CAACC,KAAK,CAACI,WAAW,IACvB,CAAC,IAAI,CAACJ,KAAK,CAACI,WAAW,CAACjB,MAAM,EAC9B;MACA,OAAO,IAAI;IACb;IAEA,MAAMa,KAAK,GAAG;MACZ,GAAG,IAAI,CAACA,KAAK;MACbD,GAAG,EAAE,IAAI,CAACD,OAAO,CAAC;IACpB,CAAC;IAED;MAAA;MACE;MACA3B,MAAA,CAAAQ,OAAA,CAAA0B,aAAA,CAAC9B,gCAAA,CAAAI,OAA+B,EAAAC,QAAA;QAAC0B,GAAG,EAAE,IAAI,CAACC;MAAa,GAAKP,KAAK,GAC/D,IAAAQ,kCAA2B,EAAC,IAAI,CAACR,KAAK,CAACS,QAAQ,EAAE;QAChDC,QAAQ,EAAE,IAAI,CAACV,KAAK,CAACW;MACvB,CAAC,CAC8B;IAAC;EAEtC;AACF;AAAC,IAAAC,QAAA,GAAAjB,OAAA,CAAAhB,OAAA,GAEciB,WAAW"}

package/lib/commonjs/components/RasterDemSource.js

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.NATIVE_MODULE_NAME = void 0;
+exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactNative = require("react-native");
+var _RNMBXRasterDemSourceNativeComponent = _interopRequireDefault(require("../specs/RNMBXRasterDemSourceNativeComponent"));
 var _utils = require("../utils");
 var _AbstractSource = _interopRequireDefault(require("./AbstractSource"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 const isTileTemplateUrl = url => !!url && (url.includes('{z}') || url.includes('{bbox-') || url.includes('{quadkey}'));
 const MapboxGL = _reactNative.NativeModules.RNMBXModule;
-const NATIVE_MODULE_NAME = exports.NATIVE_MODULE_NAME = 'RNMBXRasterDemSource';
 class RasterDemSource extends _AbstractSource.default {
   static defaultProps = {
     id: MapboxGL.StyleSource.DefaultSourceID
@@ -47,13 +47,16 @@ class RasterDemSource extends _AbstractSource.default {
       maxZoomLevel: this.props.maxZoomLevel,
       tileSize: this.props.tileSize
     };
-    return /*#__PURE__*/_react.default.createElement(RNMBXRasterDemSource, _extends({
-      ref: this.setNativeRef
-    }, props), (0, _utils.cloneReactChildrenWithProps)(this.props.children, {
-      sourceID: this.props.id
-    }));
+    return (
+      /*#__PURE__*/
+      // @ts-expect-error just codegen stuff
+      _react.default.createElement(_RNMBXRasterDemSourceNativeComponent.default, _extends({
+        ref: this.setNativeRef
+      }, props), (0, _utils.cloneReactChildrenWithProps)(this.props.children, {
+        sourceID: this.props.id
+      }))
+    );
   }
 }
-const RNMBXRasterDemSource = (0, _reactNative.requireNativeComponent)(NATIVE_MODULE_NAME);
 var _default = exports.default = RasterDemSource;
 //# sourceMappingURL=RasterDemSource.js.map

package/lib/commonjs/components/RasterDemSource.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_utils","_AbstractSource","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","isTileTemplateUrl","url","includes","MapboxGL","NativeModules","RNMBXModule","NATIVE_MODULE_NAME","exports","RasterDemSource","AbstractSource","defaultProps","id","StyleSource","DefaultSourceID","constructor","props","console","warn","render","tileUrlTemplates","undefined","existing","minZoomLevel","maxZoomLevel","tileSize","createElement","RNMBXRasterDemSource","ref","setNativeRef","cloneReactChildrenWithProps","children","sourceID","requireNativeComponent","_default"],"sourceRoot":"../../../src","sources":["components/RasterDemSource.tsx"],"mappings":"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"}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_RNMBXRasterDemSourceNativeComponent","_utils","_AbstractSource","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","isTileTemplateUrl","url","includes","MapboxGL","NativeModules","RNMBXModule","RasterDemSource","AbstractSource","defaultProps","id","StyleSource","DefaultSourceID","constructor","props","console","warn","render","tileUrlTemplates","undefined","existing","minZoomLevel","maxZoomLevel","tileSize","createElement","ref","setNativeRef","cloneReactChildrenWithProps","children","sourceID","_default","exports"],"sourceRoot":"../../../src","sources":["components/RasterDemSource.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,oCAAA,GAAAH,sBAAA,CAAAC,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAEA,IAAAI,eAAA,GAAAL,sBAAA,CAAAC,OAAA;AAA8C,SAAAD,uBAAAM,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,SAAA,IAAAA,QAAA,GAAAC,MAAA,CAAAC,MAAA,GAAAD,MAAA,CAAAC,MAAA,CAAAC,IAAA,eAAAC,MAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAC,SAAA,CAAAC,MAAA,EAAAF,CAAA,UAAAG,MAAA,GAAAF,SAAA,CAAAD,CAAA,YAAAI,GAAA,IAAAD,MAAA,QAAAP,MAAA,CAAAS,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAJ,MAAA,EAAAC,GAAA,KAAAL,MAAA,CAAAK,GAAA,IAAAD,MAAA,CAAAC,GAAA,gBAAAL,MAAA,YAAAJ,QAAA,CAAAa,KAAA,OAAAP,SAAA;AAE9C,MAAMQ,iBAAiB,GAAIC,GAAY,IACrC,CAAC,CAACA,GAAG,KACJA,GAAG,CAACC,QAAQ,CAAC,KAAK,CAAC,IAAID,GAAG,CAACC,QAAQ,CAAC,QAAQ,CAAC,IAAID,GAAG,CAACC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAE9E,MAAMC,QAAQ,GAAGC,0BAAa,CAACC,WAAW;AAiD1C,MAAMC,eAAe,SAASC,uBAAc,CAAqB;EAC/D,OAAOC,YAAY,GAAG;IACpBC,EAAE,EAAEN,QAAQ,CAACO,WAAW,CAACC;EAC3B,CAAC;EAEDC,WAAWA,CAACC,KAAY,EAAE;IACxB,KAAK,CAACA,KAAK,CAAC;IACZ,IAAIb,iBAAiB,CAACa,KAAK,CAACZ,GAAG,CAAC,EAAE;MAChCa,OAAO,CAACC,IAAI,CACT,mKAAkKF,KAAK,CAACZ,GAAI,eAC/K,CAAC;IACH;EACF;EAEAe,MAAMA,CAAA,EAAG;IACP,IAAI;MAAEf;IAAI,CAAC,GAAG,IAAI,CAACY,KAAK;IACxB,IAAI;MAAEI;IAAiB,CAAC,GAAG,IAAI,CAACJ,KAAK;;IAErC;IACA;IACA,IAAIb,iBAAiB,CAACC,GAAG,CAAC,EAAE;MAC1BgB,gBAAgB,GAAG,CAAChB,GAAG,CAAC;MACxBA,GAAG,GAAGiB,SAAS;IACjB;IAEA,MAAML,KAAK,GAAG;MACZ,GAAG,IAAI,CAACA,KAAK;MACbJ,EAAE,EAAE,IAAI,CAACI,KAAK,CAACJ,EAAE;MACjBU,QAAQ,EAAE,IAAI,CAACN,KAAK,CAACM,QAAQ;MAC7BlB,GAAG;MACHgB,gBAAgB;MAChBG,YAAY,EAAE,IAAI,CAACP,KAAK,CAACO,YAAY;MACrCC,YAAY,EAAE,IAAI,CAACR,KAAK,CAACQ,YAAY;MACrCC,QAAQ,EAAE,IAAI,CAACT,KAAK,CAACS;IACvB,CAAC;IACD;MAAA;MACE;MACA9C,MAAA,CAAAS,OAAA,CAAAsC,aAAA,CAAC3C,oCAAA,CAAAK,OAAmC,EAAAC,QAAA;QAACsC,GAAG,EAAE,IAAI,CAACC;MAAa,GAAKZ,KAAK,GACnE,IAAAa,kCAA2B,EAAC,IAAI,CAACb,KAAK,CAACc,QAAQ,EAAE;QAChDC,QAAQ,EAAE,IAAI,CAACf,KAAK,CAACJ;MACvB,CAAC,CACkC;IAAC;EAE1C;AACF;AAAC,IAAAoB,QAAA,GAAAC,OAAA,CAAA7C,OAAA,GAEcqB,eAAe"}

package/lib/commonjs/components/RasterSource.js

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.NATIVE_MODULE_NAME = void 0;
+exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactNative = require("react-native");
 var _utils = require("../utils");
+var _RNMBXRasterSourceNativeComponent = _interopRequireDefault(require("../specs/RNMBXRasterSourceNativeComponent"));
 var _AbstractSource = _interopRequireDefault(require("./AbstractSource"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 const MapboxGL = _reactNative.NativeModules.RNMBXModule;
-const NATIVE_MODULE_NAME = exports.NATIVE_MODULE_NAME = 'RNMBXRasterSource';
 const isTileTemplateUrl = url => !!url && (url.includes('{z}') || url.includes('{bbox-') || url.includes('{quadkey}'));
 /**
  * RasterSource is a map content source that supplies raster image tiles to be shown on the map.
@@ -54,13 +54,16 @@ class RasterSource extends _AbstractSource.default {
       tms: this.props.tms,
       attribution: this.props.attribution
     };
-    return /*#__PURE__*/_react.default.createElement(RNMBXRasterSource, _extends({
-      ref: this.setNativeRef
-    }, props), (0, _utils.cloneReactChildrenWithProps)(this.props.children, {
-      sourceID: this.props.id
-    }));
+    return (
+      /*#__PURE__*/
+      // @ts-expect-error just codegen stuff
+      _react.default.createElement(_RNMBXRasterSourceNativeComponent.default, _extends({
+        ref: this.setNativeRef
+      }, props), (0, _utils.cloneReactChildrenWithProps)(this.props.children, {
+        sourceID: this.props.id
+      }))
+    );
   }
 }
-const RNMBXRasterSource = (0, _reactNative.requireNativeComponent)(NATIVE_MODULE_NAME);
 var _default = exports.default = RasterSource;
 //# sourceMappingURL=RasterSource.js.map

package/lib/commonjs/components/RasterSource.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_utils","_AbstractSource","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","MapboxGL","NativeModules","RNMBXModule","NATIVE_MODULE_NAME","exports","isTileTemplateUrl","url","includes","RasterSource","AbstractSource","defaultProps","id","StyleSource","DefaultSourceID","constructor","props","console","warn","render","tileUrlTemplates","undefined","existing","minZoomLevel","maxZoomLevel","tileSize","tms","attribution","createElement","RNMBXRasterSource","ref","setNativeRef","cloneReactChildrenWithProps","children","sourceID","requireNativeComponent","_default"],"sourceRoot":"../../../src","sources":["components/RasterSource.tsx"],"mappings":"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"}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_utils","_RNMBXRasterSourceNativeComponent","_AbstractSource","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","MapboxGL","NativeModules","RNMBXModule","isTileTemplateUrl","url","includes","RasterSource","AbstractSource","defaultProps","id","StyleSource","DefaultSourceID","constructor","props","console","warn","render","tileUrlTemplates","undefined","existing","minZoomLevel","maxZoomLevel","tileSize","tms","attribution","createElement","ref","setNativeRef","cloneReactChildrenWithProps","children","sourceID","_default","exports"],"sourceRoot":"../../../src","sources":["components/RasterSource.tsx"],"mappings":"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"}

package/lib/commonjs/components/ShapeSource.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.ShapeSource = exports.NATIVE_MODULE_NAME = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactNative = require("react-native");
-var _filterUtils = require("../utils/filterUtils");
+var _RNMBXShapeSourceNativeComponent = _interopRequireDefault(require("../specs/RNMBXShapeSourceNativeComponent"));
+var _NativeRNMBXShapeSourceModule = _interopRequireDefault(require("../specs/NativeRNMBXShapeSourceModule"));
 var _utils = require("../utils");
 var _deprecation = require("../utils/deprecation");
 var _AbstractSource = _interopRequireDefault(require("./AbstractSource"));
-var _NativeBridgeComponent = _interopRequireDefault(require("./NativeBridgeComponent"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const MapboxGL = _reactNative.NativeModules.RNMBXModule;
 const NATIVE_MODULE_NAME = exports.NATIVE_MODULE_NAME = 'RNMBXShapeSource';
@@ -18,7 +18,7 @@ const NATIVE_MODULE_NAME = exports.NATIVE_MODULE_NAME = 'RNMBXShapeSource';
  * ShapeSource is a map content source that supplies vector shapes to be shown on the map.
  * The shape may be an url or a GeoJSON object
  */
-class ShapeSource extends (0, _NativeBridgeComponent.default)(_AbstractSource.default, NATIVE_MODULE_NAME) {
+class ShapeSource extends _AbstractSource.default {
   static NATIVE_ASSETS_KEY = 'assets';
   static defaultProps = {
     id: MapboxGL.StyleSource.DefaultSourceID
@@ -28,26 +28,6 @@ class ShapeSource extends (0, _NativeBridgeComponent.default)(_AbstractSource.de
   }
   _setNativeRef(nativeRef) {
     this.setNativeRef(nativeRef);
-    super._runPendingNativeCommands(nativeRef);
-  }
-
-  /**
-   * Returns all features from the source that match the query parameters whether the feature is currently
-   * rendered on the map.
-   *
-   * @example
-   * shapeSource.features()
-   *
-   * @param  {Array=} filter - an optional filter statement to filter the returned Features.
-   * @return {FeatureCollection}
-   */
-  async features() {
-    let filter = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    const res = await this._runNativeCommand('features', this._nativeRef, (0, _filterUtils.getFilter)(filter));
-    if ((0, _utils.isAndroid)()) {
-      return JSON.parse(res.data);
-    }
-    return res.data;
   }
 
   /**
@@ -62,10 +42,9 @@ class ShapeSource extends (0, _NativeBridgeComponent.default)(_AbstractSource.de
   async getClusterExpansionZoom(feature) {
     if (typeof feature === 'number') {
       console.warn('Using cluster_id is deprecated and will be removed from the future releases. Please use cluster as an argument instead.');
-      const res = await this._runNativeCommand('getClusterExpansionZoomById', this._nativeRef, [feature]);
-      return res.data;
     }
-    const res = await this._runNativeCommand('getClusterExpansionZoom', this._nativeRef, [JSON.stringify(feature)]);
+    const handle = (0, _reactNative.findNodeHandle)(this._nativeRef);
+    const res = await _NativeRNMBXShapeSourceModule.default.getClusterExpansionZoom(handle, JSON.stringify(feature));
     return res.data;
   }
 
@@ -83,13 +62,9 @@ class ShapeSource extends (0, _NativeBridgeComponent.default)(_AbstractSource.de
   async getClusterLeaves(feature, limit, offset) {
     if (typeof feature === 'number') {
       console.warn('Using cluster_id is deprecated and will be removed from the future releases. Please use cluster as an argument instead.');
-      const res = await this._runNativeCommand('getClusterLeavesById', this._nativeRef, [feature, limit, offset]);
-      if ((0, _utils.isAndroid)()) {
-        return JSON.parse(res.data);
-      }
-      return res.data;
     }
-    const res = await this._runNativeCommand('getClusterLeaves', this._nativeRef, [JSON.stringify(feature), limit, offset]);
+    const handle = (0, _reactNative.findNodeHandle)(this._nativeRef);
+    const res = await _NativeRNMBXShapeSourceModule.default.getClusterLeaves(handle, JSON.stringify(feature), limit, offset);
     if ((0, _utils.isAndroid)()) {
       return JSON.parse(res.data);
     }
@@ -108,13 +83,9 @@ class ShapeSource extends (0, _NativeBridgeComponent.default)(_AbstractSource.de
   async getClusterChildren(feature) {
     if (typeof feature === 'number') {
       console.warn('Using cluster_id is deprecated and will be removed from the future releases. Please use cluster as an argument instead.');
-      const res = await this._runNativeCommand('getClusterChildrenById', this._nativeRef, [feature]);
-      if ((0, _utils.isAndroid)()) {
-        return JSON.parse(res.data);
-      }
-      return res.data;
     }
-    const res = await this._runNativeCommand('getClusterChildren', this._nativeRef, [JSON.stringify(feature)]);
+    const handle = (0, _reactNative.findNodeHandle)(this._nativeRef);
+    const res = await _NativeRNMBXShapeSourceModule.default.getClusterChildren(handle, JSON.stringify(feature));
     if ((0, _utils.isAndroid)()) {
       return JSON.parse(res.data);
     }
@@ -135,16 +106,22 @@ class ShapeSource extends (0, _NativeBridgeComponent.default)(_AbstractSource.de
     }
     return (0, _utils.toJSONString)(this.props.shape);
   }
+  _decodePayload(payload) {
+    // we check whether the payload is a string, since the strict type safety is enforced only on iOS on the new arch
+    // on Android, on both archs, the payload is an object
+    if (typeof payload === 'string') {
+      return JSON.parse(payload);
+    } else {
+      return payload;
+    }
+  }
   onPress(event) {
+    const payload = this._decodePayload(event.nativeEvent.payload);
     const {
-      nativeEvent: {
-        payload: {
-          features,
-          coordinates,
-          point
-        }
-      }
-    } = event;
+      features,
+      coordinates,
+      point
+    } = payload;
     let newEvent = {
       features,
       coordinates,
@@ -178,14 +155,16 @@ class ShapeSource extends (0, _NativeBridgeComponent.default)(_AbstractSource.de
       tolerance: this.props.tolerance,
       lineMetrics: this.props.lineMetrics,
       onPress: undefined,
-      ref: nativeRef => this._setNativeRef(nativeRef),
-      onAndroidCallback: (0, _utils.isAndroid)() ? this._onAndroidCallback : undefined
+      ref: nativeRef => this._setNativeRef(nativeRef)
     };
-    return /*#__PURE__*/_react.default.createElement(RNMBXShapeSource, props, (0, _utils.cloneReactChildrenWithProps)(this.props.children, {
-      sourceID: this.props.id
-    }));
+    return (
+      /*#__PURE__*/
+      // @ts-expect-error just codegen stuff
+      _react.default.createElement(_RNMBXShapeSourceNativeComponent.default, props, (0, _utils.cloneReactChildrenWithProps)(this.props.children, {
+        sourceID: this.props.id
+      }))
+    );
   }
 }
 exports.ShapeSource = ShapeSource;
-const RNMBXShapeSource = (0, _reactNative.requireNativeComponent)(NATIVE_MODULE_NAME);
 //# sourceMappingURL=ShapeSource.js.map

package/lib/commonjs/components/ShapeSource.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_filterUtils","_utils","_deprecation","_AbstractSource","_NativeBridgeComponent","obj","__esModule","default","MapboxGL","NativeModules","RNMBXModule","NATIVE_MODULE_NAME","exports","ShapeSource","NativeBridgeComponent","AbstractSource","NATIVE_ASSETS_KEY","defaultProps","id","StyleSource","DefaultSourceID","constructor","props","_setNativeRef","nativeRef","setNativeRef","_runPendingNativeCommands","features","filter","arguments","length","undefined","res","_runNativeCommand","_nativeRef","getFilter","isAndroid","JSON","parse","data","getClusterExpansionZoom","feature","console","warn","stringify","getClusterLeaves","limit","offset","getClusterChildren","setNativeProps","shallowProps","Object","assign","shape","_getShape","toJSONString","onPress","event","nativeEvent","payload","coordinates","point","newEvent","copyPropertiesAsDeprecated","key","origNativeEvent","render","existing","url","hitbox","hasPressListener","isFunction","onMapboxShapeSourcePress","bind","cluster","clusterRadius","clusterMaxZoomLevel","clusterProperties","maxZoomLevel","buffer","tolerance","lineMetrics","ref","onAndroidCallback","_onAndroidCallback","createElement","RNMBXShapeSource","cloneReactChildrenWithProps","children","sourceID","requireNativeComponent"],"sourceRoot":"../../../src","sources":["components/ShapeSource.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAOA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAMA,IAAAI,YAAA,GAAAJ,OAAA;AAGA,IAAAK,eAAA,GAAAN,sBAAA,CAAAC,OAAA;AACA,IAAAM,sBAAA,GAAAP,sBAAA,CAAAC,OAAA;AAA4D,SAAAD,uBAAAQ,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAE5D,MAAMG,QAAQ,GAAGC,0BAAa,CAACC,WAAW;AAEnC,MAAMC,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,GAAG,kBAAkB;AA2HpD;AACA;AACA;AACA;AACO,MAAME,WAAW,SAAS,IAAAC,8BAAqB,EACpDC,uBAAc,EACdJ,kBACF,CAAC,CAAC;EACA,OAAOK,iBAAiB,GAAG,QAAQ;EAEnC,OAAOC,YAAY,GAAG;IACpBC,EAAE,EAAEV,QAAQ,CAACW,WAAW,CAACC;EAC3B,CAAC;EAEDC,WAAWA,CAACC,KAAY,EAAE;IACxB,KAAK,CAACA,KAAK,CAAC;EACd;EAEAC,aAAaA,CACXC,SAAiE,EACjE;IACA,IAAI,CAACC,YAAY,CAACD,SAAS,CAAC;IAC5B,KAAK,CAACE,yBAAyB,CAACF,SAAS,CAAC;EAC5C;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAMG,QAAQA,CAAA,EAA6B;IAAA,IAA5BC,MAAqB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;IACvC,MAAMG,GAAqB,GAAG,MAAM,IAAI,CAACC,iBAAiB,CACxD,UAAU,EACV,IAAI,CAACC,UAAU,EACf,IAAAC,sBAAS,EAACP,MAAM,CAClB,CAAC;IAED,IAAI,IAAAQ,gBAAS,EAAC,CAAC,EAAE;MACf,OAAOC,IAAI,CAACC,KAAK,CAACN,GAAG,CAACO,IAAI,CAAC;IAC7B;IAEA,OAAOP,GAAG,CAACO,IAAI;EACjB;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAMC,uBAAuBA,CAC3BC,OAAiC,EAChB;IACjB,IAAI,OAAOA,OAAO,KAAK,QAAQ,EAAE;MAC/BC,OAAO,CAACC,IAAI,CACV,yHACF,CAAC;MACD,MAAMX,GAAqB,GAAG,MAAM,IAAI,CAACC,iBAAiB,CACxD,6BAA6B,EAC7B,IAAI,CAACC,UAAU,EACf,CAACO,OAAO,CACV,CAAC;MACD,OAAOT,GAAG,CAACO,IAAI;IACjB;IAEA,MAAMP,GAAqB,GAAG,MAAM,IAAI,CAACC,iBAAiB,CACxD,yBAAyB,EACzB,IAAI,CAACC,UAAU,EACf,CAACG,IAAI,CAACO,SAAS,CAACH,OAAO,CAAC,CAC1B,CAAC;IACD,OAAOT,GAAG,CAACO,IAAI;EACjB;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAMM,gBAAgBA,CACpBJ,OAAiC,EACjCK,KAAa,EACbC,MAAc,EACd;IACA,IAAI,OAAON,OAAO,KAAK,QAAQ,EAAE;MAC/BC,OAAO,CAACC,IAAI,CACV,yHACF,CAAC;MACD,MAAMX,GAAqB,GAAG,MAAM,IAAI,CAACC,iBAAiB,CACxD,sBAAsB,EACtB,IAAI,CAACC,UAAU,EACf,CAACO,OAAO,EAAEK,KAAK,EAAEC,MAAM,CACzB,CAAC;MAED,IAAI,IAAAX,gBAAS,EAAC,CAAC,EAAE;QACf,OAAOC,IAAI,CAACC,KAAK,CAACN,GAAG,CAACO,IAAI,CAAC;MAC7B;MAEA,OAAOP,GAAG,CAACO,IAAI;IACjB;IAEA,MAAMP,GAAqB,GAAG,MAAM,IAAI,CAACC,iBAAiB,CACxD,kBAAkB,EAClB,IAAI,CAACC,UAAU,EACf,CAACG,IAAI,CAACO,SAAS,CAACH,OAAO,CAAC,EAAEK,KAAK,EAAEC,MAAM,CACzC,CAAC;IAED,IAAI,IAAAX,gBAAS,EAAC,CAAC,EAAE;MACf,OAAOC,IAAI,CAACC,KAAK,CAACN,GAAG,CAACO,IAAI,CAAC;IAC7B;IAEA,OAAOP,GAAG,CAACO,IAAI;EACjB;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAMS,kBAAkBA,CAACP,OAAiC,EAAE;IAC1D,IAAI,OAAOA,OAAO,KAAK,QAAQ,EAAE;MAC/BC,OAAO,CAACC,IAAI,CACV,yHACF,CAAC;MACD,MAAMX,GAAqB,GAAG,MAAM,IAAI,CAACC,iBAAiB,CACxD,wBAAwB,EACxB,IAAI,CAACC,UAAU,EACf,CAACO,OAAO,CACV,CAAC;MAED,IAAI,IAAAL,gBAAS,EAAC,CAAC,EAAE;QACf,OAAOC,IAAI,CAACC,KAAK,CAACN,GAAG,CAACO,IAAI,CAAC;MAC7B;MAEA,OAAOP,GAAG,CAACO,IAAI;IACjB;IAEA,MAAMP,GAAqB,GAAG,MAAM,IAAI,CAACC,iBAAiB,CACxD,oBAAoB,EACpB,IAAI,CAACC,UAAU,EACf,CAACG,IAAI,CAACO,SAAS,CAACH,OAAO,CAAC,CAC1B,CAAC;IAED,IAAI,IAAAL,gBAAS,EAAC,CAAC,EAAE;MACf,OAAOC,IAAI,CAACC,KAAK,CAACN,GAAG,CAACO,IAAI,CAAC;IAC7B;IAEA,OAAOP,GAAG,CAACO,IAAI;EACjB;EAEAU,cAAcA,CAAC3B,KAAkB,EAAE;IACjC,MAAM4B,YAAY,GAAGC,MAAM,CAACC,MAAM,CAAC,CAAC,CAAC,EAAE9B,KAAK,CAAC;;IAE7C;IACA,IAAI4B,YAAY,CAACG,KAAK,IAAI,OAAOH,YAAY,CAACG,KAAK,KAAK,QAAQ,EAAE;MAChEH,YAAY,CAACG,KAAK,GAAGhB,IAAI,CAACO,SAAS,CAACM,YAAY,CAACG,KAAK,CAAC;IACzD;IAEA,KAAK,CAACJ,cAAc,CAACC,YAAY,CAAC;EACpC;EAEAI,SAASA,CAAA,EAAG;IACV,IAAI,CAAC,IAAI,CAAChC,KAAK,CAAC+B,KAAK,EAAE;MACrB;IACF;IACA,OAAO,IAAAE,mBAAY,EAAC,IAAI,CAACjC,KAAK,CAAC+B,KAAK,CAAC;EACvC;EAEAG,OAAOA,CACLC,KAEE,EACF;IACA,MAAM;MACJC,WAAW,EAAE;QACXC,OAAO,EAAE;UAAEhC,QAAQ;UAAEiC,WAAW;UAAEC;QAAM;MAC1C;IACF,CAAC,GAAGJ,KAAK;IACT,IAAIK,QAAgC,GAAG;MACrCnC,QAAQ;MACRiC,WAAW;MACXC;IACF,CAAC;IAEDC,QAAQ,GAAG,IAAAC,uCAA0B,EACnCN,KAAK,EACLK,QAAQ,EACPE,GAAG,IAAK;MACPtB,OAAO,CAACC,IAAI,CACT,SAAQqB,GAAI,kEACf,CAAC;IACH,CAAC,EACD;MACEN,WAAW,EAAGO,eAAwB,KAAM;QAC1C,GAAIA,eAAgC;QACpCN,OAAO,EAAEhC,QAAQ,CAAC,CAAC;MACrB,CAAC;IACH,CACF,CAAC;IACD,IAAI,CAACL,KAAK,CAACkC,OAAO,GAAGM,QAAQ,CAAC;EAChC;EAEAI,MAAMA,CAAA,EAAG;IACP,MAAM5C,KAAK,GAAG;MACZJ,EAAE,EAAE,IAAI,CAACI,KAAK,CAACJ,EAAE;MACjBiD,QAAQ,EAAE,IAAI,CAAC7C,KAAK,CAAC6C,QAAQ;MAC7BC,GAAG,EAAE,IAAI,CAAC9C,KAAK,CAAC8C,GAAG;MACnBf,KAAK,EAAE,IAAI,CAACC,SAAS,CAAC,CAAC;MACvBe,MAAM,EAAE,IAAI,CAAC/C,KAAK,CAAC+C,MAAM;MACzBC,gBAAgB,EAAE,IAAAC,iBAAU,EAAC,IAAI,CAACjD,KAAK,CAACkC,OAAO,CAAC;MAChDgB,wBAAwB,EAAE,IAAI,CAAChB,OAAO,CAACiB,IAAI,CAAC,IAAI,CAAC;MACjDC,OAAO,EAAE,IAAI,CAACpD,KAAK,CAACoD,OAAO,GAAG,CAAC,GAAG,CAAC;MACnCC,aAAa,EAAE,IAAI,CAACrD,KAAK,CAACqD,aAAa;MACvCC,mBAAmB,EAAE,IAAI,CAACtD,KAAK,CAACsD,mBAAmB;MACnDC,iBAAiB,EAAE,IAAI,CAACvD,KAAK,CAACuD,iBAAiB;MAC/CC,YAAY,EAAE,IAAI,CAACxD,KAAK,CAACwD,YAAY;MACrCC,MAAM,EAAE,IAAI,CAACzD,KAAK,CAACyD,MAAM;MACzBC,SAAS,EAAE,IAAI,CAAC1D,KAAK,CAAC0D,SAAS;MAC/BC,WAAW,EAAE,IAAI,CAAC3D,KAAK,CAAC2D,WAAW;MACnCzB,OAAO,EAAEzB,SAAS;MAClBmD,GAAG,EACD1D,SAAiE,IAC9D,IAAI,CAACD,aAAa,CAACC,SAAS,CAAC;MAClC2D,iBAAiB,EAAE,IAAA/C,gBAAS,EAAC,CAAC,GAAG,IAAI,CAACgD,kBAAkB,GAAGrD;IAC7D,CAAC;IAED,oBACEnC,MAAA,CAAAW,OAAA,CAAA8E,aAAA,CAACC,gBAAgB,EAAKhE,KAAK,EACxB,IAAAiE,kCAA2B,EAAC,IAAI,CAACjE,KAAK,CAACkE,QAAQ,EAAE;MAChDC,QAAQ,EAAE,IAAI,CAACnE,KAAK,CAACJ;IACvB,CAAC,CACe,CAAC;EAEvB;AACF;AAACN,OAAA,CAAAC,WAAA,GAAAA,WAAA;AAOD,MAAMyE,gBAAgB,GACpB,IAAAI,mCAAsB,EAAc/E,kBAAkB,CAAC"}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_RNMBXShapeSourceNativeComponent","_NativeRNMBXShapeSourceModule","_utils","_deprecation","_AbstractSource","obj","__esModule","default","MapboxGL","NativeModules","RNMBXModule","NATIVE_MODULE_NAME","exports","ShapeSource","AbstractSource","NATIVE_ASSETS_KEY","defaultProps","id","StyleSource","DefaultSourceID","constructor","props","_setNativeRef","nativeRef","setNativeRef","getClusterExpansionZoom","feature","console","warn","handle","findNodeHandle","_nativeRef","res","NativeRNMBXShapeSourceModule","JSON","stringify","data","getClusterLeaves","limit","offset","isAndroid","parse","getClusterChildren","setNativeProps","shallowProps","Object","assign","shape","_getShape","toJSONString","_decodePayload","payload","onPress","event","nativeEvent","features","coordinates","point","newEvent","copyPropertiesAsDeprecated","key","origNativeEvent","render","existing","url","hitbox","hasPressListener","isFunction","onMapboxShapeSourcePress","bind","cluster","clusterRadius","clusterMaxZoomLevel","clusterProperties","maxZoomLevel","buffer","tolerance","lineMetrics","undefined","ref","createElement","cloneReactChildrenWithProps","children","sourceID"],"sourceRoot":"../../../src","sources":["components/ShapeSource.tsx"],"mappings":"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"}

package/lib/commonjs/components/VectorSource.js

@@ -6,11 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.NATIVE_MODULE_NAME = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactNative = require("react-native");
+var _RNMBXVectorSourceNativeComponent = _interopRequireDefault(require("../specs/RNMBXVectorSourceNativeComponent"));
 var _utils = require("../utils");
-var _filterUtils = require("../utils/filterUtils");
 var _deprecation = require("../utils/deprecation");
 var _AbstractSource = _interopRequireDefault(require("./AbstractSource"));
-var _NativeBridgeComponent = _interopRequireDefault(require("./NativeBridgeComponent"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 const MapboxGL = _reactNative.NativeModules.RNMBXModule;
@@ -23,7 +22,7 @@ const NATIVE_MODULE_NAME = exports.NATIVE_MODULE_NAME = 'RNMBXVectorSource';
  * VectorSource is a map content source that supplies tiled vector data in Mapbox Vector Tile format to be shown on the map.
  * The location of and metadata about the tiles are defined either by an option dictionary or by an external file that conforms to the TileJSON specification.
  */
-class VectorSource extends (0, _NativeBridgeComponent.default)(_AbstractSource.default, NATIVE_MODULE_NAME) {
+class VectorSource extends _AbstractSource.default {
   static defaultProps = {
     id: MapboxGL.StyleSource.DefaultSourceID
   };
@@ -34,41 +33,25 @@ class VectorSource extends (0, _NativeBridgeComponent.default)(_AbstractSource.d
     if (nativeRef) {
       this.setNativeRef(nativeRef);
       // this._nativeRef = nativeRef;
-      super._runPendingNativeCommands(nativeRef);
     }
   }
 
-  /**
-   * Returns all features that match the query parameters regardless of whether or not the feature is
-   * currently rendered on the map. The domain of the query includes all currently-loaded vector tiles
-   * and GeoJSON source tiles. This function does not check tiles outside of the visible viewport.
-   *
-   * @example
-   * vectorSource.features(['id1', 'id2'])
-   *
-   * @param  {Array=} layerIDs - A set of strings that correspond to the names of layers defined in the current style. Only the features contained in these layers are included in the returned array.
-   * @param  {Array=} filter - an optional filter statement to filter the returned Features.
-   * @return {FeatureCollection}
-   */
-  async features() {
-    let layerIDs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    let filter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    const res = await this._runNativeCommand('features', this._nativeRef, [layerIDs, (0, _filterUtils.getFilter)(filter)]);
-    if ((0, _utils.isAndroid)()) {
-      return JSON.parse(res.data);
+  _decodePayload(payload) {
+    // we check whether the payload is a string, since the strict type safety is enforced only on iOS on the new arch
+    // on Android, on both archs, the payload is an object
+    if (typeof payload === 'string') {
+      return JSON.parse(payload);
+    } else {
+      return payload;
     }
-    return res.data;
   }
   onPress(event) {
+    const payload = this._decodePayload(event.nativeEvent.payload);
     const {
-      nativeEvent: {
-        payload: {
-          features,
-          coordinates,
-          point
-        }
-      }
-    } = event;
+      features,
+      coordinates,
+      point
+    } = payload;
     let newEvent = {
       features,
       coordinates,
@@ -102,16 +85,20 @@ class VectorSource extends (0, _NativeBridgeComponent.default)(_AbstractSource.d
       hitbox: this.props.hitbox,
       hasPressListener: (0, _utils.isFunction)(this.props.onPress),
       onMapboxVectorSourcePress: this.onPress.bind(this),
-      onPress: undefined,
-      onAndroidCallback: (0, _utils.isAndroid)() ? this._onAndroidCallback : undefined
+      onPress: undefined
     };
-    return /*#__PURE__*/_react.default.createElement(RNMBXVectorSource, _extends({
-      ref: r => this._setNativeRef(r)
-    }, props), (0, _utils.cloneReactChildrenWithProps)(this.props.children, {
-      sourceID: this.props.id
-    }));
+    return (
+      /*#__PURE__*/
+      // @ts-expect-error just codegen stuff
+      _react.default.createElement(_RNMBXVectorSourceNativeComponent.default
+      // @ts-expect-error just codegen stuff
+      , _extends({
+        ref: r => this._setNativeRef(r)
+      }, props), (0, _utils.cloneReactChildrenWithProps)(this.props.children, {
+        sourceID: this.props.id
+      }))
+    );
   }
 }
-const RNMBXVectorSource = (0, _reactNative.requireNativeComponent)(NATIVE_MODULE_NAME);
 var _default = exports.default = VectorSource;
 //# sourceMappingURL=VectorSource.js.map