@rnmapbox/maps 10.1.0-beta.24 → 10.1.0-beta.26

package/src/components/ModelLayer.tsx

@@ -0,0 +1,107 @@
+import React from 'react';
+import { NativeModules } from 'react-native';
+
+import { FilterExpression, ModelLayerStyleProps } from '../utils/MapboxStyles';
+import { StyleValue } from '../utils/StyleValue';
+import RNMBXModelLayerNativeComponent from '../specs/RNMBXModelLayerNativeComponent';
+
+import AbstractLayer from './AbstractLayer';
+
+const Mapbox = NativeModules.RNMBXModule;
+
+// @{codepart-replace-start(LayerPropsCommon.codepart-tsx)}
+type Slot = 'bottom' | 'middle' | 'top';
+
+type LayerPropsCommon = {
+  /**
+   * A string that uniquely identifies the source in the style to which it is added.
+   */
+  id: string;
+
+  /**
+   * The id refers to en existing layer in the style. Does not create a new layer.
+   */
+  existing?: boolean;
+
+  /**
+   * The source from which to obtain the data to style.
+   * If the source has not yet been added to the current style, the behavior is undefined.
+   * Inferred from parent source only if the layer is a direct child to it.
+   */
+  sourceID?: string;
+
+  /**
+   * Identifier of the layer within the source identified by the sourceID property from which the receiver obtains the data to style.
+   */
+  sourceLayerID?: string;
+
+  /**
+   * Inserts a layer above aboveLayerID.
+   */
+  aboveLayerID?: string;
+
+  /**
+   * Inserts a layer below belowLayerID
+   */
+  belowLayerID?: string;
+
+  /**
+   * Inserts a layer at a specified index
+   */
+  layerIndex?: number;
+
+  /**
+   *  Filter only the features in the source layer that satisfy a condition that you define
+   */
+  filter?: FilterExpression;
+
+  /**
+   * The minimum zoom level at which the layer gets parsed and appears.
+   */
+  minZoomLevel?: number;
+
+  /**
+   * The maximum zoom level at which the layer gets parsed and appears.
+   */
+  maxZoomLevel?: number;
+
+  /**
+   * The slot this layer is assigned to. If specified, and a slot with that name exists, it will be placed at that position in the layer order.
+   *
+   * v11 only
+   */
+  slot?: Slot;
+};
+// @{codepart-replace-end}
+
+export type Props = LayerPropsCommon & {
+  /**
+   * Customizable style attributes
+   */
+  style?: ModelLayerStyleProps;
+};
+
+type NativeTypeProps = Omit<Props, 'style'> & {
+  reactStyle?: { [key: string]: StyleValue };
+};
+
+/**
+ * ModelLayer is a style layer that renders one or more stroked polylines on the map.
+ */
+class ModelLayer extends AbstractLayer<Props, NativeTypeProps> {
+  static defaultProps = {
+    sourceID: Mapbox.StyleSource.DefaultSourceID,
+  };
+
+  render() {
+    const props = {
+      ...this.baseProps,
+      sourceLayerID: this.props.sourceLayerID,
+    };
+    return (
+      <RNMBXModelLayerNativeComponent ref={this.setNativeLayer} {...props} />
+    );
+  }
+}
+
+export default ModelLayer;

package/src/components/Models.tsx

