fix: x,y位置修正

didi · Jan 13, 2025 · d80a546 · d80a546
1 parent 7fb6e70
commit d80a546
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/packages/webpack-plugin/lib/runtime/components/react/mpx-movable-view.tsx b/packages/webpack-plugin/lib/runtime/components/react/mpx-movable-view.tsx
@@ -343,17 +343,19 @@ const _MovableView = forwardRef<HandlerRef<View, MovableViewProps>, MovableViewP
     props.onLayout && props.onLayout(e)
   }
 
-  const extendEvent = useCallback((e: any, obj?: Record<string, any>) => {
+  const extendEvent = useCallback((e: any, type: 'start'|'move'|'end') => {
     const { y: navigationY = 0 } = navigation?.layout || {}
     const touchArr = [e.changedTouches, e.allTouches]
     touchArr.forEach(touches => {
-      touches && touches.forEach((item: { absoluteX: number; absoluteY: number; pageX: number; pageY: number }) => {
+      touches && touches.forEach((item: { absoluteX: number; absoluteY: number; pageX: number; pageY: number ; clientX: number; clientY: number}) => {
         item.pageX = item.absoluteX
         item.pageY = item.absoluteY - navigationY
+        item.clientX = item.absoluteX
+        item.clientY = item.absoluteY - navigationY
       })
     })
     Object.assign(e, {
-      touches: e.allTouches,
+      touches: type === 'end' ? [] : e.allTouches,
       detail: {
         x: e.changedTouches[0].absoluteX,
         y: e.changedTouches[0].absoluteY - navigationY
@@ -364,17 +366,17 @@ const _MovableView = forwardRef<HandlerRef<View, MovableViewProps>, MovableViewP
         offsetLeft: 0,
         offsetTop: 0
       }
-    }, obj)
+    })
   }, [])
 
   const triggerStartOnJS = ({ e }: { e: GestureTouchEvent }) => {
-    extendEvent(e)
+    extendEvent(e, 'start')
     bindtouchstart && bindtouchstart(e)
     catchtouchstart && catchtouchstart(e)
   }
 
   const triggerMoveOnJS = ({ e, hasTouchmove, hasCatchTouchmove, touchEvent }: { e: GestureTouchEvent; hasTouchmove: boolean; hasCatchTouchmove: boolean; touchEvent: string }) => {
-    extendEvent(e)
+    extendEvent(e, 'move')
     if (hasTouchmove) {
       if (touchEvent === 'htouchmove') {
         bindhtouchmove && bindhtouchmove(e)
@@ -395,7 +397,7 @@ const _MovableView = forwardRef<HandlerRef<View, MovableViewProps>, MovableViewP
   }
 
   const triggerEndOnJS = ({ e }: { e: GestureTouchEvent }) => {
-    extendEvent(e)
+    extendEvent(e, 'end')
     bindtouchend && bindtouchend(e)
     catchtouchend && catchtouchend(e)
   }