fix stopPropagation in click event handle not working

NervJS · Jul 11, 2022 · a2af02d · a2af02d
1 parent a5cba25
commit a2af02d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/packages/nextjs/components/src/_util/hooks/useTaroBaseEvents.ts b/packages/nextjs/components/src/_util/hooks/useTaroBaseEvents.ts
@@ -28,6 +28,8 @@ export interface UseTaroBaseEventsReturn extends TaroBaseAttributes {
 
     onMouseLeave: React.MouseEventHandler
     onTouchCancel: React.TouchEventHandler
+
+    onClick: React.MouseEventHandler
 }
 
 function useTaroBaseEvents({
@@ -47,7 +49,7 @@ function useTaroBaseEvents({
 
     const touchHasMoved = useCallback((reactEvent: React.TouchEvent | React.MouseEvent) => {
         const start = 'targetTouches' in reactEvent ? reactEvent.targetTouches[0] : reactEvent
-        const end = touchStartInfo.current
+        const end = touchStartInfo.current!
 
         return Math.sqrt(Math.pow(end.screenX - start.screenX, 2) + Math.pow(end.screenY - start.screenY, 2))
     }, [])
@@ -120,14 +122,7 @@ function useTaroBaseEvents({
             const taroEvent = createTaroTouchEvent('touchend', reactEvent)
             onTouchEnd(taroEvent)
         }
-        const endTime = Date.now()
-        if (trackingTap.current && onClick && endTime - startTime.current < 350) {
-            const taroEvent = createTaroMouseEvent('tap', reactEvent)
-            setTimeout(() => {
-                onClick(taroEvent)
-            })
-        }
-    }, [onTouchEnd, onClick])
+    }, [onTouchEnd])
 
     const handleCancel = useCallback((reactEvent: React.TouchEvent | React.MouseEvent): void => {
         const eventType = EVENT_TYPE_MAPPINGS[reactEvent.type]
@@ -144,6 +139,14 @@ function useTaroBaseEvents({
         }
     }, [onTouchCancel])
 
+    const handleClick = useCallback((reactEvent: React.TouchEvent | React.MouseEvent): void => {
+        const endTime = Date.now()
+        if (trackingTap.current && onClick && endTime - startTime.current < 350) {
+            const taroEvent = createTaroMouseEvent('tap', reactEvent)
+            onClick(taroEvent)
+        }
+    }, [])
+
     return {
         onMouseDown: handleStart,
         onTouchStart: handleStart,
@@ -157,6 +160,8 @@ function useTaroBaseEvents({
         onMouseLeave: handleCancel,
         onTouchCancel: handleCancel,
 
+        onClick: handleClick,
+
         ...rest
     }
 }

diff --git a/packages/nextjs/components/src/_util/taroEvent.ts b/packages/nextjs/components/src/_util/taroEvent.ts
@@ -123,7 +123,7 @@ export function createTaroBlurEvent<T extends HTMLTextAreaElement | HTMLInputEle
         currentTarget,
         target,
         detail: {
-            cursor: el.selectionEnd,
+            cursor: el.selectionEnd || 0,
             value: el.value
         },
         timeStamp,