Skip to content

Commit 0a3db4f

Browse files
committed
chore: remove commented-out code related to #705 for now
1 parent 6e3507e commit 0a3db4f

File tree

3 files changed

+1
-60
lines changed

3 files changed

+1
-60
lines changed

ios/Fabric/RNCPagerViewComponentView.mm

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
#import <Foundation/Foundation.h>
44
#import "RNCPagerViewComponentView.h"
5-
// #import "RNCPagerScrollView.h" // PR -> https://github.com/callstack/react-native-pager-view/pull/705
65
#import <RNCViewPager/RNCViewPagerComponentDescriptor.h>
7-
// #import <react/renderer/components/RNCViewPager/ComponentDescriptors.h>
86
#import <react/renderer/components/RNCViewPager/EventEmitters.h>
97
#import <react/renderer/components/RNCViewPager/Props.h>
108
#import <react/renderer/components/RNCViewPager/RCTComponentViewHelpers.h>
@@ -21,10 +19,6 @@ @interface RNCPagerViewComponentView () <RCTRNCViewPagerViewProtocol, UIScrollVi
2119
@end
2220

2321
@implementation RNCPagerViewComponentView {
24-
// RNCPagerScrollView *_scrollView; // PR -> https://github.com/callstack/react-native-pager-view/pull/705
25-
26-
// LayoutMetrics _layoutMetrics;
27-
// UIScrollView *scrollView;
2822
RNCViewPagerShadowNode::ConcreteState::Shared _state;
2923
UIScrollView *_scrollView;
3024
UIView *_containerView;
@@ -40,7 +34,7 @@ - (instancetype)initWithFrame:(CGRect)frame
4034
_props = defaultProps;
4135
_initialPage = -1;
4236

43-
_scrollView = [[UIScrollView alloc] initWithFrame:self.bounds]; // PR -> https://github.com/callstack/react-native-pager-view/pull/705
37+
_scrollView = [[UIScrollView alloc] initWithFrame:self.bounds];
4438

4539
_scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
4640
_scrollView.delaysContentTouches = NO;
@@ -59,16 +53,6 @@ - (instancetype)initWithFrame:(CGRect)frame
5953
return self;
6054
}
6155

62-
63-
64-
// PR -> https://github.com/callstack/react-native-pager-view/pull/705
65-
// - (void)didMoveToWindow {
66-
// // Disable scroll view pan gesture for navigation controller screen edge go back gesture
67-
// if (self.reactViewController.navigationController != nil && self.reactViewController.navigationController.interactivePopGestureRecognizer != nil) {
68-
// [_scrollView.panGestureRecognizer requireGestureRecognizerToFail:self.reactViewController.navigationController.interactivePopGestureRecognizer];
69-
// }
70-
// }
71-
7256
#pragma mark - React API
7357

