the keyboardDimissMode is not longer set to the scrollViewProxy, now the inputAccesoryView keeps the reference of the Keyboard to move it directly, now the transition looks much more smooth

Author: Camilo Vera

Source/Classes/SLKInputAccessoryView.h

@@ -16,8 +16,9 @@
 
 #import <UIKit/UIKit.h>
 
-UIKIT_EXTERN NSString * const SLKInputAccessoryViewKeyboardFrameDidChangeNotification;
-
 @interface SLKInputAccessoryView : UIView
-
+/*
+ * Used to save the reference of the keyboard or the Keyboard container..
+ */
+@property (nonatomic, weak, readonly) UIView *keyboard;
 @end

Source/Classes/SLKInputAccessoryView.m

@@ -17,84 +17,16 @@
 #import "SLKInputAccessoryView.h"
 #import "SLKUIConstants.h"
 
-NSString * const SLKInputAccessoryViewKeyboardFrameDidChangeNotification = @"SLKInputAccessoryViewKeyboardFrameDidChangeNotification";
-
-@interface SLKInputAccessoryView ()
-@property (nonatomic, weak) UIView *observedSuperview;
-@end
-
 @implementation SLKInputAccessoryView
 
-#pragma mark - Getters
-
-NSString *SLKKeyboardHandlingKeyPath()
-{
-    // Listening for the superview's frame doesn't work on iOS8 and above, so we use its center
-    if (SLK_IS_IOS8_AND_HIGHER) {
-        return NSStringFromSelector(@selector(center));
-    }
-    else {
-        return NSStringFromSelector(@selector(frame));
-    }
-}
-
-
 #pragma mark - Super Overrides
 
 - (void)willMoveToSuperview:(UIView *)newSuperview
 {
-    [self slk_removeSuperviewObserver];
-    [self slk_addSuperviewObserver:newSuperview];
-    
-    [super willMoveToSuperview:newSuperview];
-}
-
-
-#pragma mark - Superview handling
-
-- (void)slk_addSuperviewObserver:(UIView *)superview
-{
-    if (!_observedSuperview && superview) {
-        _observedSuperview = superview;
-        [superview addObserver:self forKeyPath:SLKKeyboardHandlingKeyPath() options:0 context:NULL];
+    if (newSuperview != nil)
+    {
+        _keyboard = newSuperview;
     }
 }
 
-- (void)slk_removeSuperviewObserver
-{
-    if (_observedSuperview) {
-        [self.observedSuperview removeObserver:self forKeyPath:SLKKeyboardHandlingKeyPath()];
-        _observedSuperview = nil;
-    }
-}
-
-
-#pragma mark - Events
-
-- (void)slk_didChangeKeyboardFrame:(CGRect)frame
-{
-    NSDictionary *userInfo = @{UIKeyboardFrameEndUserInfoKey:[NSValue valueWithCGRect:frame]};
-    [[NSNotificationCenter defaultCenter] postNotificationName:SLKInputAccessoryViewKeyboardFrameDidChangeNotification object:nil userInfo:userInfo];
-}
-
-
-#pragma mark - KVO Listener
-
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
-{
-    if ([object isEqual:self.superview] && [keyPath isEqualToString:SLKKeyboardHandlingKeyPath()]) {
-        [self slk_didChangeKeyboardFrame:self.superview.frame];
-    }
-    else {
-        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
-    }
-}
-
-#pragma mark - Lifeterm
-
-- (void)dealloc
-{
-    [self slk_removeSuperviewObserver];
-}
-
 @end

Source/Classes/SLKTextViewController.m

@@ -38,6 +38,8 @@ @interface SLKTextViewController ()
 // A hairline displayed on top of the auto-completion view, to better separate the content from the control.
 @property (nonatomic, strong) UIView *autoCompletionHairline;
 
+@property (nonatomic, strong) SLKInputAccessoryView *inputAccessoryView;
+
 // Auto-Layout height constraints used for updating their constants
 @property (nonatomic, strong) NSLayoutConstraint *scrollViewHC;
 @property (nonatomic, strong) NSLayoutConstraint *textInputbarHC;
@@ -372,19 +374,20 @@ - (UIButton *)rightButton
 
 - (SLKInputAccessoryView *)emptyInputAccessoryView
 {
-    if (!self.isKeyboardPanningEnabled) {
-        return nil;
-    }
-    
-    SLKInputAccessoryView *view = [[SLKInputAccessoryView alloc] initWithFrame:self.textInputbar.bounds];
-    view.backgroundColor = [UIColor clearColor];
-    view.userInteractionEnabled = NO;
-    
+    if (self.inputAccessoryView == nil)
+    {
+        SLKInputAccessoryView *view = [[SLKInputAccessoryView alloc] initWithFrame:self.textInputbar.bounds];
+        view.backgroundColor = [UIColor clearColor];
+        view.userInteractionEnabled = NO;
+        
 #if SLK_INPUT_ACCESSORY_DEBUG
-    view.backgroundColor = [[UIColor redColor] colorWithAlphaComponent:0.5];
+        view.backgroundColor = [[UIColor redColor] colorWithAlphaComponent:0.5];
 #endif
+        
+        self.inputAccessoryView = view;
+    }
 
-    return view;
+    return self.inputAccessoryView;
 }
 
 - (UIModalPresentationStyle)modalPresentationStyle
@@ -506,6 +509,8 @@ - (void)setScrollViewProxy:(UIScrollView *)scrollView
 
     [scrollView addGestureRecognizer:self.singleTapGesture];
 
+    [scrollView.panGestureRecognizer addTarget:self action:@selector(slk_didPanScrollView:)];
+    
     _scrollViewProxy = scrollView;
 }
 
