Skip to content

Commit 7324cd9

Browse files
committed
fix: direction is now a number allowing masks
1 parent c6321bb commit 7324cd9

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

src/gesturehandler.android.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export abstract class Handler<T extends com.swmansion.gesturehandler.GestureHand
165165
hitSlop;
166166
@nativeProperty enabled: boolean;
167167
@nativeProperty shouldCancelWhenOutside: boolean;
168-
shouldStartGesture:(arg)=>boolean
168+
shouldStartGesture: (arg) => boolean;
169169
manager: WeakRef<Manager>;
170170
touchListener: com.swmansion.gesturehandler.OnTouchEventListener<T>;
171171

@@ -343,6 +343,13 @@ export class PinchGestureHandler extends Handler<com.swmansion.gesturehandler.Pi
343343
}
344344
}
345345

346+
export enum FlingDirection {
347+
DIRECTION_LEFT = com.swmansion.gesturehandler.GestureHandler.DIRECTION_LEFT,
348+
DIRECTION_UP = com.swmansion.gesturehandler.GestureHandler.DIRECTION_UP,
349+
DIRECTION_DOWN = com.swmansion.gesturehandler.GestureHandler.DIRECTION_DOWN,
350+
DIRECTION_RIGHT = com.swmansion.gesturehandler.GestureHandler.DIRECTION_RIGHT,
351+
}
352+
346353
function directionToString(direction: number) {
347354
switch (direction) {
348355
case com.swmansion.gesturehandler.GestureHandler.DIRECTION_RIGHT:
@@ -371,7 +378,7 @@ function directionFromString(direction: string) {
371378

372379
export class FlingGestureHandler extends Handler<com.swmansion.gesturehandler.FlingGestureHandler, TapGestureHandlerOptions> {
373380
@nativeProperty numberOfPointers: number;
374-
@nativeProperty({ converter: { fromNative: directionToString, toNative: directionFromString } }) direction: string;
381+
@nativeProperty direction: number;
375382
createNative(options) {
376383
return new com.swmansion.gesturehandler.FlingGestureHandler();
377384
}

src/gesturehandler.d.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ import { HandlerType, OptionsTypeMap, TypeMap } from './gesturehandler.common';
66
export { GestureState, GestureHandlerStateEvent, GestureHandlerTouchEvent, GestureStateEventData, GestureTouchEventData, HandlerType } from './gesturehandler.common';
77
// export * from './gesturehandler.ios';
88

9+
export enum FlingDirection {
10+
DIRECTION_LEFT ,
11+
DIRECTION_UP,
12+
DIRECTION_DOWN,
13+
DIRECTION_RIGHT,
14+
}
15+
916
export abstract class BaseNative<T, U extends {}> extends Observable {
1017
options?: U;
1118
native: T;
@@ -115,11 +122,11 @@ export class LongPressGestureHandler extends Handler<any, LongPressGestureHandle
115122
}
116123
export interface FlingGestureHandlerOptions extends HandlerOptions {
117124
numberOfPointers?: number;
118-
direction?: string;
125+
direction?: number;
119126
}
120127
export class FlingGestureHandler extends Handler<any, FlingGestureHandlerOptions> {
121128
numberOfPointers: number;
122-
direction: string;
129+
direction: number;
123130
}
124131
export interface PinchGestureHandlerOptions extends HandlerOptions {}
125132
export class PinchGestureHandler extends Handler<any, PinchGestureHandlerOptions> {}

src/gesturehandler.ios.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ import {
2121
import { observe as gestureObserve } from './gestures_override';
2222
export { GestureState, GestureHandlerStateEvent, GestureHandlerTouchEvent, GestureStateEventData, GestureTouchEventData, HandlerType, ViewInitEvent, ViewDisposeEvent };
2323

24+
export enum FlingDirection {
25+
DIRECTION_LEFT = UISwipeGestureRecognizerDirection.Left,
26+
DIRECTION_UP = UISwipeGestureRecognizerDirection.Up,
27+
DIRECTION_DOWN = UISwipeGestureRecognizerDirection.Down,
28+
DIRECTION_RIGHT = UISwipeGestureRecognizerDirection.Right,
29+
}
30+
2431
let installed = false;
2532
export function install(overrideNGestures = false) {
2633
if (installed) {

0 commit comments

Comments
 (0)