react-native-gesture-handler 1.10.3 → 2.1.2

package/lib/typescript/handlers/gestures/gestureObjects.d.ts

@@ -0,0 +1,39 @@
+import { FlingGesture } from './flingGesture';
+import { ForceTouchGesture } from './forceTouchGesture';
+import { Gesture } from './gesture';
+import { ComposedGesture, ExclusiveGesture, SimultaneousGesture } from './gestureComposition';
+import { LongPressGesture } from './longPressGesture';
+import { PanGesture } from './panGesture';
+import { PinchGesture } from './pinchGesture';
+import { RotationGesture } from './rotationGesture';
+import { TapGesture } from './tapGesture';
+import { NativeGesture } from './nativeGesture';
+import { ManualGesture } from './manualGesture';
+export declare const GestureObjects: {
+    Tap: () => TapGesture;
+    Pan: () => PanGesture;
+    Pinch: () => PinchGesture;
+    Rotation: () => RotationGesture;
+    Fling: () => FlingGesture;
+    LongPress: () => LongPressGesture;
+    ForceTouch: () => ForceTouchGesture;
+    Native: () => NativeGesture;
+    Manual: () => ManualGesture;
+    /**
+     * Builds a composed gesture consisting of gestures provided as parameters.
+     * The first one that becomes active cancels the rest of gestures.
+     */
+    Race: (...gestures: Gesture[]) => ComposedGesture;
+    /**
+     * Builds a composed gesture that allows all base gestures to run simultaneously.
+     */
+    Simultaneous(...gestures: Gesture[]): SimultaneousGesture;
+    /**
+     * Builds a composed gesture where only one of the provided gestures can become active.
+     * Priority is decided through the order of gestures: the first one has higher priority
+     * than the second one, second one has higher priority than the third one, and so on.
+     * For example, to make a gesture that recognizes both single and double tap you need
+     * to call Exclusive(doubleTap, singleTap).
+     */
+    Exclusive(...gestures: Gesture[]): ExclusiveGesture;
+};

package/lib/typescript/handlers/gestures/gestureStateManager.d.ts

@@ -0,0 +1,9 @@
+export interface GestureStateManagerType {
+    begin: () => void;
+    activate: () => void;
+    fail: () => void;
+    end: () => void;
+}
+export declare const GestureStateManager: {
+    create(handlerTag: number): GestureStateManagerType;
+};

package/lib/typescript/handlers/gestures/longPressGesture.d.ts

@@ -0,0 +1,9 @@
+import { BaseGesture, BaseGestureConfig } from './gesture';
+import { LongPressGestureConfig, LongPressGestureHandlerEventPayload } from '../LongPressGestureHandler';
+export declare class LongPressGesture extends BaseGesture<LongPressGestureHandlerEventPayload> {
+    config: BaseGestureConfig & LongPressGestureConfig;
+    constructor();
+    minDuration(duration: number): this;
+    maxDistance(distance: number): this;
+}
+export declare type LongPressGestureType = InstanceType<typeof LongPressGesture>;

package/lib/typescript/handlers/gestures/manualGesture.d.ts

@@ -0,0 +1,7 @@
+import { GestureUpdateEvent } from '../gestureHandlerCommon';
+import { ContinousBaseGesture } from './gesture';
+export declare class ManualGesture extends ContinousBaseGesture<Record<string, never>, Record<string, never>> {
+    constructor();
+    onChange(callback: (event: GestureUpdateEvent<Record<string, never>>) => void): this;
+}
+export declare type ManualGestureType = InstanceType<typeof ManualGesture>;

package/lib/typescript/handlers/gestures/nativeGesture.d.ts

@@ -0,0 +1,9 @@
+import { BaseGestureConfig, BaseGesture } from './gesture';
+import { NativeViewGestureConfig, NativeViewGestureHandlerPayload } from '../NativeViewGestureHandler';
+export declare class NativeGesture extends BaseGesture<NativeViewGestureHandlerPayload> {
+    config: BaseGestureConfig & NativeViewGestureConfig;
+    constructor();
+    shouldActivateOnStart(value: boolean): this;
+    disallowInterruption(value: boolean): this;
+}
+export declare type NativeGestureType = InstanceType<typeof NativeGesture>;

