feat: remove deprecated event types

maplibre · Dec 8, 2024 · 315ea96 · 315ea96
1 parent 3bae330
commit 315ea96
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 75 deletions.
diff --git a/src/components/ShapeSource.tsx b/src/components/ShapeSource.tsx
@@ -26,7 +26,6 @@ import {
   type ExpressionField,
   type FilterExpression,
 } from "../utils/MapLibreRNStyles";
-import { copyPropertiesAsDeprecated } from "../utils/deprecation";
 import { getFilter } from "../utils/filterUtils";
 
 const MapLibreRN = NativeModules.MLRNModule;
@@ -323,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,
+          });
         }
       }
 

diff --git a/src/components/VectorSource.tsx b/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 = {

diff --git a/src/utils/deprecation.ts b/src/utils/deprecation.ts