Fixes ScrollView centerContent not work in some cases (#24817)

zhongwuzw · facebook-github-bot · commit 2cdf9694b56e · 2019-05-13T13:03:26.000-07:00
Summary: The bug description can see #24688, we add `contentView` size check before center the content, because in some cases, the contentView's size not yet be calculated, in those cases, we don't adjust the `contentOffset`. cc. cpojer . [iOS] [Fixed] - Fixes ScrollView centerContent not work in some cases Pull Request resolved: #24817 Differential Revision: D15322502 Pulled By: sahrens fbshipit-source-id: e2081f13e9f2e8597a379a9db1607451ea496909
diff --git a/React/Views/ScrollView/RCTScrollView.m b/React/Views/ScrollView/RCTScrollView.m
@@ -298,7 +298,7 @@ - (BOOL)touchesShouldCancelInContentView:(__unused UIView *)view
 - (void)setContentOffset:(CGPoint)contentOffset
 {
   UIView *contentView = [self contentView];
-  if (contentView && _centerContent) {
+  if (contentView && _centerContent && !CGSizeEqualToSize(contentView.frame.size, CGSizeZero)) {
     CGSize subviewSize = contentView.frame.size;
     CGSize scrollViewSize = self.bounds.size;
     if (subviewSize.width <= scrollViewSize.width) {

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ - (BOOL)touchesShouldCancelInContentView:(__unused UIView *)view`
`298`	`298`	`- (void)setContentOffset:(CGPoint)contentOffset`
`299`	`299`	`{`
`300`	`300`	`UIView *contentView = [self contentView];`
`301`		`- if (contentView && _centerContent) {`
	`301`	`+ if (contentView && _centerContent && !CGSizeEqualToSize(contentView.frame.size, CGSizeZero)) {`
`302`	`302`	`CGSize subviewSize = contentView.frame.size;`
`303`	`303`	`CGSize scrollViewSize = self.bounds.size;`
`304`	`304`	`if (subviewSize.width <= scrollViewSize.width) {`