From 862d127fd12adcdf945d4b5e4a8a1d9f0da1b6ba Mon Sep 17 00:00:00 2001
From: Curt Grimes <curt@curtgrimes.com>
Date: Tue, 8 Nov 2022 18:18:30 -0600
Subject: [PATCH] fix(usePointerSwipe): handle secondary clicks properly
 (#2379)

Fix issue where a secondary click (the right button on a right-handed
mouse) on an element using usePointerSwipe() is treated as if the
primary button (left click on a right-handed mouse) has started a drag.

- Rename filterEvent() to eventIsAllowed() for better clarity
- Fix typo in docs and make punctuation consistent

Fixes #2338
---
 packages/core/usePointerSwipe/index.ts | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/core/usePointerSwipe/index.ts b/packages/core/usePointerSwipe/index.ts
index e8c0198ecaf..e9f31280336 100644
--- a/packages/core/usePointerSwipe/index.ts
+++ b/packages/core/usePointerSwipe/index.ts
@@ -13,22 +13,22 @@ export interface UsePointerSwipeOptions {
   threshold?: number
 
   /**
-   * Callback on swipe start
+   * Callback on swipe start.
    */
   onSwipeStart?: (e: PointerEvent) => void
 
   /**
-   * Callback on swipe move
+   * Callback on swipe move.
    */
   onSwipe?: (e: PointerEvent) => void
 
   /**
-   * Callback on swipe end
+   * Callback on swipe end.
    */
   onSwipeEnd?: (e: PointerEvent, direction: SwipeDirection) => void
 
   /**
-   * Pointer types that listen to.
+   * Pointer types to listen to.
    *
    * @default ['mouse', 'touch', 'pen']
    */
@@ -100,15 +100,15 @@ export function usePointerSwipe(
     }
   })
 
-  const filterEvent = (e: PointerEvent) => {
-    if (options.pointerTypes)
-      return options.pointerTypes.includes(e.pointerType as PointerType)
-    return true
+  const eventIsAllowed = (e: PointerEvent): boolean => {
+    const isReleasingButton = e.buttons === 0
+    const isPrimaryButton = e.buttons === 1
+    return options.pointerTypes?.includes(e.pointerType as PointerType) ?? (isReleasingButton || isPrimaryButton) ?? true
   }
 
   const stops = [
     useEventListener(target, 'pointerdown', (e: PointerEvent) => {
-      if (!filterEvent(e))
+      if (!eventIsAllowed(e))
         return
       isPointerDown.value = true
       // Disable scroll on for TouchEvents
@@ -123,7 +123,7 @@ export function usePointerSwipe(
     }),
 
     useEventListener(target, 'pointermove', (e: PointerEvent) => {
-      if (!filterEvent(e))
+      if (!eventIsAllowed(e))
         return
       if (!isPointerDown.value)
         return
@@ -137,7 +137,7 @@ export function usePointerSwipe(
     }),
 
     useEventListener(target, 'pointerup', (e: PointerEvent) => {
-      if (!filterEvent(e))
+      if (!eventIsAllowed(e))
         return
       if (isSwiping.value)
         onSwipeEnd?.(e, direction.value)