react-native-maps 1.21.0-alpha.76 → 1.21.0-alpha.78

package/android/generated/ReactAppDependencyProvider.podspec

@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-version = "0.77.1"
+version = "0.78.0"
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.

package/android/generated/java/com/facebook/react/viewmanagers/RNMapsCalloutManagerInterface.java

@@ -10,8 +10,9 @@
 package com.facebook.react.viewmanagers;
 
 import android.view.View;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMapsCalloutManagerInterface<T extends View> {
+public interface RNMapsCalloutManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setAlphaHitTest(T view, boolean value);
   void setTooltip(T view, boolean value);
 }

package/android/generated/java/com/facebook/react/viewmanagers/RNMapsGooglePolygonManagerDelegate.java

@@ -0,0 +1,49 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ColorPropConverter;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.LayoutShadowNode;
+
+public class RNMapsGooglePolygonManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMapsGooglePolygonManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMapsGooglePolygonManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "coordinates":
+        mViewManager.setCoordinates(view, (ReadableArray) value);
+        break;
+      case "fillColor":
+        mViewManager.setFillColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "strokeColor":
+        mViewManager.setStrokeColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "geodesic":
+        mViewManager.setGeodesic(view, value == null ? false : (boolean) value);
+        break;
+      case "holes":
+        mViewManager.setHoles(view, (ReadableArray) value);
+        break;
+      case "tappable":
+        mViewManager.setTappable(view, value == null ? false : (boolean) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/generated/java/com/facebook/react/viewmanagers/RNMapsGooglePolygonManagerInterface.java

@@ -0,0 +1,24 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
+
+public interface RNMapsGooglePolygonManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+  void setCoordinates(T view, @Nullable ReadableArray value);
+  void setFillColor(T view, @Nullable Integer value);
+  void setStrokeColor(T view, @Nullable Integer value);
+  void setGeodesic(T view, boolean value);
+  void setHoles(T view, @Nullable ReadableArray value);
+  void setTappable(T view, boolean value);
+}

package/android/generated/java/com/facebook/react/viewmanagers/RNMapsMapViewManagerInterface.java

@@ -12,8 +12,9 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMapsMapViewManagerInterface<T extends View> {
+public interface RNMapsMapViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setCacheEnabled(T view, boolean value);
   void setCamera(T view, @Nullable ReadableMap value);
   void setCompassOffset(T view, @Nullable ReadableMap value);

package/android/generated/java/com/facebook/react/viewmanagers/RNMapsMarkerManagerInterface.java

@@ -12,8 +12,9 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMapsMarkerManagerInterface<T extends View> {
+public interface RNMapsMarkerManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setAnchor(T view, @Nullable ReadableMap value);
   void setCalloutAnchor(T view, @Nullable ReadableMap value);
   void setImage(T view, @Nullable ReadableMap value);

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

@@ -0,0 +1,89 @@
+package com.rnmaps.fabric;
+
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.ViewManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsGooglePolygonManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsGooglePolygonManagerInterface;
+import com.rnmaps.maps.MapPolygon;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@ReactModule(name = PolygonManager.REACT_CLASS)
+public class PolygonManager extends ViewGroupManager<MapPolygon> implements RNMapsGooglePolygonManagerInterface<MapPolygon> {
+
+    public PolygonManager(ReactApplicationContext context){
+        super(context);
+    }//
+    private final RNMapsGooglePolygonManagerDelegate<MapPolygon, PolygonManager> delegate =
+            new RNMapsGooglePolygonManagerDelegate<>(this);
+
+    @Override
+    public ViewManagerDelegate<MapPolygon> getDelegate() {
+        return delegate;
+    }
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    public MapPolygon createViewInstance(ThemedReactContext context) {
+        return new MapPolygon(context);
+    }
+
+
+
+    public static final String REACT_CLASS = "RNMapsGooglePolygon";
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+        return MapPolygon.getExportedCustomBubblingEventTypeConstants();
+    }
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+        return new HashMap<>();
+    }
+
+
+    @Override
+    public void setCoordinates(MapPolygon view, @Nullable ReadableArray value) {
+        view.setCoordinates(value);
+    }
+
+    @Override
+    public void setFillColor(MapPolygon view, @Nullable Integer value) {
+        view.setFillColor(value);
+    }
+
+    @Override
+    public void setStrokeColor(MapPolygon view, @Nullable Integer value) {
+        view.setStrokeColor(value);
+    }
+
+    @Override
+    public void setGeodesic(MapPolygon view, boolean value) {
+        view.setGeodesic(value);
+    }
+
+    @Override
+    public void setHoles(MapPolygon view, @Nullable ReadableArray value) {
+        view.setHoles(value);
+    }
+
+    @Override
+    public void setTappable(MapPolygon view, boolean value) {
+            view.setTappable(value);
+    }
+}

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

