@maplibre/maplibre-react-native 10.0.0-beta.2 → 10.0.0-beta.21

package/src/utils/BridgeValue.ts

@@ -16,7 +16,7 @@ export type StyleValueJSON =
 
 type StyleValueTypes = "boolean" | "number" | "string" | "hashmap" | "array";
 
-export default class BridgeValue {
+export class BridgeValue {
   rawValue: RawValueType;
 
   constructor(rawValue: RawValueType) {

package/src/utils/Logger.ts

@@ -14,7 +14,7 @@ interface Log {
 
 type LogCallback = (log: Log) => boolean;
 
-class Logger {
+export class Logger {
   static instance: Logger | null = null;
 
   static sharedInstance(): Logger {
@@ -129,5 +129,3 @@ class Logger {
     }
   }
 }
-
-export default Logger;

package/src/utils/StyleValue.ts

@@ -1,11 +1,12 @@
 import { Image, processColor } from "react-native";
 
-import BridgeValue, {
+import {
+  BridgeValue,
   type RawValueType,
   type StyleValueJSON,
 } from "./BridgeValue";
-import { type AllLayerStyleProps } from "./MapLibreRNStyles";
-import { getStyleType } from "./styleMap";
+import { getStylePropertyType } from "./getStylePropertyType";
+import { type AllLayerStyle } from "../types/MapLibreRNStyles";
 
 export type StyleValue = {
   styletype: string;
@@ -13,7 +14,7 @@ export type StyleValue = {
 };
 
 export function transformStyle(
-  style: AllLayerStyleProps | undefined,
+  style: AllLayerStyle | undefined,
 ): undefined | { [key: string]: StyleValue } {
   if (!style) {
     return undefined;
@@ -22,7 +23,7 @@ export function transformStyle(
   const nativeStyle: { [key: string]: StyleValue } = {};
   const styleProps = Object.keys(style) as (keyof typeof style)[];
   for (const styleProp of styleProps) {
-    const styleType = getStyleType(styleProp);
+    const styleType = getStylePropertyType(styleProp);
     let rawStyle: RawValueType | undefined = style[styleProp];
 
     if (styleType === "color" && typeof rawStyle === "string") {

package/src/utils/animated/AbstractAnimatedCoordinates.ts

@@ -17,7 +17,9 @@ const defaultConfig = {
   useNativeDriver: false,
 };
 
-abstract class AbstractAnimatedCoordinates<State> extends AnimatedWithChildren {
+export abstract class AbstractAnimatedCoordinates<
+  State,
+> extends AnimatedWithChildren {
   constructor(coords: AnimatedCoordinates[]) {
     super();
 
@@ -130,5 +132,3 @@ abstract class AbstractAnimatedCoordinates<State> extends AnimatedWithChildren {
     );
   }
 }
-
-export default AbstractAnimatedCoordinates;

package/src/utils/animated/Animated.ts

@@ -1,24 +1,29 @@
-import React from "react";
+import {
+  type ForwardRefExoticComponent,
+  type MemoExoticComponent,
+  type RefAttributes,
+} from "react";
 import { Animated as RNAnimated } from "react-native";
 
-import AnimatedCoordinatesArray from "./AnimatedCoordinatesArray";
-import AnimatedExtractCoordinateFromArray from "./AnimatedExtractCoordinateFromArray";
-import AnimatedRouteCoordinatesArray from "./AnimatedRouteCoordinatesArray";
-import AnimatedShape from "./AnimatedShape";
-import BackgroundLayer from "../../components/BackgroundLayer";
-import CircleLayer from "../../components/CircleLayer";
-import FillExtrusionLayer from "../../components/FillExtrusionLayer";
-import FillLayer from "../../components/FillLayer";
-import ImageSource from "../../components/ImageSource";
-import LineLayer from "../../components/LineLayer";
-import RasterLayer from "../../components/RasterLayer";
-import ShapeSource, {
+import { AnimatedCoordinatesArray } from "./AnimatedCoordinatesArray";
+import { AnimatedExtractCoordinateFromArray } from "./AnimatedExtractCoordinateFromArray";
+import { AnimatedRouteCoordinatesArray } from "./AnimatedRouteCoordinatesArray";
+import { AnimatedShape } from "./AnimatedShape";
+import { BackgroundLayer } from "../../components/BackgroundLayer";
+import { CircleLayer } from "../../components/CircleLayer";
+import { FillExtrusionLayer } from "../../components/FillExtrusionLayer";
+import { FillLayer } from "../../components/FillLayer";
+import { ImageSource } from "../../components/ImageSource";
+import { LineLayer } from "../../components/LineLayer";
+import { RasterLayer } from "../../components/RasterLayer";
+import {
+  ShapeSource,
   type ShapeSourceProps,
   type ShapeSourceRef,
 } from "../../components/ShapeSource";
-import SymbolLayer from "../../components/SymbolLayer";
+import { SymbolLayer } from "../../components/SymbolLayer";
 
-const Animated = {
+export const Animated = {
   // sources
   ShapeSource: RNAnimated.createAnimatedComponent(ShapeSource),
   ImageSource: RNAnimated.createAnimatedComponent(ImageSource),
@@ -39,15 +44,14 @@ const Animated = {
   ExtractCoordinateFromArray: AnimatedExtractCoordinateFromArray,
 };
 
-type ShapeSourcePropsWithRef = ShapeSourceProps &
-  React.RefAttributes<ShapeSourceRef>;
+type ShapeSourcePropsWithRef = ShapeSourceProps & RefAttributes<ShapeSourceRef>;
 
 type BaseShapeSourceComponent =
-  React.ForwardRefExoticComponent<ShapeSourcePropsWithRef>;
+  ForwardRefExoticComponent<ShapeSourcePropsWithRef>;
 
 type AnimatedShapeSourceType =
   RNAnimated.AnimatedComponent<BaseShapeSourceComponent> &
-    React.MemoExoticComponent<BaseShapeSourceComponent>;
+    MemoExoticComponent<BaseShapeSourceComponent>;
 
 /**
  * Manual typing is required for AnimatedShapeSource because the
@@ -57,5 +61,3 @@ type AnimatedShapeSourceType =
 export const AnimatedShapeSource = RNAnimated.createAnimatedComponent(
   ShapeSource,
 ) as AnimatedShapeSourceType;
-
-export default Animated;

package/src/utils/animated/AnimatedCoordinatesArray.ts

@@ -1,4 +1,5 @@
-import AbstractAnimatedCoordinates, {
+import {
+  AbstractAnimatedCoordinates,
   type AnimatedCoordinates,
 } from "./AbstractAnimatedCoordinates";
 
@@ -7,7 +8,7 @@ interface CoordinatesState {
   targetCoords: AnimatedCoordinates[];
 }
 
-class AnimatedCoordinatesArray extends AbstractAnimatedCoordinates<CoordinatesState> {
+export class AnimatedCoordinatesArray extends AbstractAnimatedCoordinates<CoordinatesState> {
   /**
    * Subclasses can override to calculate initial state
    *
@@ -109,5 +110,3 @@ class AnimatedCoordinatesArray extends AbstractAnimatedCoordinates<CoordinatesSt
     };
   }
 }
-
-export default AnimatedCoordinatesArray;

package/src/utils/animated/AnimatedExtractCoordinateFromArray.ts

@@ -11,7 +11,7 @@ if (__DEV__) {
   }
 }
 
-export default class AnimatedExtractCoordinateFromArray extends AnimatedWithChildren {
+export class AnimatedExtractCoordinateFromArray extends AnimatedWithChildren {
   _array: AnimatedExtractCoordinateFromArray;
 
   _index = 0;

package/src/utils/animated/AnimatedPoint.ts

@@ -130,5 +130,3 @@ export class AnimatedPoint extends AnimatedWithChildren {
     this.latitude.__removeChild(this);
   }
 }
-
-export default AnimatedPoint;

package/src/utils/animated/AnimatedRouteCoordinatesArray.ts

@@ -9,7 +9,8 @@ import {
 import length from "@turf/length";
 import nearestPointOnLine from "@turf/nearest-point-on-line";
 
-import AbstractAnimatedCoordinates, {
+import {
+  AbstractAnimatedCoordinates,
   type AnimatedCoordinates,
 } from "./AbstractAnimatedCoordinates";
 
@@ -25,7 +26,7 @@ interface AnimatedRouteState {
   };
 }
 
-export default class AnimatedRouteCoordinatesArray extends AbstractAnimatedCoordinates<AnimatedRouteState> {
+export class AnimatedRouteCoordinatesArray extends AbstractAnimatedCoordinates<AnimatedRouteState> {
   /**
    * Calculate initial state
    *

package/src/utils/animated/AnimatedShape.ts

@@ -2,9 +2,9 @@
 
 import { Animated } from "react-native";
 
-import AnimatedCoordinatesArray from "./AnimatedCoordinatesArray";
-import AnimatedExtractCoordinateFromArray from "./AnimatedExtractCoordinateFromArray";
-import AnimatedRouteCoordinatesArray from "./AnimatedRouteCoordinatesArray";
+import { AnimatedCoordinatesArray } from "./AnimatedCoordinatesArray";
+import { AnimatedExtractCoordinateFromArray } from "./AnimatedExtractCoordinateFromArray";
+import { AnimatedRouteCoordinatesArray } from "./AnimatedRouteCoordinatesArray";
 
 // see
 // https://github.com/facebook/react-native/blob/master/Libraries/Animated/src/nodes/AnimatedWithChildren.js
@@ -34,7 +34,7 @@ type Shape =
  * @example
  * <AnimatedShapeSource ... shape={new AnimatedShape({type:'LineString', coordinates: animatedCoords})} />
  */
-class AnimatedShape extends AnimatedWithChildren {
+export class AnimatedShape extends AnimatedWithChildren {
   // equivalent of AnimatedStyle for shapes
   // https://github.com/facebook/react-native/blob/master/Libraries/Animated/src/nodes/AnimatedStyle.js
 
@@ -89,5 +89,3 @@ class AnimatedShape extends AnimatedWithChildren {
     super.__detach();
   }
 }
-
-export default AnimatedShape;

package/src/utils/filterUtils.ts

@@ -1,4 +1,4 @@
-import { type FilterExpression } from "./MapLibreRNStyles";
+import { type FilterExpression } from "../types/MapLibreRNStyles";
 
 export function getFilter(filter: FilterExpression | undefined): string[] {
   if (!Array.isArray(filter) || filter.length === 0) {

package/src/utils/getStylePropertyType.ts

@@ -0,0 +1,265 @@
+/* eslint-disable */
+// DO NOT MODIFY
+// This file is auto-generated from scripts/templates/getStylePropertyType.ts.ejs
+
+import { isAndroid } from "./index";
+
+const StyleType = {
+  Constant: "constant",
+  Color: "color",
+  Transition: "transition",
+  Translation: "translation",
+  Function: "function",
+  Image: "image",
+  Enum: "enum",
+};
+
+const STYLE_MAP = {
+  fillSortKey: StyleType.Constant,
+  fillAntialias: StyleType.Constant,
+  fillOpacity: StyleType.Constant,
+  fillOpacityTransition: StyleType.Transition,
+  fillColor: StyleType.Color,
+  fillColorTransition: StyleType.Transition,
+  fillOutlineColor: StyleType.Color,
+  fillOutlineColorTransition: StyleType.Transition,
+  fillTranslate: StyleType.Translation,
+  fillTranslateTransition: StyleType.Transition,
+  fillTranslateAnchor: StyleType.Enum,
+  fillPattern: StyleType.Image,
+  fillPatternTransition: StyleType.Transition,
+
+  lineCap: StyleType.Enum,
+  lineJoin: StyleType.Enum,
+  lineMiterLimit: StyleType.Constant,
+  lineRoundLimit: StyleType.Constant,
+  lineSortKey: StyleType.Constant,
+  lineOpacity: StyleType.Constant,
+  lineOpacityTransition: StyleType.Transition,
+  lineColor: StyleType.Color,
+  lineColorTransition: StyleType.Transition,
+  lineTranslate: StyleType.Translation,
+  lineTranslateTransition: StyleType.Transition,
+  lineTranslateAnchor: StyleType.Enum,
+  lineWidth: StyleType.Constant,
+  lineWidthTransition: StyleType.Transition,
+  lineGapWidth: StyleType.Constant,
+  lineGapWidthTransition: StyleType.Transition,
+  lineOffset: StyleType.Constant,
+  lineOffsetTransition: StyleType.Transition,
+  lineBlur: StyleType.Constant,
+  lineBlurTransition: StyleType.Transition,
+  lineDasharray: StyleType.Constant,
+  lineDasharrayTransition: StyleType.Transition,
+  linePattern: StyleType.Image,
+  linePatternTransition: StyleType.Transition,
+  lineGradient: StyleType.Color,
+
+  symbolPlacement: StyleType.Enum,
+  symbolSpacing: StyleType.Constant,
+  symbolAvoidEdges: StyleType.Constant,
+  symbolSortKey: StyleType.Constant,
+  symbolZOrder: StyleType.Enum,
+  iconAllowOverlap: StyleType.Constant,
+  iconIgnorePlacement: StyleType.Constant,
+  iconOptional: StyleType.Constant,
+  iconRotationAlignment: StyleType.Enum,
+  iconSize: StyleType.Constant,
+  iconTextFit: StyleType.Enum,
+  iconTextFitPadding: StyleType.Constant,
+  iconImage: StyleType.Image,
+  iconRotate: StyleType.Constant,
+  iconPadding: StyleType.Constant,
+  iconKeepUpright: StyleType.Constant,
+  iconOffset: StyleType.Constant,
+  iconAnchor: StyleType.Enum,
+  iconPitchAlignment: StyleType.Enum,
+  textPitchAlignment: StyleType.Enum,
+  textRotationAlignment: StyleType.Enum,
+  textField: StyleType.Constant,
+  textFont: StyleType.Constant,
+  textSize: StyleType.Constant,
+  textMaxWidth: StyleType.Constant,
+  textLineHeight: StyleType.Constant,
+  textLetterSpacing: StyleType.Constant,
+  textJustify: StyleType.Enum,
+  textRadialOffset: StyleType.Constant,
+  textVariableAnchor: StyleType.Constant,
+  textAnchor: StyleType.Enum,
+  textMaxAngle: StyleType.Constant,
+  textWritingMode: StyleType.Constant,
+  textRotate: StyleType.Constant,
+  textPadding: StyleType.Constant,
+  textKeepUpright: StyleType.Constant,
+  textTransform: StyleType.Enum,
+  textOffset: StyleType.Constant,
+  textAllowOverlap: StyleType.Constant,
+  textIgnorePlacement: StyleType.Constant,
+  textOptional: StyleType.Constant,
+  iconOpacity: StyleType.Constant,
+  iconOpacityTransition: StyleType.Transition,
+  iconColor: StyleType.Color,
+  iconColorTransition: StyleType.Transition,
+  iconHaloColor: StyleType.Color,
+  iconHaloColorTransition: StyleType.Transition,
+  iconHaloWidth: StyleType.Constant,
+  iconHaloWidthTransition: StyleType.Transition,
+  iconHaloBlur: StyleType.Constant,
+  iconHaloBlurTransition: StyleType.Transition,
+  iconTranslate: StyleType.Translation,
+  iconTranslateTransition: StyleType.Transition,
+  iconTranslateAnchor: StyleType.Enum,
+  textOpacity: StyleType.Constant,
+  textOpacityTransition: StyleType.Transition,
+  textColor: StyleType.Color,
+  textColorTransition: StyleType.Transition,
+  textHaloColor: StyleType.Color,
+  textHaloColorTransition: StyleType.Transition,
+  textHaloWidth: StyleType.Constant,
+  textHaloWidthTransition: StyleType.Transition,
+  textHaloBlur: StyleType.Constant,
+  textHaloBlurTransition: StyleType.Transition,
+  textTranslate: StyleType.Translation,
+  textTranslateTransition: StyleType.Transition,
+  textTranslateAnchor: StyleType.Enum,
+
+  circleSortKey: StyleType.Constant,
+  circleRadius: StyleType.Constant,
+  circleRadiusTransition: StyleType.Transition,
+  circleColor: StyleType.Color,
+  circleColorTransition: StyleType.Transition,
+  circleBlur: StyleType.Constant,
+  circleBlurTransition: StyleType.Transition,
+  circleOpacity: StyleType.Constant,
+  circleOpacityTransition: StyleType.Transition,
+  circleTranslate: StyleType.Translation,
+  circleTranslateTransition: StyleType.Transition,
+  circleTranslateAnchor: StyleType.Enum,
+  circlePitchScale: StyleType.Enum,
+  circlePitchAlignment: StyleType.Enum,
+  circleStrokeWidth: StyleType.Constant,
+  circleStrokeWidthTransition: StyleType.Transition,
+  circleStrokeColor: StyleType.Color,
+  circleStrokeColorTransition: StyleType.Transition,
+  circleStrokeOpacity: StyleType.Constant,
+  circleStrokeOpacityTransition: StyleType.Transition,
+
+  heatmapRadius: StyleType.Constant,
+  heatmapRadiusTransition: StyleType.Transition,
+  heatmapWeight: StyleType.Constant,
+  heatmapIntensity: StyleType.Constant,
+  heatmapIntensityTransition: StyleType.Transition,
+  heatmapColor: StyleType.Color,
+  heatmapOpacity: StyleType.Constant,
+  heatmapOpacityTransition: StyleType.Transition,
+
+  fillExtrusionOpacity: StyleType.Constant,
+  fillExtrusionOpacityTransition: StyleType.Transition,
+  fillExtrusionColor: StyleType.Color,
+  fillExtrusionColorTransition: StyleType.Transition,
+  fillExtrusionTranslate: StyleType.Translation,
+  fillExtrusionTranslateTransition: StyleType.Transition,
+  fillExtrusionTranslateAnchor: StyleType.Enum,
+  fillExtrusionPattern: StyleType.Image,
+  fillExtrusionPatternTransition: StyleType.Transition,
+  fillExtrusionHeight: StyleType.Constant,
+  fillExtrusionHeightTransition: StyleType.Transition,
+  fillExtrusionBase: StyleType.Constant,
+  fillExtrusionBaseTransition: StyleType.Transition,
+  fillExtrusionVerticalGradient: StyleType.Constant,
+
+  rasterOpacity: StyleType.Constant,
+  rasterOpacityTransition: StyleType.Transition,
+  rasterHueRotate: StyleType.Constant,
+  rasterHueRotateTransition: StyleType.Transition,
+  rasterBrightnessMin: StyleType.Constant,
+  rasterBrightnessMinTransition: StyleType.Transition,
+  rasterBrightnessMax: StyleType.Constant,
+  rasterBrightnessMaxTransition: StyleType.Transition,
+  rasterSaturation: StyleType.Constant,
+  rasterSaturationTransition: StyleType.Transition,
+  rasterContrast: StyleType.Constant,
+  rasterContrastTransition: StyleType.Transition,
+  rasterResampling: StyleType.Enum,
+  rasterFadeDuration: StyleType.Constant,
+
+  hillshadeIlluminationDirection: StyleType.Constant,
+  hillshadeIlluminationAnchor: StyleType.Enum,
+  hillshadeExaggeration: StyleType.Constant,
+  hillshadeExaggerationTransition: StyleType.Transition,
+  hillshadeShadowColor: StyleType.Color,
+  hillshadeShadowColorTransition: StyleType.Transition,
+  hillshadeHighlightColor: StyleType.Color,
+  hillshadeHighlightColorTransition: StyleType.Transition,
+  hillshadeAccentColor: StyleType.Color,
+  hillshadeAccentColorTransition: StyleType.Transition,
+
+  backgroundColor: StyleType.Color,
+  backgroundColorTransition: StyleType.Transition,
+  backgroundPattern: StyleType.Image,
+  backgroundPatternTransition: StyleType.Transition,
+  backgroundOpacity: StyleType.Constant,
+  backgroundOpacityTransition: StyleType.Transition,
+
+  anchor: StyleType.Enum,
+  position: StyleType.Constant,
+  positionTransition: StyleType.Transition,
+  color: StyleType.Color,
+  colorTransition: StyleType.Transition,
+  intensity: StyleType.Constant,
+  intensityTransition: StyleType.Transition,
+
+  visibility: StyleType.Constant,
+};
+
+const STYLE_OVERRIDES = {
+  // padding
+  iconTextFitPadding: {
+    iosType: "edgeinsets",
+  },
+
+  // offsets
+  iconOffset: {
+    iosType: "vector",
+  },
+  textOffset: {
+    iosType: "vector",
+  },
+  lineOffset: {
+    iosType: "vector",
+  },
+
+  // translates
+  fillTranslate: {
+    iosType: "vector",
+  },
+  lineTranslate: {
+    iosType: "vector",
+  },
+  iconTranslate: {
+    iosType: "vector",
+  },
+  textTranslate: {
+    iosType: "vector",
+  },
+  circleTranslate: {
+    iosType: "vector",
+  },
+  fillExtrusionTranslate: {
+    iosType: "vector",
+  },
+};
+
+export function getStylePropertyType(
+  styleProperty: keyof typeof STYLE_OVERRIDES,
+): string {
+  if (!isAndroid() && STYLE_OVERRIDES[styleProperty]) {
+    return STYLE_OVERRIDES[styleProperty].iosType;
+  }
+
+  if (STYLE_MAP[styleProperty]) {
+    return STYLE_MAP[styleProperty];
+  }
+
+  throw new Error(`${styleProperty} is not a valid MapLibre layer style`);
+}

package/android/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">MLRN</string>
-</resources>