@rnmapbox/maps 10.0.0-beta.74 → 10.0.0-beta.75

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/camera/CameraStop.kt

@@ -2,42 +2,31 @@ package com.mapbox.rctmgl.components.camera
 
 import android.animation.Animator
 import android.content.Context
-import com.mapbox.maps.MapView
-import com.mapbox.maps.MapboxMap
 import com.mapbox.rctmgl.utils.GeoJSONUtils.toPointGeometry
 import com.mapbox.rctmgl.utils.GeoJSONUtils.toLatLng
 import com.mapbox.rctmgl.utils.GeoJSONUtils.toLatLngBounds
 import com.mapbox.rctmgl.utils.LatLngBounds
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.camera.CameraUpdateItem
-import com.mapbox.maps.CameraState
 import com.mapbox.maps.CameraOptions
-import com.mapbox.rctmgl.components.camera.CameraStop
 import com.facebook.react.bridge.ReadableMap
-import com.mapbox.rctmgl.utils.GeoJSONUtils
-import android.util.DisplayMetrics
 import com.mapbox.geojson.FeatureCollection
 import com.mapbox.maps.EdgeInsets
 import com.mapbox.rctmgl.components.camera.constants.CameraMode
 import com.mapbox.rctmgl.utils.LatLng
 
-/*
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.geometry.LatLngBounds;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
- */   class CameraStop {
+class CameraStop {
     private var mBearing: Double? = null
     private var mTilt: Double? = null
     private var mZoom: Double? = null
+
     private var mLatLng: LatLng? = null
     private var mBounds: LatLngBounds? = null
-    private var mBoundsPaddingLeft : Int? = null
-    private var mBoundsPaddingRight : Int? = null
-    private var mBoundsPaddingBottom : Int? = null
-    private var mBoundsPaddingTop : Int? = null
+
+    private var mPaddingLeft: Int? = null
+    private var mPaddingRight: Int? = null
+    private var mPaddingBottom: Int? = null
+    private var mPaddingTop: Int? = null
+
     private var mMode = CameraMode.EASE
     private var mDuration = 2000
     private var mCallback: Animator.AnimatorListener? = null
@@ -65,6 +54,18 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         mCallback = callback
     }
 
+    fun setPadding(
+        paddingLeft: Int?,
+        paddingRight: Int?,
+        paddingTop: Int?,
+        paddingBottom: Int?
+    ) {
+        mPaddingLeft = paddingLeft
+        mPaddingRight = paddingRight
+        mPaddingTop = paddingTop
+        mPaddingBottom = paddingBottom
+    }
+
     fun setBounds(
         bounds: LatLngBounds?,
         paddingLeft: Int?,
@@ -73,21 +74,18 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         paddingBottom: Int?
     ) {
         mBounds = bounds
-        mBoundsPaddingLeft = paddingLeft
-        mBoundsPaddingRight = paddingRight
-        mBoundsPaddingTop = paddingTop
-        mBoundsPaddingBottom = paddingBottom
+        this.setPadding(paddingLeft, paddingRight, paddingTop, paddingBottom)
     }
 
     fun setMode(@CameraMode.Mode mode: Int) {
         mMode = mode
     }
 
-    fun convert(value: IntArray): EdgeInsets {
-        val left = value[0].toDouble();
-        val top = value[1].toDouble();
-        val right = value[2].toDouble();
-        val bottom = value[3].toDouble();
+    private fun convert(value: IntArray): EdgeInsets {
+        val left = value[0].toDouble()
+        val top = value[1].toDouble()
+        val right = value[2].toDouble()
+        val bottom = value[3].toDouble()
         return EdgeInsets(
             top, left, bottom, right
         )
@@ -100,7 +98,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         builder.center(currentCamera.center)
         builder.bearing(currentCamera.bearing)
 
-        val currentPadding = currentCamera.padding;
+        val currentPadding = currentCamera.padding
 
         builder.padding(currentCamera.padding)
         builder.zoom(currentCamera.zoom)
@@ -110,33 +108,39 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         if (mTilt != null) {
             builder.pitch(mTilt)
         }
+
+        val paddingLeft: Int = mPaddingLeft ?: currentPadding.left.toInt()
+        val paddingTop: Int = mPaddingTop ?: currentPadding.top.toInt()
+        val paddingRight: Int = mPaddingRight ?: currentPadding.right.toInt()
+        val paddingBottom: Int = mPaddingBottom ?: currentPadding.bottom.toInt()
+        val cameraPadding = intArrayOf(paddingLeft, paddingTop, paddingRight, paddingBottom)
+        val cameraPaddingClipped = clippedPadding(cameraPadding, mapView)
+        val cameraPaddingEdgeInsets = convert(cameraPaddingClipped)
+
         if (mLatLng != null) {
             builder.center(mLatLng!!.point)
+            builder.padding(cameraPaddingEdgeInsets)
         } else if (mBounds != null) {
             val tilt = if (mTilt != null) mTilt!! else currentCamera.pitch
             val bearing = if (mBearing != null) mBearing!! else currentCamera.bearing
 
-            val paddingLeft: Int = mBoundsPaddingLeft ?: currentPadding.left.toInt()
-            val paddingTop: Int = mBoundsPaddingTop ?: currentPadding.top.toInt()
-            val paddingRight: Int = mBoundsPaddingRight ?: currentPadding.right.toInt()
-            val paddingBottom: Int = mBoundsPaddingBottom ?: currentPadding.bottom.toInt()
-
-            val cameraPadding = intArrayOf(paddingLeft, paddingTop, paddingRight, paddingBottom)
-            val cameraPaddingClipped = clippedPadding(cameraPadding, mapView)
             val boundsCamera = map.cameraForCoordinateBounds(
                 mBounds!!.toBounds(),
-                convert(cameraPaddingClipped),
+                cameraPaddingEdgeInsets,
                 bearing,
                 tilt
             )
+
             builder.center(boundsCamera.center)
             builder.anchor(boundsCamera.anchor)
             builder.zoom(boundsCamera.zoom)
             builder.padding(boundsCamera.padding)
         }
+
         if (mZoom != null) {
             builder.zoom(mZoom)
         }
+
         return CameraUpdateItem(map, builder.build(), mDuration, mCallback, mMode)
     }
 
@@ -148,35 +152,44 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
             callback: Animator.AnimatorListener?
         ): CameraStop {
             val stop = CameraStop()
+
             if (readableMap.hasKey("pitch")) {
                 stop.setTilt(readableMap.getDouble("pitch"))
             }
+
             if (readableMap.hasKey("heading")) {
                 stop.setBearing(readableMap.getDouble("heading"))
             }
+
             if (readableMap.hasKey("centerCoordinate")) {
                 val target = toPointGeometry(readableMap.getString("centerCoordinate"))
                 stop.setLatLng(toLatLng(target!!))
             }
+
             if (readableMap.hasKey("zoom")) {
                 stop.setZoom(readableMap.getDouble("zoom"))
             }
+
             if (readableMap.hasKey("duration")) {
                 stop.setDuration(readableMap.getInt("duration"))
             }
-            if (readableMap.hasKey("bounds")) {
-                val metrics = context.resources.displayMetrics
-                var paddingTop = getBoundsPaddingByKey(readableMap, metrics.density, "paddingTop")
-                var paddingRight = getBoundsPaddingByKey(readableMap, metrics.density, "paddingRight")
-                var paddingBottom = getBoundsPaddingByKey(readableMap, metrics.density, "paddingBottom")
-                var paddingLeft = getBoundsPaddingByKey(readableMap, metrics.density, "paddingLeft")
 
+            val metrics = context.resources.displayMetrics
+            val paddingTop = getBoundsPaddingByKey(readableMap, metrics.density, "paddingTop")
+            val paddingRight = getBoundsPaddingByKey(readableMap, metrics.density, "paddingRight")
+            val paddingBottom = getBoundsPaddingByKey(readableMap, metrics.density, "paddingBottom")
+            val paddingLeft = getBoundsPaddingByKey(readableMap, metrics.density, "paddingLeft")
+
+            if (readableMap.hasKey("bounds")) {
                 val collection = FeatureCollection.fromJson(readableMap.getString("bounds")!!)
                 stop.setBounds(
                     toLatLngBounds(collection), paddingLeft, paddingRight,
                     paddingTop, paddingBottom
                 )
+            } else {
+                stop.setPadding(paddingLeft, paddingRight, paddingTop, paddingBottom)
             }
+
             if (readableMap.hasKey("mode")) {
                 when (readableMap.getInt("mode")) {
                     CameraMode.FLIGHT -> stop.setMode(CameraMode.FLIGHT)
@@ -185,7 +198,9 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
                     else -> stop.setMode(CameraMode.EASE)
                 }
             }
+
             stop.setCallback(callback)
+
             return stop
         }
 
@@ -218,10 +233,10 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         }
 
         private fun getBoundsPaddingByKey(map: ReadableMap, density: Float, key: String): Int? {
-            if (map.hasKey(key)) {
-                return (map.getInt(key) * density).toInt()
+            return if (map.hasKey(key)) {
+                (map.getInt(key) * density).toInt()
             } else {
-                return null;
+                null
             }
         }
     }

package/index.d.ts

@@ -20,7 +20,6 @@ import type {
   SymbolLayerStyleProps,
   CircleLayerStyleProps,
   FillExtrusionLayerStyleProps,
-  SkyLayerStyleProps,
   RasterLayerStyleProps,
   HeatmapLayerStyleProps,
   FillLayerStyleProps,
@@ -43,6 +42,7 @@ import {
 } from './javascript/components/Camera';
 import _Images from './javascript/components/Images';
 import _Image from './javascript/components/Image';
+import _MapView, { _MapState } from './javascript/components/MapView';
 import { MarkerView as _MarkerView } from './javascript/components/MarkerView';
 import { PointAnnotation as _PointAnnotation } from './javascript/components/PointAnnotation';
 import { Atmosphere as _Atmosphere } from './javascript/components/Atmosphere';
@@ -53,17 +53,22 @@ import {
 import _LineLayer, {
   Props as _LineLayerProps,
 } from './javascript/components/LineLayer';
+import _SkyLater from './javascript/components/SkyLayer';
 import { Props as _BackgroundLayerProps } from './javascript/components/BackgroundLayer';
 import { Props as _CircleLayerProps } from './javascript/components/CircleLayer';
 import { Props as _FillLayerProps } from './javascript/components/FillLayer';
 import { Props as _FillExtrusionLayerProps } from './javascript/components/FillExtrusionLayer';
 import { Props as _RasterLayerProps } from './javascript/components/RasterLayer';
 import { Props as _HeatmapLayerProps } from './javascript/components/HeatmapLayer';
-import { Props as _SkyLayerProps } from './javascript/components/SkyLayer';
+import _SkyLayer, {
+  Props as _SkyLayerProps,
+} from './javascript/components/SkyLayer';
 import {
   ShapeSource as _ShapeSource,
   Props as _ShapeSourceProps,
 } from './javascript/components/ShapeSource';
+import _RasterSource from './javascript/components/RasterSource';
+import _RasterDemSource from './javascript/components/RasterDemSource';
 import _VectorSource from './javascript/components/VectorSource';
 import _Light from './javascript/components/Light';
 import type {
@@ -84,55 +89,6 @@ import {
   Logger as _Logger,
 } from './javascript/utils/Logger';
 
-// prettier-ignore
-type ExpressionName =
-  // Types
-  | 'array' | 'boolean' | 'collator' | 'format' | 'image' | 'literal' | 'number' | 'number-format' | 'object' | 'string'
-  | 'to-boolean' | 'to-color' | 'to-number' | 'to-string' | 'typeof'
-  // Feature data
-  | 'accumulated' | 'feature-state' | 'geometry-type' | 'id' | 'line-progress' | 'properties'
-  // Lookup
-  | 'at' | 'get' | 'has' | 'in' | 'index-of' | 'length' | 'slice'
-  // Decision
-  | '!' | '!=' | '<' | '<=' | '==' | '>' | '>=' | 'all' | 'any' | 'case' | 'match' | 'coalesce' | 'within'
-  // Ramps, scales, curves
-  | 'interpolate' | 'interpolate-hcl' | 'interpolate-lab' | 'step'
-  // Variable binding
-  | 'let' | 'var'
-  // String
-  | 'concat' | 'downcase' | 'is-supported-script' | 'resolved-locale' | 'upcase'
-  // Color
-  | 'rgb' | 'rgba' | 'to-rgba'
-  // Math
-  | '-' | '*' | '/' | '%' | '^' | '+' | 'abs' | 'acos' | 'asin' | 'atan' | 'ceil' | 'cos' | 'distance' | 'e'
-  | 'floor' | 'ln' | 'ln2' | 'log10' | 'log2' | 'max' | 'min' | 'pi' | 'round' | 'sin' | 'sqrt' | 'tan'
-  // Zoom, Heatmap
-  | 'zoom' | 'heatmap-density';
-
-type ExpressionField =
-  | string
-  | number
-  | boolean
-  | Expression
-  | ExpressionField[]
-  | { [key: string]: ExpressionField };
-
-export type Expression = [ExpressionName, ...ExpressionField[]];
-
-type Anchor =
-  | 'center'
-  | 'left'
-  | 'right'
-  | 'top'
-  | 'bottom'
-  | 'top-left'
-  | 'top-right'
-  | 'bottom-left'
-  | 'bottom-right';
-type Visibility = 'visible' | 'none';
-type Alignment = 'map' | 'viewport';
-type AutoAlignment = Alignment | 'auto';
-
 export type OnPressEvent = _OnPressEvent;
 
 declare namespace MapboxGL {
@@ -167,8 +123,14 @@ declare namespace MapboxGL {
   const PointAnnotation = _PointAnnotation;
   const SymbolLayer = _SymbolLayer;
   const LineLayer = _LineLayer;
+  type LineLayer = _LineLayer;
   const ShapeSource = _ShapeSource;
   type ShapeSource = _ShapeSource;
+  const SkyLayer = _SkyLayer;
+  type SkyLayer = _SkyLayer;
+
+  const MapView = _MapView;
+  type MapView = _MapView;
 
   type MapboxGLEvent = _MapboxGLEvent;
   type UserTrackingMode = _UserTrackingMode;
@@ -290,41 +252,12 @@ declare namespace MapboxGL {
     // layers
     class FillLayer extends Component<_FillLayerProps> {}
     class FillExtrusionLayer extends Component<_FillExtrusionLayerProps> {}
-    class LineLayer extends Component<_LineLayerProps> {}
     class CircleLayer extends Component<_CircleLayerProps> {}
     class SymbolLayer extends Component<_SymbolLayerProps> {}
     class RasterLayer extends Component<_RasterLayerProps> {}
     class BackgroundLayer extends Component<_BackgroundLayerProps> {}
   }
 
-  /**
-   * Components
-   */
-  export class MapView extends Component<MapViewProps> {
-    getPointInView(coordinate: GeoJSON.Position): Promise<GeoJSON.Position>;
-    getCoordinateFromView(point: GeoJSON.Position): Promise<GeoJSON.Position>;
-    getVisibleBounds(): Promise<GeoJSON.Position[]>;
-    queryRenderedFeaturesAtPoint(
-      coordinate: GeoJSON.Position,
-      filter?: Expression,
-      layerIds?: Array<string>,
-    ): Promise<GeoJSON.FeatureCollection | undefined>;
-    queryRenderedFeaturesInRect(
-      coordinate: GeoJSON.Position,
-      filter?: Expression,
-      layerIds?: Array<string>,
-    ): Promise<GeoJSON.FeatureCollection | undefined>;
-    takeSnap(writeToDisk?: boolean): Promise<string>;
-    getZoom(): Promise<number>;
-    getCenter(): Promise<GeoJSON.Position>;
-    showAttribution(): void;
-    setSourceVisibility(
-      visible: boolean,
-      sourceId: string,
-      sourceLayerId?: string,
-    ): void;
-  }
-
   type Padding = number | [number, number] | [number, number, number, number];
 
   class UserLocation extends Component<UserLocationProps> {}
@@ -332,15 +265,16 @@ declare namespace MapboxGL {
   const Light = _Light;
 
   class Callout extends Component<CalloutProps> {}
-  type Style = FC<StyleProps>;
 
   /**
    * Sources
    */
-  type VectorSource = typeof _VectorSource;
+  type VectorSource = _VectorSource;
   const VectorSource = _VectorSource;
-  class RasterSource extends Component<RasterSourceProps> {}
-  class RasterDemSource extends Component<RasterSourceProps> {}
+  type RasterSource = _RasterSource;
+  const RasterSource = _RasterSource;
+  type RasterDemSource = RasterDemSource;
+  const RasterDemSource = _RasterDemSource;
 
   /**
    * Layers
@@ -349,11 +283,11 @@ declare namespace MapboxGL {
   class CircleLayer extends Component<_CircleLayerProps> {}
   class FillExtrusionLayer extends Component<_FillExtrusionLayerProps> {}
   class FillLayer extends Component<_FillLayerProps> {}
-  class LineLayer extends Component<_LineLayerProps> {}
   class RasterLayer extends Component<_RasterLayerProps> {}
   class HeatmapLayer extends Component<_HeatmapLayerProps> {}
   class ImageSource extends Component<ImageSourceProps> {}
-  class SkyLayer extends Component<_SkyLayerProps> {}
+  type SkyLayer = _SkyLayer;
+  const SkyLayer = _SkyLayer;
 
   type Images = _Images;
   const Images = _Images;
@@ -454,99 +388,6 @@ declare namespace MapboxGL {
   }
 }
 
-export type OrnamentPosition =
-  | { top: number; left: number }
-  | { top: number; right: number }
-  | { bottom: number; left: number }
-  | { bottom: number; right: number };
-
-export interface RegionPayload {
-  zoomLevel: number;
-  heading: number;
-  animated: boolean;
-  isUserInteraction: boolean;
-  visibleBounds: GeoJSON.Position[];
-  pitch: number;
-}
-
-/**
- * v10 only - experimental
- */
-export interface MapState {
-  properties: {
-    center: GeoJSON.Position;
-    bounds: {
-      ne: GeoJSON.Position;
-      sw: GeoJSON.Position;
-    };
-    zoom: number;
-    heading: number;
-    pitch: number;
-  };
-  gestures: {
-    isGestureActive: boolean;
-    isAnimatingFromGesture: boolean;
-  };
-}
-
-export interface MapViewProps extends ViewProps {
-  animated?: boolean;
-  userTrackingMode?: MapboxGL.UserTrackingModes;
-  contentInset?: Array<number>;
-  projection?: 'mercator' | 'globe';
-  style?: StyleProp<ViewStyle>;
-  styleURL?: string;
-  styleJSON?: string;
-  preferredFramesPerSecond?: number;
-  localizeLabels?: boolean;
-  zoomEnabled?: boolean;
-  scrollEnabled?: boolean;
-  pitchEnabled?: boolean;
-  rotateEnabled?: boolean;
-  attributionEnabled?: boolean;
-  attributionPosition?: OrnamentPosition;
-  logoEnabled?: boolean;
-  logoPosition?: OrnamentPosition;
-  compassEnabled?: boolean;
-  compassFadeWhenNorth?: boolean;
-  compassPosition?: OrnamentPosition;
-  compassViewPosition?: number;
-  compassViewMargins?: Point;
-  compassImage?: string;
-  scaleBarEnabled?: boolean;
-  scaleBarPosition?: OrnamentPosition;
-  surfaceView?: boolean;
-  regionWillChangeDebounceTime?: number;
-  regionDidChangeDebounceTime?: number;
-  tintColor?: string;
-
-  onPress?: (feature: GeoJSON.Feature) => void;
-  onLongPress?: (feature: GeoJSON.Feature) => void;
-  onRegionWillChange?: (
-    feature: GeoJSON.Feature<GeoJSON.Point, RegionPayload>,
-  ) => void;
-  onRegionIsChanging?: (
-    feature: GeoJSON.Feature<GeoJSON.Point, RegionPayload>,
-  ) => void;
-  onRegionDidChange?: (
-    feature: GeoJSON.Feature<GeoJSON.Point, RegionPayload>,
-  ) => void;
-  onCameraChanged?: (state: MapState) => void;
-  onMapIdle?: (state: MapState) => void;
-  onUserLocationUpdate?: (feature: Location) => void;
-  onWillStartLoadingMap?: () => void;
-  onDidFinishLoadingMap?: () => void;
-  onDidFailLoadingMap?: () => void;
-  onWillStartRenderingFrame?: () => void;
-  onDidFinishRenderingFrame?: () => void;
-  onDidFinishRenderingFrameFully?: () => void;
-  onWillStartRenderingMap?: () => void;
-  onDidFinishRenderingMap?: () => void;
-  onDidFinishRenderingMapFully?: () => void;
-  onDidFinishLoadingStyle?: () => void;
-  onUserTrackingModeChange?: () => void;
-}
-
 export interface UserLocationProps {
   androidRenderMode?: 'normal' | 'compass' | 'gps';
   animated?: boolean;
@@ -560,20 +401,6 @@ export interface UserLocationProps {
   visible?: boolean;
 }
 
-export type WithExpression<T> = {
-  [P in keyof T]: T[P] | Expression;
-};
-
-export interface LightStyle {
-  anchor?: Alignment | Expression;
-  position?: GeoJSON.Position | Expression;
-  positionTransition?: Transition | Expression;
-  color?: string | Expression;
-  colorTransition?: Transition | Expression;
-  intensity?: number | Expression;
-  intensityTransition?: Transition | Expression;
-}
-
 export interface Transition {
   duration: number;
   delay: number;
@@ -593,17 +420,6 @@ export type LineLayerStyle = LineLayerStyleProps;
 
 export type RasterLayerStyle = RasterLayerStyleProps;
 
-export type TextVariableAnchorValues =
-  | 'center'
-  | 'left'
-  | 'right'
-  | 'top'
-  | 'bottom'
-  | 'top-left'
-  | 'top-right'
-  | 'bottom-left'
-  | 'bottom-right';
-
 export type SymbolLayerStyle = SymbolLayerStyleProps;
 export type LineLayerStyle = LineLayerStyleProps;
 
@@ -614,56 +430,13 @@ export interface Point {
   y: number;
 }
 
-export interface LightProps extends Omit<ViewProps, 'style'> {
-  style?: LightStyle;
-}
-
-export interface StyleProps {
-  json: any;
-}
-
 export interface CalloutProps extends Omit<ViewProps, 'style'> {
   title?: string;
-  style?: StyleProp<WithExpression<ViewStyle>>;
-  containerStyle?: StyleProp<WithExpression<ViewStyle>>;
-  contentStyle?: StyleProp<WithExpression<ViewStyle>>;
-  tipStyle?: StyleProp<WithExpression<ViewStyle>>;
-  textStyle?: StyleProp<WithExpression<TextStyle>>;
-}
-
-export interface TileSourceProps extends ViewProps {
-  id: string;
-  url?: string;
-  tileUrlTemplates?: Array<string>;
-  minZoomLevel?: number;
-  maxZoomLevel?: number;
-}
-
-export interface RasterSourceProps extends TileSourceProps {
-  tileSize?: number;
-}
-
-export interface LayerBaseProps<T = object> extends Omit<ViewProps, 'style'> {
-  id: string;
-  sourceID?: string;
-  sourceLayerID?: string;
-  aboveLayerID?: string;
-  belowLayerID?: string;
-  layerIndex?: number;
-  filter?: Expression;
-  minZoomLevel?: number;
-  maxZoomLevel?: number;
-}
-
-export interface ImageSourceProps extends ViewProps {
-  id: string;
-  url?: number | string;
-  coordinates: [
-    GeoJSON.Position,
-    GeoJSON.Position,
-    GeoJSON.Position,
-    GeoJSON.Position,
-  ];
+  style?: StyleProp<ViewStyle>;
+  containerStyle?: StyleProp<ViewStyle>;
+  contentStyle?: StyleProp<ViewStyle>;
+  tipStyle?: StyleProp<ViewStyle>;
+  textStyle?: StyleProp<TextStyle>;
 }
 
 export interface OfflineCreatePackOptions {
@@ -686,11 +459,6 @@ export interface SnapshotOptions {
   writeToDisk?: boolean;
 }
 
-export interface SkyLayerProps extends LayerBaseProps {
-  id: string;
-  style?: StyleProp<SkyLayerStyle>;
-}
-
 export import Logger = MapboxGL.Logger;
 
 export import MapView = MapboxGL.MapView;
@@ -737,6 +505,9 @@ export import Images = MapboxGL.Images;
 export import Image = MapboxGL.Image;
 export import Light = MapboxGL.Light;
 export import VectorSource = MapboxGL.VectorSource;
+export import MapView = MapboxGL.MapView;
+export import SkyLayer = MapboxGL.SkyLayer;
+export import MapState = _MapState;
 
 export const { offlineManager } = MapboxGL;