Merge pull request #429 from slackhq/typing-indicator-enhancement

Typing Indicator enhancement
slackhq · Mar 30, 2016 · 95e68c4 · 95e68c4
2 parents 7004cda + 23b5202
commit 95e68c4
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/Source/SLKTextViewController.m b/Source/SLKTextViewController.m
@@ -599,7 +599,7 @@ - (BOOL)slk_updateKeyboardStatus:(SLKKeyboardStatus)status
 }
 
 
-#pragma mark - Public & Subclassable Methods
+#pragma mark - Public & Subclass Callbacks Methods
 
 - (void)presentKeyboard:(BOOL)animated
 {
@@ -798,12 +798,7 @@ - (void)didCancelTextEditing:(id)sender
 - (BOOL)canShowTypingIndicator
 {
     // Don't show if the text is being edited or auto-completed.
-    if (_textInputbar.isEditing || self.isAutoCompleting) {
-        return NO;
-    }
-
-    // Don't show if the content offset is not at top (when inverted) or at bottom (when not inverted)
-    if ((self.isInverted && ![self.scrollViewProxy slk_isAtTop]) || (!self.isInverted && ![self.scrollViewProxy slk_isAtBottom])) {
+    if (_textInputbar.isEditing) {
         return NO;
     }
 
@@ -2135,7 +2130,8 @@ - (void)slk_setupViewConstraints
                             @"textInputbar": self.textInputbar,
                             };
 
-    [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[scrollView(0@750)][typingIndicatorView(0)]-0@999-[textInputbar(0)]|" options:0 metrics:nil views:views]];
+    [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[scrollView(0@750)][textInputbar(0)]|" options:0 metrics:nil views:views]];
+    [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[typingIndicatorView(0)]-0@999-[textInputbar]|" options:0 metrics:nil views:views]];
     [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(>=0)-[autoCompletionView(0@750)][typingIndicatorView]" options:0 metrics:nil views:views]];
     [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[scrollView]|" options:0 metrics:nil views:views]];
     [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[autoCompletionView]|" options:0 metrics:nil views:views]];