@rnmapbox/maps 10.0.0-rc.0 → 10.0.0-rc.10

package/src/components/MapView.tsx

@@ -22,6 +22,7 @@ import { getFilter } from '../utils/filterUtils';
 import Logger from '../utils/Logger';
 import { FilterExpression } from '../utils/MapboxStyles';
 import { type Position } from '../types/Position';
+import { type Location } from '../modules/location/locationManager';
 
 import NativeBridgeComponent from './NativeBridgeComponent';
 
@@ -184,7 +185,7 @@ type Props = ViewProps & {
   /**
    * Enable/Disable the compass from appearing on the map
    */
-  compassEnabled: boolean;
+  compassEnabled?: boolean;
 
   /**
    * [`mapbox` (v10) implementation only] Enable/Disable if the compass should fade out when the map is pointing north
@@ -226,6 +227,12 @@ type Props = ViewProps & {
    */
   surfaceView?: boolean;
 
+  /**
+   * [Android only] Experimental, call requestDisallowInterceptTouchEvent on parent with onTochEvent, this allows touch interaction to work
+   * when embedded into a scroll view
+   */
+  requestDisallowInterceptTouchEvent?: boolean;
+
   /**
    * [`mapbox` (v10) implementation only]
    * Set map's label locale, e.g. { "locale": "es" } will localize labels to Spanish, { "locale": "current" } will localize labels to system locale.
@@ -397,7 +404,8 @@ class MapView extends NativeBridgeComponent(
     compassFadeWhenNorth: false,
     logoEnabled: true,
     scaleBarEnabled: true,
-    surfaceView: false,
+    surfaceView: MGLModule.MapboxV10 ? true : false,
+    requestDisallowInterceptTouchEvent: false,
     regionWillChangeDebounceTime: 10,
     regionDidChangeDebounceTime: 500,
   };
@@ -526,7 +534,7 @@ class MapView extends NativeBridgeComponent(
           );
           this.deprecationLogged.regionDidChange = true;
         }
-        if (props.onRegionDidChange) {
+        if (props.onMapIdle) {
           console.warn(
             'rnmapbox/maps: only one of MapView.onRegionDidChange or onMapIdle is supported',
           );

package/src/components/NativeUserLocation.tsx

@@ -1,5 +1,5 @@
 import React, { memo } from 'react';
-import { HostComponent, requireNativeComponent } from 'react-native';
+import { requireNativeComponent } from 'react-native';
 
 const NATIVE_MODULE_NAME = 'RCTMGLNativeUserLocation';
 
@@ -23,8 +23,10 @@ export type Props = {
   iosShowsUserHeadingIndicator?: boolean;
 };
 
-const RCTMGLNativeUserLocation: HostComponent<Props> =
-  requireNativeComponent(NATIVE_MODULE_NAME);
+type NativeProps = Props;
+
+const RCTMGLNativeUserLocation =
+  requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
 
 const NativeUserLocation = memo((props: Props) => {
   return <RCTMGLNativeUserLocation {...props} />;

package/src/components/Terrain.tsx

@@ -1,5 +1,5 @@
 import React, { memo, useMemo } from 'react';
-import { HostComponent, requireNativeComponent } from 'react-native';
+import { requireNativeComponent } from 'react-native';
 
 import type { TerrainLayerStyleProps, Value } from '../utils/MapboxStyles';
 import { StyleValue, transformStyle } from '../utils/StyleValue';
@@ -33,7 +33,7 @@ export const Terrain = memo((props: Props) => {
 
   if (props.exaggeration) {
     console.warn(
-      `Tarrain: exaggeration property is deprecated pls use style.exaggeration instead!`,
+      `Terrain: exaggeration property is deprecated pls use style.exaggeration instead!`,
     );
     style = { exaggeration: props.exaggeration, ...style };
   }
@@ -45,10 +45,8 @@ export const Terrain = memo((props: Props) => {
       style: undefined,
     };
   }, [props, style]);
-  console.log('BASE PROPS', baseProps);
 
   return <RCTMGLTerrain {...baseProps} />;
 });
 
-const RCTMGLTerrain: HostComponent<NativeProps> =
-  requireNativeComponent(NATIVE_MODULE_NAME);
+const RCTMGLTerrain = requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/AbstractEventEmitter.java

@@ -1,82 +0,0 @@
-package com.mapbox.rctmgl.components;
-
-import android.view.ViewGroup;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIManagerModule;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.events.EventDispatcher;
-
-import com.mapbox.rctmgl.events.IEvent;
-import com.mapbox.rctmgl.components.AbstractEvent;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import javax.annotation.Nonnull;
-
-/**
- * Created by nickitaliano on 8/23/17.
- */
-
-abstract public class AbstractEventEmitter<T extends ViewGroup> extends ViewGroupManager<T> {
-    private static final double BRIDGE_TIMEOUT_MS = 10;
-    private Map<String, Long> mRateLimitedEvents;
-    private EventDispatcher mEventDispatcher;
-    private ReactApplicationContext mRCTAppContext;
-
-    public AbstractEventEmitter(ReactApplicationContext reactApplicationContext) {
-        mRateLimitedEvents = new HashMap<>();
-        mRCTAppContext = reactApplicationContext;
-    }
-
-    public void handleEvent(IEvent event) {
-        String eventCacheKey = getEventCacheKey(event);
-
-        // fail safe to protect bridge from being spammed
-        if (shouldDropEvent(eventCacheKey, event)) {
-            return;
-        }
-
-        mRateLimitedEvents.put(eventCacheKey, System.currentTimeMillis());
-        mEventDispatcher.dispatchEvent(new AbstractEvent(event.getID(), event.getKey(), event.canCoalesce(), event.toJSON()));
-    }
-
-    @Override
-    protected void addEventEmitters(ThemedReactContext context, @Nonnull T view) {
-        mEventDispatcher = context.getNativeModule(UIManagerModule.class).getEventDispatcher();
-    }
-
-    @Nullable
-    @Override
-    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
-        Map<String, String> events = customEvents();
-
-        if (events == null) {
-            return null;
-        }
-
-        Map<String, Object> exportedEvents = new HashMap<>();
-
-        for (Map.Entry<String, String> event : events.entrySet()) {
-            exportedEvents.put(event.getKey(), MapBuilder.of("registrationName", event.getValue()));
-        }
-
-        return exportedEvents;
-    }
-
-    @Nullable
-    public abstract Map<String, String> customEvents();
-
-    private boolean shouldDropEvent(String cacheKey, IEvent event) {
-        Long lastEventTimestamp = mRateLimitedEvents.get(cacheKey);
-        return lastEventTimestamp != null && (event.getTimestamp() - lastEventTimestamp) <= BRIDGE_TIMEOUT_MS;
-    }
-
-    private String getEventCacheKey(IEvent event) {
-        return String.format("%s-%s", event.getKey(), event.getType());
-    }
-}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLAndroidTextureMapView.java