@@ -532,17 +537,6 @@ - (void)setInverted:(BOOL)inverted
     self.automaticallyAdjustsScrollViewInsets = inverted ? NO : YES;
 }
 
-- (void)setKeyboardPanningEnabled:(BOOL)enabled
-{
-    if (_keyboardPanningEnabled == enabled) {
-        return;
-    }
-    
-    _keyboardPanningEnabled = enabled;
-    
-    self.scrollViewProxy.keyboardDismissMode = enabled ? UIScrollViewKeyboardDismissModeInteractive : UIScrollViewKeyboardDismissModeNone;
-}
-
 - (BOOL)slk_updateKeyboardStatus:(SLKKeyboardStatus)status
 {
     // Skips if trying to update the same status
@@ -817,6 +811,127 @@ - (void)willRequestUndo
 
 #pragma mark - Private Methods
 
+- (void)slk_didPanScrollView:(UIPanGestureRecognizer *)gesture
+{
+    //if the panning is not enable, then let's skip it..
+    if (!self.keyboardPanningEnabled) return;
+    
+    // Skips this if it's not the expected textView.
+    // Checking the keyboard height constant helps to disable the view constraints update on iPad when the keyboard is undocked.
+    // Checking the keyboard status allows to keep the inputAccessoryView valid when still reacing the bottom of the screen.
+    if (![self.textView isFirstResponder] || (self.keyboardHC.constant == 0 && self.keyboardStatus == SLKKeyboardStatusDidHide)) {
+        return;
+    }
+    
+    // Skips if the view isn't visible
+    if (!self.view.window) {
+        return;
+    }
+    
+    // Skips if it is presented inside of a popover
+    if (self.isPresentedInPopover) {
+        return;
+    }
+    
+    static CGPoint startPoint   = (CGPoint){0,0};
+    static BOOL dragging        = NO;
+    static CGRect originalFrame = (CGRect){{0,0},{0,0}};
+    
+    CGPoint point = [gesture locationInView:self.view];
+
+    if (gesture.state == UIGestureRecognizerStateBegan)
+    {
+        startPoint = CGPointZero;
+        dragging   = NO;
+    }
+    else if (gesture.state == UIGestureRecognizerStateChanged)
+    {
+        if (CGRectContainsPoint(self.textInputbar.frame, point) || dragging)
+        {
+            if (CGPointEqualToPoint(startPoint, CGPointZero)) {
+                startPoint    = point;
+                dragging      = YES;
+                originalFrame = self.inputAccessoryView.keyboard.frame;
+            }
+            
+            self.movingKeyboard = YES;
+
+            CGPoint transition = CGPointMake(point.x - startPoint.x, point.y - startPoint.y);
+            
+            CGRect keyboardFrame = originalFrame;
+            
+            keyboardFrame.origin.y+= MAX(transition.y,0);
+            
+            self.inputAccessoryView.keyboard.frame = keyboardFrame;
+            
+            CGFloat constant = MAX(0.0, CGRectGetHeight(self.view.bounds) - CGRectGetMinY(keyboardFrame) - CGRectGetHeight(self.textView.inputAccessoryView.bounds));
+
+            self.keyboardHC.constant = constant;
+            self.scrollViewHC.constant = [self slk_appropriateScrollViewHeight];
+            
+            // layoutIfNeeded must be called before any further scrollView internal adjustments (content offset and size)
+            [self.view layoutIfNeeded];
+            
+            // Overrides the scrollView's contentOffset to allow following the same position when dragging the keyboard
+            CGPoint offset = _scrollViewOffsetBeforeDragging;
+            
+            if (self.isInverted)
+            {
+                if (!self.scrollViewProxy.isDecelerating && self.scrollViewProxy.isTracking) {
+                    self.scrollViewProxy.contentOffset = _scrollViewOffsetBeforeDragging;
+                }
+            }
+            else
+            {
+                CGFloat keyboardHeightDelta = _keyboardHeightBeforeDragging-self.keyboardHC.constant;
+                offset.y -= keyboardHeightDelta;
+                
+                self.scrollViewProxy.contentOffset = offset;
+            }
+        }
+        
+    }
+    else if (gesture.state == UIGestureRecognizerStateCancelled ||
+             gesture.state == UIGestureRecognizerStateEnded ||
+             gesture.state == UIGestureRecognizerStateFailed )
+    {
+        if (dragging)
+        {
+            CGPoint transition = CGPointMake(point.x - startPoint.x, point.y - startPoint.y);
+            
+            if (transition.y < 0) transition.y = 0;
+            
+            startPoint = CGPointZero;
+            dragging   = NO;
+            CGRect keyboardFrame = originalFrame;
+            
+            //the velocity can be changed to hide or show the keyboard based on the gesture
+            CGFloat minVelocity = 20.0f;
+            BOOL hide = [gesture velocityInView:self.view].y > minVelocity || transition.y > keyboardFrame.size.height/2.0f;
+            
+            if (hide)  keyboardFrame.origin.y = [UIScreen mainScreen].bounds.size.height;
+            
+            CGFloat constant = MAX(0.0, CGRectGetHeight(self.view.bounds) - CGRectGetMinY(keyboardFrame) - CGRectGetHeight(self.textView.inputAccessoryView.bounds));
+            
+            self.keyboardHC.constant = constant;
+            self.scrollViewHC.constant = [self slk_appropriateScrollViewHeight];
+            
+            [UIView animateWithDuration:0.15 animations:^{
+                [self.view layoutIfNeeded];
+                self.inputAccessoryView.keyboard.frame = keyboardFrame;
+            } completion:^(BOOL finished) {
+                if (hide)
+                {
+                    [UIView performWithoutAnimation:^{
+                        [self.textView resignFirstResponder];
+                    }];
+                }
+            }];
+        }
+
+    }
+}
+
 - (void)slk_didTapScrollView:(UIGestureRecognizer *)gesture
 {
     if (!self.isPresentedInPopover && !self.isExternalKeyboardDetected) {
@@ -1173,55 +1288,6 @@ - (void)slk_didShowOrHideKeyboard:(NSNotification *)notification
     self.movingKeyboard = NO;
 }
 
-- (void)slk_didChangeKeyboardFrame:(NSNotification *)notification
-{
-    // Skips if the view isn't visible
-    if (!self.view.window) {
-        return;
-    }
-    
-    // Skips if it is presented inside of a popover
-    if (self.isPresentedInPopover) {
-        return;
-    }
-    
-    // Skips this if it's not the expected textView.
-    // Checking the keyboard height constant helps to disable the view constraints update on iPad when the keyboard is undocked.
-    // Checking the keyboard status allows to keep the inputAccessoryView valid when still reacing the bottom of the screen.
-    if (![self.textView isFirstResponder] || (self.keyboardHC.constant == 0 && self.keyboardStatus == SLKKeyboardStatusDidHide)) {
-        return;
-    }
-    
-    if (self.scrollViewProxy.isDragging) {
-        self.movingKeyboard = YES;
-    }
-
-    if (self.isMovingKeyboard == NO) {
-        return;
-    }
-    
-    self.keyboardHC.constant = [self slk_appropriateKeyboardHeight:notification];
-    self.scrollViewHC.constant = [self slk_appropriateScrollViewHeight];
-    
-    // layoutIfNeeded must be called before any further scrollView internal adjustments (content offset and size)
-    [self.view layoutIfNeeded];
-    
-    // Overrides the scrollView's contentOffset to allow following the same position when dragging the keyboard
-    CGPoint offset = _scrollViewOffsetBeforeDragging;
-    
-    if (self.isInverted) {
-        if (!self.scrollViewProxy.isDecelerating && self.scrollViewProxy.isTracking) {
-            self.scrollViewProxy.contentOffset = _scrollViewOffsetBeforeDragging;
-        }
-    }
-    else {
-        CGFloat keyboardHeightDelta = _keyboardHeightBeforeDragging-self.keyboardHC.constant;
-        offset.y -= keyboardHeightDelta;
-        
-        self.scrollViewProxy.contentOffset = offset;
-    }
-}
-
 - (void)slk_didPostSLKKeyboardNotification:(NSNotification *)notification
 {
     if (![notification.object isEqual:self.textView]) {
@@ -1865,8 +1931,6 @@ - (void)slk_registerNotifications
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(slk_didPostSLKKeyboardNotification:) name:SLKKeyboardDidHideNotification object:nil];
 #endif
 
-    // Keyboard Accessory View notifications
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(slk_didChangeKeyboardFrame:) name:SLKInputAccessoryViewKeyboardFrameDidChangeNotification object:nil];
 
     // TextView notifications
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(slk_willChangeTextViewText:) name:SLKTextViewTextWillChangeNotification object:nil];
@@ -1897,9 +1961,6 @@ - (void)slk_unregisterNotifications
     [[NSNotificationCenter defaultCenter] removeObserver:self name:SLKKeyboardDidHideNotification object:nil];
 #endif
 
-    // TextView notifications
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:SLKInputAccessoryViewKeyboardFrameDidChangeNotification object:nil];
-    
     // TextView notifications
     [[NSNotificationCenter defaultCenter] removeObserver:self name:UITextViewTextDidBeginEditingNotification object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:UITextViewTextDidEndEditingNotification object:nil];