@maplibre/maplibre-react-native 11.0.0-alpha.42 → 11.0.0-alpha.43

package/ios/components/annotations/point-annotation/MLRNPointAnnotationComponentView.mm

@@ -0,0 +1,331 @@
+#import "MLRNPointAnnotationComponentView.h"
+
+#import <react/renderer/components/MapLibreReactNativeSpec/ComponentDescriptors.h>
+#import <react/renderer/components/MapLibreReactNativeSpec/EventEmitters.h>
+#import <react/renderer/components/MapLibreReactNativeSpec/Props.h>
+#import <react/renderer/components/MapLibreReactNativeSpec/RCTComponentViewHelpers.h>
+
+#import "RCTFabricComponentsPlugins.h"
+
+#import <React/RCTConversions.h>
+#import <React/UIView+React.h>
+#import "MLRNPointAnnotation.h"
+#import "MLRNCallout.h"
+
+using namespace facebook::react;
+
+// MARK: - MLRNPointAnnotationComponentView
+
+@interface MLRNPointAnnotationComponentView () <RCTMLRNPointAnnotationViewProtocol>
+
+@end
+
+@implementation MLRNPointAnnotationComponentView {
+  MLRNPointAnnotation *_view;
+}
+
++ (BOOL)shouldBeRecycled {
+  // Prevent Fabric from recycling this view - MapLibre reparents annotation views
+  // which conflicts with Fabric's view hierarchy management
+  return NO;
+}
+
+- (UIView *)contentView {
+  // Return _view so MapView's mountChildComponentView can find it via contentView
+  // We don't set self.contentView = _view directly to avoid Fabric's view management
+  return _view;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame {
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const MLRNPointAnnotationProps>();
+    _props = defaultProps;
+    [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView {
+  _view = [[MLRNPointAnnotation alloc] init];
+
+  // Capture weak self reference to prevent retain cycle
+  __weak __typeof__(self) weakSelf = self;
+
+  [_view setReactOnSelected:^(NSDictionary *event) {
+    __typeof__(self) strongSelf = weakSelf;
+
+    if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+      NSString *idValue = event[@"id"];
+      facebook::react::MLRNPointAnnotationEventEmitter::OnSelected eventStruct{
+          std::string([idValue UTF8String] ?: ""),
+          folly::dynamic::array([event[@"lngLat"][0] doubleValue],
+                                [event[@"lngLat"][1] doubleValue]),
+          folly::dynamic::array([event[@"point"][0] doubleValue],
+                                [event[@"point"][1] doubleValue])};
+
+      std::dynamic_pointer_cast<const facebook::react::MLRNPointAnnotationEventEmitter>(
+          strongSelf->_eventEmitter)
+          ->onSelected(eventStruct);
+    }
+  }];
+
+  [_view setReactOnDeselected:^(NSDictionary *event) {
+    __typeof__(self) strongSelf = weakSelf;
+
+    if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+      NSString *idValue = event[@"id"];
+      facebook::react::MLRNPointAnnotationEventEmitter::OnDeselected eventStruct{
+          std::string([idValue UTF8String] ?: ""),
+          folly::dynamic::array([event[@"lngLat"][0] doubleValue],
+                                [event[@"lngLat"][1] doubleValue]),
+          folly::dynamic::array([event[@"point"][0] doubleValue],
+                                [event[@"point"][1] doubleValue])};
+
+      std::dynamic_pointer_cast<const facebook::react::MLRNPointAnnotationEventEmitter>(
+          strongSelf->_eventEmitter)
+          ->onDeselected(eventStruct);
+    }
+  }];
+
+  [_view setReactOnDragStart:^(NSDictionary *event) {
+    __typeof__(self) strongSelf = weakSelf;
+
+    if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+      NSString *idValue = event[@"id"];
+      facebook::react::MLRNPointAnnotationEventEmitter::OnDragStart eventStruct{
+          std::string([idValue UTF8String] ?: ""),
+          folly::dynamic::array([event[@"lngLat"][0] doubleValue],
+                                [event[@"lngLat"][1] doubleValue]),
+          folly::dynamic::array([event[@"point"][0] doubleValue],
+                                [event[@"point"][1] doubleValue])};
+
+      std::dynamic_pointer_cast<const facebook::react::MLRNPointAnnotationEventEmitter>(
+          strongSelf->_eventEmitter)
+          ->onDragStart(eventStruct);
+    }
+  }];
+
+  [_view setReactOnDrag:^(NSDictionary *event) {
+    __typeof__(self) strongSelf = weakSelf;
+
+    if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+      NSString *idValue = event[@"id"];
+      facebook::react::MLRNPointAnnotationEventEmitter::OnDrag eventStruct{
+          std::string([idValue UTF8String] ?: ""),
+          folly::dynamic::array([event[@"lngLat"][0] doubleValue],
+                                [event[@"lngLat"][1] doubleValue]),
+          folly::dynamic::array([event[@"point"][0] doubleValue],
+                                [event[@"point"][1] doubleValue])};
+
+      std::dynamic_pointer_cast<const facebook::react::MLRNPointAnnotationEventEmitter>(
+          strongSelf->_eventEmitter)
+          ->onDrag(eventStruct);
+    }
+  }];
+
+  [_view setReactOnDragEnd:^(NSDictionary *event) {
+    __typeof__(self) strongSelf = weakSelf;
+
+    if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+      NSString *idValue = event[@"id"];
+      facebook::react::MLRNPointAnnotationEventEmitter::OnDragEnd eventStruct{
+          std::string([idValue UTF8String] ?: ""),
+          folly::dynamic::array([event[@"lngLat"][0] doubleValue],
+                                [event[@"lngLat"][1] doubleValue]),
+          folly::dynamic::array([event[@"point"][0] doubleValue],
+                                [event[@"point"][1] doubleValue])};
+
+      std::dynamic_pointer_cast<const facebook::react::MLRNPointAnnotationEventEmitter>(
+          strongSelf->_eventEmitter)
+          ->onDragEnd(eventStruct);
+    }
+  }];
+
+  // Add _view as a subview (not contentView) so the MapView can discover it
+  // via its addToMap: method which iterates through subviews looking for
+  // MLRNPointAnnotation instances to set their map property.
+  // Note: MapLibre will reparent _view when displaying the annotation,
+  // but that's fine - the initial subview relationship lets MapView find it.
+  [self addSubview:_view];
+}
+
+- (void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics
+           oldLayoutMetrics:(const facebook::react::LayoutMetrics &)oldLayoutMetrics {
+  [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
+
+  // Forward layout to _view - this triggers reactSetFrame: which adds the annotation to the map
+  CGRect frame = CGRectMake(
+    layoutMetrics.frame.origin.x,
+    layoutMetrics.frame.origin.y,
+    layoutMetrics.frame.size.width,
+    layoutMetrics.frame.size.height
+  );
+  [_view reactSetFrame:frame];
+}
+
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView
+                          index:(NSInteger)index {
+  // Track custom children for Fabric - needed for getAnnotationView to know
+  // if this is a custom annotation or should use the default pin
+  BOOL needsAnnotationRefresh = NO;
+
+  BOOL isCallout = NO;
+
+  if ([childComponentView isKindOfClass:[RCTViewComponentView class]]) {
+    UIView *contentView = ((RCTViewComponentView *)childComponentView).contentView;
+    if ([contentView isKindOfClass:[MLRNCallout class]]) {
+      // Set up calloutView reference for Callout children
+      // NOTE: We do NOT add Callout as a subview - MapLibre will present it
+      // when the annotation is selected via calloutViewForAnnotation delegate
+      _view.calloutView = (MLRNCallout *)contentView;
+      _view.calloutView.representedObject = _view;
+      isCallout = YES;
+    } else {
+      // Track non-Callout custom children (custom annotation views)
+      // If this is the first custom child and annotation is already on map,
+      // we need to refresh so MapLibre picks up the custom view
+      if (_view.customChildCount == 0 && _view.map != nil) {
+        needsAnnotationRefresh = YES;
+      }
+      _view.customChildCount++;
+    }
+  }
+
+  // Add non-Callout children directly to _view (the annotation view).
+  // We do NOT call super because we want children in _view, not in self.
+  // This allows children to move with _view when MapLibre reparents it.
+  // Callouts are NOT added as subviews - they're presented by MapLibre on selection.
+  // Note: We use the current subview count as the index because Callouts are skipped,
+  // so React's index won't match our actual subview indices.
+  if (!isCallout) {
+    [_view addSubview:childComponentView];
+  }
+
+  // If annotation was added before children were mounted, MapLibre would have
+  // returned nil from getAnnotationView (no custom children). Now that we have
+  // children, remove and re-add to trigger viewForAnnotation: again.
+  if (needsAnnotationRefresh && [_view.map.annotations containsObject:_view]) {
+    [_view.map removeAnnotation:_view];
+    [_view.map addAnnotation:_view];
+  }
+}
+
+- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView
+                            index:(NSInteger)index {
+  // Update tracking for custom children
+  BOOL isCallout = NO;
+
+  if ([childComponentView isKindOfClass:[RCTViewComponentView class]]) {
+    UIView *contentView = ((RCTViewComponentView *)childComponentView).contentView;
+    if ([contentView isKindOfClass:[MLRNCallout class]]) {
+      // Clear calloutView reference - Callout was never added as subview
+      _view.calloutView = nil;
+      isCallout = YES;
+    } else if (_view.customChildCount > 0) {
+      // Decrement custom child count
+      _view.customChildCount--;
+    }
+  }
+
+  // Remove from _view (not from self, since we added to _view)
+  // Don't remove Callout since it was never added as subview
+  if (!isCallout) {
+    [childComponentView removeFromSuperview];
+  }
+}
+
+#pragma mark - RCTComponentViewProtocol
+
+- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps {
+  const auto &oldViewProps = *std::static_pointer_cast<MLRNPointAnnotationProps const>(_props);
+  const auto &newViewProps = *std::static_pointer_cast<MLRNPointAnnotationProps const>(props);
+
+  if (oldViewProps.id != newViewProps.id) {
+    NSString *idValue = [NSString stringWithCString:newViewProps.id.c_str()
+                                           encoding:NSUTF8StringEncoding];
+    [_view setId:idValue];
+  }
+
+  if (oldViewProps.title != newViewProps.title) {
+    NSString *titleValue = newViewProps.title.empty()
+                               ? nil
+                               : [NSString stringWithCString:newViewProps.title.c_str()
+                                                    encoding:NSUTF8StringEncoding];
+    [_view setReactTitle:titleValue];
+  }
+
+  if (oldViewProps.snippet != newViewProps.snippet) {
+    NSString *snippetValue = newViewProps.snippet.empty()
+                                 ? nil
+                                 : [NSString stringWithCString:newViewProps.snippet.c_str()
+                                                      encoding:NSUTF8StringEncoding];
+    [_view setReactSnippet:snippetValue];
+  }
+
+  if (oldViewProps.selected != newViewProps.selected) {
+    [_view setReactSelected:newViewProps.selected];
+  }
+
+  if (oldViewProps.draggable != newViewProps.draggable) {
+    [_view setReactDraggable:newViewProps.draggable];
+  }
+
+  if (!oldViewProps.lngLat.isNull() || !newViewProps.lngLat.isNull()) {
+    if (newViewProps.lngLat.isArray() && newViewProps.lngLat.size() >= 2) {
+      NSArray<NSNumber *> *lngLat = @[
+        @(newViewProps.lngLat[0].asDouble()),
+        @(newViewProps.lngLat[1].asDouble())
+      ];
+      [_view setReactLngLat:lngLat];
+    }
+  }
+
+  if (oldViewProps.anchor.x != newViewProps.anchor.x ||
+      oldViewProps.anchor.y != newViewProps.anchor.y) {
+    NSDictionary *anchor = @{
+      @"x" : @(newViewProps.anchor.x),
+      @"y" : @(newViewProps.anchor.y)
+    };
+    [_view setAnchor:anchor];
+  }
+
+  if (oldViewProps.offset.x != newViewProps.offset.x ||
+      oldViewProps.offset.y != newViewProps.offset.y) {
+    NSDictionary *offset = @{
+      @"x" : @(newViewProps.offset.x),
+      @"y" : @(newViewProps.offset.y)
+    };
+    [_view setOffset:offset];
+  }
+
+  // Handle zIndex from style prop - it's in the base ViewProps
+  if (oldViewProps.zIndex != newViewProps.zIndex) {
+    if (newViewProps.zIndex.has_value()) {
+      [_view setZIndex:(CGFloat)newViewProps.zIndex.value()];
+    }
+  }
+
+  [super updateProps:props oldProps:oldProps];
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider {
+  return concreteComponentDescriptorProvider<MLRNPointAnnotationComponentDescriptor>();
+}
+
+#pragma mark - Native Commands
+
+- (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args {
+  RCTMLRNPointAnnotationHandleCommand(self, commandName, args);
+}
+
+- (void)refresh {
+  // refresh is only used on Android to rerender the bitmap
+  // On iOS, this is a no-op
+}
+
+@end
+
+Class<RCTComponentViewProtocol> MLRNPointAnnotationCls(void) {
+  return MLRNPointAnnotationComponentView.class;
+}

package/ios/components/map-view/MLRNMapView.m

@@ -613,9 +613,8 @@ static double const M2PI = M_PI * 2;
   if ([annotation isKindOfClass:[MLRNPointAnnotation class]]) {
     MLRNPointAnnotation *rctAnnotation = (MLRNPointAnnotation *)annotation;
 
-    if (rctAnnotation.onSelected != nil) {
-      MLRNMapTouchEvent *event = [MLRNMapTouchEvent makeAnnotationTapEvent:rctAnnotation];
-      rctAnnotation.onSelected([event toJSON]);
+    if (rctAnnotation.reactOnSelected != nil) {
+      rctAnnotation.reactOnSelected([rctAnnotation makeEventPayload]);
     }
   }
 }
@@ -624,8 +623,8 @@ static double const M2PI = M_PI * 2;
   if ([annotation isKindOfClass:[MLRNPointAnnotation class]]) {
     MLRNPointAnnotation *rctAnnotation = (MLRNPointAnnotation *)annotation;
 
-    if (rctAnnotation.onDeselected != nil) {
-      rctAnnotation.onDeselected(nil);
+    if (rctAnnotation.reactOnDeselected != nil) {
+      rctAnnotation.reactOnDeselected([rctAnnotation makeEventPayload]);
     }
   }
 }

package/lib/commonjs/components/annotations/callout/Callout.js

@@ -0,0 +1,94 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Callout = void 0;
+var _react = require("react");
+var _reactNative = require("react-native");
+var _CalloutNativeComponent = _interopRequireDefault(require("./CalloutNativeComponent"));
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const styles = _reactNative.StyleSheet.create({
+  animated: {
+    alignItems: "center",
+    justifyContent: "center",
+    width: 180,
+    zIndex: 9999999
+  },
+  content: {
+    backgroundColor: "white",
+    borderColor: "rgba(0, 0, 0, 0.2)",
+    borderRadius: 3,
+    borderWidth: 1,
+    flex: 1,
+    padding: 8,
+    position: "relative"
+  },
+  tip: {
+    backgroundColor: "transparent",
+    borderBottomColor: "transparent",
+    borderBottomWidth: 0,
+    borderLeftColor: "transparent",
+    borderLeftWidth: 8,
+    borderRightColor: "transparent",
+    borderRightWidth: 8,
+    borderTopColor: "white",
+    borderTopWidth: 16,
+    elevation: 0,
+    marginTop: -2,
+    zIndex: 1000
+  },
+  title: {
+    color: "black",
+    textAlign: "center"
+  }
+});
+/**
+ *  Callout that displays information about a selected annotation near the annotation.
+ */
+const Callout = ({
+  title,
+  style,
+  animatedStyle,
+  contentStyle,
+  tipStyle,
+  titleStyle,
+  children,
+  testID,
+  ...props
+}) => {
+  const calloutContent = _react.Children.count(children) > 0 ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Animated.View, {
+    testID: testID ? `${testID}-animated` : undefined,
+    style: animatedStyle,
+    ...props,
+    children: children
+  }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.Animated.View, {
+    testID: testID ? `${testID}-animated` : undefined,
+    style: [styles.animated, animatedStyle],
+    ...props,
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+      testID: testID ? `${testID}-content` : undefined,
+      style: [styles.content, contentStyle],
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+        testID: testID ? `${testID}-title` : undefined,
+        style: [styles.title, titleStyle],
+        children: title
+      })
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+      testID: testID ? `${testID}-tip` : undefined,
+      style: [styles.tip, tipStyle]
+    })]
+  });
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CalloutNativeComponent.default, {
+    testID: testID,
+    style: [{
+      position: "absolute",
+      zIndex: 999,
+      backgroundColor: "transparent"
+    }, style],
+    children: calloutContent
+  });
+};
+exports.Callout = Callout;
+//# sourceMappingURL=Callout.js.map

