Merge pull request jessesquires#646 from evilstudios/keyboard-notific…

…ation-fix Fix jessesquires#645: add 'keyboardDidHide' notification handling
alvincrisuy · Dec 19, 2014 · 38c14c1 · 38c14c1
2 parents 736d110 + 276e9f9
commit 38c14c1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.h b/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.h
@@ -59,6 +59,15 @@ FOUNDATION_EXPORT NSString * const JSQMessagesKeyboardControllerUserInfoKeyKeybo
  */
 - (void)keyboardController:(JSQMessagesKeyboardController *)keyboardController keyboardDidChangeFrame:(CGRect)keyboardFrame;
 
+@optional
+
+/**
+ *  Tells the delegate that the keyboard has been hidden.
+ *
+ *  @param keyboardController The keyboard controller that is notifying the delegate.
+ */
+- (void)keyboardControllerDidReceiveKeyboardHideNotification:(JSQMessagesKeyboardController *)keyboardController;
+
 @end
 
 

diff --git a/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.m b/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.m
@@ -213,6 +213,11 @@ - (void)jsq_didReceiveKeyboardDidHideNotification:(NSNotification *)notification
 
     [self jsq_handleKeyboardNotification:notification completion:^(BOOL finished) {
         [self.panGestureRecognizer removeTarget:self action:NULL];
+
+        if ([self.delegate respondsToSelector:@selector(keyboardControllerDidReceiveKeyboardHideNotification:)]) {
+            [self.delegate keyboardControllerDidReceiveKeyboardHideNotification:self];
+        }
+
     }];
 }
 

diff --git a/JSQMessagesViewController/Controllers/JSQMessagesViewController.m b/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
@@ -765,6 +765,13 @@ - (void)keyboardController:(JSQMessagesKeyboardController *)keyboardController k
     heightFromBottom = MAX(0.0f, heightFromBottom);
 
     [self jsq_setToolbarBottomLayoutGuideConstant:heightFromBottom];
+
+}
+
+- (void)keyboardControllerDidReceiveKeyboardHideNotification:(JSQMessagesKeyboardController *)keyboardController {
+
+    [self jsq_setToolbarBottomLayoutGuideConstant:0.0f];
+
 }
 
 - (void)jsq_setToolbarBottomLayoutGuideConstant:(CGFloat)constant