@@ -13,6 +13,7 @@ import com.rnmaps.fabric.MapViewManager;
 import com.rnmaps.fabric.MarkerManager;
 import com.rnmaps.fabric.NativeAirMapsModule;
 import com.facebook.fbreact.specs.NativeAirMapsModuleSpec;
+import com.rnmaps.fabric.PolygonManager;
 
 import java.util.HashMap;
 import java.util.List;
@@ -22,12 +23,15 @@ public class MapAirModulePackage extends TurboReactPackage {
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return List.of(new MapViewManager(reactContext), new MarkerManager(reactContext), new CalloutManager(reactContext));
+        return List.of(new MapViewManager(reactContext), new MarkerManager(reactContext), new CalloutManager(reactContext), new PolygonManager(reactContext));
     }
 
 
     @Override
     public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+        if (PolygonManager.REACT_CLASS.equals(name)) {
+            return new PolygonManager(reactContext);
+        }
         if (CalloutManager.REACT_CLASS.equals(name)) {
             return new CalloutManager(reactContext);
         }

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

@@ -1,9 +1,16 @@
 package com.rnmaps.maps;
 
 import android.content.Context;
+import android.util.Log;
 
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.MapBuilder;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.events.Event;
+import com.facebook.react.uimanager.events.EventDispatcher;
 import com.google.android.gms.maps.model.Dash;
 import com.google.android.gms.maps.model.Gap;
 import com.google.android.gms.maps.model.LatLng;
@@ -11,9 +18,11 @@ import com.google.android.gms.maps.model.PatternItem;
 import com.google.android.gms.maps.model.Polygon;
 import com.google.android.gms.maps.model.PolygonOptions;
 import com.google.maps.android.collections.PolygonManager;
+import com.rnmaps.fabric.event.OnPressEvent;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class MapPolygon extends MapFeature {
 
@@ -35,6 +44,26 @@ public class MapPolygon extends MapFeature {
     super(context);
   }
 
+    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();
+    }
+
+  public  <T extends Event> void dispatchEvent(WritableMap payload, MapView.EventCreator<T> creator, ReactContext reactContext) {
+
+    // Get the event dispatcher
+    EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, getId());
+
+    // If there is a dispatcher, create and dispatch the event
+    if (eventDispatcher != null) {
+      int surfaceId = UIManagerHelper.getSurfaceId(reactContext);
+      T event = creator.create(surfaceId, getId(), payload);
+      eventDispatcher.dispatchEvent(event);
+    }
+  }
+
+
   public void setCoordinates(ReadableArray coordinates) {
     // it's kind of a bummer that we can't run map() or anything on the ReadableArray
     this.coordinates = new ArrayList<>(coordinates.size());

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

@@ -486,8 +486,12 @@ public void onCreate(LifecycleOwner owner) {
             public void onPolygonClick(@NonNull Polygon polygon) {
                 WritableMap event = makeClickEventData(tapLocation);
                 event.putString("action", "polygon-press");
-                // todo: use Fabric events
-                // manager.pushEvent(context, polygonMap.get(polygon), "onPress", event);
+                MapPolygon mapPolygon = polygonMap.get(polygon);
+                mapPolygon.dispatchEvent(event, OnPressEvent::new, context);
+                event = makeClickEventData(tapLocation);
+                event.putString("action", "polygon-press");
+                event.putString("id", String.valueOf(mapPolygon.getId()));
+                dispatchEvent(event, OnPressEvent::new);
             }
         });
 

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -9,9 +9,9 @@
 
 #import "RNMapsGoogleMapView.h"
 #import "RNMapsGooglePolygonView.h"
