From 42d85c66d524b144d56cf829c14ee7e1d4622753 Mon Sep 17 00:00:00 2001
From: Raymond Walsh <raymond@codespeck.com>
Date: Fri, 4 Sep 2015 10:42:35 -0700
Subject: [PATCH 1/2] Address #1174 & prevent keyboard-positioning regression

Track the state of first-responder when the interactive pop gesture begins
Restore the first-responder state when pop gesture ends/cancels
---
 .../Controllers/JSQMessagesViewController.m              | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/JSQMessagesViewController/Controllers/JSQMessagesViewController.m b/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
index fba848c95..8d479466f 100644
--- a/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
+++ b/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
@@ -63,6 +63,8 @@ @interface JSQMessagesViewController () <JSQMessagesInputToolbarDelegate,
 
 @property (weak, nonatomic) UIGestureRecognizer *currentInteractivePopGestureRecognizer;
 
+@property (assign, nonatomic) BOOL interactivePopGestureFirstResponderState;
+
 - (void)jsq_configureMessagesViewController;
 
 - (NSString *)jsq_currentlyComposedMessageText;
@@ -260,13 +262,13 @@ - (void)viewDidAppear:(BOOL)animated
 - (void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
-    [self jsq_addActionToInteractivePopGestureRecognizer:NO];
     self.collectionView.collectionViewLayout.springinessEnabled = NO;
 }
 
 - (void)viewDidDisappear:(BOOL)animated
 {
     [super viewDidDisappear:animated];
+    [self jsq_addActionToInteractivePopGestureRecognizer:NO];
     [self jsq_removeObservers];
     [self.keyboardController endListeningForKeyboard];
 }
@@ -844,6 +846,8 @@ - (void)jsq_handleInteractivePopGestureRecognizer:(UIGestureRecognizer *)gesture
                 [self.snapshotView removeFromSuperview];
             }
 
+            _interactivePopGestureFirstResponderState = [[[[self inputToolbar] contentView] textView] isFirstResponder];
+
             [self.keyboardController endListeningForKeyboard];
 
             if ([UIDevice jsq_isCurrentDeviceBeforeiOS8]) {
@@ -865,6 +869,9 @@ - (void)jsq_handleInteractivePopGestureRecognizer:(UIGestureRecognizer *)gesture
         case UIGestureRecognizerStateEnded:
         case UIGestureRecognizerStateFailed:
             [self.keyboardController beginListeningForKeyboard];
+            if (_interactivePopGestureFirstResponderState) {
+                [[[[self inputToolbar] contentView] textView] becomeFirstResponder];
+            }
 
             if ([UIDevice jsq_isCurrentDeviceBeforeiOS8]) {
                 [self.snapshotView removeFromSuperview];

From b95e6064477c13f544961519cdb812ba663ab897 Mon Sep 17 00:00:00 2001
From: Raymond Walsh <raymond@codespeck.com>
Date: Tue, 8 Sep 2015 10:00:53 -0700
Subject: [PATCH 2/2] align code to repo code style

1. dot notation
2. rename ivar
---
 .../Controllers/JSQMessagesViewController.m               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/JSQMessagesViewController/Controllers/JSQMessagesViewController.m b/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
index 8d479466f..3f0e2c6b3 100644
--- a/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
+++ b/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
@@ -63,7 +63,7 @@ @interface JSQMessagesViewController () <JSQMessagesInputToolbarDelegate,
 
 @property (weak, nonatomic) UIGestureRecognizer *currentInteractivePopGestureRecognizer;
 
-@property (assign, nonatomic) BOOL interactivePopGestureFirstResponderState;
+@property (assign, nonatomic) BOOL textViewWasFirstResponderDuringInteractivePop;
 
 - (void)jsq_configureMessagesViewController;
 
@@ -846,7 +846,7 @@ - (void)jsq_handleInteractivePopGestureRecognizer:(UIGestureRecognizer *)gesture
                 [self.snapshotView removeFromSuperview];
             }
 
-            _interactivePopGestureFirstResponderState = [[[[self inputToolbar] contentView] textView] isFirstResponder];
+            self.textViewWasFirstResponderDuringInteractivePop = [self.inputToolbar.contentView.textView isFirstResponder];
 
             [self.keyboardController endListeningForKeyboard];
 
@@ -869,8 +869,8 @@ - (void)jsq_handleInteractivePopGestureRecognizer:(UIGestureRecognizer *)gesture
         case UIGestureRecognizerStateEnded:
         case UIGestureRecognizerStateFailed:
             [self.keyboardController beginListeningForKeyboard];
-            if (_interactivePopGestureFirstResponderState) {
-                [[[[self inputToolbar] contentView] textView] becomeFirstResponder];
+            if (self.textViewWasFirstResponderDuringInteractivePop) {
+                [self.inputToolbar.contentView.textView becomeFirstResponder];
             }
 
             if ([UIDevice jsq_isCurrentDeviceBeforeiOS8]) {