Merge branch 'charlesmchen/conversationScrollVsAppeared' into release/2.38.0

pull/2/head
Matthew Chen 6 years ago
commit 85b42865df

@ -3903,7 +3903,7 @@ typedef enum : NSUInteger {
} else if (wasScrolledToBottom) { } else if (wasScrolledToBottom) {
// If we were scrolled to the bottom, don't do any fancy math. Just stay at the bottom. // If we were scrolled to the bottom, don't do any fancy math. Just stay at the bottom.
[self scrollToBottomAnimated:NO]; [self scrollToBottomAnimated:NO];
} else { } else if (self.isViewCompletelyAppeared) {
// If we were scrolled away from the bottom, shift the content in lockstep with the // If we were scrolled away from the bottom, shift the content in lockstep with the
// keyboard, up to the limits of the content bounds. // keyboard, up to the limits of the content bounds.
CGFloat insetChange = newInsets.bottom - oldInsets.bottom; CGFloat insetChange = newInsets.bottom - oldInsets.bottom;

Loading…
Cancel
Save