Skip to content

Rename EventType to TouchEventType to clear up the naming #1909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
j-piasecki merged 1 commit into from
Mar 30, 2022
Merged

Rename EventType to TouchEventType to clear up the naming #1909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/EventType.ts → src/TouchEventType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const EventType = {
export const TouchEventType = {
UNDETERMINED: 0,
TOUCHES_DOWN: 1,
TOUCHES_MOVE: 2,
Expand All @@ -7,4 +7,4 @@ export const EventType = {
} 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];
export type TouchEventType = typeof TouchEventType[keyof typeof TouchEventType];
4 changes: 2 additions & 2 deletions src/handlers/gestureHandlerCommon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as React from 'react';
import { Platform, findNodeHandle as findNodeHandleRN } from 'react-native';

import { State } from '../State';
import { EventType } from '../EventType';
import { TouchEventType } from '../TouchEventType';
import { ValueOf } from '../typeUtils';
import { handlerIDToTag } from './handlersRegistry';
import { toArray } from '../utils';
Expand Down Expand Up @@ -83,7 +83,7 @@ export type GestureTouchEvent = {
handlerTag: number;
numberOfTouches: number;
state: ValueOf<typeof State>;
eventType: EventType;
eventType: TouchEventType;
allTouches: TouchData[];
changedTouches: TouchData[];
};
Expand Down
16 changes: 9 additions & 7 deletions src/handlers/gestures/GestureDetector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
} from '../PanGestureHandler';
import { tapGestureHandlerProps } from '../TapGestureHandler';
import { State } from '../../State';
import { EventType } from '../../EventType';
import { TouchEventType } from '../../TouchEventType';
import { ComposedGesture } from './gestureComposition';
import { ActionType } from '../../ActionType';
import { isFabric, tagMessage } from '../../utils';
Expand Down Expand Up @@ -322,16 +322,18 @@ function useAnimatedGesture(
}
}

function touchEventTypeToCallbackType(eventType: EventType): CALLBACK_TYPE {
function touchEventTypeToCallbackType(
eventType: TouchEventType
): CALLBACK_TYPE {
'worklet';
switch (eventType) {
case EventType.TOUCHES_DOWN:
case TouchEventType.TOUCHES_DOWN:
return CALLBACK_TYPE.TOUCHES_DOWN;
case EventType.TOUCHES_MOVE:
case TouchEventType.TOUCHES_MOVE:
return CALLBACK_TYPE.TOUCHES_MOVE;
case EventType.TOUCHES_UP:
case TouchEventType.TOUCHES_UP:
return CALLBACK_TYPE.TOUCHES_UP;
case EventType.TOUCHES_CANCELLED:
case TouchEventType.TOUCHES_CANCELLED:
return CALLBACK_TYPE.TOUCHES_CANCELLED;
}
return CALLBACK_TYPE.UNDEFINED;
Expand Down Expand Up @@ -418,7 +420,7 @@ function useAnimatedGesture(
stateControllers[i] = GestureStateManager.create(event.handlerTag);
}

if (event.eventType !== EventType.UNDETERMINED) {
if (event.eventType !== TouchEventType.UNDETERMINED) {
runWorklet(
touchEventTypeToCallbackType(event.eventType),
gesture,
Expand Down
10 changes: 5 additions & 5 deletions src/handlers/gestures/eventReceiver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DeviceEventEmitter, EmitterSubscription } from 'react-native';
import { State } from '../../State';
import { EventType } from '../../EventType';
import { TouchEventType } from '../../TouchEventType';
import {
GestureTouchEvent,
GestureUpdateEvent,
Expand Down Expand Up @@ -87,16 +87,16 @@ function onGestureHandlerEvent(
}
} else if (isTouchEvent(event)) {
switch (event.eventType) {
case EventType.TOUCHES_DOWN:
case TouchEventType.TOUCHES_DOWN:
handler.handlers?.onTouchesDown?.(event, dummyStateManager);
break;
case EventType.TOUCHES_MOVE:
case TouchEventType.TOUCHES_MOVE:
handler.handlers?.onTouchesMove?.(event, dummyStateManager);
break;
case EventType.TOUCHES_UP:
case TouchEventType.TOUCHES_UP:
handler.handlers?.onTouchesUp?.(event, dummyStateManager);
break;
case EventType.TOUCHES_CANCELLED:
case TouchEventType.TOUCHES_CANCELLED:
handler.handlers?.onTouchesCancelled?.(event, dummyStateManager);
break;
}
Expand Down