package/lib/typescript/handlers/gestures/panGesture.d.ts

@@ -0,0 +1,26 @@
+import { BaseGestureConfig, ContinousBaseGesture } from './gesture';
+import { GestureUpdateEvent } from '../gestureHandlerCommon';
+import { PanGestureConfig, PanGestureHandlerEventPayload } from '../PanGestureHandler';
+declare type PanGestureChangeEventPayload = {
+    changeX: number;
+    changeY: number;
+};
+export declare class PanGesture extends ContinousBaseGesture<PanGestureHandlerEventPayload, PanGestureChangeEventPayload> {
+    config: BaseGestureConfig & PanGestureConfig;
+    constructor();
+    activeOffsetY(offset: number | number[]): this;
+    activeOffsetX(offset: number | number[]): this;
+    failOffsetY(offset: number | number[]): this;
+    failOffsetX(offset: number | number[]): this;
+    minPointers(minPointers: number): this;
+    maxPointers(maxPointers: number): this;
+    minDistance(distance: number): this;
+    minVelocity(velocity: number): this;
+    minVelocityX(velocity: number): this;
+    minVelocityY(velocity: number): this;
+    averageTouches(value: boolean): this;
+    enableTrackpadTwoFingerGesture(value: boolean): this;
+    onChange(callback: (event: GestureUpdateEvent<PanGestureHandlerEventPayload & PanGestureChangeEventPayload>) => void): this;
+}
+export declare type PanGestureType = InstanceType<typeof PanGesture>;
+export {};

package/lib/typescript/handlers/gestures/pinchGesture.d.ts

@@ -0,0 +1,12 @@
+import { ContinousBaseGesture } from './gesture';
+import { PinchGestureHandlerEventPayload } from '../PinchGestureHandler';
+import { GestureUpdateEvent } from '../gestureHandlerCommon';
+declare type PinchGestureChangeEventPayload = {
+    scaleChange: number;
+};
+export declare class PinchGesture extends ContinousBaseGesture<PinchGestureHandlerEventPayload, PinchGestureChangeEventPayload> {
+    constructor();
+    onChange(callback: (event: GestureUpdateEvent<PinchGestureHandlerEventPayload & PinchGestureChangeEventPayload>) => void): this;
+}
+export declare type PinchGestureType = InstanceType<typeof PinchGesture>;
+export {};

package/lib/typescript/handlers/gestures/reanimatedWrapper.d.ts

@@ -0,0 +1,14 @@
+import { ComponentClass } from 'react';
+import { GestureUpdateEvent, GestureStateChangeEvent } from '../gestureHandlerCommon';
+export interface SharedValue<T> {
+    value: T;
+}
+declare let Reanimated: {
+    default: {
+        createAnimatedComponent<P extends object>(component: ComponentClass<P>, options?: unknown): ComponentClass<P>;
+    };
+    useEvent: (callback: (event: GestureUpdateEvent | GestureStateChangeEvent) => void, events: string[], rebuild: boolean) => unknown;
+    useSharedValue: <T>(value: T) => SharedValue<T>;
+    setGestureState: (handlerTag: number, newState: number) => void;
+};
+export { Reanimated };

package/lib/typescript/handlers/gestures/rotationGesture.d.ts

@@ -0,0 +1,12 @@
+import { ContinousBaseGesture } from './gesture';
+import { RotationGestureHandlerEventPayload } from '../RotationGestureHandler';
+import { GestureUpdateEvent } from '../gestureHandlerCommon';
+declare type RotationGestureChangeEventPayload = {
+    rotationChange: number;
+};
+export declare class RotationGesture extends ContinousBaseGesture<RotationGestureHandlerEventPayload, RotationGestureChangeEventPayload> {
+    constructor();
+    onChange(callback: (event: GestureUpdateEvent<RotationGestureHandlerEventPayload & RotationGestureChangeEventPayload>) => void): this;
+}
+export declare type RotationGestureType = InstanceType<typeof RotationGesture>;
+export {};

package/lib/typescript/handlers/gestures/tapGesture.d.ts

