react-native-maps 1.21.0-alpha.61 → 1.21.0-alpha.63

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

@@ -3,6 +3,8 @@ 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;
 
@@ -26,6 +28,7 @@ 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;
@@ -33,6 +36,7 @@ import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 import com.google.android.gms.maps.model.MapColorScheme;
+import com.rnmaps.maps.MapMarker;
 import com.rnmaps.maps.MapView;
 import com.rnmaps.maps.SizeReportingShadowNode;
 
@@ -301,7 +305,13 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void addView(MapView parent, View child, int index) {
-        parent.addFeature(child, index);
+        if (child instanceof MapMarker && ((MapMarker) child).isLoadingImage()){
+            ((MapMarker) child).setImageLoadedListener((uri, drawable, b) -> {
+                parent.addFeature(child, parent.getFeatureCount());
+            });
+        } else {
+            parent.addFeature(child, index);
+        }
     }
 
     @Override

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

@@ -1,23 +1,24 @@
 package com.rnmaps.fabric;
 
 
+import android.util.Log;
+
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.ReactStylesDiffMap;
+import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewManagerDelegate;
-import com.facebook.react.viewmanagers.RNMapsMapViewManagerDelegate;
-import com.facebook.react.viewmanagers.RNMapsMapViewManagerInterface;
 import com.facebook.react.viewmanagers.RNMapsMarkerManagerDelegate;
 import com.facebook.react.viewmanagers.RNMapsMarkerManagerInterface;
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.GoogleMapOptions;
 import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.MarkerOptions;
 import com.rnmaps.maps.MapMarker;
-import com.rnmaps.maps.MapView;
 
 import java.util.Map;
 
@@ -28,7 +29,6 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
     public MarkerManager(ReactApplicationContext context){
         super(context);
     }
-    private GoogleMapOptions options;
     private final RNMapsMarkerManagerDelegate<MapMarker, MarkerManager> delegate =
             new RNMapsMarkerManagerDelegate<>(this);
 
@@ -46,6 +46,70 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
     public MapMarker createViewInstance(ThemedReactContext context) {
         return new MapMarker(context, null);
     }
+    private MarkerOptions optionsForInitialProps(ReactStylesDiffMap initialProps){
+        MarkerOptions options = new MarkerOptions();
+        if (initialProps != null) {
+            if (initialProps.hasKey("opacity")) {
+                options.alpha(initialProps.getFloat("opacity", 1));
+            }
+            if (initialProps.hasKey("anchor")) {
+                ReadableMap map = initialProps.getMap("anchor");
+                float x = (float) (map != null && map.hasKey("x") ? map.getDouble("x") : 0.5);
+                float y = (float) (map != null && map.hasKey("y") ? map.getDouble("y") : 1.0);
+                options.anchor(x, y);
+            }
+
+            if (initialProps.hasKey("coordinate")) {
+                ReadableMap coordinate = initialProps.getMap("coordinate");
+                LatLng position = new LatLng(coordinate.getDouble("latitude"), coordinate.getDouble("longitude"));
+                options.position(position);
+            }
+            if (initialProps.hasKey("title")) {
+                options.title(initialProps.getString("title"));
+            }
+            if (initialProps.hasKey("description")) {
+                options.snippet(initialProps.getString("description"));
+            }
+            if (initialProps.hasKey("draggable")){
+                options.draggable(initialProps.getBoolean("draggable", false));
+            }
+            if (initialProps.hasKey("rotation")){
+                options.rotation(initialProps.getFloat("rotation", 0));
+            }
+            if (initialProps.hasKey("flat")) {
+                options.flat(initialProps.getBoolean("flat", false));
+            }
+            if (initialProps.hasKey("calloutAnchor")){
+                ReadableMap map = initialProps.getMap("calloutAnchor");
+                float x = (float) (map != null && map.hasKey("x") ? map.getDouble("x") : 0.5);
+                float y = (float) (map != null && map.hasKey("y") ? map.getDouble("y") : 1.0);
+                options.infoWindowAnchor(x, y);
+            }
+
+            if (initialProps.hasKey("zIndex")){
+                options.zIndex(initialProps.getFloat("zIndex", 0));
+            }
+        }
+        return options;
+    }
+
+    @Override
+    protected MapMarker createViewInstance(int reactTag, @NonNull ThemedReactContext reactContext, @Nullable ReactStylesDiffMap initialProps, @Nullable StateWrapper stateWrapper) {
+        MapMarker view = null;
+        view = new MapMarker(reactContext, optionsForInitialProps(initialProps), null);
+        view.setId(reactTag);
+        this.addEventEmitters(reactContext, view);
+        if (initialProps != null) {
+            this.updateProperties(view, initialProps);
+        }
+        if (stateWrapper != null) {
+            Object extraData = this.updateState(view, initialProps, stateWrapper);
+            if (extraData != null) {
+                this.updateExtraData(view, extraData);
+            }
+        }
+        return view;
+    }
 
 
     public static final String REACT_CLASS = "RNMapsMarker";
@@ -76,7 +140,7 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
 
     @Override
     public void setImage(MapMarker view, @Nullable ReadableMap value) {
-
+        view.setImage(value.getString("uri"));
     }
 
     @Override

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

