Skip to content

Rename tag to handlerTag #3916

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
m-bert merged 3 commits into from
Jan 13, 2026
+126 −101
Merged

Rename tag to handlerTag #3916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07c2dba
Rename tag to handlerTag
m-bert Jan 12, 2026
0f609b1
Merge branch 'next' into @mbert/rename-tag
m-bert Jan 12, 2026
429b1c1
Update check
m-bert Jan 12, 2026
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
116 changes: 62 additions & 54 deletions packages/react-native-gesture-handler/src/__tests__/RelationsTraversal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ describe('Simple relations', () => {
configureRelations(composedGesture);

expect(pan1.gestureRelations.simultaneousHandlers).toStrictEqual([
pan2.tag,
pan2.handlerTag,
]);
expect(pan2.gestureRelations.simultaneousHandlers).toStrictEqual([
pan1.tag,
pan1.handlerTag,
]);
});

Expand All @@ -88,7 +88,7 @@ describe('Simple relations', () => {

configureRelations(composedGesture);

expect(pan1.gestureRelations.waitFor).toStrictEqual([pan2.tag]);
expect(pan1.gestureRelations.waitFor).toStrictEqual([pan2.handlerTag]);
expect(pan2.gestureRelations.waitFor).toStrictEqual([]);
});

Expand Down Expand Up @@ -131,13 +131,13 @@ describe('External relations', () => {
configureRelations(pan3);

expect(pan1.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan2.tag, pan3.tag].sort()
[pan2.handlerTag, pan3.handlerTag].sort()
);
expect(pan2.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan1.tag, pan3.tag].sort()
[pan1.handlerTag, pan3.handlerTag].sort()
);
expect(pan3.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan1.tag, pan2.tag].sort()
[pan1.handlerTag, pan2.handlerTag].sort()
);
});

Expand All @@ -163,8 +163,11 @@ describe('External relations', () => {
configureRelations(pan3);

expect(pan1.gestureRelations.waitFor).toStrictEqual([]);
expect(pan2.gestureRelations.waitFor).toStrictEqual([pan1.tag]);
expect(pan3.gestureRelations.waitFor).toStrictEqual([pan1.tag, pan2.tag]);
expect(pan2.gestureRelations.waitFor).toStrictEqual([pan1.handlerTag]);
expect(pan3.gestureRelations.waitFor).toStrictEqual([
pan1.handlerTag,
pan2.handlerTag,
]);
});

test('blocks', () => {
Expand All @@ -189,10 +192,12 @@ describe('External relations', () => {
configureRelations(pan3);

expect(pan1.gestureRelations.blocksHandlers).toStrictEqual([]);
expect(pan2.gestureRelations.blocksHandlers).toStrictEqual([pan1.tag]);
expect(pan2.gestureRelations.blocksHandlers).toStrictEqual([
pan1.handlerTag,
]);
expect(pan3.gestureRelations.blocksHandlers).toStrictEqual([
pan1.tag,
pan2.tag,
pan1.handlerTag,
pan2.handlerTag,
]);
});
});
Expand Down Expand Up @@ -241,35 +246,35 @@ describe('Complex relations', () => {

expect(tap1.gestureRelations.waitFor).toStrictEqual([]);
expect(tap1.gestureRelations.simultaneousHandlers).toStrictEqual([
pan1.tag,
pan1.handlerTag,
]);

expect(tap2.gestureRelations.waitFor).toStrictEqual([tap1.tag]);
expect(tap2.gestureRelations.waitFor).toStrictEqual([tap1.handlerTag]);
expect(tap2.gestureRelations.simultaneousHandlers).toStrictEqual([
pan1.tag,
pan1.handlerTag,
]);

expect(pan1.gestureRelations.waitFor).toStrictEqual([]);
expect(pan1.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[tap1.tag, tap2.tag].sort()
[tap1.handlerTag, tap2.handlerTag].sort()
);

expect(pan2.gestureRelations.waitFor).toStrictEqual([
tap1.tag,
tap2.tag,
pan1.tag,
tap1.handlerTag,
tap2.handlerTag,
pan1.handlerTag,
]);
expect(pan2.gestureRelations.simultaneousHandlers).toStrictEqual([
pan3.tag,
pan3.handlerTag,
]);

expect(pan3.gestureRelations.waitFor).toStrictEqual([
tap1.tag,
tap2.tag,
pan1.tag,
tap1.handlerTag,
tap2.handlerTag,
pan1.handlerTag,
]);
expect(pan3.gestureRelations.simultaneousHandlers).toStrictEqual([
pan2.tag,
pan2.handlerTag,
]);
});

