@maplibre/maplibre-react-native 11.0.0-beta.13 → 11.0.0-beta.15

package/src/components/map/Map.tsx

@@ -6,9 +6,9 @@ import type {
 import {
   Component,
   type ComponentProps,
-  forwardRef,
   memo,
   type ReactElement,
+  type Ref,
   useImperativeHandle,
   useLayoutEffect,
   useMemo,
@@ -461,166 +461,159 @@ export interface MapProps extends ViewProps {
    * Triggered when a style has finished loading
    */
   onDidFinishLoadingStyle?: (event: NativeSyntheticEvent<null>) => void;
+
+  /**
+   * Ref to access Map methods.
+   */
+  ref?: Ref<MapRef>;
 }
 
 /**
  * MapLibre Native Map
  */
 export const Map = memo(
-  forwardRef<MapRef, MapProps>(
-    ({ androidView = "surface", style, ...props }, ref) => {
-      const [isReady, setIsReady] = useState(false);
-
-      const nativeRef = useRef<
-        Component<ComponentProps<typeof MapViewNativeComponent>> &
-          ReactNativeElement
-      >(null);
-
-      useImperativeHandle(ref, () => ({
-        getCenter: () =>
-          NativeMapViewModule.getCenter(findNodeHandle(nativeRef.current)),
-
-        getZoom: () =>
-          NativeMapViewModule.getZoom(findNodeHandle(nativeRef.current)),
-
-        getBearing: () =>
-          NativeMapViewModule.getBearing(findNodeHandle(nativeRef.current)),
-
-        getPitch: () =>
-          NativeMapViewModule.getPitch(findNodeHandle(nativeRef.current)),
-
-        getBounds: () =>
-          NativeMapViewModule.getBounds(findNodeHandle(nativeRef.current)),
-
-        getViewState: () =>
-          NativeMapViewModule.getViewState(
-            findNodeHandle(nativeRef.current),
-          ) as Promise<ViewState>,
-
-        project: (lngLat) =>
-          NativeMapViewModule.project(
-            findNodeHandle(nativeRef.current),
-            lngLat,
-          ),
-
-        unproject: (point) =>
-          NativeMapViewModule.unproject(
-            findNodeHandle(nativeRef.current),
-            point,
-          ),
-
-        queryRenderedFeatures: async (
-          pixelPointOrPixelPointBoundsOrOptions?:
-            | PixelPoint
-            | PixelPointBounds
-            | QueryRenderedFeaturesOptions,
-          options?: QueryRenderedFeaturesOptions,
-        ) => {
-          if (
-            pixelPointOrPixelPointBoundsOrOptions &&
-            Array.isArray(pixelPointOrPixelPointBoundsOrOptions) &&
-            ((value: PixelPoint | PixelPointBounds): value is PixelPoint =>
-              typeof value[0] === "number" && typeof value[1] === "number")(
-              pixelPointOrPixelPointBoundsOrOptions,
-            )
-          ) {
-            return await NativeMapViewModule.queryRenderedFeaturesWithPoint(
-              findNodeHandle(nativeRef.current),
-              pixelPointOrPixelPointBoundsOrOptions,
-              options?.layers ?? [],
-              getNativeFilter(options?.filter) as string[],
-            );
-          } else if (
-            pixelPointOrPixelPointBoundsOrOptions &&
-            Array.isArray(pixelPointOrPixelPointBoundsOrOptions) &&
-            ((
-              value: PixelPoint | PixelPointBounds,
-            ): value is PixelPointBounds =>
-              Array.isArray(value[0]) && Array.isArray(value[1]))(
-              pixelPointOrPixelPointBoundsOrOptions,
-            )
-          ) {
-            return await NativeMapViewModule.queryRenderedFeaturesWithBounds(
-              findNodeHandle(nativeRef.current),
-              pixelPointOrPixelPointBoundsOrOptions,
-              options?.layers ?? [],
-              getNativeFilter(options?.filter) as string[],
-            );
-          } else {
-            return await NativeMapViewModule.queryRenderedFeaturesWithBounds(
-              findNodeHandle(nativeRef.current),
-              null,
-              pixelPointOrPixelPointBoundsOrOptions?.layers ?? [],
-              getNativeFilter(
-                pixelPointOrPixelPointBoundsOrOptions?.filter,
-              ) as string[],
-            );
-          }
-        },
-
-        createStaticMapImage: (options) =>
-          NativeMapViewModule.createStaticMapImage(
+  ({ androidView = "surface", style, ref, ...props }: MapProps) => {
+    const [isReady, setIsReady] = useState(false);
+
+    const nativeRef = useRef<
+      Component<ComponentProps<typeof MapViewNativeComponent>> &
+        ReactNativeElement
+    >(null);
+
+    useImperativeHandle(ref, () => ({
+      getCenter: () =>
+        NativeMapViewModule.getCenter(findNodeHandle(nativeRef.current)),
+
+      getZoom: () =>
+        NativeMapViewModule.getZoom(findNodeHandle(nativeRef.current)),
+
+      getBearing: () =>
+        NativeMapViewModule.getBearing(findNodeHandle(nativeRef.current)),
+
+      getPitch: () =>
+        NativeMapViewModule.getPitch(findNodeHandle(nativeRef.current)),
+
+      getBounds: () =>
+        NativeMapViewModule.getBounds(findNodeHandle(nativeRef.current)),
+
+      getViewState: () =>
+        NativeMapViewModule.getViewState(
+          findNodeHandle(nativeRef.current),
+        ) as Promise<ViewState>,
+
+      project: (lngLat) =>
+        NativeMapViewModule.project(findNodeHandle(nativeRef.current), lngLat),
+
+      unproject: (point) =>
+        NativeMapViewModule.unproject(findNodeHandle(nativeRef.current), point),
+
+      queryRenderedFeatures: async (
+        pixelPointOrPixelPointBoundsOrOptions?:
+          | PixelPoint
+          | PixelPointBounds
+          | QueryRenderedFeaturesOptions,
+        options?: QueryRenderedFeaturesOptions,
+      ) => {
+        if (
+          pixelPointOrPixelPointBoundsOrOptions &&
+          Array.isArray(pixelPointOrPixelPointBoundsOrOptions) &&
+          ((value: PixelPoint | PixelPointBounds): value is PixelPoint =>
+            typeof value[0] === "number" && typeof value[1] === "number")(
+            pixelPointOrPixelPointBoundsOrOptions,
+          )
+        ) {
+          return await NativeMapViewModule.queryRenderedFeaturesWithPoint(
             findNodeHandle(nativeRef.current),
-            options.output,
-          ),
-
-        setSourceVisibility: (visible, source, sourceLayer) =>
-          NativeMapViewModule.setSourceVisibility(
+            pixelPointOrPixelPointBoundsOrOptions,
+            options?.layers ?? [],
+            getNativeFilter(options?.filter) as string[],
+          );
+        } else if (
+          pixelPointOrPixelPointBoundsOrOptions &&
+          Array.isArray(pixelPointOrPixelPointBoundsOrOptions) &&
+          ((value: PixelPoint | PixelPointBounds): value is PixelPointBounds =>
+            Array.isArray(value[0]) && Array.isArray(value[1]))(
+            pixelPointOrPixelPointBoundsOrOptions,
+          )
+        ) {
+          return await NativeMapViewModule.queryRenderedFeaturesWithBounds(
             findNodeHandle(nativeRef.current),
-            visible,
-            source,
-            sourceLayer ?? null,
-          ),
-
-        showAttribution: () =>
-          NativeMapViewModule.showAttribution(
+            pixelPointOrPixelPointBoundsOrOptions,
+            options?.layers ?? [],
+            getNativeFilter(options?.filter) as string[],
+          );
+        } else {
+          return await NativeMapViewModule.queryRenderedFeaturesWithBounds(
             findNodeHandle(nativeRef.current),
-          ),
-      }));
-
-      // Start before rendering
-      useLayoutEffect(() => {
-        LogManager.start();
-
-        return () => {
-          LogManager.stop();
-        };
-      }, []);
-
-      const nativeProps = useMemo(() => {
-        const { mapStyle, light, ...otherProps } = props;
-
-        return {
-          ...otherProps,
-          ref: nativeRef,
-          style: styles.flex1,
-          mapStyle:
-            typeof mapStyle === "object" ? JSON.stringify(mapStyle) : mapStyle,
-          light: props.light
-            ? transformStyle(convertToInternalStyle(props.light))
-            : undefined,
-        };
-      }, [props]);
-
-      let map: ReactElement | null = null;
-      if (isReady) {
-        const NativeMapView =
-          Platform.OS === "android" && androidView === "texture"
-            ? AndroidTextureMapViewNativeComponent
-            : MapViewNativeComponent;
-
-        map = <NativeMapView {...nativeProps} />;
-      }
-
-      return (
-        <View
-          onLayout={() => setIsReady(true)}
-          style={style ?? styles.flex1}
-          testID={nativeProps.testID ? `${nativeProps.testID}-view` : undefined}
-        >
-          {map}
-        </View>
-      );
-    },
-  ),
+            null,
+            pixelPointOrPixelPointBoundsOrOptions?.layers ?? [],
+            getNativeFilter(
+              pixelPointOrPixelPointBoundsOrOptions?.filter,
+            ) as string[],
+          );
+        }
+      },
+
+      createStaticMapImage: (options) =>
+        NativeMapViewModule.createStaticMapImage(
+          findNodeHandle(nativeRef.current),
+          options.output,
+        ),
+
+      setSourceVisibility: (visible, source, sourceLayer) =>
+        NativeMapViewModule.setSourceVisibility(
+          findNodeHandle(nativeRef.current),
+          visible,
+          source,
+          sourceLayer ?? null,
+        ),
+
+      showAttribution: () =>
+        NativeMapViewModule.showAttribution(findNodeHandle(nativeRef.current)),
+    }));
+
+    // Start before rendering
+    useLayoutEffect(() => {
+      LogManager.start();
+
+      return () => {
+        LogManager.stop();
+      };
+    }, []);
+
+    const nativeProps = useMemo(() => {
+      const { mapStyle, light, ...otherProps } = props;
+
+      return {
+        ...otherProps,
+        ref: nativeRef,
+        style: styles.flex1,
+        mapStyle:
+          typeof mapStyle === "object" ? JSON.stringify(mapStyle) : mapStyle,
+        light: props.light
+          ? transformStyle(convertToInternalStyle(props.light))
+          : undefined,
+      };
+    }, [props]);
+
+    let map: ReactElement | null = null;
+    if (isReady) {
+      const NativeMapView =
+        Platform.OS === "android" && androidView === "texture"
+          ? AndroidTextureMapViewNativeComponent
+          : MapViewNativeComponent;
+
+      map = <NativeMapView {...nativeProps} />;
+    }
+
+    return (
+      <View
+        onLayout={() => setIsReady(true)}
+        style={style ?? styles.flex1}
+        testID={nativeProps.testID ? `${nativeProps.testID}-view` : undefined}
+      >
+        {map}
+      </View>
+    );
+  },
 );

package/src/components/sources/geojson-source/GeoJSONSource.tsx

@@ -5,9 +5,9 @@ import type {
 import {
   Component,
   type ComponentProps,
-  forwardRef,
   memo,
   type ReactNode,
+  type Ref,
   useImperativeHandle,
   useRef,
 } from "react";
@@ -155,6 +155,11 @@ export interface GeoJSONSourceProps extends BaseProps, PressableSourceProps {
   lineMetrics?: boolean;
 
   children?: ReactNode;
+
+  /**
+   * Ref to access GeoJSONSource methods.
+   */
+  ref?: Ref<GeoJSONSourceRef>;
 }
 
 /**
@@ -162,64 +167,62 @@ export interface GeoJSONSourceProps extends BaseProps, PressableSourceProps {
  * The data may be provided as an url or a GeoJSON object.
  */
 export const GeoJSONSource = memo(
-  forwardRef<GeoJSONSourceRef, GeoJSONSourceProps>(
-    ({ id, data, ...props }, ref) => {
-      const nativeRef = useRef<
-        Component<ComponentProps<typeof GeoJSONSourceNativeComponent>> &
-          ReactNativeElement
-      >(null);
-
-      const frozenId = useFrozenId(id);
-
-      useImperativeHandle(ref, () => ({
-        getData: async (filter) => {
-          return NativeGeoJSONSourceModule.getData(
-            findNodeHandle(nativeRef.current),
-            getNativeFilter(filter),
-          );
-        },
-
-        getClusterExpansionZoom: async (clusterId) => {
-          return NativeGeoJSONSourceModule.getClusterExpansionZoom(
-            findNodeHandle(nativeRef.current),
-            clusterId,
-          );
-        },
-
-        getClusterLeaves: async (
-          clusterId: number,
-          limit: number,
-          offset: number,
-        ) => {
-          return NativeGeoJSONSourceModule.getClusterLeaves(
-            findNodeHandle(nativeRef.current),
-            clusterId,
-            limit,
-            offset,
-          );
-        },
-
-        getClusterChildren: async (clusterId: number) => {
-          return NativeGeoJSONSourceModule.getClusterChildren(
-            findNodeHandle(nativeRef.current),
-            clusterId,
-          );
-        },
-      }));
-
-      return (
-        <GeoJSONSourceNativeComponent
-          ref={nativeRef}
-          id={frozenId}
-          data={typeof data === "string" ? data : JSON.stringify(data)}
-          hasOnPress={!!props.onPress}
-          {...props}
-        >
-          {cloneReactChildrenWithProps(props.children, {
-            source: frozenId,
-          })}
-        </GeoJSONSourceNativeComponent>
-      );
-    },
-  ),
+  ({ id, data, ref, ...props }: GeoJSONSourceProps) => {
+    const nativeRef = useRef<
+      Component<ComponentProps<typeof GeoJSONSourceNativeComponent>> &
+        ReactNativeElement
+    >(null);
+
+    const frozenId = useFrozenId(id);
+
+    useImperativeHandle(ref, () => ({
+      getData: async (filter) => {
+        return NativeGeoJSONSourceModule.getData(
+          findNodeHandle(nativeRef.current),
+          getNativeFilter(filter),
+        );
+      },
+
+      getClusterExpansionZoom: async (clusterId) => {
+        return NativeGeoJSONSourceModule.getClusterExpansionZoom(
+          findNodeHandle(nativeRef.current),
+          clusterId,
+        );
+      },
+
+      getClusterLeaves: async (
+        clusterId: number,
+        limit: number,
+        offset: number,
+      ) => {
+        return NativeGeoJSONSourceModule.getClusterLeaves(
+          findNodeHandle(nativeRef.current),
+          clusterId,
+          limit,
+          offset,
+        );
+      },
+
+      getClusterChildren: async (clusterId: number) => {
+        return NativeGeoJSONSourceModule.getClusterChildren(
+          findNodeHandle(nativeRef.current),
+          clusterId,
+        );
+      },
+    }));
+
+    return (
+      <GeoJSONSourceNativeComponent
+        ref={nativeRef}
+        id={frozenId}
+        data={typeof data === "string" ? data : JSON.stringify(data)}
+        hasOnPress={!!props.onPress}
+        {...props}
+      >
+        {cloneReactChildrenWithProps(props.children, {
+          source: frozenId,
+        })}
+      </GeoJSONSourceNativeComponent>
+    );
+  },
 );

package/src/components/sources/vector-source/VectorSource.tsx

@@ -2,9 +2,9 @@ import type { FilterSpecification } from "@maplibre/maplibre-gl-style-spec";
 import {
   Component,
   type ComponentProps,
-  forwardRef,
   memo,
   type ReactNode,
+  type Ref,
   useImperativeHandle,
   useRef,
 } from "react";
@@ -82,48 +82,51 @@ export interface VectorSourceProps extends BaseProps, PressableSourceProps {
   attribution?: string;
 
   children?: ReactNode;
+
+  /**
+   * Ref to access VectorSource methods.
+   */
+  ref?: Ref<VectorSourceRef>;
 }
 
 /**
  * VectorSource is a map content source that supplies tiled vector data in Mapbox Vector Tile format to be shown on the map.
  * The location of and metadata about the tiles are defined either by an option dictionary or by an external file that conforms to the TileJSON specification.
  */
-export const VectorSource = memo(
-  forwardRef<VectorSourceRef, VectorSourceProps>(({ id, ...props }, ref) => {
-    const nativeRef = useRef<
-      Component<ComponentProps<typeof VectorSourceNativeComponent>> &
-        ReactNativeElement
-    >(null);
+export const VectorSource = memo(({ id, ref, ...props }: VectorSourceProps) => {
+  const nativeRef = useRef<
+    Component<ComponentProps<typeof VectorSourceNativeComponent>> &
+      ReactNativeElement
+  >(null);
 
-    const frozenId = useFrozenId(id);
+  const frozenId = useFrozenId(id);
 
-    useImperativeHandle(ref, () => ({
-      querySourceFeatures: async ({
+  useImperativeHandle(ref, () => ({
+    querySourceFeatures: async ({
+      sourceLayer,
+      filter,
+    }: {
+      sourceLayer: string;
+      filter?: FilterSpecification;
+    }): Promise<GeoJSON.Feature[]> => {
+      return NativeVectorSourceModule.querySourceFeatures(
+        findNodeHandle(nativeRef.current),
         sourceLayer,
-        filter,
-      }: {
-        sourceLayer: string;
-        filter?: FilterSpecification;
-      }): Promise<GeoJSON.Feature[]> => {
-        return NativeVectorSourceModule.querySourceFeatures(
-          findNodeHandle(nativeRef.current),
-          sourceLayer,
-          getNativeFilter(filter) as string[],
-        );
-      },
-    }));
+        getNativeFilter(filter) as string[],
+      );
+    },
+  }));
 
-    return (
-      <VectorSourceNativeComponent
-        ref={nativeRef}
-        id={frozenId}
-        hasOnPress={!!props.onPress}
-        {...props}
-      >
-        {cloneReactChildrenWithProps(props.children, {
-          source: frozenId,
-        })}
-      </VectorSourceNativeComponent>
-    );
-  }),
-);
+  return (
+    <VectorSourceNativeComponent
+      ref={nativeRef}
+      id={frozenId}
+      hasOnPress={!!props.onPress}
+      {...props}
+    >
+      {cloneReactChildrenWithProps(props.children, {
+        source: frozenId,
+      })}
+    </VectorSourceNativeComponent>
+  );
+});