fix: 修复 onFingerDown 影响 onDoubleTap 的问题

examples/develop.tsx

@@ -1,4 +1,4 @@
-import { Finger, FingerProxy, FingerProxyContainer, HostPointerEvent } from '../src';
+import { Finger, FingerProxy, FingerProxyContainer } from '../src';
 import React, { CSSProperties } from "react"
 
 import { FingerShortcutEvent } from '../src';
@@ -29,18 +29,16 @@ export const onShortcut = (event: FingerShortcutEvent) => {
   });
 };
 
-function onPointerDown(event: HostPointerEvent) {
-  console.log('event', event);
-}
-
 export function App() {
   return (
     <FingerBoxWrapper className='box' style={boxStyle} tabIndex={0}>
       <FingerProxy onShortcut={onShortcut} />
       <FingeredDiv
-        onTapHold={(event) => console.log('onTapHold', event)}
+        onTapHold={event => console.log('onTapHold', event)}
         onDoubleTap={event => console.log('onDoubleTap', event)}
-        onPointerDown={onPointerDown}
+        onFingerDown={event => console.log('onFingerDown', event)}
+        onPinch={event => console.log('onPinch', event)}
+        onPointerDown={event => console.log('onPointerDown', event)}
       >
         Tap me
       </FingeredDiv >

src/core/FingerContext.ts

@@ -22,7 +22,7 @@ export type FingerContext = {
   flags: Map<symbol, unknown>;
   cleanTimers: () => void;
   cleanPointers: () => void;
-  cleanFlags: () => void;
+  cleanFlags: (flags?: symbol[]) => void;
   clean: () => void;
 };
 
@@ -56,7 +56,10 @@ export function FingerContext(): FingerContext {
     pointers.clear();
     changedPointers.clear();
   };
-  const cleanFlags = () => flags.clear();
+  const cleanFlags = (flagKeys?: symbol[]) => {
+    if (!flagKeys || flagKeys.length < 1) return flags.clear();
+    flagKeys.forEach((key) => flags.delete(key));
+  };
   const clean = () => {
     cleanTimers();
     cleanPointers();

src/events/FingerBasicProvider.ts

@@ -10,12 +10,14 @@ import { FingerProvider } from "../core/FingerProviders";
 
 const LATEST_POS = Symbol();
 
+const ALL_FLAGS = [LATEST_POS];
+
 export const FingerBasicProvider: FingerProvider = {
   name: "Basic",
   events: ["onFingerDown", "onFingerMove", "onFingerUp", "onFingerCancel"],
 
   handlePointerDown: ({ events, context, pointer }) => {
-    if (pointer.isPrimary) context.cleanFlags();
+    if (pointer.isPrimary) context.cleanFlags(ALL_FLAGS);
     context.flags.delete(LATEST_POS);
     if (!events.onFingerDown) return;
     const { getPointers, getChangedPointers } = context;

src/events/FingerPinchProvider.ts

@@ -23,13 +23,22 @@ const ORIGIN_CENTER = Symbol();
 const LATEST_CENTER = Symbol();
 const ORIGIN_ROTATE = Symbol();
 
+const ALL_FLAGS = [
+  PINCHING,
+  DETAIL,
+  ORIGIN_DIST,
+  ORIGIN_CENTER,
+  LATEST_CENTER,
+  ORIGIN_ROTATE,
+];
+
 export const FingerPinchProvider: FingerProvider = {
   name: "Pinch",
   events: ["onPinchStart", "onPinch", "onPinchEnd"],
 
   handlePointerDown: ({ events, context, pointer }) => {
     pointer.target.setPointerCapture?.(pointer.pointerId);
-    if (pointer.isPrimary) context.cleanFlags();
+    if (pointer.isPrimary) context.cleanFlags(ALL_FLAGS);
     const { flags, getPointers, getChangedPointers } = context;
     const pointers = getPointers();
     const changedPointers = getChangedPointers();

src/events/FingerSwipeProvider.ts

@@ -12,6 +12,8 @@ const { swipeMinDistanceThreshold, swipeMaxDurationThreshold } = FingerOptions;
 const CANCELED = Symbol();
 const START_TIME = Symbol();
 
+const ALL_FLAGS = [CANCELED, START_TIME];
+
 type SwipeDirection = "up" | "down" | "left" | "right";
 type SwipeEventNames =
   | "onSwipeUp"
@@ -38,7 +40,7 @@ export const FingerSwipeProvider: FingerProvider = {
 
   handlePointerDown: ({ context, pointer }) => {
     pointer.target.setPointerCapture?.(pointer.pointerId);
-    if (pointer.isPrimary) context.cleanFlags();
+    if (pointer.isPrimary) context.cleanFlags(ALL_FLAGS);
     const { flags, getPointers } = context;
     flags.set(CANCELED, getPointers().length > 1);
     flags.set(START_TIME, Date.now());