7458
- (void)updateProps:(const facebook::react::Props::Shared &)props oldProps:(const facebook::react::Props::Shared &)oldProps{

ios/LEGACY/Fabric/LEGACY_RNCPagerViewComponentView.mm

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22

33
#import <Foundation/Foundation.h>
44
#import "LEGACY_RNCPagerViewComponentView.h"
5-
// #import "RNCPagerScrollView.h"
6-
// #import <RNCViewPager/RNCViewPagerComponentDescriptor.h>
7-
// #import <react/renderer/components/RNCViewPager/ComponentDescriptors.h>
8-
// #import <react/renderer/components/RNCViewPager/EventEmitters.h>
9-
// #import <react/renderer/components/RNCViewPager/Props.h>
10-
// #import <react/renderer/components/RNCViewPager/RCTComponentViewHelpers.h>
115
#import <react/renderer/components/LEGACY_RNCViewPager/ComponentDescriptors.h>
126
#import <react/renderer/components/LEGACY_RNCViewPager/EventEmitters.h>
137
#import <react/renderer/components/LEGACY_RNCViewPager/Props.h>
@@ -25,9 +19,6 @@ @interface LEGACY_RNCPagerViewComponentView () <RCTLEGACY_RNCViewPagerViewProtoc
2519
@end
2620

2721
@implementation LEGACY_RNCPagerViewComponentView {
28-
// RNCViewPagerShadowNode::ConcreteState::Shared _state;
29-
// RNCPagerScrollView *_scrollView;
30-
// UIView *_containerView;
3122
LayoutMetrics _layoutMetrics;
3223
UIScrollView *scrollView;
3324
}
@@ -67,22 +58,6 @@ - (instancetype)initWithFrame:(CGRect)frame
6758
if (self = [super initWithFrame:frame]) {
6859
static const auto defaultProps = std::make_shared<const LEGACY_RNCViewPagerProps>();
6960
_props = defaultProps;
70-
// _initialPage = -1;
71-
72-
// _scrollView = [[RNCPagerScrollView alloc] initWithFrame:self.bounds];
73-
74-
// _scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
75-
// _scrollView.delaysContentTouches = NO;
76-
// _scrollView.delegate = self;
77-
// _scrollView.pagingEnabled = YES;
78-
// _scrollView.showsHorizontalScrollIndicator = NO;
79-
// _scrollView.showsVerticalScrollIndicator = NO;
80-
81-
// [self addSubview:_scrollView];
82-
83-
// _containerView = [[UIView alloc] initWithFrame:CGRectZero];
84-
85-
// [_scrollView addSubview:_containerView];
8661
_nativeChildrenViewControllers = [[NSMutableArray alloc] init];
8762
_currentIndex = -1;
8863
_destinationIndex = -1;
@@ -100,14 +75,6 @@ - (void)willMoveToSuperview:(UIView *)newSuperview {
10075
}
10176
}
10277

103-
104-
// - (void)didMoveToWindow {
105-
// // Disable scroll view pan gesture for navigation controller screen edge go back gesture
106-
// if (self.reactViewController.navigationController != nil && self.reactViewController.navigationController.interactivePopGestureRecognizer != nil) {
107-
// [_scrollView.panGestureRecognizer requireGestureRecognizerToFail:self.reactViewController.navigationController.interactivePopGestureRecognizer];
108-
// }
109-
// }
110-
11178
#pragma mark - React API
11279

11380
- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {

ios/RNCPagerView.m

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#import "UIViewController+CreateExtension.h"
77
#import "RCTOnPageScrollEvent.h"
8-
// #import "RNCPagerScrollView.h"
98
#import "RCTOnPageScrollStateChanged.h"
109
#import "React/RCTUIManagerObserverCoordinator.h"
1110
#import "RCTOnPageSelected.h"
@@ -16,7 +15,6 @@ @interface RNCPagerView () <UIScrollViewDelegate>
1615
@property(nonatomic, strong) id<RCTEventDispatcherProtocol> eventDispatcher;
1716

1817
@property(nonatomic, strong) UIScrollView *scrollView;
19-
// @property(nonatomic, strong) RNCPagerScrollView *scrollView;
2018
@property(nonatomic, strong) UIView *containerView;
2119

2220
- (void)goTo:(NSInteger)index animated:(BOOL)animated;
@@ -41,13 +39,6 @@ - (instancetype)initWithEventDispatcher:(id<RCTEventDispatcherProtocol>)eventDis
4139
return self;
4240
}
4341

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-
// }
50-
5142
- (void)didUpdateReactSubviews {
5243
[self updateContentSizeIfNeeded];
5344
}
@@ -73,7 +64,6 @@ - (void)removeReactSubview:(UIView *)subview {
7364

7465
- (void)embed {
7566
_scrollView = [[UIScrollView alloc] initWithFrame:self.bounds];
76-
// _scrollView = [[RNCPagerScrollView alloc] initWithFrame:self.bounds];
7767
_scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
7868
_scrollView.delaysContentTouches = NO;
7969
_scrollView.delegate = self;

0 commit comments

Comments
 (0)