package/lib/commonjs/components/annotations/callout/Callout.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","_reactNative","_CalloutNativeComponent","_interopRequireDefault","_jsxRuntime","e","__esModule","default","styles","StyleSheet","create","animated","alignItems","justifyContent","width","zIndex","content","backgroundColor","borderColor","borderRadius","borderWidth","flex","padding","position","tip","borderBottomColor","borderBottomWidth","borderLeftColor","borderLeftWidth","borderRightColor","borderRightWidth","borderTopColor","borderTopWidth","elevation","marginTop","title","color","textAlign","Callout","style","animatedStyle","contentStyle","tipStyle","titleStyle","children","testID","props","calloutContent","Children","count","jsx","Animated","View","undefined","jsxs","Text","exports"],"sourceRoot":"../../../../../src","sources":["components/annotations/callout/Callout.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/annotations/callout/CalloutNativeComponent.ts

@@ -0,0 +1,11 @@
+import {
+  codegenNativeComponent,
+  type HostComponent,
+  type ViewProps,
+} from "react-native";
+
+export interface NativeProps extends ViewProps {}
+
+export default codegenNativeComponent<NativeProps>(
+  "MLRNCallout",
+) as HostComponent<NativeProps>;

package/lib/commonjs/components/annotations/marker-view/MarkerView.js

