From 60c8abcc7025d8b7bf14e1af1e1213af541132ce Mon Sep 17 00:00:00 2001
From: Zack Gomez <zacharyg@fb.com>
Date: Wed, 29 Jul 2015 17:19:46 -0700
Subject: [PATCH] Revert "[ReactNative] revert "prevent ScrollView content
 offset from changing during layout""

---
 React/Views/RCTScrollView.m | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/React/Views/RCTScrollView.m b/React/Views/RCTScrollView.m
index bc4db361e..fbdcf3474 100644
--- a/React/Views/RCTScrollView.m
+++ b/React/Views/RCTScrollView.m
@@ -461,7 +461,10 @@ RCT_NOT_IMPLEMENTED(-initWithCoder:(NSCoder *)aDecoder)
   [super layoutSubviews];
   RCTAssert(self.subviews.count == 1, @"we should only have exactly one subview");
   RCTAssert([self.subviews lastObject] == _scrollView, @"our only subview should be a scrollview");
+
+  CGPoint originalOffset = _scrollView.contentOffset;
   _scrollView.frame = self.bounds;
+  _scrollView.contentOffset = originalOffset;
 
   [RCTView autoAdjustInsetsForView:self
                     withScrollView:_scrollView