@@ -0,0 +1,14 @@
+import { BaseGestureConfig, BaseGesture } from './gesture';
+import { TapGestureConfig, TapGestureHandlerEventPayload } from '../TapGestureHandler';
+export declare class TapGesture extends BaseGesture<TapGestureHandlerEventPayload> {
+    config: BaseGestureConfig & TapGestureConfig;
+    constructor();
+    minPointers(minPointers: number): this;
+    numberOfTaps(count: number): this;
+    maxDistance(maxDist: number): this;
+    maxDuration(duration: number): this;
+    maxDelay(delay: number): this;
+    maxDeltaX(delta: number): this;
+    maxDeltaY(delta: number): this;
+}
+export declare type TapGestureType = InstanceType<typeof TapGesture>;

package/lib/typescript/handlers/handlersRegistry.d.ts

@@ -0,0 +1,6 @@
+import { GestureType } from './gestures/gesture';
+export declare const handlerIDToTag: Record<string, number>;
+export declare function getNextHandlerTag(): number;
+export declare function registerHandler(handlerTag: number, handler: GestureType): void;
+export declare function unregisterHandler(handlerTag: number): void;
+export declare function findHandler(handlerTag: number): import("./gestures/gesture").BaseGesture<Record<string, unknown>> | import("./gestures/gesture").BaseGesture<Record<string, never>> | import("./gestures/gesture").BaseGesture<import("./TapGestureHandler").TapGestureHandlerEventPayload> | import("./gestures/gesture").BaseGesture<import("./PanGestureHandler").PanGestureHandlerEventPayload> | import("./gestures/gesture").BaseGesture<import("./LongPressGestureHandler").LongPressGestureHandlerEventPayload> | import("./gestures/gesture").BaseGesture<import("./RotationGestureHandler").RotationGestureHandlerEventPayload> | import("./gestures/gesture").BaseGesture<import("./PinchGestureHandler").PinchGestureHandlerEventPayload> | import("./gestures/gesture").BaseGesture<import("./FlingGestureHandler").FlingGestureHandlerEventPayload> | import("./gestures/gesture").BaseGesture<import("./ForceTouchGestureHandler").ForceTouchGestureHandlerEventPayload> | import("./gestures/gesture").BaseGesture<import("./NativeViewGestureHandler").NativeViewGestureHandlerPayload> | undefined;

package/lib/typescript/index.d.ts

@@ -2,10 +2,37 @@ export { Directions } from './Directions';
 export { State } from './State';
 export { default as gestureHandlerRootHOC } from './gestureHandlerRootHOC';
 export { default as GestureHandlerRootView } from './GestureHandlerRootView';
-export type { GestureEvent, HandlerStateChangeEvent, GestureEventPayload, HandlerStateChangeEventPayload, TapGestureHandlerEventPayload, ForceTouchGestureHandlerEventPayload, LongPressGestureHandlerEventPayload, PanGestureHandlerEventPayload, PinchGestureHandlerEventPayload, RotationGestureHandlerEventPayload, FlingGestureHandlerEventPayload, TapGestureHandlerProps, ForceTouchGestureHandlerProps, LongPressGestureHandlerProps, PanGestureHandlerProps, PinchGestureHandlerProps, RotationGestureHandlerProps, FlingGestureHandlerProps, } from './handlers/gestureHandlers';
-export { TapGestureHandler, ForceTouchGestureHandler, LongPressGestureHandler, PanGestureHandler, PinchGestureHandler, RotationGestureHandler, FlingGestureHandler, } from './handlers/gestureHandlers';
+export type { GestureEvent, HandlerStateChangeEvent, GestureEventPayload, HandlerStateChangeEventPayload, GestureTouchEvent, TouchData, GestureUpdateEvent, GestureStateChangeEvent, } from './handlers/gestureHandlerCommon';
+export type { GestureType } from './handlers/gestures/gesture';
+export type { TapGestureHandlerEventPayload, TapGestureHandlerProps, } from './handlers/TapGestureHandler';
+export type { ForceTouchGestureHandlerEventPayload, ForceTouchGestureHandlerProps, } from './handlers/ForceTouchGestureHandler';
+export type { LongPressGestureHandlerEventPayload, LongPressGestureHandlerProps, } from './handlers/LongPressGestureHandler';
+export type { PanGestureHandlerEventPayload, PanGestureHandlerProps, } from './handlers/PanGestureHandler';
+export type { PinchGestureHandlerEventPayload, PinchGestureHandlerProps, } from './handlers/PinchGestureHandler';
+export type { RotationGestureHandlerEventPayload, RotationGestureHandlerProps, } from './handlers/RotationGestureHandler';
+export type { FlingGestureHandlerEventPayload, FlingGestureHandlerProps, } from './handlers/FlingGestureHandler';
+export { TapGestureHandler } from './handlers/TapGestureHandler';
+export { ForceTouchGestureHandler } from './handlers/ForceTouchGestureHandler';
+export { LongPressGestureHandler } from './handlers/LongPressGestureHandler';
+export { PanGestureHandler } from './handlers/PanGestureHandler';
+export { PinchGestureHandler } from './handlers/PinchGestureHandler';
+export { RotationGestureHandler } from './handlers/RotationGestureHandler';
+export { FlingGestureHandler } from './handlers/FlingGestureHandler';
 export { default as createNativeWrapper } from './handlers/createNativeWrapper';
 export type { NativeViewGestureHandlerPayload, NativeViewGestureHandlerProps, } from './handlers/NativeViewGestureHandler';
