Skip to content

Commit 694761e

Browse files
author
Andrzej Antoni Kwaśniewski
committed
update hook
1 parent 8f13c5e commit 694761e

1 file changed

Lines changed: 60 additions & 77 deletions

File tree

‎packages/react-native-gesture-handler/src/__tests__/RelationsTraversal.test.tsx‎

Lines changed: 60 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,25 @@ import {
44
useCompetingGestures,
55
useSimultaneousGestures,
66
} from '../v3/hooks/composition';
7-
import { useGesture } from '../v3/hooks/useGesture';
87
import { configureRelations } from '../v3/detectors/utils';
9-
import { SingleGesture, SingleGestureName } from '../v3/types';
108
import { renderHook } from '@testing-library/react-native';
9+
import {
10+
PanGesture,
11+
TapGesture,
12+
usePanGesture,
13+
useTapGesture,
14+
} from '../v3/hooks/gestures';
1115

1216
describe('Ensure only one leaf node', () => {
13-
let pan1: SingleGesture<unknown, unknown>,
14-
pan2: SingleGesture<unknown, unknown>,
15-
pan3: SingleGesture<unknown, unknown>;
17+
let pan1: PanGesture, pan2: PanGesture, pan3: PanGesture;
1618

1719
beforeEach(() => {
18-
pan1 = renderHook(() =>
19-
useGesture(SingleGestureName.Pan, { disableReanimated: true })
20-
).result.current;
21-
pan2 = renderHook(() =>
22-
useGesture(SingleGestureName.Pan, { disableReanimated: true })
23-
).result.current;
24-
pan3 = renderHook(() =>
25-
useGesture(SingleGestureName.Pan, { disableReanimated: true })
26-
).result.current;
20+
pan1 = renderHook(() => usePanGesture({ disableReanimated: true })).result
21+
.current;
22+
pan2 = renderHook(() => usePanGesture({ disableReanimated: true })).result
23+
.current;
24+
pan3 = renderHook(() => usePanGesture({ disableReanimated: true })).result
25+
.current;
2726
});
2827

2928
const errorMessage = tagMessage(
@@ -55,16 +54,13 @@ describe('Ensure only one leaf node', () => {
5554
});
5655

5756
describe('Simple relations', () => {
58-
let pan1: SingleGesture<unknown, unknown>,
59-
pan2: SingleGesture<unknown, unknown>;
57+
let pan1: PanGesture, pan2: PanGesture;
6058

6159
beforeEach(() => {
62-
pan1 = renderHook(() =>
63-
useGesture(SingleGestureName.Pan, { disableReanimated: true })
64-
).result.current;
65-
pan2 = renderHook(() =>
66-
useGesture(SingleGestureName.Pan, { disableReanimated: true })
67-
).result.current;
60+
pan1 = renderHook(() => usePanGesture({ disableReanimated: true })).result
61+
.current;
62+
pan2 = renderHook(() => usePanGesture({ disableReanimated: true })).result
63+
.current;
6864
});
6965

7066
test('useSimultaneous', () => {
@@ -110,17 +106,16 @@ describe('Simple relations', () => {
110106

111107
describe('External relations', () => {
112108
test('simultaneousWith', () => {
113-
const pan1 = renderHook(() =>
114-
useGesture(SingleGestureName.Pan, { disableReanimated: true })
115-
).result.current;
109+
const pan1 = renderHook(() => usePanGesture({ disableReanimated: true }))
110+
.result.current;
116111
const pan2 = renderHook(() =>
117-
useGesture(SingleGestureName.Pan, {
112+
usePanGesture({
118113
disableReanimated: true,
119114
simultaneousWith: pan1,
120115
})
121116
).result.current;
122117
const pan3 = renderHook(() =>
123-
useGesture(SingleGestureName.Pan, {
118+
usePanGesture({
124119
disableReanimated: true,
125120
simultaneousWith: [pan1, pan2],
126121
})
@@ -142,17 +137,16 @@ describe('External relations', () => {
142137
});
143138

144139
test('requireToFail', () => {
145-
const pan1 = renderHook(() =>
146-
useGesture(SingleGestureName.Pan, { disableReanimated: true })
147-
).result.current;
140+
const pan1 = renderHook(() => usePanGesture({ disableReanimated: true }))
141+
.result.current;
148142
const pan2 = renderHook(() =>
149-
useGesture(SingleGestureName.Pan, {
143+
usePanGesture({
150144
disableReanimated: true,
151145
requireToFail: pan1,
152146
})
153147
).result.current;
154148
const pan3 = renderHook(() =>
155-
useGesture(SingleGestureName.Pan, {
149+
usePanGesture({
156150
disableReanimated: true,
157151
requireToFail: [pan1, pan2],
158152
})
@@ -168,17 +162,16 @@ describe('External relations', () => {
168162
});
169163

170164
test('blocks', () => {
171-
const pan1 = renderHook(() =>
172-
useGesture(SingleGestureName.Pan, { disableReanimated: true })
173-
).result.current;
165+
const pan1 = renderHook(() => usePanGesture({ disableReanimated: true }))
166+
.result.current;
174167
const pan2 = renderHook(() =>
175-
useGesture(SingleGestureName.Pan, {
168+
usePanGesture({
176169
disableReanimated: true,
177170
block: pan1,
178171
})
179172
).result.current;
180173
const pan3 = renderHook(() =>
181-
useGesture(SingleGestureName.Pan, {
174+
usePanGesture({
182175
disableReanimated: true,
183176
block: [pan1, pan2],
184177
})
@@ -198,33 +191,23 @@ describe('External relations', () => {
198191
});
199192

200193
describe('Complex relations', () => {
201-
let pan1: SingleGesture<unknown, unknown>,
202-
pan2: SingleGesture<unknown, unknown>,
203-
pan3: SingleGesture<unknown, unknown>;
204-
let tap1: SingleGesture<unknown, unknown>,
205-
tap2: SingleGesture<unknown, unknown>,
206-
tap3: SingleGesture<unknown, unknown>;
194+
let pan1: PanGesture, pan2: PanGesture, pan3: PanGesture;
195+
let tap1: TapGesture, tap2: TapGesture, tap3: TapGesture;
207196

208197
beforeEach(() => {
209-
tap1 = renderHook(() =>
210-
useGesture(SingleGestureName.Tap, { disableReanimated: true })
211-
).result.current;
212-
tap2 = renderHook(() =>
213-
useGesture(SingleGestureName.Tap, { disableReanimated: true })
214-
).result.current;
215-
tap3 = renderHook(() =>
216-
useGesture(SingleGestureName.Tap, { disableReanimated: true })
217-
).result.current;
198+
tap1 = renderHook(() => useTapGesture({ disableReanimated: true })).result
199+
.current;
200+
tap2 = renderHook(() => useTapGesture({ disableReanimated: true })).result
201+
.current;
202+
tap3 = renderHook(() => useTapGesture({ disableReanimated: true })).result
203+
.current;
218204

219-
pan1 = renderHook(() =>
220-
useGesture(SingleGestureName.Pan, { disableReanimated: true })
221-
).result.current;
222-
pan2 = renderHook(() =>
223-
useGesture(SingleGestureName.Pan, { disableReanimated: true })
224-
).result.current;
225-
pan3 = renderHook(() =>
226-
useGesture(SingleGestureName.Pan, { disableReanimated: true })
227-
).result.current;
205+
pan1 = renderHook(() => usePanGesture({ disableReanimated: true })).result
206+
.current;
207+
pan2 = renderHook(() => usePanGesture({ disableReanimated: true })).result
208+
.current;
209+
pan3 = renderHook(() => usePanGesture({ disableReanimated: true })).result
210+
.current;
228211
});
229212

230213
// Test case from description of https://github.com/software-mansion/react-native-gesture-handler/pull/3693
@@ -315,31 +298,31 @@ describe('Complex relations', () => {
315298
describe('Complex relations with external gestures', () => {
316299
test('Case 1', () => {
317300
const pan5 = renderHook(() =>
318-
useGesture(SingleGestureName.Pan, {
301+
usePanGesture({
319302
disableReanimated: true,
320303
})
321304
).result.current;
322305

323306
const pan1 = renderHook(() =>
324-
useGesture(SingleGestureName.Pan, {
307+
usePanGesture({
325308
disableReanimated: true,
326309
simultaneousWith: pan5,
327310
})
328311
).result.current;
329312
const pan2 = renderHook(() =>
330-
useGesture(SingleGestureName.Pan, {
313+
usePanGesture({
331314
disableReanimated: true,
332315
simultaneousWith: pan5,
333316
})
334317
).result.current;
335318
const pan3 = renderHook(() =>
336-
useGesture(SingleGestureName.Pan, {
319+
usePanGesture({
337320
disableReanimated: true,
338321
requireToFail: pan5,
339322
})
340323
).result.current;
341324
const pan4 = renderHook(() =>
342-
useGesture(SingleGestureName.Pan, {
325+
usePanGesture({
343326
disableReanimated: true,
344327
requireToFail: pan5,
345328
})
@@ -389,33 +372,33 @@ describe('Complex relations with external gestures', () => {
389372

390373
test('Case 2', () => {
391374
const pan4 = renderHook(() =>
392-
useGesture(SingleGestureName.Pan, {
375+
usePanGesture({
393376
disableReanimated: true,
394377
})
395378
).result.current;
396379

397380
const pan5 = renderHook(() =>
398-
useGesture(SingleGestureName.Pan, {
381+
usePanGesture({
399382
disableReanimated: true,
400383
})
401384
).result.current;
402385

403386
const pan1 = renderHook(() =>
404-
useGesture(SingleGestureName.Pan, {
387+
usePanGesture({
405388
disableReanimated: true,
406389
simultaneousWith: [pan4, pan5],
407390
})
408391
).result.current;
409392

410393
const pan2 = renderHook(() =>
411-
useGesture(SingleGestureName.Pan, {
394+
usePanGesture({
412395
disableReanimated: true,
413396
requireToFail: [pan4, pan5],
414397
})
415398
).result.current;
416399

417400
const pan3 = renderHook(() =>
418-
useGesture(SingleGestureName.Pan, {
401+
usePanGesture({
419402
disableReanimated: true,
420403
})
421404
).result.current;
@@ -461,13 +444,13 @@ describe('Complex relations with external gestures', () => {
461444
describe('External relations with composed gestures', () => {
462445
test('Case 1', () => {
463446
const pan1 = renderHook(() =>
464-
useGesture(SingleGestureName.Pan, {
447+
usePanGesture({
465448
disableReanimated: true,
466449
})
467450
).result.current;
468451

469452
const pan2 = renderHook(() =>
470-
useGesture(SingleGestureName.Pan, {
453+
usePanGesture({
471454
disableReanimated: true,
472455
})
473456
).result.current;
@@ -477,7 +460,7 @@ describe('External relations with composed gestures', () => {
477460
).result.current;
478461

479462
const pan3 = renderHook(() =>
480-
useGesture(SingleGestureName.Pan, {
463+
usePanGesture({
481464
disableReanimated: true,
482465
simultaneousWith: composedGesture,
483466
})
@@ -499,13 +482,13 @@ describe('External relations with composed gestures', () => {
499482

500483
test('Case 1 - reversed order of configuring relations', () => {
501484
const pan1 = renderHook(() =>
502-
useGesture(SingleGestureName.Pan, {
485+
usePanGesture({
503486
disableReanimated: true,
504487
})
505488
).result.current;
506489

507490
const pan2 = renderHook(() =>
508-
useGesture(SingleGestureName.Pan, {
491+
usePanGesture({
509492
disableReanimated: true,
510493
})
511494
).result.current;
@@ -515,7 +498,7 @@ describe('External relations with composed gestures', () => {
515498
).result.current;
516499

517500
const pan3 = renderHook(() =>
518-
useGesture(SingleGestureName.Pan, {
501+
usePanGesture({
519502
disableReanimated: true,
520503
simultaneousWith: composedGesture,
521504
})

0 commit comments

Comments
 (0)