react-native-maps 1.21.0-alpha.56 → 1.21.0-alpha.58

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

@@ -16,6 +16,7 @@ import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.viewmanagers.RNMapsMapViewManagerInterface;
@@ -62,9 +63,7 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
         // override parent to block recycling / allow reliable GoogleMapsOptions passing
     }
 
-    @Override
-    protected MapView createViewInstance(int reactTag, @NonNull ThemedReactContext reactContext, @Nullable ReactStylesDiffMap initialProps, @Nullable StateWrapper stateWrapper) {
-        MapView view = null;
+    private GoogleMapOptions optionsForInitialProps(ReactStylesDiffMap initialProps){
         GoogleMapOptions options = new GoogleMapOptions();
         if (initialProps != null) {
             setGoogleRenderer(null, initialProps.getString("googleRenderer"));
@@ -122,8 +121,12 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
                 options.zoomGesturesEnabled(initialProps.getBoolean("zoomEnabled", true));
             }
         }
-
-        view = new MapView(reactContext, options);
+        return options;
+    }
+    @Override
+    protected MapView createViewInstance(int reactTag, @NonNull ThemedReactContext reactContext, @Nullable ReactStylesDiffMap initialProps, @Nullable StateWrapper stateWrapper) {
+        MapView view = null;
+        view = new MapView(reactContext, optionsForInitialProps(initialProps));
         view.setId(reactTag);
         this.addEventEmitters(reactContext, view);
         if (initialProps != null) {
@@ -212,13 +215,12 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setLiteMode(MapView view, boolean value) {
-
+        // do nothing (initialProp)
     }
 
     @Override
     public void setGoogleMapId(MapView view, @Nullable String value) {
         // do nothing (initialProp)
-
     }
 
     @Override

package/android/src/main/java/com/rnmaps/fabric/event/OnDeselectEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -13,6 +15,7 @@ public class OnDeselectEvent extends Event<OnDeselectEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnDragEndEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -13,6 +15,7 @@ public class OnDragEndEvent extends Event<OnDragEndEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnDragEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -13,6 +15,7 @@ public class OnDragEvent extends Event<OnDragEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnDragStartEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -13,6 +15,7 @@ public class OnDragStartEvent extends Event<OnDragStartEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnLongPressEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -13,6 +15,7 @@ public class OnLongPressEvent extends Event<OnLongPressEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnMapReadyEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -14,6 +16,7 @@ public class OnMapReadyEvent extends Event<OnMapReadyEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnMarkerDeselectEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -13,6 +15,7 @@ public class OnMarkerDeselectEvent extends Event<OnMarkerDeselectEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnMarkerDragEndEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -13,6 +15,7 @@ public class OnMarkerDragEndEvent extends Event<OnMarkerDragEndEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnMarkerDragEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -13,6 +15,7 @@ public class OnMarkerDragEvent extends Event<OnMarkerDragEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnMarkerDragStartEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -13,6 +15,7 @@ public class OnMarkerDragStartEvent extends Event<OnMarkerDragStartEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnMarkerPressEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -13,6 +15,7 @@ public class OnMarkerPressEvent extends Event<OnMarkerPressEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnMarkerSelectEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -13,6 +15,7 @@ public class OnMarkerSelectEvent extends Event<OnMarkerSelectEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnPoiClickEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -12,6 +14,7 @@ public class OnPoiClickEvent extends Event<OnPoiClickEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnPressEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -12,6 +14,7 @@ public class OnPressEvent extends Event<OnPressEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnRegionChangeEvent.java

@@ -1,5 +1,8 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.uimanager.events.Event;
@@ -7,7 +10,7 @@ import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 
 public class OnRegionChangeEvent extends Event<OnRegionChangeEvent> {
-  public static final String EVENT_NAME = "topChange";
+  public static final String EVENT_NAME = "topRegionChange";
 
   private final WritableMap payload;
 
@@ -30,14 +33,16 @@ public class OnRegionChangeEvent extends Event<OnRegionChangeEvent> {
     return event;
   }
 
+  @NonNull
   @Override
   public String getEventName() {
     return EVENT_NAME;
   }
 
+
   @Override
-  public boolean canCoalesce() {
-    return false;
+  protected WritableMap getEventData() {
+    return payload;
   }
 
 }

package/android/src/main/java/com/rnmaps/fabric/event/OnSelectEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -13,6 +15,7 @@ public class OnSelectEvent extends Event<OnSelectEvent> {
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

package/android/src/main/java/com/rnmaps/fabric/event/OnUserLocationChangeEvent.java

@@ -1,5 +1,7 @@
 package com.rnmaps.fabric.event;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
@@ -13,6 +15,7 @@ public class OnUserLocationChangeEvent extends Event<OnUserLocationChangeEvent>
         this.payload = payload;
     }
 
+    @NonNull
     @Override
     public String getEventName() {
         return EVENT_NAME;

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

@@ -551,7 +551,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     if (selectedMarker == target) {
       return;
     }
-    
+
     WritableMap event;
 
     if (selectedMarker != null) {
@@ -1349,7 +1349,7 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
   public boolean dispatchTouchEvent(MotionEvent ev) {
     gestureDetector.onTouchEvent(ev);
 
-    int X = (int)ev.getX();          
+    int X = (int)ev.getX();
     int Y = (int)ev.getY();
     if(map != null) {
       tapLocation = map.getProjection().fromScreenLocation(new Point(X,Y));

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