File tree Expand file tree Collapse file tree 4 files changed +41
-6
lines changed Expand file tree Collapse file tree 4 files changed +41
-6
lines changed Original file line number Diff line number Diff line change @@ -1437,7 +1437,7 @@ PODS:
1437
1437
- React-Core
1438
1438
- react-native-notifications (5.1.0):
1439
1439
- React-Core
1440
- - react-native-pager-view (6.4.0 ):
1440
+ - react-native-pager-view (6.7.1 ):
1441
1441
- DoubleConversion
1442
1442
- glog
1443
1443
- hermes-engine
@@ -2471,7 +2471,7 @@ SPEC CHECKSUMS:
2471
2471
react-native-keep-awake: ad1d67f617756b139536977a0bf06b27cec0714a
2472
2472
react-native-netinfo: 8a7fd3f7130ef4ad2fb4276d5c9f8d3f28d2df3d
2473
2473
react-native-notifications: 4601a5a8db4ced6ae7cfc43b44d35fe437ac50c4
2474
- react-native-pager-view: d9c1185fdb50e28e25a1d79c5d1094c50789e424
2474
+ react-native-pager-view: ad90e78510ae4cb5f91d8b0d7ebb8a794c2ad266
2475
2475
react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
2476
2476
react-native-restart: 7595693413fe3ca15893702f2c8306c62a708162
2477
2477
react-native-safe-area-context: 3e6db312a77016d4f618550c814d9e236e0c0879
Original file line number Diff line number Diff line change 146
146
"react-native-modal" : " 13.0.1" ,
147
147
"react-native-modal-datetime-picker" : " 17.1.0" ,
148
148
"react-native-notifications" : " 5.1.0" ,
149
- "react-native-pager-view" : " 6.4.0 " ,
149
+ "react-native-pager-view" : " 6.7.1 " ,
150
150
"react-native-permissions" : " 4.0.1" ,
151
151
"react-native-qrcode-svg" : " 6.2.0" ,
152
152
"react-native-radial-gradient" : " 1.1.4" ,
Original file line number Diff line number Diff line change
1
+ diff --git a/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm b/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm
2
+ index 652a5c1..9141b23 100644
3
+ --- a/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm
4
+ +++ b/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm
5
+ @@ -439,6 +439,13 @@ using namespace facebook::react;
6
+
7
+ return YES;
8
+ }
9
+ +
10
+ +
11
+ + // Allow nested scroll views to scroll simultaneously with the pager
12
+ + if ([otherGestureRecognizer.view isKindOfClass: UIScrollView.class]) {
13
+ + return YES;
14
+ + }
15
+ +
16
+ const auto &viewProps = *std::static_pointer_cast<const RNCViewPagerProps>(_props);
17
+ scrollView.panGestureRecognizer.enabled = viewProps.scrollEnabled;
18
+ return NO;
19
+ diff --git a/node_modules/react-native-pager-view/ios/RNCPagerView.m b/node_modules/react-native-pager-view/ios/RNCPagerView.m
20
+ index 507b45d..cdd95c3 100644
21
+ --- a/node_modules/react-native-pager-view/ios/RNCPagerView.m
22
+ +++ b/node_modules/react-native-pager-view/ios/RNCPagerView.m
23
+ @@ -492,6 +492,11 @@
24
+ return YES;
25
+ }
26
+
27
+ + // Allow nested scroll views to scroll simultaneously with the pager
28
+ + if ([otherGestureRecognizer.view isKindOfClass: UIScrollView.class]) {
29
+ + return YES;
30
+ + }
31
+ +
32
+ self.scrollView.panGestureRecognizer.enabled = self.scrollEnabled;
33
+ return NO;
34
+ }
You can’t perform that action at this time.
0 commit comments