Merge branch 'macoscope-bugfix/animation-on-push'

Ignacio Romero Zurbuchen · Ignacio Romero Zurbuchen · commit da1951097b71 · 2015-09-21T14:11:58.000-03:00
diff --git a/Source/Classes/SLKTextViewController.m b/Source/Classes/SLKTextViewController.m
@@ -1306,6 +1306,9 @@ - (void)slk_willShowOrHideKeyboard:(NSNotification *)notification
     NSInteger curve = [notification.userInfo[UIKeyboardAnimationCurveUserInfoKey] integerValue];
     NSTimeInterval duration = [notification.userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue];
     
+    CGRect beginFrame = [notification.userInfo[UIKeyboardFrameBeginUserInfoKey] CGRectValue];
+    CGRect endFrame = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+    
     SLKKeyboardStatus status = [self slk_keyboardStatusForNotification:notification];
     
     // Programatically stops scrolling before updating the view constraints (to avoid scrolling glitch).
@@ -1328,14 +1331,24 @@ - (void)slk_willShowOrHideKeyboard:(NSNotification *)notification
         [self slk_postKeyboarStatusNotification:notification];
     }
     
-    // Only for this animation, we set bo to bounce since we want to give the impression that the text input is glued to the keyboard.
-    [self.view slk_animateLayoutIfNeededWithDuration:duration
-                                              bounce:NO
-                                             options:(curve<<16)|UIViewAnimationOptionLayoutSubviews|UIViewAnimationOptionBeginFromCurrentState
-                                          animations:^{
-                                              [self slk_scrollToBottomIfNeeded];
-                                          }
-                                          completion:NULL];
+    void (^animations)() = ^void() {
+        [self slk_scrollToBottomIfNeeded];
+    };
+    
+    // Begin and end frames are the same when the keyboard is shown during navigation controller's push animation.
+    // The animation happens in window coordinates (slides from right to left) but doesn't in the view controller's view coordinates.
+    if (!CGRectEqualToRect(beginFrame, endFrame))
+    {
+        // Only for this animation, we set bo to bounce since we want to give the impression that the text input is glued to the keyboard.
+        [self.view slk_animateLayoutIfNeededWithDuration:duration
+                                                  bounce:NO
+                                                 options:(curve<<16)|UIViewAnimationOptionLayoutSubviews|UIViewAnimationOptionBeginFromCurrentState
+                                              animations:animations
+                                              completion:NULL];
+    }
+    else {
+        animations();
+    }
 }
 
 - (void)slk_didShowOrHideKeyboard:(NSNotification *)notification
