Skip to content

Commit 6b2a059

Browse files
authored
[PE-6051] Fix scrolling inside remix contest info (#11964)
1 parent c64a609 commit 6b2a059

File tree

4 files changed

+41
-6
lines changed

4 files changed

+41
-6
lines changed

package-lock.json

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/mobile/ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,7 @@ PODS:
14371437
- React-Core
14381438
- react-native-notifications (5.1.0):
14391439
- React-Core
1440-
- react-native-pager-view (6.4.0):
1440+
- react-native-pager-view (6.7.1):
14411441
- DoubleConversion
14421442
- glog
14431443
- hermes-engine
@@ -2471,7 +2471,7 @@ SPEC CHECKSUMS:
24712471
react-native-keep-awake: ad1d67f617756b139536977a0bf06b27cec0714a
24722472
react-native-netinfo: 8a7fd3f7130ef4ad2fb4276d5c9f8d3f28d2df3d
24732473
react-native-notifications: 4601a5a8db4ced6ae7cfc43b44d35fe437ac50c4
2474-
react-native-pager-view: d9c1185fdb50e28e25a1d79c5d1094c50789e424
2474+
react-native-pager-view: ad90e78510ae4cb5f91d8b0d7ebb8a794c2ad266
24752475
react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
24762476
react-native-restart: 7595693413fe3ca15893702f2c8306c62a708162
24772477
react-native-safe-area-context: 3e6db312a77016d4f618550c814d9e236e0c0879

packages/mobile/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
"react-native-modal": "13.0.1",
147147
"react-native-modal-datetime-picker": "17.1.0",
148148
"react-native-notifications": "5.1.0",
149-
"react-native-pager-view": "6.4.0",
149+
"react-native-pager-view": "6.7.1",
150150
"react-native-permissions": "4.0.1",
151151
"react-native-qrcode-svg": "6.2.0",
152152
"react-native-radial-gradient": "1.1.4",
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
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+
}

0 commit comments

Comments
 (0)