@maplibre/maplibre-react-native 10.0.0-beta.3 → 10.0.0-beta.6

package/src/components/ShapeSource.tsx

@@ -26,12 +26,10 @@ import {
   type ExpressionField,
   type FilterExpression,
 } from "../utils/MapLibreRNStyles";
-import { copyPropertiesAsDeprecated } from "../utils/deprecation";
 import { getFilter } from "../utils/filterUtils";
 
 const MapLibreRN = NativeModules.MLRNModule;
 export const NATIVE_MODULE_NAME = "MLRNShapeSource";
-export const SHAPE_SOURCE_NATIVE_ASSETS_KEY = "assets";
 
 interface NativeProps {
   shape?: string;
@@ -252,18 +250,6 @@ const ShapeSource = memo(
       async function getClusterExpansionZoom(
         feature: GeoJSON.Feature,
       ): Promise<number> {
-        if (typeof feature === "number") {
-          console.warn(
-            "Using cluster_id is deprecated and will be removed from the future releases. Please use cluster as an argument instead.",
-          );
-          const res: { data: number } = await _runNativeCommand(
-            "getClusterExpansionZoomById",
-            _nativeRef.current,
-            [feature],
-          );
-          return res.data;
-        }
-
         const res: { data: number } = await _runNativeCommand(
           "getClusterExpansionZoom",
           _nativeRef.current,
@@ -277,24 +263,6 @@ const ShapeSource = memo(
         limit: number,
         offset: number,
       ): Promise<GeoJSON.FeatureCollection> {
-        if (typeof feature === "number") {
-          console.warn(
-            "Using cluster_id is deprecated and will be removed from the future releases. Please use cluster as an argument instead.",
-          );
-          const res: { data: string | GeoJSON.FeatureCollection } =
-            await _runNativeCommand(
-              "getClusterLeavesById",
-              _nativeRef.current,
-              [feature, limit, offset],
-            );
-
-          if (isAndroid()) {
-            return JSON.parse(res.data as string);
-          }
-
-          return res.data as GeoJSON.FeatureCollection;
-        }
-
         const res: { data: string | GeoJSON.FeatureCollection } =
           await _runNativeCommand("getClusterLeaves", _nativeRef.current, [
             JSON.stringify(feature),
@@ -312,24 +280,6 @@ const ShapeSource = memo(
       async function getClusterChildren(
         feature: GeoJSON.Feature,
       ): Promise<GeoJSON.FeatureCollection> {
-        if (typeof feature === "number") {
-          console.warn(
-            "Using cluster_id is deprecated and will be removed from the future releases. Please use cluster as an argument instead.",
-          );
-          const res: { data: string | GeoJSON.FeatureCollection } =
-            await _runNativeCommand(
-              "getClusterChildrenById",
-              _nativeRef.current,
-              [feature],
-            );
-
-          if (isAndroid()) {
-            return JSON.parse(res.data as string);
-          }
-
-          return res.data as GeoJSON.FeatureCollection;
-        }
-
         const res: { data: string | GeoJSON.FeatureCollection } =
           await _runNativeCommand("getClusterChildren", _nativeRef.current, [
             JSON.stringify(feature),
@@ -372,31 +322,13 @@ const ShapeSource = memo(
             payload: { features, coordinates, point },
           },
         } = event;
-        let newEvent = {
-          features,
-          coordinates,
-          point,
-        };
-        newEvent = copyPropertiesAsDeprecated(
-          event,
-          newEvent,
-          (key: string): void => {
-            console.warn(
-              `event.${key} is deprecated on ShapeSource#onPress, please use event.features`,
-            );
-          },
-          {
-            nativeEvent: (
-              origNativeEvent: NativeSyntheticEvent<{ payload: OnPressEvent }>,
-            ) => ({
-              ...origNativeEvent,
-              payload: features[0],
-            }),
-          },
-        );
 
         if (props.onPress) {
-          props.onPress(newEvent);
+          props.onPress({
+            features,
+            coordinates,
+            point,
+          });
         }
       }
 

package/src/components/SymbolLayer.tsx

@@ -1,5 +1,4 @@
-import { Children, type ReactElement } from "react";
-import { View, NativeModules, requireNativeComponent } from "react-native";
+import { NativeModules, requireNativeComponent } from "react-native";
 
 import useAbstractLayer, {
   type BaseLayerProps,
@@ -17,17 +16,11 @@ export interface SymbolLayerProps extends BaseProps, BaseLayerProps {
    * Customizable style attributes
    */
   style?: SymbolLayerStyleProps;
-
-  /**
-   * @deprecated passed children used to create an image with id of symbol in style and also set the iconImageName property accordingly.
-   * This is now deprecated, use Image component instead.
-   */
-  children?: ReactElement | ReactElement[];
 }
 
-interface NativeProps extends Omit<SymbolLayerProps, "style">, NativeBaseProps {
-  snapshot: boolean;
-}
+interface NativeProps
+  extends Omit<SymbolLayerProps, "style">,
+    NativeBaseProps {}
 
 const MLRNSymbolLayer = requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
 
@@ -46,32 +39,11 @@ const SymbolLayer: React.FC<SymbolLayerProps> = ({
     sourceID,
   });
 
-  const _shouldSnapshot = (): boolean => {
-    let isSnapshot = false;
-
-    if (Children.count(props.children) <= 0) {
-      return isSnapshot;
-    }
-
-    Children.forEach(props.children, (child) => {
-      if (child?.type === View) {
-        isSnapshot = true;
-      }
-    });
-
-    return isSnapshot;
-  };
-
   const updatedProps = {
     ...baseProps,
-    snapshot: _shouldSnapshot(),
   };
 
-  return (
-    <MLRNSymbolLayer ref={setNativeLayer} {...updatedProps}>
-      {props.children}
-    </MLRNSymbolLayer>
-  );
+  return <MLRNSymbolLayer ref={setNativeLayer} {...updatedProps} />;
 };
 
 export default SymbolLayer;

package/src/components/VectorSource.tsx

@@ -12,7 +12,6 @@ import { type BaseProps } from "../types/BaseProps";
 import { type OnPressEvent } from "../types/OnPressEvent";
 import { cloneReactChildrenWithProps, isFunction, isAndroid } from "../utils";
 import { type FilterExpression } from "../utils/MapLibreRNStyles";
-import { copyPropertiesAsDeprecated } from "../utils/deprecation";
 import { getFilter } from "../utils/filterUtils";
 
 const MapLibreRN = NativeModules.MLRNModule;
@@ -160,33 +159,18 @@ const VectorSource = memo(
         if (!onPress) {
           return;
         }
+
         const {
           nativeEvent: {
             payload: { features, coordinates, point },
           },
         } = event;
-        let newEvent = {
+
+        onPress({
           features,
           coordinates,
           point,
-        };
-        newEvent = copyPropertiesAsDeprecated(
-          event,
-          newEvent,
-          (key: string) => {
-            console.warn(
-              `event.${key} is deprecated on VectorSource#onPress, please use event.features`,
-            );
-          },
-          {
-            nativeEvent: (origNativeEvent: OnPressEvent) => ({
-              ...origNativeEvent,
-              payload: features[0],
-            }),
-          },
-        );
-
-        onPress(newEvent);
+        });
       };
 
       const allProps = {

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

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

package/lib/commonjs/utils/deprecation.js

@@ -1,31 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.copyPropertiesAsDeprecated = copyPropertiesAsDeprecated;
-/**
- * Copy properties from origObject to newObject, which not exists in newObject,
- * calls onDeprecatedCalled callback in case a copied property is invoked.
- */
-
-function copyPropertiesAsDeprecated(origObject, newObject, onDeprecatedCalled, accessors = {}) {
-  const result = {
-    ...newObject
-  };
-  for (const [key, value] of Object.entries(origObject)) {
-    if (!(key in newObject)) {
-      Object.defineProperty(result, key, {
-        get() {
-          onDeprecatedCalled(key);
-          return accessors[key] ? accessors[key](value) : value;
-        },
-        enumerable: true,
-        // Ensure the property is enumerable
-        configurable: true // Ensure the property can be reconfigured
-      });
-    }
-  }
-  return result;
-}
-//# sourceMappingURL=deprecation.js.map

package/lib/commonjs/utils/deprecation.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["copyPropertiesAsDeprecated","origObject","newObject","onDeprecatedCalled","accessors","result","key","value","Object","entries","defineProperty","get","enumerable","configurable"],"sourceRoot":"../../../src","sources":["utils/deprecation.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;;AAEO,SAASA,0BAA0BA,CAIxCC,UAA0B,EAC1BC,SAA6B,EAC7BC,kBAAyC,EACzCC,SAAkD,GAAG,CAAC,CAAC,EACnC;EACpB,MAAMC,MAAM,GAAG;IAAE,GAAGH;EAAU,CAAC;EAE/B,KAAK,MAAM,CAACI,GAAG,EAAEC,KAAK,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACR,UAAU,CAAC,EAAE;IACrD,IAAI,EAAEK,GAAG,IAAIJ,SAAS,CAAC,EAAE;MACvBM,MAAM,CAACE,cAAc,CAACL,MAAM,EAAEC,GAAG,EAAE;QACjCK,GAAGA,CAAA,EAAG;UACJR,kBAAkB,CAACG,GAAG,CAAC;UACvB,OAAOF,SAAS,CAACE,GAAG,CAAC,GAAGF,SAAS,CAACE,GAAG,CAAC,CAACC,KAAK,CAAC,GAAGA,KAAK;QACvD,CAAC;QACDK,UAAU,EAAE,IAAI;QAAE;QAClBC,YAAY,EAAE,IAAI,CAAE;MACtB,CAAC,CAAC;IACJ;EACF;EAEA,OAAOR,MAAM;AACf","ignoreList":[]}

package/lib/module/utils/deprecation.js

@@ -1,27 +0,0 @@
-"use strict";
-
-/**
- * Copy properties from origObject to newObject, which not exists in newObject,
- * calls onDeprecatedCalled callback in case a copied property is invoked.
- */
-
-export function copyPropertiesAsDeprecated(origObject, newObject, onDeprecatedCalled, accessors = {}) {
-  const result = {
-    ...newObject
-  };
-  for (const [key, value] of Object.entries(origObject)) {
-    if (!(key in newObject)) {
-      Object.defineProperty(result, key, {
-        get() {
-          onDeprecatedCalled(key);
-          return accessors[key] ? accessors[key](value) : value;
-        },
-        enumerable: true,
-        // Ensure the property is enumerable
-        configurable: true // Ensure the property can be reconfigured
-      });
-    }
-  }
-  return result;
-}
-//# sourceMappingURL=deprecation.js.map

package/lib/module/utils/deprecation.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["copyPropertiesAsDeprecated","origObject","newObject","onDeprecatedCalled","accessors","result","key","value","Object","entries","defineProperty","get","enumerable","configurable"],"sourceRoot":"../../../src","sources":["utils/deprecation.ts"],"mappings":";;AAAA;AACA;AACA;AACA;;AAEA,OAAO,SAASA,0BAA0BA,CAIxCC,UAA0B,EAC1BC,SAA6B,EAC7BC,kBAAyC,EACzCC,SAAkD,GAAG,CAAC,CAAC,EACnC;EACpB,MAAMC,MAAM,GAAG;IAAE,GAAGH;EAAU,CAAC;EAE/B,KAAK,MAAM,CAACI,GAAG,EAAEC,KAAK,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACR,UAAU,CAAC,EAAE;IACrD,IAAI,EAAEK,GAAG,IAAIJ,SAAS,CAAC,EAAE;MACvBM,MAAM,CAACE,cAAc,CAACL,MAAM,EAAEC,GAAG,EAAE;QACjCK,GAAGA,CAAA,EAAG;UACJR,kBAAkB,CAACG,GAAG,CAAC;UACvB,OAAOF,SAAS,CAACE,GAAG,CAAC,GAAGF,SAAS,CAACE,GAAG,CAAC,CAACC,KAAK,CAAC,GAAGA,KAAK;QACvD,CAAC;QACDK,UAAU,EAAE,IAAI;QAAE;QAClBC,YAAY,EAAE,IAAI,CAAE;MACtB,CAAC,CAAC;IACJ;EACF;EAEA,OAAOR,MAAM;AACf","ignoreList":[]}

package/lib/typescript/commonjs/src/utils/deprecation.d.ts

@@ -1,6 +0,0 @@
-/**
- * Copy properties from origObject to newObject, which not exists in newObject,
- * calls onDeprecatedCalled callback in case a copied property is invoked.
- */
-export declare function copyPropertiesAsDeprecated<DeprecatedType extends object, WithDeprecatedType extends Record<string, unknown>>(origObject: DeprecatedType, newObject: WithDeprecatedType, onDeprecatedCalled: (key: string) => void, accessors?: Record<string, (value: any) => unknown>): WithDeprecatedType;
-//# sourceMappingURL=deprecation.d.ts.map

package/lib/typescript/commonjs/src/utils/deprecation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"deprecation.d.ts","sourceRoot":"","sources":["../../../../../src/utils/deprecation.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,wBAAgB,0BAA0B,CACxC,cAAc,SAAS,MAAM,EAC7B,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAElD,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,kBAAkB,EAC7B,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,EACzC,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAM,GACtD,kBAAkB,CAiBpB"}

package/lib/typescript/module/src/utils/deprecation.d.ts

@@ -1,6 +0,0 @@
-/**
- * Copy properties from origObject to newObject, which not exists in newObject,
- * calls onDeprecatedCalled callback in case a copied property is invoked.
- */
-export declare function copyPropertiesAsDeprecated<DeprecatedType extends object, WithDeprecatedType extends Record<string, unknown>>(origObject: DeprecatedType, newObject: WithDeprecatedType, onDeprecatedCalled: (key: string) => void, accessors?: Record<string, (value: any) => unknown>): WithDeprecatedType;
-//# sourceMappingURL=deprecation.d.ts.map

package/lib/typescript/module/src/utils/deprecation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"deprecation.d.ts","sourceRoot":"","sources":["../../../../../src/utils/deprecation.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,wBAAgB,0BAA0B,CACxC,cAAc,SAAS,MAAM,EAC7B,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAElD,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,kBAAkB,EAC7B,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,EACzC,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAM,GACtD,kBAAkB,CAiBpB"}

package/src/utils/deprecation.ts

@@ -1,31 +0,0 @@
-/**
- * Copy properties from origObject to newObject, which not exists in newObject,
- * calls onDeprecatedCalled callback in case a copied property is invoked.
- */
-
-export function copyPropertiesAsDeprecated<
-  DeprecatedType extends object,
-  WithDeprecatedType extends Record<string, unknown>,
->(
-  origObject: DeprecatedType,
-  newObject: WithDeprecatedType,
-  onDeprecatedCalled: (key: string) => void,
-  accessors: Record<string, (value: any) => unknown> = {},
-): WithDeprecatedType {
-  const result = { ...newObject };
-
-  for (const [key, value] of Object.entries(origObject)) {
-    if (!(key in newObject)) {
-      Object.defineProperty(result, key, {
-        get() {
-          onDeprecatedCalled(key);
-          return accessors[key] ? accessors[key](value) : value;
-        },
-        enumerable: true, // Ensure the property is enumerable
-        configurable: true, // Ensure the property can be reconfigured
-      });
-    }
-  }
-
-  return result;
-}