expo-gaode-map 1.1.0 → 1.1.2

package/src/ExpoGaodeMapView.tsx

@@ -1,5 +1,6 @@
 import { requireNativeViewManager } from 'expo-modules-core';
 import * as React from 'react';
+import { NativeSyntheticEvent } from 'react-native';
 import { EventManager } from './utils/EventManager';
 import type {
   MapViewProps,
@@ -21,14 +22,14 @@ const NativeView: React.ComponentType<MapViewProps & { ref?: React.Ref<NativeMap
 export const MapContext = React.createContext<React.RefObject<MapViewRef | null> | null>(null);
 
 type MarkerEventCallbacks = {
-  onPress?: () => void;
-  onDragStart?: () => void;
-  onDrag?: () => void;
-  onDragEnd?: (event: { nativeEvent: LatLng }) => void;
+  onPress?: (event: NativeSyntheticEvent<{}>) => void;
+  onDragStart?: (event: NativeSyntheticEvent<LatLng>) => void;
+  onDrag?: (event: NativeSyntheticEvent<LatLng>) => void;
+  onDragEnd?: (event: NativeSyntheticEvent<LatLng>) => void;
 };
 
 type OverlayEventCallbacks = {
-  onPress?: () => void;
+  onPress?: (event: NativeSyntheticEvent<{}>) => void;
 };
 
 export const MarkerEventContext = React.createContext<EventManager<MarkerEventCallbacks> | null>(null);
@@ -63,50 +64,45 @@ const ExpoGaodeMapView = React.forwardRef<MapViewRef, MapViewProps>((props, ref)
   const polylineEventManager = React.useMemo(() => new EventManager<OverlayEventCallbacks>(), []);
   const handleMarkerPress = (event: any) => {
     const markerId = event.nativeEvent?.markerId;
-    if (markerId) markerEventManager.trigger(markerId, 'onPress');
+    if (markerId) markerEventManager.trigger(markerId, 'onPress', event);
     props.onMarkerPress?.(event);
   };
   
   const handleMarkerDragStart = (event: any) => {
     const markerId = event.nativeEvent?.markerId;
-    if (markerId) markerEventManager.trigger(markerId, 'onDragStart');
+    if (markerId) markerEventManager.trigger(markerId, 'onDragStart', event);
     props.onMarkerDragStart?.(event);
   };
   
   const handleMarkerDrag = (event: any) => {
     const markerId = event.nativeEvent?.markerId;
-    if (markerId) markerEventManager.trigger(markerId, 'onDrag');
+    if (markerId) markerEventManager.trigger(markerId, 'onDrag', event);
     props.onMarkerDrag?.(event);
   };
   
   const handleMarkerDragEnd = (event: any) => {
     const markerId = event.nativeEvent?.markerId;
     if (markerId) {
-      markerEventManager.trigger(markerId, 'onDragEnd', {
-        nativeEvent: {
-          latitude: event.nativeEvent.latitude,
-          longitude: event.nativeEvent.longitude
-        }
-      });
+      markerEventManager.trigger(markerId, 'onDragEnd', event);
     }
     props.onMarkerDragEnd?.(event);
   };
   
   const handleCirclePress = (event: any) => {
     const circleId = event.nativeEvent?.circleId;
-    if (circleId) circleEventManager.trigger(circleId, 'onPress');
+    if (circleId) circleEventManager.trigger(circleId, 'onPress', event);
     props.onCirclePress?.(event);
   };
   
   const handlePolygonPress = (event: any) => {
     const polygonId = event.nativeEvent?.polygonId;
-    if (polygonId) polygonEventManager.trigger(polygonId, 'onPress');
+    if (polygonId) polygonEventManager.trigger(polygonId, 'onPress', event);
     props.onPolygonPress?.(event);
   };
   
   const handlePolylinePress = (event: any) => {
     const polylineId = event.nativeEvent?.polylineId;
-    if (polylineId) polylineEventManager.trigger(polylineId, 'onPress');
+    if (polylineId) polylineEventManager.trigger(polylineId, 'onPress', event);
     props.onPolylinePress?.(event);
   };
 

package/src/types/map-view.types.ts

@@ -3,9 +3,9 @@
  * 基于 Expo Modules API
  */
 
-import type { StyleProp, ViewStyle } from 'react-native';
+import type { StyleProp, ViewStyle,NativeSyntheticEvent } from 'react-native';
 import type { CameraPosition, LatLng, LatLngBounds, MapPoi, MapType, Point } from './common.types';
-import type { Coordinates, ReGeocode } from './location.types';
+
 
 /**
  * 地图相机事件
@@ -168,72 +168,72 @@ export interface MapViewProps {
   /**
    * 点击地图事件
    */
-  onMapPress?: (event: LatLng) => void;
+  onMapPress?: (event: NativeSyntheticEvent<LatLng>) => void;
 
   /**
    * 点击标注点事件
    */
-  onPressPoi?: (event: MapPoi) => void;
+  onPressPoi?: (event: NativeSyntheticEvent<MapPoi>) => void;
 
   /**
    * 长按地图事件
    */
-  onMapLongPress?: (event: LatLng) => void;
+  onMapLongPress?: (event: NativeSyntheticEvent<LatLng>) => void;
 
   /**
    * 地图状态改变事件（实时触发）
    */
-  onCameraMove?: (event: CameraEvent) => void;
+  onCameraMove?: (event: NativeSyntheticEvent<CameraEvent>) => void;
 
   /**
    * 地图状态改变完成事件
    */
-  onCameraIdle?: (event: CameraEvent) => void;
+  onCameraIdle?: (event: NativeSyntheticEvent<CameraEvent>) => void;
 
   /**
    * 地图加载完成事件
    */
-  onLoad?: (event: {}) => void;
+  onLoad?: (event: NativeSyntheticEvent<{}>) => void;
 
   /**
    * 地图定位更新事件
    */
-  onLocation?: (event: Coordinates | ReGeocode) => void;
+  onLocation?: (event: NativeSyntheticEvent<GeolocationPosition>) => void;
 
   /**
    * Marker 点击事件
    */
-  onMarkerPress?: (event: { markerId: string } & LatLng) => void;
+  onMarkerPress?: (event: NativeSyntheticEvent<{ markerId: string } & LatLng>) => void;
 
   /**
    * Marker 拖拽开始事件
    */
-  onMarkerDragStart?: (event: { markerId: string } & LatLng) => void;
+  onMarkerDragStart?: (event: NativeSyntheticEvent<{ markerId: string } & LatLng>) => void;
 
   /**
    * Marker 拖拽中事件
    */
-  onMarkerDrag?: (event: { markerId: string } & LatLng) => void;
+  onMarkerDrag?: (event: NativeSyntheticEvent<{ markerId: string } & LatLng>) => void;
 
   /**
    * Marker 拖拽结束事件
    */
-  onMarkerDragEnd?: (event: { markerId: string } & LatLng) => void;
+  onMarkerDragEnd?: (event: NativeSyntheticEvent<{ markerId: string } & LatLng>) => void;
 
   /**
    * Circle 点击事件
    */
-  onCirclePress?: (event: { circleId: string } & LatLng) => void;
+  onCirclePress?: (event: NativeSyntheticEvent<{ circleId: string } & LatLng>) => void;
 
   /**
    * Polygon 点击事件
    */
-  onPolygonPress?: (event: { polygonId: string } & LatLng) => void;
+  onPolygonPress?: (event: NativeSyntheticEvent<{ polygonId: string } & LatLng>) => void;
 
   /**
    * Polyline 点击事件
    */
-  onPolylinePress?: (event: { polylineId: string } & LatLng) => void;
+  onPolylinePress?: (event: NativeSyntheticEvent<{ polylineId: string } & LatLng>) => void;
 
   /**
    * 子组件

package/src/types/overlays.types.ts

@@ -3,7 +3,7 @@
  * 基于 Expo Modules API
  */
 
-import type { ImageSourcePropType, ViewStyle } from 'react-native';
+import type { ImageSourcePropType, ViewStyle, NativeSyntheticEvent } from 'react-native';
 import type { ColorValue, LatLng, Point } from './common.types';
 
 /**
@@ -116,22 +116,22 @@ export interface MarkerProps {
   /**
    * 点击事件
    */
-  onPress?: () => void;
+  onPress?: (event: NativeSyntheticEvent<{}>) => void;
 
   /**
    * 拖拽开始事件
    */
-  onDragStart?: () => void;
+  onDragStart?: (event: NativeSyntheticEvent<LatLng>) => void;
 
   /**
    * 拖拽中事件
    */
-  onDrag?: () => void;
+  onDrag?: (event: NativeSyntheticEvent<LatLng>) => void;
 
   /**
    * 拖拽结束事件
    */
-  onDragEnd?: (event: { nativeEvent: LatLng }) => void;
+  onDragEnd?: (event: NativeSyntheticEvent<LatLng>) => void;
 }
 
 /**
@@ -193,7 +193,7 @@ export interface PolylineProps {
   /**
    * 点击事件
    */
-  onPress?: () => void;
+  onPress?: (event: NativeSyntheticEvent<{}>) => void;
 }
 
 /**
@@ -228,7 +228,7 @@ export interface PolygonProps {
   /**
    * 点击事件
    */
-  onPress?: () => void;
+  onPress?: (event: NativeSyntheticEvent<{}>) => void;
 }
 
 /**
@@ -268,7 +268,7 @@ export interface CircleProps {
   /**
    * 点击事件
    */
-  onPress?: () => void;
+  onPress?: (event: NativeSyntheticEvent<{}>) => void;
 
   /**
    * 自定义子元素
@@ -330,7 +330,7 @@ export interface MultiPointProps {
   /**
    * 点击事件
    */
-  onPress?: (event: { nativeEvent: { index: number; item: MultiPointItem } }) => void;
+  onPress?: (event: NativeSyntheticEvent<{ index: number; item: MultiPointItem }>) => void;
 }
 
 /**
@@ -405,5 +405,5 @@ export interface ClusterProps {
   /**
    * 聚合点点击事件
    */
-  onPress?: (params: ClusterParams) => void;
+  onPress?: (event: NativeSyntheticEvent<ClusterParams>) => void;
 }