Skip to content

Commit 1c20ea0

Browse files
committed
Merge branch '@mbert/docs-detector' into @mbert/docs-state-manager
2 parents 5f998f4 + 59fd8df commit 1c20ea0

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

packages/react-native-gesture-handler/src/v3/gestureStateManager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export type GestureStateManagerType = {
55
begin(handlerTag: number): void;
66
activate(handlerTag: number): void;
77
fail(handlerTag: number): void;
8-
end(handlerTag: number): void;
8+
deactivate(handlerTag: number): void;
99
};
1010

1111
const setGestureState = (handlerTag: number, state: State) => {
@@ -36,7 +36,7 @@ export const GestureStateManager: GestureStateManagerType = {
3636
setGestureState(handlerTag, State.FAILED);
3737
},
3838

39-
end(handlerTag: number) {
39+
deactivate(handlerTag: number) {
4040
'worklet';
4141
setGestureState(handlerTag, State.END);
4242
},

packages/react-native-gesture-handler/src/v3/gestureStateManager.web.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const GestureStateManager: GestureStateManagerType = {
2525
NodeManager.getHandler(handlerTag).fail();
2626
},
2727

28-
end(handlerTag: number): void {
28+
deactivate(handlerTag: number): void {
2929
'worklet';
3030
NodeManager.getHandler(handlerTag).end();
3131
},

packages/react-native-gesture-handler/src/web/handlers/GestureHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ export default abstract class GestureHandler implements IGestureHandler {
714714
// Helper function to correctly set enabled property
715715
private maybeUpdateEnabled(enabled: boolean | undefined): boolean {
716716
if (enabled === undefined) {
717-
if (this._enabled !== undefined) {
717+
if (this._enabled !== null) {
718718
return false;
719719
}
720720

0 commit comments

Comments
 (0)