From 2c518c696ec4e473265c0082b69860115f78d8cb Mon Sep 17 00:00:00 2001 From: Janic Duplessis Date: Sun, 27 Aug 2017 02:36:05 -0400 Subject: [PATCH] Fix content offset validation --- React/Views/RCTScrollView.m | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/React/Views/RCTScrollView.m b/React/Views/RCTScrollView.m index 9e8eb88876fe5f..96fea689c77e15 100644 --- a/React/Views/RCTScrollView.m +++ b/React/Views/RCTScrollView.m @@ -315,12 +315,17 @@ - (void)setFrame:(CGRect)frame UIEdgeInsets contentInset = self.contentInset; CGSize contentSize = self.contentSize; - - CGSize boundsSize = self.bounds.size; - - self.contentOffset = CGPointMake( - MAX(-contentInset.top, MIN(contentSize.width - boundsSize.width + contentInset.bottom, originalOffset.x)), - MAX(-contentInset.left, MIN(contentSize.height - boundsSize.height + contentInset.right, originalOffset.y))); + + // If contentSize has not been measured yet we can't check bounds. + if (CGSizeEqualToSize(contentSize, CGSizeZero)) { + self.contentOffset = originalOffset; + } else { + // Make sure offset don't exceed bounds. This could happen on screen rotation. + CGSize boundsSize = self.bounds.size; + self.contentOffset = CGPointMake( + MAX(-contentInset.left, MIN(contentSize.width - boundsSize.width + contentInset.right, originalOffset.x)), + MAX(-contentInset.top, MIN(contentSize.height - boundsSize.height + contentInset.bottom, originalOffset.y))); + } } #if !TARGET_OS_TV