react-native-maps 1.21.0-alpha.64 → 1.21.0-alpha.66

package/android/build.gradle

@@ -12,7 +12,8 @@ buildscript {
       mavenCentral()
     }
     dependencies {
-      classpath("com.android.tools.build:gradle:8.6.0")
+      classpath("com.android.tools.build:gradle:8.7.2")
+      classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '2.0.21')}")
     }
   }
 }

package/android/generated/jni/react/renderer/components/RNMapsSpecs/ComponentDescriptors.cpp

@@ -16,6 +16,7 @@ namespace facebook::react {
 
 void RNMapsSpecs_registerComponentDescriptorsFromCodegen(
   std::shared_ptr<const ComponentDescriptorProviderRegistry> registry) {
+registry->add(concreteComponentDescriptorProvider<RNMapsCalloutComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsGoogleMapViewComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsGooglePolygonComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsMapViewComponentDescriptor>());

package/android/generated/jni/react/renderer/components/RNMapsSpecs/ComponentDescriptors.h

@@ -16,6 +16,7 @@
 
 namespace facebook::react {
 
+using RNMapsCalloutComponentDescriptor = ConcreteComponentDescriptor<RNMapsCalloutShadowNode>;
 using RNMapsGoogleMapViewComponentDescriptor = ConcreteComponentDescriptor<RNMapsGoogleMapViewShadowNode>;
 using RNMapsGooglePolygonComponentDescriptor = ConcreteComponentDescriptor<RNMapsGooglePolygonShadowNode>;
 using RNMapsMapViewComponentDescriptor = ConcreteComponentDescriptor<RNMapsMapViewShadowNode>;

package/android/generated/jni/react/renderer/components/RNMapsSpecs/EventEmitters.cpp

@@ -13,6 +13,28 @@
 
 namespace facebook::react {
 
+void RNMapsCalloutEventEmitter::onPress(OnPress $event) const {
+  dispatchEvent("press", [$event=std::move($event)](jsi::Runtime &runtime) {
+    auto $payload = jsi::Object(runtime);
+    $payload.setProperty(runtime, "action", $event.action);
+$payload.setProperty(runtime, "id", $event.id);
+{
+  auto coordinate = jsi::Object(runtime);
+  coordinate.setProperty(runtime, "latitude", $event.coordinate.latitude);
+  coordinate.setProperty(runtime, "longitude", $event.coordinate.longitude);
+  $payload.setProperty(runtime, "coordinate", coordinate);
+}
+{
+  auto position = jsi::Object(runtime);
+  position.setProperty(runtime, "x", $event.position.x);
+  position.setProperty(runtime, "y", $event.position.y);
+  $payload.setProperty(runtime, "position", position);
+}
+    return $payload;
+  });
+}
+
+
 void RNMapsGoogleMapViewEventEmitter::onIndoorBuildingFocused(OnIndoorBuildingFocused $event) const {
   dispatchEvent("indoorBuildingFocused", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);

package/android/generated/jni/react/renderer/components/RNMapsSpecs/EventEmitters.h

@@ -13,6 +13,28 @@
 
 
 namespace facebook::react {
+class RNMapsCalloutEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  struct OnPressCoordinate {
+      double latitude;
+    double longitude;
+    };
+
+  struct OnPressPosition {
+      double x;
+    double y;
+    };
+
+  struct OnPress {
+      std::string action;
+    std::string id;
+    OnPressCoordinate coordinate;
+    OnPressPosition position;
+    };
+  void onPress(OnPress value) const;
+};
 class RNMapsGoogleMapViewEventEmitter : public ViewEventEmitter {
  public:
   using ViewEventEmitter::ViewEventEmitter;

package/android/generated/jni/react/renderer/components/RNMapsSpecs/Props.cpp

@@ -15,6 +15,14 @@
 
 namespace facebook::react {
 
+RNMapsCalloutProps::RNMapsCalloutProps(
+    const PropsParserContext &context,
+    const RNMapsCalloutProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    alphaHitTest(convertRawProp(context, rawProps, "alphaHitTest", sourceProps.alphaHitTest, {false})),
+    tooltip(convertRawProp(context, rawProps, "tooltip", sourceProps.tooltip, {false}))
+      {}
 RNMapsGoogleMapViewProps::RNMapsGoogleMapViewProps(
     const PropsParserContext &context,
     const RNMapsGoogleMapViewProps &sourceProps,

package/android/generated/jni/react/renderer/components/RNMapsSpecs/Props.h

@@ -18,6 +18,17 @@
 
 namespace facebook::react {
 
+class RNMapsCalloutProps final : public ViewProps {
+ public:
+  RNMapsCalloutProps() = default;
+  RNMapsCalloutProps(const PropsParserContext& context, const RNMapsCalloutProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  bool alphaHitTest{false};
+  bool tooltip{false};
+};
+
 enum class RNMapsGoogleMapViewMapType { Hybrid, MutedStandard, None, Satellite, Standard, Terrain, SatelliteFlyover, HybridFlyover };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsGoogleMapViewMapType &result) {

package/android/generated/jni/react/renderer/components/RNMapsSpecs/RNMapsSpecsJSI.h

@@ -176,8 +176,12 @@ public:
 template <typename T>
 class JSI_EXPORT NativeAirMapsModuleCxxSpec : public TurboModule {
 public:
-  jsi::Value get(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
-    return delegate_.get(rt, propName);
+  jsi::Value create(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
+    return delegate_.create(rt, propName);
+  }
+
+  std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& runtime) override {
+    return delegate_.getPropertyNames(runtime);
   }
 
   static constexpr std::string_view kModuleName = "RNMapsAirModule";

package/android/generated/jni/react/renderer/components/RNMapsSpecs/ShadowNodes.cpp

@@ -12,6 +12,7 @@
 
 namespace facebook::react {
 
+extern const char RNMapsCalloutComponentName[] = "RNMapsCallout";
 extern const char RNMapsGoogleMapViewComponentName[] = "RNMapsGoogleMapView";
 extern const char RNMapsGooglePolygonComponentName[] = "RNMapsGooglePolygon";
 extern const char RNMapsMapViewComponentName[] = "RNMapsMapView";

package/android/generated/jni/react/renderer/components/RNMapsSpecs/ShadowNodes.h

@@ -18,6 +18,17 @@
 
 namespace facebook::react {
 
+JSI_EXPORT extern const char RNMapsCalloutComponentName[];
+
+/*
+ * `ShadowNode` for <RNMapsCallout> component.
+ */
+using RNMapsCalloutShadowNode = ConcreteViewShadowNode<
+    RNMapsCalloutComponentName,
+    RNMapsCalloutProps,
+    RNMapsCalloutEventEmitter,
+    RNMapsCalloutState>;
+
 JSI_EXPORT extern const char RNMapsGoogleMapViewComponentName[];
 
 /*

package/android/generated/jni/react/renderer/components/RNMapsSpecs/States.h

@@ -14,6 +14,18 @@
 
 namespace facebook::react {
 
+class RNMapsCalloutState {
+public:
+  RNMapsCalloutState() = default;
+
+#ifdef ANDROID
+  RNMapsCalloutState(RNMapsCalloutState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+#endif
+};
+
 class RNMapsGoogleMapViewState {
 public:
   RNMapsGoogleMapViewState() = default;

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/src/main/java/com/rnmaps/fabric/CalloutManager.java

@@ -0,0 +1,89 @@
+package com.rnmaps.fabric;
+
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.LayoutShadowNode;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.ViewManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsCalloutManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsCalloutManagerInterface;
+import com.rnmaps.maps.MapCallout;
+import com.rnmaps.maps.SizeReportingShadowNode;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@ReactModule(name = CalloutManager.REACT_CLASS)
+public class CalloutManager extends ViewGroupManager<MapCallout> implements RNMapsCalloutManagerInterface<MapCallout> {
+
+
+    public CalloutManager(ReactApplicationContext context){
+        super(context);
+    }
+    private final RNMapsCalloutManagerDelegate<MapCallout, CalloutManager> delegate =
+            new RNMapsCalloutManagerDelegate<>(this);
+
+    @Override
+    public ViewManagerDelegate<MapCallout> getDelegate() {
+        return delegate;
+    }
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    public MapCallout createViewInstance(ThemedReactContext context) {
+        return new MapCallout(context);
+    }
+
+
+    public static final String REACT_CLASS = "RNMapsCallout";
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+        return MapCallout.getExportedCustomBubblingEventTypeConstants();
+    }
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+        return new HashMap<>();
+    }
+
+
+    @Override
+    public void setAlphaHitTest(MapCallout view, boolean value) {
+    /// do nothing
+    }
+
+    @Override
+    public void setTooltip(MapCallout view, boolean value) {
+            view.setTooltip(value);
+    }
+    @Override
+    public LayoutShadowNode createShadowNodeInstance() {
+        // we use a custom shadow node that emits the width/height of the view
+        // after layout with the updateExtraData method. Without this, we can't generate
+        // a bitmap of the appropriate width/height of the rendered view.
+        return new SizeReportingShadowNode();
+    }
+
+    @Override
+    public void updateExtraData(MapCallout view, Object extraData) {
+        // This method is called from the shadow node with the width/height of the rendered
+        // marker view.
+        //noinspection unchecked
+        Map<String, Float> data = (Map<String, Float>) extraData;
+        float width = data.get("width");
+        float height = data.get("height");
+        view.width = (int) width;
+        view.height = (int) height;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/MapViewManager.java

@@ -3,8 +3,6 @@ package com.rnmaps.fabric;
 
 import static com.rnmaps.maps.MapManager.MY_LOCATION_PRIORITY;
 
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.util.Log;
 import android.view.View;
 
@@ -28,7 +26,6 @@ import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.viewmanagers.RNMapsMapViewManagerInterface;
 import com.facebook.react.viewmanagers.RNMapsMapViewManagerDelegate;
-import com.google.android.gms.common.images.ImageManager;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMapOptions;
 import com.google.android.gms.maps.MapsInitializer;

package/android/src/main/java/com/rnmaps/fabric/MarkerManager.java

@@ -2,6 +2,7 @@ package com.rnmaps.fabric;
 
 
 import android.util.Log;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -17,7 +18,9 @@ import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.viewmanagers.RNMapsMarkerManagerDelegate;
 import com.facebook.react.viewmanagers.RNMapsMarkerManagerInterface;
 import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
+import com.rnmaps.maps.MapCallout;
 import com.rnmaps.maps.MapMarker;
 
 import java.util.Map;
@@ -220,12 +223,13 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
 
     @Override
     public void showCallout(MapMarker view) {
+        ((Marker) view.getFeature()).showInfoWindow();
 
     }
 
     @Override
     public void hideCallout(MapMarker view) {
-
+        ((Marker) view.getFeature()).hideInfoWindow();
     }
 
     @Override
@@ -237,4 +241,15 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
     public void redraw(MapMarker view) {
 
     }
+    @Override
+    public void addView(MapMarker parent, View child, int index) {
+        // if an <Callout /> component is a child, then it is a callout view, NOT part of the
+        // marker.
+        if (child instanceof MapCallout) {
+            parent.setCalloutView((MapCallout) child);
+        } else {
+            super.addView(parent, child, index);
+            parent.update(true);
+        }
+    }
 }

package/android/src/main/java/com/rnmaps/maps/MapAirModulePackage.java

@@ -8,6 +8,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
+import com.rnmaps.fabric.CalloutManager;
 import com.rnmaps.fabric.MapViewManager;
 import com.rnmaps.fabric.MarkerManager;
 import com.rnmaps.fabric.NativeAirMapsModule;
@@ -21,12 +22,15 @@ public class MapAirModulePackage extends TurboReactPackage {
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return List.of(new MapViewManager(reactContext), new MarkerManager(reactContext));
+        return List.of(new MapViewManager(reactContext), new MarkerManager(reactContext), new CalloutManager(reactContext));
     }
 
 
     @Override
     public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+        if (CalloutManager.REACT_CLASS.equals(name)) {
+            return new CalloutManager(reactContext);
+        }
         if (MarkerManager.REACT_CLASS.equals(name)) {
             return new MarkerManager(reactContext);
         }

package/android/src/main/java/com/rnmaps/maps/MapCallout.java

@@ -2,7 +2,19 @@ package com.rnmaps.maps;
 
 import android.content.Context;
 
+import com.facebook.react.common.MapBuilder;
 import com.facebook.react.views.view.ReactViewGroup;
+import com.rnmaps.fabric.event.OnLongPressEvent;
+import com.rnmaps.fabric.event.OnMarkerDeselectEvent;
+import com.rnmaps.fabric.event.OnMarkerDragEndEvent;
+import com.rnmaps.fabric.event.OnMarkerDragEvent;
+import com.rnmaps.fabric.event.OnMarkerDragStartEvent;
+import com.rnmaps.fabric.event.OnMarkerPressEvent;
+import com.rnmaps.fabric.event.OnMarkerSelectEvent;
+import com.rnmaps.fabric.event.OnPoiClickEvent;
+import com.rnmaps.fabric.event.OnPressEvent;
+
+import java.util.Map;
 
 public class MapCallout extends ReactViewGroup {
   private boolean tooltip = false;
@@ -20,4 +32,11 @@ public class MapCallout extends ReactViewGroup {
   public boolean getTooltip() {
     return this.tooltip;
   }
+
+
+  public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+    MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
+   builder.put(OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME));
+   return builder.build();
+  }
 }

package/ios/generated/RNMapsSpecs/ComponentDescriptors.cpp

@@ -16,6 +16,7 @@ namespace facebook::react {
 
 void RNMapsSpecs_registerComponentDescriptorsFromCodegen(
   std::shared_ptr<const ComponentDescriptorProviderRegistry> registry) {
+registry->add(concreteComponentDescriptorProvider<RNMapsCalloutComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsGoogleMapViewComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsGooglePolygonComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<RNMapsMapViewComponentDescriptor>());

package/ios/generated/RNMapsSpecs/ComponentDescriptors.h

@@ -16,6 +16,7 @@
 
 namespace facebook::react {
 
+using RNMapsCalloutComponentDescriptor = ConcreteComponentDescriptor<RNMapsCalloutShadowNode>;
 using RNMapsGoogleMapViewComponentDescriptor = ConcreteComponentDescriptor<RNMapsGoogleMapViewShadowNode>;
 using RNMapsGooglePolygonComponentDescriptor = ConcreteComponentDescriptor<RNMapsGooglePolygonShadowNode>;
 using RNMapsMapViewComponentDescriptor = ConcreteComponentDescriptor<RNMapsMapViewShadowNode>;

package/ios/generated/RNMapsSpecs/EventEmitters.cpp

@@ -13,6 +13,28 @@
 
 namespace facebook::react {
 
+void RNMapsCalloutEventEmitter::onPress(OnPress $event) const {
+  dispatchEvent("press", [$event=std::move($event)](jsi::Runtime &runtime) {
+    auto $payload = jsi::Object(runtime);
+    $payload.setProperty(runtime, "action", $event.action);
+$payload.setProperty(runtime, "id", $event.id);
+{
+  auto coordinate = jsi::Object(runtime);
+  coordinate.setProperty(runtime, "latitude", $event.coordinate.latitude);
+  coordinate.setProperty(runtime, "longitude", $event.coordinate.longitude);
+  $payload.setProperty(runtime, "coordinate", coordinate);
+}
+{
+  auto position = jsi::Object(runtime);
+  position.setProperty(runtime, "x", $event.position.x);
+  position.setProperty(runtime, "y", $event.position.y);
+  $payload.setProperty(runtime, "position", position);
+}
+    return $payload;
+  });
+}
+
+
 void RNMapsGoogleMapViewEventEmitter::onIndoorBuildingFocused(OnIndoorBuildingFocused $event) const {
   dispatchEvent("indoorBuildingFocused", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);

package/ios/generated/RNMapsSpecs/EventEmitters.h

@@ -13,6 +13,28 @@
 
 
 namespace facebook::react {
+class RNMapsCalloutEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  struct OnPressCoordinate {
+      double latitude;
+    double longitude;
+    };
+
+  struct OnPressPosition {
+      double x;
+    double y;
+    };
+
+  struct OnPress {
+      std::string action;
+    std::string id;
+    OnPressCoordinate coordinate;
+    OnPressPosition position;
+    };
+  void onPress(OnPress value) const;
+};
 class RNMapsGoogleMapViewEventEmitter : public ViewEventEmitter {
  public:
   using ViewEventEmitter::ViewEventEmitter;

package/ios/generated/RNMapsSpecs/Props.cpp

@@ -15,6 +15,14 @@
 
 namespace facebook::react {
 
+RNMapsCalloutProps::RNMapsCalloutProps(
+    const PropsParserContext &context,
+    const RNMapsCalloutProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    alphaHitTest(convertRawProp(context, rawProps, "alphaHitTest", sourceProps.alphaHitTest, {false})),
+    tooltip(convertRawProp(context, rawProps, "tooltip", sourceProps.tooltip, {false}))
+      {}
 RNMapsGoogleMapViewProps::RNMapsGoogleMapViewProps(
     const PropsParserContext &context,
     const RNMapsGoogleMapViewProps &sourceProps,

package/ios/generated/RNMapsSpecs/Props.h

@@ -18,6 +18,17 @@
 
 namespace facebook::react {
 
+class RNMapsCalloutProps final : public ViewProps {
+ public:
+  RNMapsCalloutProps() = default;
+  RNMapsCalloutProps(const PropsParserContext& context, const RNMapsCalloutProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  bool alphaHitTest{false};
+  bool tooltip{false};
+};
+
 enum class RNMapsGoogleMapViewMapType { Hybrid, MutedStandard, None, Satellite, Standard, Terrain, SatelliteFlyover, HybridFlyover };
 
 static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsGoogleMapViewMapType &result) {

package/ios/generated/RNMapsSpecs/RNMapsSpecs.h

@@ -30,6 +30,8 @@
 #import <optional>
 #import <vector>
 
+
+NS_ASSUME_NONNULL_BEGIN
 namespace JS {
   namespace NativeAirMapsModule {
     struct LatLng {
@@ -131,4 +133,5 @@ inline double JS::NativeAirMapsModule::Point::y() const
   id const p = _v[@"y"];
   return RCTBridgingToDouble(p);
 }
+NS_ASSUME_NONNULL_END
 #endif // RNMapsSpecs_H

package/ios/generated/RNMapsSpecs/ShadowNodes.cpp

@@ -12,6 +12,7 @@
 
 namespace facebook::react {
 
+extern const char RNMapsCalloutComponentName[] = "RNMapsCallout";
 extern const char RNMapsGoogleMapViewComponentName[] = "RNMapsGoogleMapView";
 extern const char RNMapsGooglePolygonComponentName[] = "RNMapsGooglePolygon";
 extern const char RNMapsMapViewComponentName[] = "RNMapsMapView";

package/ios/generated/RNMapsSpecs/ShadowNodes.h

@@ -18,6 +18,17 @@
 
 namespace facebook::react {
 
+JSI_EXPORT extern const char RNMapsCalloutComponentName[];
+
+/*
+ * `ShadowNode` for <RNMapsCallout> component.
+ */
+using RNMapsCalloutShadowNode = ConcreteViewShadowNode<
+    RNMapsCalloutComponentName,
+    RNMapsCalloutProps,
+    RNMapsCalloutEventEmitter,
+    RNMapsCalloutState>;
+
 JSI_EXPORT extern const char RNMapsGoogleMapViewComponentName[];
 
 /*

package/ios/generated/RNMapsSpecs/States.h

@@ -14,6 +14,18 @@
 
 namespace facebook::react {
 
+class RNMapsCalloutState {
+public:
+  RNMapsCalloutState() = default;
+
+#ifdef ANDROID
+  RNMapsCalloutState(RNMapsCalloutState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+#endif
+};
+
 class RNMapsGoogleMapViewState {
 public:
   RNMapsGoogleMapViewState() = default;

package/ios/generated/RNMapsSpecsJSI.h

@@ -176,8 +176,12 @@ public:
 template <typename T>
 class JSI_EXPORT NativeAirMapsModuleCxxSpec : public TurboModule {
 public:
-  jsi::Value get(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
-    return delegate_.get(rt, propName);
+  jsi::Value create(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
+    return delegate_.create(rt, propName);
+  }
+
+  std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& runtime) override {
+    return delegate_.getPropertyNames(runtime);
   }
 
   static constexpr std::string_view kModuleName = "RNMapsAirModule";

package/lib/MapCallout.js

@@ -34,6 +34,7 @@ class MapCallout extends React.Component {
     render() {
         const { tooltip = false, alphaHitTest = false } = this.props;
         const AIRMapCallout = this.getNativeComponent();
+        console.log('renderCallout ' + AIRMapCallout);
         return (<AIRMapCallout {...this.props} tooltip={tooltip} alphaHitTest={alphaHitTest} style={[styles.callout, this.props.style]}/>);
     }
 }

package/lib/decorateMapComponent.js

@@ -9,6 +9,7 @@ const react_native_1 = require("react-native");
 const ProviderConstants_1 = require("./ProviderConstants");
 const NativeComponentGooglePolygon_1 = __importDefault(require("./specs/NativeComponentGooglePolygon"));
 const NativeComponentMarker_1 = __importDefault(require("./specs/NativeComponentMarker"));
+const NativeComponentCallout_1 = __importDefault(require("./specs/NativeComponentCallout"));
 exports.SUPPORTED = 'SUPPORTED';
 exports.USES_DEFAULT_IMPLEMENTATION = 'USES_DEFAULT_IMPLEMENTATION';
 exports.NOT_SUPPORTED = 'NOT_SUPPORTED';
@@ -44,6 +45,10 @@ function decorateMapComponent(Component, componentName, providers) {
                 // @ts-ignore
                 return NativeComponentMarker_1.default;
             }
+            if (componentName === 'Callout' && react_native_1.Platform.OS === 'android') {
+                // @ts-ignore
+                return NativeComponentCallout_1.default;
+            }
             const key = provider || 'default';
             if (components[key]) {
                 return components[key];

package/lib/specs/NativeComponentCallout.d.ts

@@ -0,0 +1,46 @@
+import type { HostComponent, ViewProps } from 'react-native';
+import { Double, BubblingEventHandler } from 'react-native/Libraries/Types/CodegenTypes';
+export type LatLng = Readonly<{
+    latitude: Double;
+    longitude: Double;
+}>;
+export type CalloutPressEvent = BubblingEventHandler<Readonly<{
+    action?: string;
+    id: string;
+    coordinate: {
+        latitude: Double;
+        longitude: Double;
+    };
+    position?: {
+        x: Double;
+        y: Double;
+    };
+}>>;
+export interface CalloutFabricNativeProps extends ViewProps {
+    /**
+     * If `true`, clicks on transparent areas in callout will be passed to map.
+     *
+     * @default false
+     * @platform iOS: Supported
+     * @platform Android: Not supported
+     */
+    alphaHitTest?: boolean;
+    /**
+     * Callback that is called when the user presses on the callout
+     *
+     * @platform iOS: Apple Maps only
+     * @platform Android: Supported
+     */
+    onPress?: CalloutPressEvent;
+    /**
+     * If `false`, a default "tooltip" bubble window will be drawn around this callouts children.
+     * If `true`, the child views can fully customize their appearance, including any "bubble" like styles.
+     *
+     * @default false
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    tooltip?: boolean;
+}
+declare const _default: HostComponent<CalloutFabricNativeProps>;
+export default _default;

package/lib/specs/NativeComponentCallout.js

@@ -0,0 +1,9 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const codegenNativeComponent_1 = __importDefault(require("react-native/Libraries/Utilities/codegenNativeComponent"));
+exports.default = (0, codegenNativeComponent_1.default)('RNMapsCallout', {
+    excludedPlatforms: ['iOS'],
+});

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.21.0-alpha.64",
+  "version": "1.21.0-alpha.66",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",