@@ -0,0 +1,44 @@
+import React from 'react';
+import { Image } from 'react-native';
+
+import NativeModels from '../specs/RNMBXModelsNativeComponent';
+
+type Props = {
+  /**
+   * pair odf model name to gltf and gbl file path/url, or asset id.
+   */
+  models: { [key: string]: string | number };
+};
+
+type Asset = {
+  __packager_asset?: boolean;
+  uri?: string;
+  url?: string;
+};
+
+function _resolveAssets(models: Props['models']): {
+  [key: string]: Asset;
+} {
+  const resolvedModels: { [key: string]: Asset } = {};
+  Object.keys(models).forEach((key) => {
+    const model = models[key];
+    if (typeof model === 'string') {
+      resolvedModels[key] = { url: model };
+    } else {
+      const asset = Image.resolveAssetSource(model);
+      if (!asset) {
+        throw new Error(`Could not resolve model asset: ${model}`);
+      }
+      resolvedModels[key] = asset;
+    }
+  });
+  return resolvedModels;
+}
+
+/**
+ * Name of 3D model assets to be used in the map
+ */
+export default function Models(props: Props) {
+  const { models, ...restOfProps } = props;
+  return <NativeModels {...restOfProps} models={_resolveAssets(models)} />;
+}

package/src/components/Viewport.tsx

