Merge pull request slackhq#220 from slackhq/keyboard-dragging-fixes

Keyboard dragging fixes

Author: fyaqub

Examples/Messenger-Shared/MessageViewController.m

@@ -216,6 +216,11 @@ - (void)editLastMessage:(id)sender
 
 #pragma mark - Overriden Methods
 
+- (BOOL)ignoreTextInputbarAdjustment
+{
+    return NO;
+}
+
 - (void)didChangeKeyboardStatus:(SLKKeyboardStatus)status
 {
     // Notifies the view controller that the keyboard changed status.

Source/Additions/SLKTextView+SLKAdditions.m

@@ -151,7 +151,7 @@ - (NSString *)slk_wordAtRange:(NSRange)range rangeInText:(NSRangePointer)rangePo
         *rangePointer = [text rangeOfString:word];
         word = [[word componentsSeparatedByString:@"\n"] lastObject];
     }
-
+    
     return word;
 }
 
@@ -161,10 +161,9 @@ - (void)slk_prepareForUndo:(NSString *)description
         return;
     }
 
-	SLKTextView *prepareInvocation = [self.undoManager prepareWithInvocationTarget:self];
-	[prepareInvocation setText:self.text];
-	[self.undoManager setActionName:description];
-	
+    SLKTextView *prepareInvocation = [self.undoManager prepareWithInvocationTarget:self];
+    [prepareInvocation setText:self.text];
+    [self.undoManager setActionName:description];
 }
 
 @end

Source/Additions/UIResponder+SLKAdditions.h

@@ -26,4 +26,4 @@
  */
 + (instancetype)slk_currentFirstResponder;
 
-@end
+@end

Source/Additions/UIScrollView+SLKAdditions.h

@@ -45,4 +45,4 @@
  */
 - (void)slk_stopScrolling;
 
-@end
+@end

Source/Additions/UIView+SLKAdditions.m

@@ -54,7 +54,7 @@ - (void)slk_animateLayoutIfNeededWithDuration:(NSTimeInterval)duration bounce:(B
                             options:options
                          animations:^{
                              [self layoutIfNeeded];
-
+                             
                              if (animations) {
                                  animations();
                              }

Source/Classes/SLKInputAccessoryView.h

@@ -21,4 +21,4 @@
 /* The system keyboard view used as reference. */
 @property (nonatomic, weak, readonly) UIView *keyboardViewProxy;
 
-@end
+@end

Source/Classes/SLKInputAccessoryView.m

@@ -28,4 +28,4 @@ - (void)willMoveToSuperview:(UIView *)newSuperview
     }
 }
 
-@end
+@end

Source/Classes/SLKTextInputbar.h

