fix(LabelMarker): fix even props issue. (#337)

uiwjs · Nov 23, 2023 · f887b86 · f887b86 · vercel · Nov 23, 2023
1 parent cb09a51
commit f887b86
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 4 deletions.
diff --git a/packages/label-marker/README.md b/packages/label-marker/README.md
@@ -27,11 +27,8 @@ const Example = () => {
       </button>
       <div style={{ width: '100%', height: '300px' }}>
         <Map zoom={4}>
-          <LabelMarker visiable={show} name= "标注2" position={[116.466994, 39.984904]} />
           <LabelMarker visiable={show} name= "标注1" position={[116.466994, 39.984904]} />
           <LabelMarker visiable={show} name= "标注3" position={new AMap.LngLat(119.306239,26.075302)} />
-
-
         </Map>
       </div>
     </>

diff --git a/packages/label-marker/src/index.tsx b/packages/label-marker/src/index.tsx
@@ -7,6 +7,46 @@ export interface LabelMarkerProps extends OverlayProps, AMap.LabelMarkerEvents,
   visiable?: boolean;
   className?: string;
   children?: JSX.Element;
+  /**
+   * 将在下一个版本 `v6+` 版本移除
+   * @deprecated use `onMouseDown`
+   */
+  onMousedown?(event: AMap.MapsEvent): void;
+  /**
+   * 将在下一个版本 `v6+` 版本移除
+   * @deprecated use `onMouseUp`
+   */
+  onMouseup?(event: AMap.MapsEvent): void;
+  /**
+   * 将在下一个版本 `v6+` 版本移除
+   * @deprecated use `onTouchStart`
+   */
+  onTouchstart?(event: AMap.MapsEvent): void;
+  /**
+   * 将在下一个版本 `v6+` 版本移除
+   * @deprecated use `onTouchMove`
+   */
+  onTouchmove?(event: AMap.MapsEvent): void;
+  /**
+   * 将在下一个版本 `v6+` 版本移除
+   * @deprecated use `onTouchEnd`
+   */
+  onTouchend?(event: AMap.MapsEvent): void;
+  /**
+   * 将在下一个版本 `v6+` 版本移除
+   * @deprecated use `onMouseMove`
+   */
+  onMousemove?(event: AMap.MapsEvent): void;
+  /**
+   * 将在下一个版本 `v6+` 版本移除
+   * @deprecated use `onMouseOver`
+   */
+  onMouseover?(event: AMap.MapsEvent): void;
+  /**
+   * 将在下一个版本 `v6+` 版本移除
+   * @deprecated use `onMouseOut`
+   */
+  onMouseout?(event: AMap.MapsEvent): void;
 }
 
 export const LabelMarker = forwardRef<LabelMarkerProps & { labelMarker?: AMap.LabelMarker }, LabelMarkerProps>(

diff --git a/packages/label-marker/src/useLabelMarker.tsx b/packages/label-marker/src/useLabelMarker.tsx
@@ -103,12 +103,22 @@ export const useLabelMarker = (props: UseLabelMarker = {}) => {
   ]);
 
   useEventProperties<AMap.LabelMarker, UseLabelMarker>(labelMarker!, props, [
+    'onTouchStart',
+    'onTouchMove',
+    'onTouchEnd',
+    'onClick',
+    'onMouseMove',
+    'onMouseOver',
+    'onMouseDown',
+    'onMouseUp',
+    'onMouseOut',
+
+    // 以下事件过时兼容，将在 v6 中移除
     'onMousedown',
     'onMouseup',
     'onTouchstart',
     'onTouchmove',
     'onTouchend',
-    'onClick',
     'onMousemove',
     'onMouseover',
     'onMouseout',