Expand All @@ -284,14 +289,14 @@ describe('Complex relations', () => {
expect(tap1.gestureRelations.waitFor).toStrictEqual([]);
expect(tap1.gestureRelations.simultaneousHandlers).toStrictEqual([]);

expect(pan1.gestureRelations.waitFor).toStrictEqual([tap1.tag]);
expect(pan1.gestureRelations.waitFor).toStrictEqual([tap1.handlerTag]);
expect(pan1.gestureRelations.simultaneousHandlers).toStrictEqual([
pan2.tag,
pan2.handlerTag,
]);

expect(pan2.gestureRelations.waitFor).toStrictEqual([tap1.tag]);
expect(pan2.gestureRelations.waitFor).toStrictEqual([tap1.handlerTag]);
expect(pan2.gestureRelations.simultaneousHandlers).toStrictEqual([
pan1.tag,
pan1.handlerTag,
]);
});

Expand All @@ -304,10 +309,13 @@ describe('Complex relations', () => {
expect(tap1.gestureRelations.waitFor).toStrictEqual([]);
expect(tap1.gestureRelations.simultaneousHandlers).toStrictEqual([]);

expect(tap2.gestureRelations.waitFor).toStrictEqual([tap1.tag]);
expect(tap2.gestureRelations.waitFor).toStrictEqual([tap1.handlerTag]);
expect(tap2.gestureRelations.simultaneousHandlers).toStrictEqual([]);

expect(tap3.gestureRelations.waitFor).toStrictEqual([tap1.tag, tap2.tag]);
expect(tap3.gestureRelations.waitFor).toStrictEqual([
tap1.handlerTag,
tap2.handlerTag,
]);
expect(tap3.gestureRelations.simultaneousHandlers).toStrictEqual([]);
});
});
Expand Down Expand Up @@ -355,35 +363,35 @@ describe('Complex relations with external gestures', () => {
configureRelations(E);

expect(pan1.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan2.tag, pan5.tag].sort()
[pan2.handlerTag, pan5.handlerTag].sort()
);
expect(pan1.gestureRelations.waitFor).toStrictEqual([]);

expect(pan2.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan1.tag, pan5.tag].sort()
[pan1.handlerTag, pan5.handlerTag].sort()
);
expect(pan2.gestureRelations.waitFor).toStrictEqual([]);

expect(pan3.gestureRelations.simultaneousHandlers).toStrictEqual([
pan4.tag,
pan4.handlerTag,
]);
expect(pan3.gestureRelations.waitFor).toStrictEqual([
pan5.tag,
pan1.tag,
pan2.tag,
pan5.handlerTag,
pan1.handlerTag,
pan2.handlerTag,
]);

expect(pan4.gestureRelations.simultaneousHandlers).toStrictEqual([
pan3.tag,
pan3.handlerTag,
]);
expect(pan4.gestureRelations.waitFor).toStrictEqual([
pan5.tag,
pan1.tag,
pan2.tag,
pan5.handlerTag,
pan1.handlerTag,
pan2.handlerTag,
]);

expect(pan5.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan1.tag, pan2.tag].sort()
[pan1.handlerTag, pan2.handlerTag].sort()
);
});

Expand Down Expand Up @@ -428,31 +436,31 @@ describe('Complex relations with external gestures', () => {
configureRelations(S);

expect(pan1.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan4.tag, pan5.tag, pan3.tag].sort()
[pan4.handlerTag, pan5.handlerTag, pan3.handlerTag].sort()
);
expect(pan1.gestureRelations.waitFor).toStrictEqual([]);

expect(pan2.gestureRelations.simultaneousHandlers).toStrictEqual([
pan3.tag,
pan3.handlerTag,
]);
expect(pan2.gestureRelations.waitFor).toStrictEqual([
pan4.tag,
pan5.tag,
pan1.tag,
pan4.handlerTag,
pan5.handlerTag,
pan1.handlerTag,
]);

expect(pan3.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan1.tag, pan2.tag].sort()
[pan1.handlerTag, pan2.handlerTag].sort()
);
expect(pan3.gestureRelations.waitFor).toStrictEqual([]);

