Skip to content

fix: multiple updates of frame and contentSize #714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2023
Merged

fix: multiple updates of frame and contentSize #714

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 25 additions & 31 deletions ios/RNCPagerView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ - (instancetype)initWithEventDispatcher:(id<RCTEventDispatcherProtocol>)eventDis
- (void)didMoveToWindow {
// Disable scroll view pan gesture for navigation controller screen edge go back gesture
if (self.reactViewController.navigationController != nil && self.reactViewController.navigationController.interactivePopGestureRecognizer != nil) {
[self.scrollView.panGestureRecognizer requireGestureRecognizerToFail:self.reactViewController.navigationController.interactivePopGestureRecognizer];
}
[self.scrollView.panGestureRecognizer requireGestureRecognizerToFail:self.reactViewController.navigationController.interactivePopGestureRecognizer];
}
}

- (void)layoutSubviews {
[super layoutSubviews];
[self calculateContentSize];
- (void)didUpdateReactSubviews {
[self updateContentSizeIfNeeded];
}

- (void)didUpdateReactSubviews {
[self calculateContentSize];
- (void)reactSetFrame:(CGRect)frame {
[super reactSetFrame:frame];
[self updateContentSizeIfNeeded];
}

-(void) insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex {
Expand Down Expand Up @@ -104,29 +104,23 @@ - (void)shouldDismissKeyboard:(NSString *)dismissKeyboard {

#pragma mark - Internal methods

- (void) calculateContentSize {
UIView *initialView = self.containerView.subviews.firstObject;
if (!initialView) {
return;
}

CGFloat totalSubviewsWidth = initialView.frame.size.width * self.containerView.subviews.count;
CGFloat totalSubviewsHeight = initialView.frame.size.height * self.containerView.subviews.count;


if ([self isHorizontal]) {
_scrollView.contentSize = CGSizeMake(totalSubviewsWidth, 0);
_containerView.frame = CGRectMake(0, 0, totalSubviewsWidth, initialView.bounds.size.height);
} else {
_scrollView.contentSize = CGSizeMake(0, totalSubviewsHeight);
_containerView.frame = CGRectMake(0, 0, initialView.bounds.size.width, totalSubviewsHeight);
}

_scrollView.frame = self.bounds;
[self.scrollView layoutIfNeeded];

if (self.initialPage != 0) {
[self goTo:self.initialPage animated:false];
- (CGSize)contentSize
{
UIView *initialView = _containerView.subviews.firstObject;
CGFloat subviewsCount = _containerView.subviews.count;
return CGSizeMake(initialView.bounds.size.width * subviewsCount, initialView.bounds.size.height * subviewsCount);
}

- (void)updateContentSizeIfNeeded
{
CGSize contentSize = self.contentSize;
if (!CGSizeEqualToSize(_scrollView.contentSize, contentSize)){
_scrollView.contentSize = [self isHorizontal] ? CGSizeMake(contentSize.width, 0) : CGSizeMake(0, contentSize.height);
_containerView.frame = CGRectMake(0, 0, contentSize.width, contentSize.height);

if (self.initialPage != 0) {
[self goTo:self.initialPage animated:false];
}
}
}

Expand All @@ -140,7 +134,7 @@ - (void)enableSwipe {

- (void)goTo:(NSInteger)index animated:(BOOL)animated {
CGPoint targetOffset = [self isHorizontal] ? CGPointMake(_scrollView.frame.size.width * index, 0) : CGPointMake(0, _scrollView.frame.size.height * index);

if (animated) {
self.animating = true;
}
Expand Down