@@ -101,7 +101,7 @@ typedef NS_ENUM(NSUInteger, SLKCounterPosition) {
 /** A Boolean value indicating whether the control is in edit mode. */
 @property (nonatomic, getter = isEditing) BOOL editing;
 
-/** 
+/**
  Verifies if the text can be edited.
  
  @param text The text to be edited.

Source/Classes/SLKTextInputbar.m

@@ -75,13 +75,13 @@ - (void)slk_commonInit
     self.autoHideRightButton = YES;
     self.editorContentViewHeight = 38.0;
     self.contentInset = UIEdgeInsetsMake(5.0, 8.0, 5.0, 8.0);
-
+    
     [self addSubview:self.editorContentView];
     [self addSubview:self.leftButton];
     [self addSubview:self.rightButton];
     [self addSubview:self.textView];
     [self addSubview:self.charCountLabel];
-
+    
     [self slk_setupViewConstraints];
     [self slk_updateConstraintConstants];
 
@@ -445,7 +445,7 @@ - (BOOL)canEditText:(NSString *)text
     if (self.isEditing && [self.textView.text isEqualToString:text]) {
         return NO;
     }
-
+    
     return YES;
 }
 
@@ -586,7 +586,7 @@ - (void)slk_setupViewConstraints
 
     CGFloat leftVerMargin = (self.intrinsicContentSize.height - leftButtonImg.size.height) / 2.0;
     CGFloat rightVerMargin = (self.intrinsicContentSize.height - CGRectGetHeight(self.rightButton.frame)) / 2.0;
-
+    
     NSDictionary *views = @{@"textView": self.textView,
                             @"leftButton": self.leftButton,
                             @"rightButton": self.rightButton,
@@ -618,15 +618,15 @@ - (void)slk_setupViewConstraints
 
     self.leftMarginWC = [self slk_constraintsForAttribute:NSLayoutAttributeLeading][0];
     self.bottomMarginWC = [self slk_constraintForAttribute:NSLayoutAttributeBottom firstItem:self secondItem:self.leftButton];
-
+    
     self.rightButtonWC = [self slk_constraintForAttribute:NSLayoutAttributeWidth firstItem:self.rightButton secondItem:nil];
     self.rightMarginWC = [self slk_constraintsForAttribute:NSLayoutAttributeTrailing][0];
 }
 
 - (void)slk_updateConstraintConstants
 {
     CGFloat zero = 0.0;
-
+    
     if (self.isEditing)
     {
         self.editorContentViewHC.constant = self.editorContentViewHeight;
@@ -639,7 +639,7 @@ - (void)slk_updateConstraintConstants
     }
     else {
         self.editorContentViewHC.constant = zero;
-
+        
         CGSize leftButtonSize = [self.leftButton imageForState:self.leftButton.state].size;
 
         if (leftButtonSize.width > 0) {

Source/Classes/SLKTextView.m

@@ -175,7 +175,7 @@ - (id)slk_pastedItem
 {
     NSString *contentType = [self slk_pasteboardContentType];
     NSData *data = [[UIPasteboard generalPasteboard] dataForPasteboardType:contentType];
-
+    
     if (data && [data isKindOfClass:[NSData class]])
     {
         SLKPastableMediaType mediaType = SLKPastableMediaTypeFromNSString(contentType);
@@ -467,7 +467,7 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
         && self.selectedRange.length > 0) {
         return YES;
     }
-
+    
     if (action == @selector(paste:) && [self slk_isPasteboardItemSupported]) {
         return YES;
     }

Source/Classes/SLKTextViewController.h

@@ -132,15 +132,15 @@ NS_CLASS_AVAILABLE_IOS(7_0) @interface SLKTextViewController : UIViewController
 /**
  Initializes a collection view controller and configures the collection view with the provided layout.
  If you use the standard -init method, a table view with plain style will be created.
-
+ 
  @param layout The layout object to associate with the collection view. The layout controls how the collection view presents its cells and supplementary views.
  @return An initialized SLKTextViewController object or nil if the object could not be created.
  */
 - (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout SLK_DESIGNATED_INITIALIZER;
 
 /**
  Initializes a text view controller to manage an arbitraty scroll view. The caller is responsible for configuration of the scroll view, including wiring the delegate.
-
+ 
  @param a UISCrollView to be used as the main content area.
  @return An initialized SLKTextViewController object or nil if the object could not be created.
  */
@@ -196,7 +196,7 @@ NS_CLASS_AVAILABLE_IOS(7_0) @interface SLKTextViewController : UIViewController
 /**
  Verifies if the text input bar should still move up/down even if it is not first responder. Default is NO.
  You can override this method to perform additional tasks associated with presenting the view. You don't need call super since this method doesn't do anything.
-
+ 
  @param responder The current first responder object.
  @return YES so the text input bar still move up/down.
  */
@@ -269,7 +269,7 @@ NS_CLASS_AVAILABLE_IOS(7_0) @interface SLKTextViewController : UIViewController
  */
 - (BOOL)canPressRightButton;
 
-/** 
+/**
  Notifies the view controller when the user has pasted a supported media content (images and/or videos).
  You can override this method to perform additional tasks associated with image/video pasting. You don't need to call super since this method doesn't do anything.
  Only supported pastable medias configured in SLKTextView will be forwarded (take a look at SLKPastableMediaType).
@@ -323,7 +323,7 @@ NS_CLASS_AVAILABLE_IOS(7_0) @interface SLKTextViewController : UIViewController
 /**
  Re-uses the text layout for edition, displaying an accessory view on top of the text input bar with options (cancel & save).
  You can override this method to perform additional tasks. You MUST call super at some point in your implementation.
-
+ 
  @param text The string text to edit.
  */
 - (void)editText:(NSString *)text NS_REQUIRES_SUPER;
@@ -387,15 +387,15 @@ NS_CLASS_AVAILABLE_IOS(7_0) @interface SLKTextViewController : UIViewController
 /**
  Returns a custom height for the autocompletion view. Default is 0.0.
  You can override this method to return a custom height.
-
+ 
  @return The autocompletion view's height.
  */
 - (CGFloat)heightForAutoCompletionView;
 
 /**
  Returns the maximum height for the autocompletion view. Default is 140 pts.
  You can override this method to return a custom max height.
-
+ 
  @return The autocompletion view's max height.
  */
 - (CGFloat)maximumHeightForAutoCompletionView;
@@ -405,7 +405,7 @@ NS_CLASS_AVAILABLE_IOS(7_0) @interface SLKTextViewController : UIViewController
  */
 - (void)cancelAutoCompletion;
 
-/** 
+/**
  Accepts the autocompletion, replacing the detected word with a new string, keeping the prefix.
  This method is an abstraction of -acceptAutoCompletionWithString:keepPrefix:
  
@@ -466,7 +466,7 @@ NS_CLASS_AVAILABLE_IOS(7_0) @interface SLKTextViewController : UIViewController
  Registers a class for customizing the behavior and appearance of the typing indicator view.
  You need to call this method inside of any initialization method.
  Make sure to conform to SLKTypingIndicatorProtocol and implement the required methods.
-
+ 
  @param aClass A UIView subclass conforming to the SLKTypingIndicatorProtocol.
  */
 - (void)registerClassForTypingIndicatorView:(Class)aClass;