@maplibre/maplibre-react-native 11.0.0-alpha.4 → 11.0.0-alpha.6

package/lib/typescript/module/src/components/ShapeSource.d.ts

@@ -31,6 +31,11 @@ export interface ShapeSourceProps extends BaseProps {
      * The default value is 50.
      */
     clusterRadius?: number;
+    /**
+     * Specifies minimum number of points to form a cluster if clustering is enabled.
+     * The default value is 2.
+     */
+    clusterMinPoints?: number;
     /**
      * Specifies the maximum zoom level at which to cluster points if clustering is enabled.
      * Defaults to one zoom level less than the value of maxZoomLevel so that, at the maximum zoom level,

package/lib/typescript/module/src/components/ShapeSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ShapeSource.d.ts","sourceRoot":"","sources":["../../../../../src/components/ShapeSource.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAGT,KAAK,SAAS,EAGf,MAAM,OAAO,CAAC;AACf,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,oBAAoB,EAE1B,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAU1D,eAAO,MAAM,kBAAkB,oBAAoB,CAAC;AAEpD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,KAAK,sBAAsB,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;AAE/E,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,CAAC,EACF,OAAO,CAAC,kBAAkB,GAC1B,OAAO,CAAC,OAAO,GACf,OAAO,CAAC,iBAAiB,GACzB,OAAO,CAAC,QAAQ,CAAC;IACrB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;;;;;;;;OAWG;IACH,iBAAiB,CAAC,EAAE;QAAE,CAAC,YAAY,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,CAAC;IAChE;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC;;OAEG;IACH,MAAM,CAAC,EAAE;QACP;;WAEG;QACH,KAAK,EAAE,MAAM,CAAC;QACd;;WAEG;QACH,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IAEF,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAExE,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnE,gBAAgB,CACd,OAAO,EAAE,OAAO,CAAC,OAAO,EACxB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEtC,kBAAkB,CAChB,OAAO,EAAE,OAAO,CAAC,OAAO,GACvB,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEtC,cAAc,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC7C,OAAO,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC;QAAE,OAAO,EAAE,YAAY,CAAA;KAAE,CAAC,KAAK,IAAI,CAAC;IAG1E,UAAU,EAAE,sBAAsB,GAAG,IAAI,CAAC;CAC3C;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,wGAgNvB,CAAC"}
+{"version":3,"file":"ShapeSource.d.ts","sourceRoot":"","sources":["../../../../../src/components/ShapeSource.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAGT,KAAK,SAAS,EAGf,MAAM,OAAO,CAAC;AACf,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,oBAAoB,EAE1B,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAU1D,eAAO,MAAM,kBAAkB,oBAAoB,CAAC;AAEpD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,KAAK,sBAAsB,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;AAE/E,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,CAAC,EACF,OAAO,CAAC,kBAAkB,GAC1B,OAAO,CAAC,OAAO,GACf,OAAO,CAAC,iBAAiB,GACzB,OAAO,CAAC,QAAQ,CAAC;IACrB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;;;;;;;;OAWG;IACH,iBAAiB,CAAC,EAAE;QAAE,CAAC,YAAY,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,CAAC;IAChE;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC;;OAEG;IACH,MAAM,CAAC,EAAE;QACP;;WAEG;QACH,KAAK,EAAE,MAAM,CAAC;QACd;;WAEG;QACH,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IAEF,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAExE,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnE,gBAAgB,CACd,OAAO,EAAE,OAAO,CAAC,OAAO,EACxB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEtC,kBAAkB,CAChB,OAAO,EAAE,OAAO,CAAC,OAAO,GACvB,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEtC,cAAc,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC7C,OAAO,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC;QAAE,OAAO,EAAE,YAAY,CAAA;KAAE,CAAC,KAAK,IAAI,CAAC;IAG1E,UAAU,EAAE,sBAAsB,GAAG,IAAI,CAAC;CAC3C;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,wGAiNvB,CAAC"}

package/lib/typescript/module/src/components/SymbolLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SymbolLayer.d.ts","sourceRoot":"","sources":["../../../../../src/components/SymbolLayer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAIlE,eAAO,MAAM,kBAAkB,oBAAoB,CAAC;AAEpD,MAAM,WAAW,gBAAiB,SAAQ,SAAS,EAAE,cAAc;IACjE;;OAEG;IACH,KAAK,CAAC,EAAE,gBAAgB,CAAC;CAC1B;AAQD;;GAEG;AACH,eAAO,MAAM,WAAW,2BAGrB,gBAAgB,4CAclB,CAAC"}
+{"version":3,"file":"SymbolLayer.d.ts","sourceRoot":"","sources":["../../../../../src/components/SymbolLayer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAIlE,eAAO,MAAM,kBAAkB,oBAAoB,CAAC;AAEpD,MAAM,WAAW,gBAAiB,SAAQ,SAAS,EAAE,cAAc;IACjE;;OAEG;IACH,KAAK,CAAC,EAAE,gBAAgB,CAAC;CAC1B;AAQD;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,wBAGzB,gBAAgB,4CAclB,CAAC"}

package/lib/typescript/module/src/plugin/android.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/android.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAElB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,wBAAwB,8BAA8B,CAAC;AAEpE,eAAO,MAAM,mBAAmB,UACvB,mBAAmB,KACzB,YAAY,EAed,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB,cAAc,EAAE,iBAChB,YAAY,EAAE,KAC5B,cAAc,EAYhB,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,mBAAmB,CAWlE,CAAC;AAEF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}
+{"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/android.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAElB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,wBAAwB,8BAA8B,CAAC;AAEpE,eAAO,MAAM,mBAAmB,GAC9B,OAAO,mBAAmB,KACzB,YAAY,EAed,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,eAAe,cAAc,EAAE,EAC/B,eAAe,YAAY,EAAE,KAC5B,cAAc,EAYhB,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,mBAAmB,CAWlE,CAAC;AAEF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}

package/lib/typescript/module/src/plugin/ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/ios.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAGlB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAIjE;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAehE;AAUD,eAAO,MAAM,2BAA2B,aAC5B,MAAM,SACT,mBAAmB,KACzB,MA2BF,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,mBAAmB,CAYxE,CAAC;AAyCF,eAAO,MAAM,GAAG;;;;;CAKf,CAAC"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/ios.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAGlB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAIjE;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAehE;AAUD,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,OAAO,mBAAmB,KACzB,MA2BF,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,mBAAmB,CAYxE,CAAC;AAyCF,eAAO,MAAM,GAAG;;;;;CAKf,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maplibre/maplibre-react-native",
   "description": "React Native library for creating maps with MapLibre Native for Android & iOS",
-  "version": "11.0.0-alpha.4",
+  "version": "11.0.0-alpha.6",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -156,7 +156,7 @@
     "@react-native/babel-preset": "^0.79.2",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@sinonjs/fake-timers": "^14.0.0",
+    "@sinonjs/fake-timers": "^15.0.0",
     "@testing-library/react-native": "^13.0.1",
     "@types/ejs": "^3.1.5",
     "@types/geojson": "^7946.0.14",
@@ -167,8 +167,8 @@
     "eslint": "^8.57.1",
     "eslint-config-universe": "15.0.3",
     "expo-module-scripts": "^4.1.7",
-    "jest": "^29.7.0",
-    "prettier": "3.5.3",
+    "jest": "^30.0.2",
+    "prettier": "3.6.2",
     "react": "19.0.0",
     "react-docgen": "^8.0.0",
     "react-native": "0.79.2",

package/src/MapLibreRN.ts

@@ -6,6 +6,7 @@ export {
   type CameraAnimationMode,
   type CameraBounds,
   type CameraRef,
+  type CameraStop,
 } from "./components/Camera";
 export {
   MapView,

package/src/components/Images.tsx

@@ -1,39 +1,35 @@
-import { type ReactNode } from "react";
+import { type ReactNode, useMemo } from "react";
 import {
   Image,
+  type ImageResolvedAssetSource,
   type ImageSourcePropType,
-  type ImageURISource,
   type NativeSyntheticEvent,
   requireNativeComponent,
 } from "react-native";
+import type {
+  ImageRequireSource,
+  ImageURISource,
+} from "react-native/Libraries/Image/ImageSource";
 
 import { type BaseProps } from "../types/BaseProps";
 
 export const NATIVE_MODULE_NAME = "MLRNImages";
 
-export type ImageEntry = string | ImageSourcePropType;
+type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
+type XOR<T, U> = T | U extends object
+  ? (Without<T, U> & U) | (Without<U, T> & T)
+  : T | U;
 
-function _isUrlOrPath(value: ImageEntry): boolean {
-  return (
-    (typeof value === "string" || value instanceof String) &&
-    (value.startsWith("file://") ||
-      value.startsWith("http://") ||
-      value.startsWith("https://") ||
-      value.startsWith("data:") ||
-      value.startsWith("asset://") ||
-      value.startsWith("/"))
-  );
-}
+export type ImageSourceWithSdf = {
+  source: ImageSourcePropType;
+  sdf?: boolean;
+};
 
-function _isImageSourcePropType(
-  value: ImageEntry,
-): value is ImageSourcePropType {
-  if (typeof value === "number" || value instanceof Number) {
-    return true;
-  }
-  const valueAsSource = value as ImageURISource;
-  return !!valueAsSource.uri && typeof valueAsSource.uri === "string";
-}
+export type ImageEntry =
+  | string
+  | ImageRequireSource
+  | ImageURISource[]
+  | XOR<ImageURISource, ImageSourceWithSdf>;
 
 interface ImagesProps extends BaseProps {
   /**
@@ -59,7 +55,7 @@ interface ImagesProps extends BaseProps {
 }
 
 /**
- * Images defines the images used in Symbol etc layers
+ * Images defines the images used in Symbol layers
  */
 export const Images = ({
   images,
@@ -68,56 +64,55 @@ export const Images = ({
   id,
   children,
 }: ImagesProps) => {
-  const _getImages = (): {
-    images?: { [key: string]: ImageEntry };
-    nativeImages?: ImageEntry[];
-  } => {
-    if (!images && !nativeAssetImages) {
-      return {};
-    }
-
-    const imagesResult: { [key: string]: ImageEntry } = {};
-    let nativeImages: ImageEntry[] = [];
+  const props = useMemo(() => {
+    const getImages = (): {
+      images?: { [key: string]: ImageEntry };
+      nativeImages?: ImageEntry[];
+    } => {
+      if (!images && !nativeAssetImages) {
+        return {};
+      }
 
-    if (images) {
-      const imageNames = Object.keys(images);
-      for (const imageName of imageNames) {
-        const value = images[imageName];
-        if (value && _isUrlOrPath(value)) {
-          imagesResult[imageName] = value;
-        } else if (value && _isImageSourcePropType(value)) {
-          const res = Image.resolveAssetSource(value);
-          if (res && res.uri) {
-            imagesResult[imageName] = res;
+      const imagesResult: {
+        [key: string]: string | (ImageResolvedAssetSource & { sdf?: boolean });
+      } = {};
+
+      if (images) {
+        Object.entries(images).forEach(([imageName, value]) => {
+          if (typeof value === "string") {
+            imagesResult[imageName] = value;
+          } else if (
+            typeof value === "object" &&
+            "source" in value &&
+            value.source
+          ) {
+            imagesResult[imageName] = {
+              ...Image.resolveAssetSource(value.source),
+              sdf: value.sdf,
+            };
+          } else {
+            imagesResult[imageName] = Image.resolveAssetSource(value);
           }
-        }
+        });
       }
-    }
 
-    if (nativeAssetImages) {
-      nativeImages = nativeAssetImages;
-    }
+      return imagesResult;
+    };
 
     return {
-      images: imagesResult,
-      nativeImages,
+      id,
+      hasOnImageMissing: !!onImageMissing,
+      onImageMissing: (
+        event: NativeSyntheticEvent<{ payload: { imageKey: string } }>,
+      ): void => {
+        if (onImageMissing) {
+          onImageMissing(event.nativeEvent.payload.imageKey);
+        }
+      },
+      images: getImages(),
+      nativeImages: nativeAssetImages ?? [],
     };
-  };
-
-  const _onImageMissing = (
-    event: NativeSyntheticEvent<{ payload: { imageKey: string } }>,
-  ): void => {
-    if (onImageMissing) {
-      onImageMissing(event.nativeEvent.payload.imageKey);
-    }
-  };
-
-  const props = {
-    id,
-    hasOnImageMissing: !!onImageMissing,
-    onImageMissing: _onImageMissing,
-    ..._getImages(),
-  };
+  }, [id, onImageMissing, images, nativeAssetImages]);
 
   return <MLRNImages {...props}>{children}</MLRNImages>;
 };

package/src/components/ShapeSource.tsx

@@ -64,6 +64,11 @@ export interface ShapeSourceProps extends BaseProps {
    * The default value is 50.
    */
   clusterRadius?: number;
+  /**
+   * Specifies minimum number of points to form a cluster if clustering is enabled.
+   * The default value is 2.
+   */
+  clusterMinPoints?: number;
   /**
    * Specifies the maximum zoom level at which to cluster points if clustering is enabled.
    * Defaults to one zoom level less than the value of maxZoomLevel so that, at the maximum zoom level,
@@ -343,6 +348,7 @@ export const ShapeSource = memo(
         onMapboxShapeSourcePress: onPress.bind(this),
         cluster: props.cluster ? 1 : 0,
         clusterRadius: props.clusterRadius,
+        clusterMinPoints: props.clusterMinPoints,
         clusterMaxZoomLevel: props.clusterMaxZoomLevel,
         clusterProperties: props.clusterProperties,
         maxZoomLevel: props.maxZoomLevel,