+export { GestureDetector } from './handlers/gestures/GestureDetector';
+export { GestureObjects as Gesture } from './handlers/gestures/gestureObjects';
+export { TapGestureType as TapGesture } from './handlers/gestures/tapGesture';
+export { PanGestureType as PanGesture } from './handlers/gestures/panGesture';
+export { FlingGestureType as FlingGesture } from './handlers/gestures/flingGesture';
+export { LongPressGestureType as LongPressGesture } from './handlers/gestures/longPressGesture';
+export { PinchGestureType as PinchGesture } from './handlers/gestures/pinchGesture';
+export { RotationGestureType as RotationGesture } from './handlers/gestures/rotationGesture';
+export { ForceTouchGestureType as ForceTouchGesture } from './handlers/gestures/forceTouchGesture';
+export { NativeGestureType as NativeGesture } from './handlers/gestures/nativeGesture';
+export { ManualGestureType as ManualGesture } from './handlers/gestures/manualGesture';
+export { ComposedGestureType as ComposedGesture, RaceGestureType as RaceGesture, SimultaneousGestureType as SimultaneousGesture, ExclusiveGestureType as ExclusiveGesture, } from './handlers/gestures/gestureComposition';
+export { GestureStateManagerType as GestureStateManager } from './handlers/gestures/gestureStateManager';
 export { NativeViewGestureHandler } from './handlers/NativeViewGestureHandler';
 export type { RawButtonProps, BaseButtonProps, RectButtonProps, BorderlessButtonProps, } from './components/GestureButtons';
 export { RawButton, BaseButton, RectButton, BorderlessButton, } from './components/GestureButtons';

package/lib/typescript/init.d.ts

@@ -0,0 +1 @@
+export declare function initialize(): void;

package/lib/typescript/mocks.d.ts