-#import "AirGoogleMap.h"
+#import "AIRGoogleMap.h"
 #import "AIRMapMarker.h"
-#import "AirGoogleMapManager.h"
+#import "AIRGoogleMapManager.h"
 
 #import <react-native-maps-generated/ComponentDescriptors.h>
 #import <react-native-maps-generated/EventEmitters.h>

package/ios/generated/RCTAppDependencyProvider.h

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+
+#import <Foundation/Foundation.h>
+
+#if __has_include(<React-RCTAppDelegate/RCTDependencyProvider.h>)
+#import <React-RCTAppDelegate/RCTDependencyProvider.h>
+#elif __has_include(<React_RCTAppDelegate/RCTDependencyProvider.h>)
+#import <React_RCTAppDelegate/RCTDependencyProvider.h>
+#else
+#import "RCTDependencyProvider.h"
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTAppDependencyProvider : NSObject <RCTDependencyProvider>
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/generated/RCTAppDependencyProvider.mm

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTAppDependencyProvider.h"
+#import <ReactCodegen/RCTModulesConformingToProtocolsProvider.h>
+#import <ReactCodegen/RCTThirdPartyComponentsProvider.h>
+
+@implementation RCTAppDependencyProvider {
+  NSArray<NSString *> * _URLRequestHandlerClassNames;
+  NSArray<NSString *> * _imageDataDecoderClassNames;
+  NSArray<NSString *> * _imageURLLoaderClassNames;
+  NSDictionary<NSString *,Class<RCTComponentViewProtocol>> * _thirdPartyFabricComponents;
+}
+
+- (nonnull NSArray<NSString *> *)URLRequestHandlerClassNames {
+  static dispatch_once_t requestUrlToken;
+  dispatch_once(&requestUrlToken, ^{
+    self->_URLRequestHandlerClassNames = RCTModulesConformingToProtocolsProvider.URLRequestHandlerClassNames;
+  });
+
+  return _URLRequestHandlerClassNames;
+}
+
+- (nonnull NSArray<NSString *> *)imageDataDecoderClassNames {
+  static dispatch_once_t dataDecoderToken;
+  dispatch_once(&dataDecoderToken, ^{
+    _imageDataDecoderClassNames = RCTModulesConformingToProtocolsProvider.imageDataDecoderClassNames;
+  });
+
+  return _imageDataDecoderClassNames;
+}
+
+- (nonnull NSArray<NSString *> *)imageURLLoaderClassNames {
+  static dispatch_once_t urlLoaderToken;
+  dispatch_once(&urlLoaderToken, ^{
+    _imageURLLoaderClassNames = RCTModulesConformingToProtocolsProvider.imageURLLoaderClassNames;
+  });
+
+  return _imageURLLoaderClassNames;
+}
+
+- (nonnull NSDictionary<NSString *,Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents {
+  static dispatch_once_t nativeComponentsToken;
+  dispatch_once(&nativeComponentsToken, ^{
+    _thirdPartyFabricComponents = RCTThirdPartyComponentsProvider.thirdPartyFabricComponents;
+  });
+
+  return _thirdPartyFabricComponents;
+}
+
+@end

package/ios/generated/RCTModulesConformingToProtocolsProvider.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface RCTModulesConformingToProtocolsProvider: NSObject
+
++(NSArray<NSString *> *)imageURLLoaderClassNames;
+
++(NSArray<NSString *> *)imageDataDecoderClassNames;
+
++(NSArray<NSString *> *)URLRequestHandlerClassNames;
+
+@end

package/ios/generated/RCTModulesConformingToProtocolsProvider.mm

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTModulesConformingToProtocolsProvider.h"
+
+@implementation RCTModulesConformingToProtocolsProvider
+
++(NSArray<NSString *> *)imageURLLoaderClassNames
+{
+  return @[
+    
+  ];
+}
+
++(NSArray<NSString *> *)imageDataDecoderClassNames
+{
+  return @[
+    
+  ];
+}
+
++(NSArray<NSString *> *)URLRequestHandlerClassNames
+{
+  return @[
+    
+  ];
+}
+
+@end

package/ios/generated/RCTThirdPartyComponentsProvider.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+
+@protocol RCTComponentViewProtocol;
+
+@interface RCTThirdPartyComponentsProvider: NSObject
+
++ (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents;
+
+@end

package/ios/generated/RCTThirdPartyComponentsProvider.mm

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+
+#import <Foundation/Foundation.h>
+
+#import "RCTThirdPartyComponentsProvider.h"
+#import <React/RCTComponentViewProtocol.h>
+
+@implementation RCTThirdPartyComponentsProvider
+
++ (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
+{
+  return @{
+		@"RNMapsGoogleMapView": NSClassFromString(@"RNMapsGoogleMapView"), // react-native-maps
+		@"RNMapsGooglePolygon": NSClassFromString(@"RNMapsGooglePolygonView"), // react-native-maps
+		@"RNMapsMapView": NSClassFromString(@"RNMapsMapView"), // react-native-maps
+		@"RNMapsMarker": NSClassFromString(@"RNMapsMarkerView"), // react-native-maps
+  };
+}
+
+@end

package/ios/generated/ReactAppDependencyProvider.podspec

@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-version = "0.77.1"
+version = "0.78.0"
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.

package/lib/decorateMapComponent.js

@@ -45,6 +45,14 @@ function decorateMapComponent(Component, componentName, providers) {
                 // @ts-ignore
                 return NativeComponentMarker_1.default;
             }
+            if (componentName === 'Polygon' &&
+                ((provider === ProviderConstants_1.PROVIDER_GOOGLE &&
+                    react_native_1.Platform.OS === 'ios' &&
+                    exports.googleMapIsInstalled) ||
+                    react_native_1.Platform.OS === 'android')) {
+                // @ts-ignore
+                return NativeComponentGooglePolygon_1.default;
+            }
             if (componentName === 'Callout' && react_native_1.Platform.OS === 'android') {
                 // @ts-ignore
                 return NativeComponentCallout_1.default;
@@ -62,13 +70,6 @@ function decorateMapComponent(Component, componentName, providers) {
             if (react_native_1.Platform.OS !== 'android' && react_native_1.Platform.OS !== 'ios') {
                 throw new Error(`react-native-maps doesn't support ${react_native_1.Platform.OS}`);
             }
-            if (componentName === 'Polygon' &&
-                provider === ProviderConstants_1.PROVIDER_GOOGLE &&
-                react_native_1.Platform.OS === 'ios' &&
-                exports.googleMapIsInstalled) {
-                // @ts-ignore
-                return NativeComponentGooglePolygon_1.default;
-            }
             const platformSupport = providerInfo[react_native_1.Platform.OS];
             const nativeComponentName = getNativeComponentName(provider, componentName);
             if (platformSupport === exports.NOT_SUPPORTED) {

package/lib/specs/NativeComponentGooglePolygon.js

@@ -4,6 +4,4 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const codegenNativeComponent_1 = __importDefault(require("react-native/Libraries/Utilities/codegenNativeComponent"));
-exports.default = (0, codegenNativeComponent_1.default)('RNMapsGooglePolygon', {
-    excludedPlatforms: ['android'],
-});
+exports.default = (0, codegenNativeComponent_1.default)('RNMapsGooglePolygon', {});

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.76",
+  "version": "1.21.0-alpha.78",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",