@@ -1,16 +0,0 @@
-package com.mapbox.rctmgl.components.mapview;
-
-import android.content.Context;
-//import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
-/**
- * Created by hernanmateo on 12/11/18.
- */
-
-@SuppressWarnings({"MissingPermission"})
-public class RCTMGLAndroidTextureMapView extends RCTMGLMapView {
-	public static final String LOG_TAG = "RCTMGLAndroidTextureMapView";
-	
-    public RCTMGLAndroidTextureMapView(Context context, RCTMGLAndroidTextureMapViewManager manager/*, MapboxMapOptions options*/) {
-        super(context, manager/*, options*/);
-    }
-}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLAndroidTextureMapViewManager.java

@@ -1,31 +0,0 @@
-package com.mapbox.rctmgl.components.mapview;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-//import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
-/**
- * Created by hernanmateo on 12/11/18.
- */
-
-public class RCTMGLAndroidTextureMapViewManager extends RCTMGLMapViewManager {
-    public static final String LOG_TAG = "RCTMGLAndroidTextureMapViewManager";
-    public static final String REACT_CLASS = "RCTMGLAndroidTextureMapView";
-
-    public RCTMGLAndroidTextureMapViewManager(ReactApplicationContext context) {
-        super(context);
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected RCTMGLAndroidTextureMapView createViewInstance(ThemedReactContext themedReactContext) {
-        //MapboxMapOptions options = new MapboxMapOptions();
-        //options.textureMode(true);
-        return new RCTMGLAndroidTextureMapView(themedReactContext, this/*, options*/);
-    }
-}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/events/AbstractEvent.java

@@ -1,62 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import android.view.View;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-
-abstract public class AbstractEvent implements IEvent {
-    private int mTagID;
-    private String mEventType;
-    private long mTimestamp;
-
-    public AbstractEvent(String eventType) {
-        this(null, eventType);
-    }
-
-    public AbstractEvent(View view, String eventType) {
-        mEventType = eventType;
-
-        if (view != null) {
-            mTagID = view.getId();
-        }
-
-        mTimestamp = System.currentTimeMillis();
-    }
-
-    public int getID() {
-        return mTagID;
-    }
-
-    public String getType() {
-        return mEventType;
-    }
-
-    public boolean equals(IEvent event) {
-        return getKey().equals(event.getKey()) && mEventType.equals(event.getType());
-    }
-
-    public WritableMap getPayload() {
-        return Arguments.createMap();
-    }
-
-    public long getTimestamp() {
-        return mTimestamp;
-    }
-
-    public WritableMap toJSON() {
-        WritableMap map = Arguments.createMap();
-        map.putString("type", getType());
-
-        WritableMap payloadClone = Arguments.createMap();
-        payloadClone.merge(getPayload());
-        map.putMap("payload", payloadClone);
-        return map;
-    }
-
-    @Override
-    public boolean canCoalesce() {
-        // default behavior of com.facebook.react.uimanager.events.Event
-        return true;
-    }
-}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/events/IEvent.java

@@ -1,18 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import com.facebook.react.bridge.WritableMap;
-
-/**
- * Created by nickitaliano on 8/23/17.
- */
-
-public interface IEvent {
-    int getID();
-    String getKey();
-    String getType();
-    long getTimestamp();
-    boolean equals(IEvent event);
-    boolean canCoalesce();
-    WritableMap getPayload();
-    WritableMap toJSON();
-}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/events/constants/EventTypes.java

@@ -1,51 +0,0 @@
-package com.mapbox.rctmgl.events.constants;
-
-public class EventTypes {
-    // map event types
-    public static final String MAP_CLICK = "press";
-    public static final String MAP_LONG_CLICK = "longpress";
-    public static final String MAP_USER_TRACKING_MODE_CHANGE = "usertrackingmodechange";
-
-    public static final String REGION_WILL_CHANGE = "regionwillchange";
-    public static final String REGION_IS_CHANGING = "regionischanging"; // deprecated
-    public static final String CAMERA_CHANGED = "camerachanged";
-    public static final String REGION_DID_CHANGE  = "regiondidchange";
-    public static final String MAP_IDLE = "mapidle";
-    public static final String USER_LOCATION_UPDATED = "userlocationdupdated";
-
-
-
-    public static final String WILL_START_LOADING_MAP = "willstartloadingmap";
-    public static final String DID_FINISH_LOADING_MAP = "didfinishloadingmap";
-    public static final String DID_FAIL_LOADING_MAP = "didfailloadingmap";
-
-    public static final String WILL_START_RENDERING_FRAME = "willstartrenderingframe";
-    public static final String DID_FINISH_RENDERING_FRAME = "didfinishrenderingframe";
-    public static final String DID_FINISH_RENDERING_FRAME_FULLY = "didfinishrenderingframefully";
-
-    public static final String WILL_START_RENDERING_MAP = "willstartrenderingmap";
-    public static final String DID_FINISH_RENDERING_MAP = "didfinishrenderingmap";
-    public static final String DID_FINISH_RENDERING_MAP_FULLY = "didfinishrenderingmapfully";
-
-    public static final String DID_FINISH_LOADING_STYLE = "didfinishloadingstyle";
-
-    // point annotation event types
-    public static final String ANNOTATION_SELECTED = "annotationselected";
-    public static final String ANNOTATION_DESELECTED = "annotationdeselected";
-    public static final String ANNOTATION_DRAG_START = "annotationdragstart";
-    public static final String ANNOTATION_DRAG = "annotationdrag";
-    public static final String ANNOTATION_DRAG_END = "annotationdragend";
-
-    // offline event types
-    public static final String OFFLINE_ERROR = "offlineerror";
-    public static final String OFFLINE_TILE_LIMIT = "offlinetilelimit";
-    public static final String OFFLINE_STATUS = "offlinestatus";
-
-    // shape source event types
-    public static final String SHAPE_SOURCE_LAYER_CLICK = "shapesourcelayerpress";
-    public static final String VECTOR_SOURCE_LAYER_CLICK = "vectorsourcelayerpress";
-    public static final String RASTER_SOURCE_LAYER_CLICK = "rastersourcelayerpress";
-
-    // image missing event type
-    public static final String IMAGES_MISSING = "imagesmissing";
-}