@@ -39,6 +39,7 @@ 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.common.images.ImageManager;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.LatLng;
@@ -94,11 +95,17 @@ public class MapMarker extends MapFeature {
   private boolean hasCustomMarkerView = false;
   private final MapMarkerManager markerManager;
   private String imageUri;
+  private boolean loadingImage;
 
   private final DraweeHolder<?> logoHolder;
+  private ImageManager.OnImageLoadedListener imageLoadedListener;
   private DataSource<CloseableReference<CloseableImage>> dataSource;
   private final ControllerListener<ImageInfo> mLogoControllerListener =
       new BaseControllerListener<ImageInfo>() {
+    @Override
+    public void onSubmit(String id, Object callerContext){
+        loadingImage = true;
+    }
         @Override
         public void onFinalImageSet(
             String id,
@@ -130,6 +137,12 @@ public class MapMarker extends MapFeature {
                 .updateIcon(iconBitmapDescriptor, iconBitmap);
           }
           update(true);
+          loadingImage = false;
+          if (imageLoadedListener != null){
+            imageLoadedListener.onImageLoaded(null, null, false);
+            // fire and forget
+            imageLoadedListener = null;
+          }
         }
       };
 
@@ -157,7 +170,7 @@ public class MapMarker extends MapFeature {
     setFlat(options.isFlat());
     setDraggable(options.isDraggable());
     setZIndex(Math.round(options.getZIndex()));
-    setAlpha(options.getAlpha());
+    setOpacity(options.getAlpha());
     iconBitmapDescriptor = options.getIcon();
   }
 
@@ -438,7 +451,6 @@ public class MapMarker extends MapFeature {
         updateTracksViewChanges();
         update(true);
       }
-
     }
   }
 
@@ -635,11 +647,23 @@ public class MapMarker extends MapFeature {
         getContext().getPackageName());
   }
 
-  @FunctionalInterface
+    public boolean isLoadingImage() {
+        return loadingImage;
+    }
+
+    public ImageManager.OnImageLoadedListener getImageLoadedListener() {
+        return imageLoadedListener;
+    }
+
+    public void setImageLoadedListener(ImageManager.OnImageLoadedListener imageLoadedListener) {
+        this.imageLoadedListener = imageLoadedListener;
+    }
+
+    @FunctionalInterface
   public interface EventCreator<T extends Event> {
     T create(int surfaceId, int viewId, WritableMap payload);
   }
-  private <T extends Event> void dispatchEvent(WritableMap payload, MapView.EventCreator<T> creator) {
+  public  <T extends Event> void dispatchEvent(WritableMap payload, MapView.EventCreator<T> creator) {
     // Cast context to ReactContext
     ReactContext reactContext = (ReactContext) context;
 

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

@@ -356,17 +356,15 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
                 MapMarker airMapMarker = getMarkerMap(marker);
 
                 WritableMap eventData = makeClickEventData(marker.getPosition());
-                eventData.putString("action", "marker-press");
+                eventData.putString("action", "press");
                 eventData.putString("id", airMapMarker.getIdentifier());
+                airMapMarker.dispatchEvent(eventData, OnPressEvent::new);
 
-                dispatchEvent(eventData, OnMarkerPressEvent::new);
+                WritableMap mapEventData = makeClickEventData(marker.getPosition());
+                mapEventData.putString("action", "marker-press");
+                mapEventData.putString("id", airMapMarker.getIdentifier());
 
-
-                eventData = makeClickEventData(marker.getPosition());
-                eventData.putString("action", "marker-press");
-                eventData.putString("id", airMapMarker.getIdentifier());
-
-                dispatchEvent(eventData, OnPressEvent::new);
+                dispatchEvent(mapEventData, OnMarkerPressEvent::new);
 
 
                 handleMarkerSelection(airMapMarker);
@@ -564,8 +562,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
             event = makeClickEventData(selectedMarker.getPosition());
             event.putString("action", "marker-deselect");
             event.putString("id", selectedMarker.getIdentifier());
-            // todo: use Fabric events
-            //  manager.pushEvent(context, selectedMarker, "onDeselect", event);
+            selectedMarker.dispatchEvent(event, OnDeselectEvent::new);
 
             event = makeClickEventData(selectedMarker.getPosition());
             event.putString("action", "marker-deselect");
@@ -577,8 +574,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
             event = makeClickEventData(target.getPosition());
             event.putString("action", "marker-select");
             event.putString("id", target.getIdentifier());
-            // todo: use Fabric events
-            // manager.pushEvent(context, target, "onSelect", event);
+            target.dispatchEvent(event, OnSelectEvent::new);
 
             event = makeClickEventData(target.getPosition());
             event.putString("action", "marker-select");

package/ios/AirMaps/RNMapsAirModule.h

@@ -3,7 +3,7 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import <Foundation/Foundation.h>
-#import <react-native-maps-generated//RNMapsSpecs.h>
+#import <react-native-maps-generated/RNMapsSpecs.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

package/lib/specs/NativeComponentMarker.d.ts

@@ -167,7 +167,7 @@ export interface MarkerFabricNativeProps extends ViewProps {
      * Callback that is called when the marker is deselected, before the callout is hidden.
      *
      * @platform iOS: Apple Maps only
-     * @platform Android: Not supported
+     * @platform Android: supported
      */
     onDeselect?: MarkerPressEventHandler;
     /**

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