Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/mobile/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1437,7 +1437,7 @@ PODS:
- React-Core
- react-native-notifications (5.1.0):
- React-Core
- react-native-pager-view (6.4.0):
- react-native-pager-view (6.7.1):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -2471,7 +2471,7 @@ SPEC CHECKSUMS:
react-native-keep-awake: ad1d67f617756b139536977a0bf06b27cec0714a
react-native-netinfo: 8a7fd3f7130ef4ad2fb4276d5c9f8d3f28d2df3d
react-native-notifications: 4601a5a8db4ced6ae7cfc43b44d35fe437ac50c4
react-native-pager-view: d9c1185fdb50e28e25a1d79c5d1094c50789e424
react-native-pager-view: ad90e78510ae4cb5f91d8b0d7ebb8a794c2ad266
react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
react-native-restart: 7595693413fe3ca15893702f2c8306c62a708162
react-native-safe-area-context: 3e6db312a77016d4f618550c814d9e236e0c0879
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"react-native-modal": "13.0.1",
"react-native-modal-datetime-picker": "17.1.0",
"react-native-notifications": "5.1.0",
"react-native-pager-view": "6.4.0",
"react-native-pager-view": "6.7.1",
"react-native-permissions": "4.0.1",
"react-native-qrcode-svg": "6.2.0",
"react-native-radial-gradient": "1.1.4",
Expand Down
34 changes: 34 additions & 0 deletions packages/mobile/patches/react-native-pager-view+6.7.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm b/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm
index 652a5c1..9141b23 100644
--- a/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm
+++ b/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm
@@ -439,6 +439,13 @@ using namespace facebook::react;

return YES;
}
+
+
+ // Allow nested scroll views to scroll simultaneously with the pager
+ if ([otherGestureRecognizer.view isKindOfClass: UIScrollView.class]) {
+ return YES;
+ }
+
const auto &viewProps = *std::static_pointer_cast<const RNCViewPagerProps>(_props);
scrollView.panGestureRecognizer.enabled = viewProps.scrollEnabled;
return NO;
diff --git a/node_modules/react-native-pager-view/ios/RNCPagerView.m b/node_modules/react-native-pager-view/ios/RNCPagerView.m
index 507b45d..cdd95c3 100644
--- a/node_modules/react-native-pager-view/ios/RNCPagerView.m
+++ b/node_modules/react-native-pager-view/ios/RNCPagerView.m
@@ -492,6 +492,11 @@
return YES;
}

+ // Allow nested scroll views to scroll simultaneously with the pager
+ if ([otherGestureRecognizer.view isKindOfClass: UIScrollView.class]) {
+ return YES;
+ }
+
self.scrollView.panGestureRecognizer.enabled = self.scrollEnabled;
return NO;
}