@@ -0,0 +1,70 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MarkerView = void 0;
+var _react = require("react");
+var _reactNative = require("react-native");
+var _MarkerViewNativeComponent = _interopRequireDefault(require("./MarkerViewNativeComponent"));
+var _useFrozenId = require("../../../hooks/useFrozenId.js");
+var _Anchor = require("../../../types/Anchor.js");
+var _PointAnnotation = require("../point-annotation/PointAnnotation.js");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+/**
+ * MarkerView allows you to place an interactive React Native View on the map.
+ *
+ * If you have static view consider using PointAnnotation or SymbolLayer for better performance.
+ *
+ * Implemented through:
+ * - Android: Native MarkerViewManager using map projection
+ * - iOS: [MLNPointAnnotation](https://maplibre.org/maplibre-native/ios/latest/documentation/maplibre/mlnpointannotation/)
+ */
+const MarkerView = ({
+  id,
+  anchor = "center",
+  offset,
+  ...props
+}) => {
+  const nativeRef = (0, _react.useRef)(null);
+  const nativeAnchor = (0, _Anchor.anchorToNative)(anchor);
+  const nativeOffset = offset ? {
+    x: offset[0],
+    y: offset[1]
+  } : undefined;
+  const pointAnnotationRef = (0, _react.useRef)(null);
+  const frozenId = (0, _useFrozenId.useFrozenId)(id);
+  if (_reactNative.Platform.OS === "ios") {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_PointAnnotation.PointAnnotation, {
+      ref: pointAnnotationRef,
+      id: frozenId,
+      anchor: anchor,
+      offset: offset,
+      ...props
+    });
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_MarkerViewNativeComponent.default, {
+    ref: nativeRef,
+    id: frozenId,
+    anchor: nativeAnchor,
+    offset: nativeOffset,
+    ...props,
+    style: [{
+      flex: 0,
+      alignSelf: "flex-start",
+      overflow: "visible"
+    }, props.style],
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+      collapsable: false,
+      style: {
+        flex: 0,
+        alignSelf: "flex-start",
+        overflow: "visible"
+      },
+      children: props.children
+    })
+  });
+};
+exports.MarkerView = MarkerView;
+//# sourceMappingURL=MarkerView.js.map