@@ -1,6 +1,25 @@
-import { View, ScrollView as RNScrollView } from 'react-native';
+import { TouchableHighlight, TouchableNativeFeedback, TouchableOpacity, TouchableWithoutFeedback, ScrollView, FlatList, Switch, TextInput, DrawerLayoutAndroid, View } from 'react-native';
 declare const _default: {
-    readonly ScrollView: typeof RNScrollView;
+    readonly TouchableHighlight: typeof TouchableHighlight;
+    readonly TouchableNativeFeedback: typeof TouchableNativeFeedback;
+    readonly TouchableOpacity: typeof TouchableOpacity;
+    readonly TouchableWithoutFeedback: typeof TouchableWithoutFeedback;
+    readonly ScrollView: typeof ScrollView;
+    readonly FlatList: typeof FlatList;
+    readonly Switch: typeof Switch;
+    readonly TextInput: typeof TextInput;
+    readonly DrawerLayoutAndroid: typeof DrawerLayoutAndroid;
+    readonly NativeViewGestureHandler: typeof View;
+    readonly TapGestureHandler: typeof View;
+    readonly ForceTouchGestureHandler: typeof View;
+    readonly LongPressGestureHandler: typeof View;
+    readonly PinchGestureHandler: typeof View;
+    readonly RotationGestureHandler: typeof View;
+    readonly FlingGestureHandler: typeof View;
+    readonly RawButton: typeof TouchableNativeFeedback;
+    readonly BaseButton: typeof TouchableNativeFeedback;
+    readonly RectButton: typeof TouchableNativeFeedback;
+    readonly BorderlessButton: typeof TouchableNativeFeedback;
     readonly PanGestureHandler: typeof View;
     readonly attachGestureHandler: () => void;
     readonly createGestureHandler: () => void;

package/lib/typescript/utils.d.ts

@@ -0,0 +1 @@
+export declare function toArray<T>(object: T | T[]): T[];

package/lib/typescript/web/FlingGestureHandler.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="hammerjs" />
 import DraggingGestureHandler from './DraggingGestureHandler';
 import { HammerInputExt } from './GestureHandler';
 declare class FlingGestureHandler extends DraggingGestureHandler {

package/lib/typescript/web/GestureHandler.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="hammerjs" />
 import { findNodeHandle } from 'react-native';
 import { State } from '../State';
 import { EventMap } from './constants';

package/lib/typescript/web/PanGestureHandler.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="hammerjs" />
 import { EventMap } from './constants';
 import DraggingGestureHandler from './DraggingGestureHandler';
 import { State } from '../State';

package/lib/typescript/web/PinchGestureHandler.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="hammerjs" />
 import { HammerInputExt } from './GestureHandler';
 import IndiscreteGestureHandler from './IndiscreteGestureHandler';
 declare class PinchGestureHandler extends IndiscreteGestureHandler {

package/lib/typescript/web/PressGestureHandler.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="hammerjs" />
 import { State } from '../State';
 import { HammerInputNames } from './constants';
 import DiscreteGestureHandler from './DiscreteGestureHandler';

package/lib/typescript/web/RotationGestureHandler.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="hammerjs" />
 import { HammerInputExt } from './GestureHandler';
 import IndiscreteGestureHandler from './IndiscreteGestureHandler';
 declare class RotationGestureHandler extends IndiscreteGestureHandler {

package/lib/typescript/web/TapGestureHandler.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="hammerjs" />
 import DiscreteGestureHandler from './DiscreteGestureHandler';
 import { HammerInputExt } from './GestureHandler';
 declare class TapGestureHandler extends DiscreteGestureHandler {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gesture-handler",
-  "version": "1.10.3",
+  "version": "2.1.2",
   "description": "Experimental implementation of a new declarative API for gesture handling in react-native",
   "scripts": {
     "prepare": "bob build",
@@ -22,10 +22,12 @@
     "!**/__fixtures__",
     "!**/__mocks__",
     "android/build.gradle",
+    "android/gradle.properties",
     "android/src/main/AndroidManifest.xml",
     "android/src/main/java/",
     "android/lib/build.gradle",
     "android/lib/src/main/java/",
+    "android/common/src/main/java/",
     "ios/",
     "Swipeable/",
     "DrawerLayout/",
@@ -49,9 +51,9 @@
   "homepage": "https://github.com/software-mansion/react-native-gesture-handler#readme",
   "dependencies": {
     "@egjs/hammerjs": "^2.0.17",
-    "fbjs": "^3.0.0",
     "hoist-non-react-statics": "^3.3.0",
     "invariant": "^2.2.4",
+    "lodash": "^4.17.21",
     "prop-types": "^15.7.2"
   },
   "jest": {
@@ -66,11 +68,11 @@
     "@babel/preset-env": "^7.12.11",
     "@babel/preset-typescript": "^7.12.7",
     "@babel/runtime": "^7.12.5",
+    "@types/hammerjs": "^2.0.38",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/jest": "^26.0.19",
-    "@types/hammerjs": "^2.0.38",
     "@types/react": "^17.0.0",
-    "@types/react-native": "^0.63.49",
+    "@types/react-native": "^0.64.2",
     "@types/react-test-renderer": "^17.0.0",
     "@typescript-eslint/eslint-plugin": "^4.10.0",
     "@typescript-eslint/parser": "^4.10.0",
@@ -89,8 +91,9 @@
     "prettier": "^2.2.1",
     "react": "^16.8.6",
     "react-dom": "^16.12.0",
-    "react-native": "^0.63.4",
+    "react-native": "^0.64.0",
     "react-native-builder-bob": "^0.17.1",
+    "react-native-reanimated": "^2.0.0",
     "react-native-web": "^0.11.7",
     "react-test-renderer": "16.8.6",
     "release-it": "^13.6.5",

package/src/EventType.ts

@@ -0,0 +1,10 @@
+export const EventType = {
+  UNDETERMINED: 0,
+  TOUCHES_DOWN: 1,
+  TOUCHES_MOVE: 2,
+  TOUCHES_UP: 3,
+  TOUCHES_CANCELLED: 4,
+} as const;
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare -- backward compatibility; it can be used as a type and as a value
+export type EventType = typeof EventType[keyof typeof EventType];

package/src/GestureHandlerRootView.android.tsx

@@ -1,34 +1,18 @@
 import * as React from 'react';
-import { PropsWithChildren } from 'react';
-import { View, requireNativeComponent } from 'react-native';
+import { requireNativeComponent } from 'react-native';
+import { GestureHandlerRootViewProps } from './GestureHandlerRootView';
 
 const GestureHandlerRootViewNative = requireNativeComponent(
   'GestureHandlerRootView'
 );
 
-const GestureHandlerRootViewContext = React.createContext(false);
-
-type Props = PropsWithChildren<Record<string, unknown>>;
-
-export default function GestureHandlerRootView({ children, ...rest }: Props) {
+export default function GestureHandlerRootView({
+  children,
+  ...rest
+}: GestureHandlerRootViewProps) {
   return (
-    <GestureHandlerRootViewContext.Consumer>
-      {(available) => {
-        if (available) {
-          // If we already have a parent wrapped in the gesture handler root view,
-          // We don't need to wrap it again in root view
-          // We still wrap it in a normal view so our styling stays the same
-          return <View {...rest}>{children}</View>;
-        }
-
-        return (
-          <GestureHandlerRootViewContext.Provider value>
-            <GestureHandlerRootViewNative {...rest}>
-              {children}
-            </GestureHandlerRootViewNative>
-          </GestureHandlerRootViewContext.Provider>
-        );
-      }}
-    </GestureHandlerRootViewContext.Consumer>
+    <GestureHandlerRootViewNative {...rest}>
+      {children}
+    </GestureHandlerRootViewNative>
   );
 }

package/src/GestureHandlerRootView.tsx

@@ -1,3 +1,12 @@
-import { View } from 'react-native';
+import * as React from 'react';
+import { PropsWithChildren } from 'react';
+import { View, ViewProps } from 'react-native';
 
-export default View;
+export interface GestureHandlerRootViewProps
+  extends PropsWithChildren<ViewProps> {}
+
+export default function GestureHandlerRootView({
+  ...rest
+}: GestureHandlerRootViewProps) {
+  return <View {...rest} />;
+}

package/src/RNGestureHandlerModule.ts

@@ -20,7 +20,11 @@ export type RNGestureHandlerModuleProps = {
     handlerTag: number,
     config: Readonly<Record<string, unknown>>
   ) => void;
-  attachGestureHandler: (handlerTag: number, newView: number) => void;
+  attachGestureHandler: (
+    handlerTag: number,
+    newView: number,
+    usingDeviceEvents: boolean
+  ) => void;
   updateGestureHandler: (
     handlerTag: number,
     newConfig: Readonly<Record<string, unknown>>

package/src/RNGestureHandlerModule.web.ts

@@ -44,6 +44,7 @@ export default {
   attachGestureHandler(
     handlerTag: number,
     newView: number,
+    _usingDeviceEvents: boolean,
     propsRef: React.RefObject<unknown>
   ) {
     NodeManager.getHandler(handlerTag).setView(newView, propsRef);