fix jessesquires#648. fix jessesquires#646. close jessesquires#649.

alvincrisuy · Dec 19, 2014 · 16c42a1 · 16c42a1
1 parent 9980266
commit 16c42a1
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/JSQMessagesViewController/Controllers/JSQMessagesViewController.m b/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
@@ -760,16 +760,23 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 
 - (void)keyboardController:(JSQMessagesKeyboardController *)keyboardController keyboardDidChangeFrame:(CGRect)keyboardFrame
 {
+    if (![self.inputToolbar.contentView.textView isFirstResponder] && self.toolbarBottomLayoutGuide.constant == 0.0f) {
+        return;
+    }
+
     CGFloat heightFromBottom = CGRectGetMaxY(self.collectionView.frame) - CGRectGetMinY(keyboardFrame);
 
     heightFromBottom = MAX(0.0f, heightFromBottom);
 
     [self jsq_setToolbarBottomLayoutGuideConstant:heightFromBottom];
-
 }
 
 - (void)keyboardControllerKeyboardDidHide:(JSQMessagesKeyboardController *)keyboardController
 {
+    if (![self.inputToolbar.contentView.textView isFirstResponder]) {
+        return;
+    }
+
     [self jsq_setToolbarBottomLayoutGuideConstant:0.0f];
     [self.inputToolbar.contentView.textView resignFirstResponder];
 }