package/lib/commonjs/components/annotations/marker-view/MarkerView.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","_reactNative","_MarkerViewNativeComponent","_interopRequireDefault","_useFrozenId","_Anchor","_PointAnnotation","_jsxRuntime","e","__esModule","default","MarkerView","id","anchor","offset","props","nativeRef","useRef","nativeAnchor","anchorToNative","nativeOffset","x","y","undefined","pointAnnotationRef","frozenId","useFrozenId","Platform","OS","jsx","PointAnnotation","ref","style","flex","alignSelf","overflow","children","View","collapsable","exports"],"sourceRoot":"../../../../../src","sources":["components/annotations/marker-view/MarkerView.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAMA,IAAAC,YAAA,GAAAD,OAAA;AAOA,IAAAE,0BAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,YAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAGA,IAAAM,gBAAA,GAAAN,OAAA;AAG6C,IAAAO,WAAA,GAAAP,OAAA;AAAA,SAAAG,uBAAAK,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AA4C7C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMG,UAAU,GAAGA,CAAC;EACzBC,EAAE;EACFC,MAAM,GAAG,QAAQ;EACjBC,MAAM;EACN,GAAGC;AACY,CAAC,KAAK;EACrB,MAAMC,SAAS,GAAG,IAAAC,aAAM,EAGtB,IAAI,CAAC;EAEP,MAAMC,YAAY,GAAG,IAAAC,sBAAc,EAACN,MAAM,CAAC;EAC3C,MAAMO,YAAY,GAAGN,MAAM,GAAG;IAAEO,CAAC,EAAEP,MAAM,CAAC,CAAC,CAAC;IAAEQ,CAAC,EAAER,MAAM,CAAC,CAAC;EAAE,CAAC,GAAGS,SAAS;EAExE,MAAMC,kBAAkB,GAAG,IAAAP,aAAM,EAAqB,IAAI,CAAC;EAC3D,MAAMQ,QAAQ,GAAG,IAAAC,wBAAW,EAACd,EAAE,CAAC;EAEhC,IAAIe,qBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;IACzB,oBACE,IAAArB,WAAA,CAAAsB,GAAA,EAACvB,gBAAA,CAAAwB,eAAe;MACdC,GAAG,EAAEP,kBAAmB;MACxBZ,EAAE,EAAEa,QAAS;MACbZ,MAAM,EAAEA,MAAO;MACfC,MAAM,EAAEA,MAAO;MAAA,GACXC;IAAK,CACV,CAAC;EAEN;EAEA,oBACE,IAAAR,WAAA,CAAAsB,GAAA,EAAC3B,0BAAA,CAAAQ,OAAyB;IACxBqB,GAAG,EAAEf,SAAU;IACfJ,EAAE,EAAEa,QAAS;IACbZ,MAAM,EAAEK,YAAa;IACrBJ,MAAM,EAAEM,YAAa;IAAA,GACjBL,KAAK;IACTiB,KAAK,EAAE,CACL;MAAEC,IAAI,EAAE,CAAC;MAAEC,SAAS,EAAE,YAAY;MAAEC,QAAQ,EAAE;IAAU,CAAC,EACzDpB,KAAK,CAACiB,KAAK,CACX;IAAAI,QAAA,eAEF,IAAA7B,WAAA,CAAAsB,GAAA,EAAC5B,YAAA,CAAAoC,IAAI;MACHC,WAAW,EAAE,KAAM;MACnBN,KAAK,EAAE;QAAEC,IAAI,EAAE,CAAC;QAAEC,SAAS,EAAE,YAAY;QAAEC,QAAQ,EAAE;MAAU,CAAE;MAAAC,QAAA,EAEhErB,KAAK,CAACqB;IAAQ,CACX;EAAC,CACkB,CAAC;AAEhC,CAAC;AAACG,OAAA,CAAA5B,UAAA,GAAAA,UAAA","ignoreList":[]}