@@ -41,7 +41,7 @@ type FollowPuckOptions = {
    *  - number: sets the camera bearing to the constant value on every frame
    *
    * On Android, 'heading' and 'coruse' sets the camera bearing to the same as the location puck's bearing. See
-   * [syncWithLocationPuck](https://docs.mapbox.com/android/maps/api/11.0.0-rc.1/mapbox-maps-android/com.mapbox.maps.plugin.viewport.data/-follow-puck-viewport-state-bearing/-sync-with-location-puck/)
+   * [syncWithLocationPuck](https://docs.mapbox.com/android/maps/api/11.0.0/mapbox-maps-android/com.mapbox.maps.plugin.viewport.data/-follow-puck-viewport-state-bearing/-sync-with-location-puck/)
    *
    * @default 'heading'
    */

package/src/specs/RNMBXCircleLayerNativeComponent.ts

@@ -2,25 +2,28 @@ import type { HostComponent, ViewProps } from 'react-native';
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
 
+import { FilterExpression } from '../utils/MapboxStyles';
+
 import type { UnsafeMixed } from './codegenUtils';
 
 // @{codepart-replace-start(CommonLayerNativeComponentsProps.codepart-ts)}
 // see https://github.com/rnmapbox/maps/wiki/FabricOptionalProp
 type OptionalProp<T> = UnsafeMixed<T>;
+type Slot = 'bottom' | 'middle' | 'top';
 
 type CommonProps = {
-  sourceID: OptionalProp<string>;
-  existing: OptionalProp<boolean>;
-  filter: UnsafeMixed<any[]>;
-
-  aboveLayerID: OptionalProp<string>;
-  belowLayerID: OptionalProp<string>;
-  layerIndex: OptionalProp<Int32>;
-
-  maxZoomLevel: OptionalProp<Double>;
-  minZoomLevel: OptionalProp<Double>;
-  sourceLayerID: OptionalProp<string>;
-  slot: OptionalProp<string>;
+  sourceID?: OptionalProp<string>;
+  existing?: OptionalProp<boolean>;
+  filter?: UnsafeMixed<FilterExpression>;
+
+  aboveLayerID?: OptionalProp<string>;
+  belowLayerID?: OptionalProp<string>;
+  layerIndex?: OptionalProp<Int32>;
+
+  maxZoomLevel?: OptionalProp<Double>;
+  minZoomLevel?: OptionalProp<Double>;
+  sourceLayerID?: OptionalProp<string>;
+  slot?: OptionalProp<Slot>;
 };
 // @{codepart-replace-end}
 

package/src/specs/RNMBXFillLayerNativeComponent.ts

@@ -2,25 +2,28 @@ import type { HostComponent, ViewProps } from 'react-native';
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
 
+import { FilterExpression } from '../utils/MapboxStyles';
+
 import type { UnsafeMixed } from './codegenUtils';
 
 // @{codepart-replace-start(CommonLayerNativeComponentsProps.codepart-ts)}
 // see https://github.com/rnmapbox/maps/wiki/FabricOptionalProp
 type OptionalProp<T> = UnsafeMixed<T>;
+type Slot = 'bottom' | 'middle' | 'top';
 
 type CommonProps = {
-  sourceID: OptionalProp<string>;
-  existing: OptionalProp<boolean>;
-  filter: UnsafeMixed<any[]>;
-
-  aboveLayerID: OptionalProp<string>;
-  belowLayerID: OptionalProp<string>;
-  layerIndex: OptionalProp<Int32>;
-
-  maxZoomLevel: OptionalProp<Double>;
-  minZoomLevel: OptionalProp<Double>;
-  sourceLayerID: OptionalProp<string>;
-  slot: OptionalProp<string>;
+  sourceID?: OptionalProp<string>;
+  existing?: OptionalProp<boolean>;
+  filter?: UnsafeMixed<FilterExpression>;
+
+  aboveLayerID?: OptionalProp<string>;
+  belowLayerID?: OptionalProp<string>;
+  layerIndex?: OptionalProp<Int32>;
+
+  maxZoomLevel?: OptionalProp<Double>;
+  minZoomLevel?: OptionalProp<Double>;
+  sourceLayerID?: OptionalProp<string>;
+  slot?: OptionalProp<Slot>;
 };
 // @{codepart-replace-end}
 

package/src/specs/RNMBXHeatmapLayerNativeComponent.ts

@@ -2,25 +2,28 @@ import type { HostComponent, ViewProps } from 'react-native';
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
 
+import { FilterExpression } from '../utils/MapboxStyles';
+
 import type { UnsafeMixed } from './codegenUtils';
 
 // @{codepart-replace-start(CommonLayerNativeComponentsProps.codepart-ts)}
 // see https://github.com/rnmapbox/maps/wiki/FabricOptionalProp
 type OptionalProp<T> = UnsafeMixed<T>;
+type Slot = 'bottom' | 'middle' | 'top';
 
 type CommonProps = {
-  sourceID: OptionalProp<string>;
-  existing: OptionalProp<boolean>;
-  filter: UnsafeMixed<any[]>;
-
-  aboveLayerID: OptionalProp<string>;
-  belowLayerID: OptionalProp<string>;
-  layerIndex: OptionalProp<Int32>;
-
-  maxZoomLevel: OptionalProp<Double>;
-  minZoomLevel: OptionalProp<Double>;
-  sourceLayerID: OptionalProp<string>;
-  slot: OptionalProp<string>;
+  sourceID?: OptionalProp<string>;
+  existing?: OptionalProp<boolean>;
+  filter?: UnsafeMixed<FilterExpression>;
+
+  aboveLayerID?: OptionalProp<string>;
+  belowLayerID?: OptionalProp<string>;
+  layerIndex?: OptionalProp<Int32>;
+
+  maxZoomLevel?: OptionalProp<Double>;
+  minZoomLevel?: OptionalProp<Double>;
+  sourceLayerID?: OptionalProp<string>;
+  slot?: OptionalProp<Slot>;
 };
 // @{codepart-replace-end}
 

package/src/specs/RNMBXLineLayerNativeComponent.ts

@@ -2,25 +2,28 @@ import type { HostComponent, ViewProps } from 'react-native';
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
 
+import { FilterExpression } from '../utils/MapboxStyles';
+
 import type { UnsafeMixed } from './codegenUtils';
 
 // @{codepart-replace-start(CommonLayerNativeComponentsProps.codepart-ts)}
 // see https://github.com/rnmapbox/maps/wiki/FabricOptionalProp
 type OptionalProp<T> = UnsafeMixed<T>;
+type Slot = 'bottom' | 'middle' | 'top';
 
 type CommonProps = {
-  sourceID: OptionalProp<string>;
-  existing: OptionalProp<boolean>;
-  filter: UnsafeMixed<any[]>;
-
-  aboveLayerID: OptionalProp<string>;
-  belowLayerID: OptionalProp<string>;
-  layerIndex: OptionalProp<Int32>;
-
-  maxZoomLevel: OptionalProp<Double>;
-  minZoomLevel: OptionalProp<Double>;
-  sourceLayerID: OptionalProp<string>;
-  slot: OptionalProp<string>;
+  sourceID?: OptionalProp<string>;
+  existing?: OptionalProp<boolean>;
+  filter?: UnsafeMixed<FilterExpression>;
+
+  aboveLayerID?: OptionalProp<string>;
+  belowLayerID?: OptionalProp<string>;
+  layerIndex?: OptionalProp<Int32>;
+
+  maxZoomLevel?: OptionalProp<Double>;
+  minZoomLevel?: OptionalProp<Double>;
+  sourceLayerID?: OptionalProp<string>;
+  slot?: OptionalProp<Slot>;
 };
 // @{codepart-replace-end}
 

package/src/specs/RNMBXModelLayerNativeComponent.ts

@@ -0,0 +1,38 @@
+import type { HostComponent, ViewProps } from 'react-native';
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+
+import { FilterExpression } from '../utils/MapboxStyles';
+import { StyleValue } from '../utils/StyleValue';
+
+import { UnsafeMixed } from './codegenUtils';
+
+// @{codepart-replace-start(CommonLayerNativeComponentsProps.codepart-ts)}
+// see https://github.com/rnmapbox/maps/wiki/FabricOptionalProp
+type OptionalProp<T> = UnsafeMixed<T>;
+type Slot = 'bottom' | 'middle' | 'top';
+
+type CommonProps = {
+  sourceID?: OptionalProp<string>;
+  existing?: OptionalProp<boolean>;
+  filter?: UnsafeMixed<FilterExpression>;
+
+  aboveLayerID?: OptionalProp<string>;
+  belowLayerID?: OptionalProp<string>;
+  layerIndex?: OptionalProp<Int32>;
+
+  maxZoomLevel?: OptionalProp<Double>;
+  minZoomLevel?: OptionalProp<Double>;
+  sourceLayerID?: OptionalProp<string>;
+  slot?: OptionalProp<Slot>;
+};
+// @{codepart-replace-end}
+
+export interface NativeProps extends ViewProps, CommonProps {
+  id: OptionalProp<string>;
+  reactStyle?: UnsafeMixed<{ [key: string]: StyleValue }>;
+}
+
+export default codegenNativeComponent<NativeProps>(
+  'RNMBXModelLayer',
+) as HostComponent<NativeProps>;

package/src/specs/RNMBXModelsNativeComponent.ts

@@ -0,0 +1,18 @@
+import type { HostComponent, ViewProps } from 'react-native';
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+
+import { UnsafeMixed } from './codegenUtils';
+
+type Asset = {
+  __packager_asset?: boolean;
+  uri?: string;
+  url?: string;
+};
+
+export interface NativeProps extends ViewProps {
+  models: UnsafeMixed<{ [key: string]: Asset }>;
+}
+
+export default codegenNativeComponent<NativeProps>(
+  'RNMBXModels',
+) as HostComponent<NativeProps>;

package/src/specs/RNMBXRasterLayerNativeComponent.ts

@@ -2,25 +2,28 @@ import type { HostComponent, ViewProps } from 'react-native';
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
 
+import { FilterExpression } from '../utils/MapboxStyles';
+
 import type { UnsafeMixed } from './codegenUtils';
 
 // @{codepart-replace-start(CommonLayerNativeComponentsProps.codepart-ts)}
 // see https://github.com/rnmapbox/maps/wiki/FabricOptionalProp
 type OptionalProp<T> = UnsafeMixed<T>;
+type Slot = 'bottom' | 'middle' | 'top';
 
 type CommonProps = {
-  sourceID: OptionalProp<string>;
-  existing: OptionalProp<boolean>;
-  filter: UnsafeMixed<any[]>;
-
-  aboveLayerID: OptionalProp<string>;
-  belowLayerID: OptionalProp<string>;
-  layerIndex: OptionalProp<Int32>;
-
-  maxZoomLevel: OptionalProp<Double>;
-  minZoomLevel: OptionalProp<Double>;
-  sourceLayerID: OptionalProp<string>;
-  slot: OptionalProp<string>;
+  sourceID?: OptionalProp<string>;
+  existing?: OptionalProp<boolean>;
+  filter?: UnsafeMixed<FilterExpression>;
+
+  aboveLayerID?: OptionalProp<string>;
+  belowLayerID?: OptionalProp<string>;
+  layerIndex?: OptionalProp<Int32>;
+
+  maxZoomLevel?: OptionalProp<Double>;
+  minZoomLevel?: OptionalProp<Double>;
+  sourceLayerID?: OptionalProp<string>;
+  slot?: OptionalProp<Slot>;
 };
 // @{codepart-replace-end}
 

package/src/specs/RNMBXSymbolLayerNativeComponent.ts

@@ -2,25 +2,28 @@ import type { HostComponent, ViewProps } from 'react-native';
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
 
+import { FilterExpression } from '../utils/MapboxStyles';
+
 import type { UnsafeMixed } from './codegenUtils';
 
 // @{codepart-replace-start(CommonLayerNativeComponentsProps.codepart-ts)}
 // see https://github.com/rnmapbox/maps/wiki/FabricOptionalProp
 type OptionalProp<T> = UnsafeMixed<T>;
+type Slot = 'bottom' | 'middle' | 'top';
 
 type CommonProps = {
-  sourceID: OptionalProp<string>;
-  existing: OptionalProp<boolean>;
-  filter: UnsafeMixed<any[]>;
-
-  aboveLayerID: OptionalProp<string>;
-  belowLayerID: OptionalProp<string>;
-  layerIndex: OptionalProp<Int32>;
-
-  maxZoomLevel: OptionalProp<Double>;
-  minZoomLevel: OptionalProp<Double>;
-  sourceLayerID: OptionalProp<string>;
-  slot: OptionalProp<string>;
+  sourceID?: OptionalProp<string>;
+  existing?: OptionalProp<boolean>;
+  filter?: UnsafeMixed<FilterExpression>;
+
+  aboveLayerID?: OptionalProp<string>;
+  belowLayerID?: OptionalProp<string>;
+  layerIndex?: OptionalProp<Int32>;
+
+  maxZoomLevel?: OptionalProp<Double>;
+  minZoomLevel?: OptionalProp<Double>;
+  sourceLayerID?: OptionalProp<string>;
+  slot?: OptionalProp<Slot>;
 };
 // @{codepart-replace-end}
 

package/src/specs/codeparts/CommonLayerNativeComponentsProps.codepart-ts

@@ -1,17 +1,18 @@
 // see https://github.com/rnmapbox/maps/wiki/FabricOptionalProp
 type OptionalProp<T> = UnsafeMixed<T>;
+type Slot = 'bottom' | 'middle' | 'top';
 
 type CommonProps = {
-  sourceID: OptionalProp<string>;
-  existing: OptionalProp<boolean>;
-  filter: UnsafeMixed<any[]>;
+  sourceID?: OptionalProp<string>;
+  existing?: OptionalProp<boolean>;
+  filter?: UnsafeMixed<FilterExpression>;
 
-  aboveLayerID: OptionalProp<string>;
-  belowLayerID: OptionalProp<string>;
-  layerIndex: OptionalProp<Int32>;
+  aboveLayerID?: OptionalProp<string>;
+  belowLayerID?: OptionalProp<string>;
+  layerIndex?: OptionalProp<Int32>;
 
-  maxZoomLevel: OptionalProp<Double>;
-  minZoomLevel: OptionalProp<Double>;
-  sourceLayerID: OptionalProp<string>;
-  slot: OptionalProp<string>;
+  maxZoomLevel?: OptionalProp<Double>;
+  minZoomLevel?: OptionalProp<Double>;
+  sourceLayerID?: OptionalProp<string>;
+  slot?: OptionalProp<Slot>;
 };