Skip to content

Commit 55496e1

Browse files
committed
wip: remove #705 related code for now
1 parent cc82db0 commit 55496e1

File tree

4 files changed

+15
-38
lines changed

4 files changed

+15
-38
lines changed

Diff for: ios/Fabric/RNCPagerViewComponentView.mm

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#import <Foundation/Foundation.h>
44
#import "RNCPagerViewComponentView.h"
5-
// #import "RNCPagerScrollView.h"
5+
// #import "RNCPagerScrollView.h" // PR -> https://github.com/callstack/react-native-pager-view/pull/705
66
// #import <RNCViewPager/RNCViewPagerComponentDescriptor.h>
77
#import <react/renderer/components/RNCViewPager/ComponentDescriptors.h>
88
#import <react/renderer/components/RNCViewPager/EventEmitters.h>
@@ -21,6 +21,8 @@ @interface RNCPagerViewComponentView () <RCTRNCViewPagerViewProtocol, UIPageView
2121
@end
2222

2323
@implementation RNCPagerViewComponentView {
24+
// RNCPagerScrollView *_scrollView; // PR -> https://github.com/callstack/react-native-pager-view/pull/705
25+
2426
// RNCViewPagerShadowNode::ConcreteState::Shared _state;
2527
// RNCPagerScrollView *_scrollView;
2628
// UIView *_containerView;
@@ -65,7 +67,7 @@ - (instancetype)initWithFrame:(CGRect)frame
6567
_props = defaultProps;
6668
// _initialPage = -1;
6769

68-
// _scrollView = [[RNCPagerScrollView alloc] initWithFrame:self.bounds];
70+
_scrollView = [[UIScrollView alloc] initWithFrame:self.bounds]; // PR -> https://github.com/callstack/react-native-pager-view/pull/705
6971

7072
// _scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
7173
// _scrollView.delaysContentTouches = NO;
@@ -97,6 +99,7 @@ - (void)willMoveToSuperview:(UIView *)newSuperview {
9799
}
98100

99101

102+
// PR -> https://github.com/callstack/react-native-pager-view/pull/705
100103
// - (void)didMoveToWindow {
101104
// // Disable scroll view pan gesture for navigation controller screen edge go back gesture
102105
// if (self.reactViewController.navigationController != nil && self.reactViewController.navigationController.interactivePopGestureRecognizer != nil) {

Diff for: ios/RNCPagerScrollView.h

-2
This file was deleted.

Diff for: ios/RNCPagerScrollView.m

-26
This file was deleted.

Diff for: ios/RNCPagerView.m

+10-8
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ @interface RNCPagerView () <UIScrollViewDelegate>
1515

1616
@property(nonatomic, strong) id<RCTEventDispatcherProtocol> eventDispatcher;
1717

18-
@property(nonatomic, strong) RNCPagerScrollView *scrollView;
18+
@property(nonatomic, strong) UIScrollView *scrollView;
19+
// @property(nonatomic, strong) RNCPagerScrollView *scrollView;
1920
@property(nonatomic, strong) UIView *containerView;
2021

2122
- (void)goTo:(NSInteger)index animated:(BOOL)animated;
@@ -40,12 +41,12 @@ - (instancetype)initWithEventDispatcher:(id<RCTEventDispatcherProtocol>)eventDis
4041
return self;
4142
}
4243

43-
- (void)didMoveToWindow {
44-
// Disable scroll view pan gesture for navigation controller screen edge go back gesture
45-
if (self.reactViewController.navigationController != nil && self.reactViewController.navigationController.interactivePopGestureRecognizer != nil) {
46-
[self.scrollView.panGestureRecognizer requireGestureRecognizerToFail:self.reactViewController.navigationController.interactivePopGestureRecognizer];
47-
}
48-
}
44+
// - (void)didMoveToWindow {
45+
// // Disable scroll view pan gesture for navigation controller screen edge go back gesture
46+
// if (self.reactViewController.navigationController != nil && self.reactViewController.navigationController.interactivePopGestureRecognizer != nil) {
47+
// [self.scrollView.panGestureRecognizer requireGestureRecognizerToFail:self.reactViewController.navigationController.interactivePopGestureRecognizer];
48+
// }
49+
// }
4950

5051
- (void)didUpdateReactSubviews {
5152
[self updateContentSizeIfNeeded];
@@ -71,7 +72,8 @@ - (void)removeReactSubview:(UIView *)subview {
7172
}
7273

7374
- (void)embed {
74-
_scrollView = [[RNCPagerScrollView alloc] initWithFrame:self.bounds];
75+
_scrollView = [[UIScrollView alloc] initWithFrame:self.bounds];
76+
// _scrollView = [[RNCPagerScrollView alloc] initWithFrame:self.bounds];
7577
_scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
7678
_scrollView.delaysContentTouches = NO;
7779
_scrollView.delegate = self;

0 commit comments

Comments
 (0)