package/lib/commonjs/components/annotations/marker-view/MarkerViewNativeComponent.ts

@@ -0,0 +1,30 @@
+import {
+  codegenNativeComponent,
+  type CodegenTypes,
+  type HostComponent,
+  type ViewProps,
+} from "react-native";
+
+import type { UnsafeMixed } from "../../../types/codegen/UnsafeMixed";
+
+type NativeAnchor = {
+  x: CodegenTypes.Double;
+  y: CodegenTypes.Double;
+};
+
+type NativeOffset = {
+  x: CodegenTypes.Double;
+  y: CodegenTypes.Double;
+};
+
+export interface NativeProps extends ViewProps {
+  lngLat: UnsafeMixed<
+    [longitude: CodegenTypes.Double, latitude: CodegenTypes.Double]
+  >;
+  anchor?: NativeAnchor;
+  offset?: NativeOffset;
+}
+
+export default codegenNativeComponent<NativeProps>(
+  "MLRNMarkerView",
+) as HostComponent<NativeProps>;

package/lib/commonjs/components/annotations/point-annotation/PointAnnotation.js

@@ -0,0 +1,88 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PointAnnotation = void 0;
+var _react = require("react");
+var _reactNative = require("react-native");
+var _PointAnnotationNativeComponent = _interopRequireWildcard(require("./PointAnnotationNativeComponent"));
+var _useFrozenId = require("../../../hooks/useFrozenId.js");
+var _Anchor = require("../../../types/Anchor.js");
+var _Callout = require("../callout/Callout.js");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+const styles = _reactNative.StyleSheet.create({
+  container: {
+    alignItems: "center",
+    justifyContent: "center",
+    position: "absolute"
+  }
+});
+/**
+ * PointAnnotation represents a one-dimensional shape located at a single geographical coordinate.
+ *
+ * Consider using GeoJSONSource and SymbolLayer instead, if you have many points, and you have static images,
+ * they'll offer much better performance.
+ *
+ * If you need interactive views please use MarkerView,
+ * as with PointAnnotation on Android child views are rendered onto a bitmap for better performance.
+ */
+const PointAnnotation = exports.PointAnnotation = /*#__PURE__*/(0, _react.forwardRef)(({
+  id,
+  anchor = "center",
+  draggable = false,
+  offset,
+  ...props
+}, ref) => {
+  const frozenId = (0, _useFrozenId.useFrozenId)(id);
+  const nativeAnchor = (0, _Anchor.anchorToNative)(anchor);
+  const nativeOffset = offset ? {
+    x: offset[0],
+    y: offset[1]
+  } : undefined;
+  const nativeRef = (0, _react.useRef)(null);
+  (0, _react.useImperativeHandle)(ref, () => ({
+    refresh
+  }));
+  function refresh() {
+    if (_reactNative.Platform.OS === "android" && nativeRef.current) {
+      _PointAnnotationNativeComponent.Commands.refresh(nativeRef.current);
+    }
+  }
+
+  // On Android, wrap children in a non-collapsable View to prevent Fabric
+  // from flattening the view hierarchy. Without this, Fabric may flatten
+  // intermediate Views, causing their backgrounds to disappear.
+  // We need to keep Callout separate so native code can identify it.
+  const wrappedChildren = (() => {
+    if (_reactNative.Platform.OS !== "android") {
+      return props.children;
+    }
+
+    // Separate Callout from other children so native can identify it
+    const childArray = _react.Children.toArray(props.children);
+    const callout = childArray.find(child => /*#__PURE__*/(0, _react.isValidElement)(child) && child.type === _Callout.Callout);
+    const otherChildren = childArray.filter(child => ! /*#__PURE__*/(0, _react.isValidElement)(child) || child.type !== _Callout.Callout);
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+        collapsable: false,
+        style: {
+          overflow: "visible"
+        },
+        children: otherChildren
+      }), callout]
+    });
+  })();
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_PointAnnotationNativeComponent.default, {
+    ref: nativeRef,
+    ...props,
+    id: frozenId,
+    anchor: nativeAnchor,
+    offset: nativeOffset,
+    draggable: draggable,
+    style: [props.style, styles.container],
+    children: wrappedChildren
+  });
+});
+//# sourceMappingURL=PointAnnotation.js.map

package/lib/commonjs/components/annotations/point-annotation/PointAnnotation.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","_reactNative","_PointAnnotationNativeComponent","_interopRequireWildcard","_useFrozenId","_Anchor","_Callout","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","styles","StyleSheet","create","container","alignItems","justifyContent","position","PointAnnotation","exports","forwardRef","id","anchor","draggable","offset","props","ref","frozenId","useFrozenId","nativeAnchor","anchorToNative","nativeOffset","x","y","undefined","nativeRef","useRef","useImperativeHandle","refresh","Platform","OS","current","Commands","wrappedChildren","children","childArray","Children","toArray","callout","find","child","isValidElement","type","Callout","otherChildren","filter","jsxs","Fragment","jsx","View","collapsable","style","overflow"],"sourceRoot":"../../../../../src","sources":["components/annotations/point-annotation/PointAnnotation.tsx"],"mappings":"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","ignoreList":[]}