expect(pan4.gestureRelations.simultaneousHandlers).toStrictEqual([
pan1.tag,
pan1.handlerTag,
]);
expect(pan4.gestureRelations.waitFor).toStrictEqual([]);

expect(pan5.gestureRelations.simultaneousHandlers).toStrictEqual([
pan1.tag,
pan1.handlerTag,
]);
expect(pan5.gestureRelations.waitFor).toStrictEqual([]);
});
Expand Down Expand Up @@ -487,13 +495,13 @@ describe('External relations with composed gestures', () => {
configureRelations(pan3);

expect(pan1.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan2.tag, pan3.tag].sort()
[pan2.handlerTag, pan3.handlerTag].sort()
);
expect(pan2.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan1.tag, pan3.tag].sort()
[pan1.handlerTag, pan3.handlerTag].sort()
);
expect(pan3.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan1.tag, pan2.tag].sort()
[pan1.handlerTag, pan2.handlerTag].sort()
);
});

Expand Down Expand Up @@ -525,13 +533,13 @@ describe('External relations with composed gestures', () => {
configureRelations(composedGesture);

expect(pan1.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan2.tag, pan3.tag].sort()
[pan2.handlerTag, pan3.handlerTag].sort()
);
expect(pan2.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan1.tag, pan3.tag].sort()
[pan1.handlerTag, pan3.handlerTag].sort()
);
expect(pan3.gestureRelations.simultaneousHandlers.sort()).toStrictEqual(
[pan1.tag, pan2.tag].sort()
[pan1.handlerTag, pan2.handlerTag].sort()
);
});
});
2 changes: 1 addition & 1 deletion packages/react-native-gesture-handler/src/jestUtils/jestUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ function getHandlerData(
if (isHookGesture(componentOrGesture)) {
return {
handlerType: componentOrGesture.type as HandlerNames,
handlerTag: componentOrGesture.tag,
handlerTag: componentOrGesture.handlerTag,
enabled: maybeUnpackValue(componentOrGesture.config.enabled),
emitEvent: (eventName, args) => {
const { state, oldState, handlerTag, ...rest } = args.nativeEvent;
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-gesture-handler/src/v3/components/GestureComponents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const ScrollView = (

const updateGesture = (gesture: NativeGesture) => {
ghQueueMicrotask(() => {
if (!scrollGesture || scrollGesture.tag !== gesture.tag) {
if (!scrollGesture || scrollGesture.handlerTag !== gesture.handlerTag) {
setScrollGesture(gesture);
onGestureUpdate_CAN_CAUSE_INFINITE_RERENDER?.(gesture);
}
Expand Down Expand Up @@ -123,7 +123,7 @@ export const FlatList = ((props) => {

const updateGesture = (gesture: NativeGesture) => {
ghQueueMicrotask(() => {
if (!scrollGesture || scrollGesture.tag !== gesture.tag) {
if (!scrollGesture || scrollGesture.handlerTag !== gesture.handlerTag) {
setScrollGesture(gesture);
onGestureUpdate_CAN_CAUSE_INFINITE_RERENDER?.(gesture);
}
Expand Down
4 changes: 3 additions & 1 deletion packages/react-native-gesture-handler/src/v3/detectors/NativeDetector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ export function NativeDetector<THandlerData, TConfig>({
configureRelations(gesture);

const handlerTags = useMemo(() => {
return isComposedGesture(gesture) ? gesture.tags : [gesture.tag];
return isComposedGesture(gesture)
? gesture.handlerTags
: [gesture.handlerTag];
}, [gesture]);

return (
Expand Down
4 changes: 3 additions & 1 deletion ...t-native-gesture-handler/src/v3/detectors/VirtualDetector/InterceptingGestureDetector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,9 @@ export function InterceptingGestureDetector<THandlerData, TConfig>({

const handlerTags = useMemo(() => {
if (gesture) {
return isComposedGesture(gesture) ? gesture.tags : [gesture.tag];
return isComposedGesture(gesture)
? gesture.handlerTags
: [gesture.handlerTag];
}
return [];
}, [gesture]);
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-gesture-handler/src/v3/detectors/VirtualDetector/VirtualDetector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ export function VirtualDetector<THandlerData, TConfig>(
}

const handlerTags = isComposedGesture(props.gesture)
? props.gesture.tags
: [props.gesture.tag];
? props.gesture.handlerTags
: [props.gesture.handlerTag];

if (props.gesture.config.dispatchesAnimatedEvents) {
throw new Error(
Expand Down
Loading
Loading