Merge pull request slackhq#539 from slackhq/inputHeightScroll

ZAndyL · web-flow · commit 27087de0d39b · 2016-10-24T14:00:19.000-07:00
Fixed scroll offset adjustment due to inputBarHeight change being don…
diff --git a/Source/SLKTextViewController.m b/Source/SLKTextViewController.m
@@ -665,6 +665,7 @@ - (void)textDidUpdate:(BOOL)animated
     if (inputbarHeight != self.textInputbarHC.constant)
     {
         CGFloat inputBarHeightDelta = inputbarHeight - self.textInputbarHC.constant;
+        CGPoint newOffset = CGPointMake(0, self.scrollViewProxy.contentOffset.y + inputBarHeightDelta);
         self.textInputbarHC.constant = inputbarHeight;
         self.scrollViewHC.constant = [self slk_appropriateScrollViewHeight];
         
@@ -678,7 +679,7 @@ - (void)textDidUpdate:(BOOL)animated
                                                    options:UIViewAnimationOptionCurveEaseInOut|UIViewAnimationOptionLayoutSubviews|UIViewAnimationOptionBeginFromCurrentState
                                                 animations:^{
                                                     if (!self.isInverted) {
-                                                        self.scrollViewProxy.contentOffset = CGPointMake(0, self.scrollViewProxy.contentOffset.y + inputBarHeightDelta);
+                                                        self.scrollViewProxy.contentOffset = newOffset;
                                                     }
                                                     if (weakSelf.textInputbar.isEditing) {
                                                         [weakSelf.textView slk_scrollToCaretPositonAnimated:NO];
