Merge pull request facebook#372 from suvarshibhadra/animationOptionsC…

…hange Add animation options to CKComponentBoundsAnimation
majak · Sep 10, 2015 · 5ba4694 · 5ba4694
2 parents df5f825 + 2b6b133
commit 5ba4694
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ComponentKit/Core/CKComponentBoundsAnimation.h b/ComponentKit/Core/CKComponentBoundsAnimation.h
@@ -39,6 +39,7 @@ struct CKComponentBoundsAnimation {
   NSTimeInterval duration;
   NSTimeInterval delay;
   CKComponentBoundsAnimationMode mode;
+  UIViewAnimationOptions options;
 
   /** Ignored unless mode is Spring, in which case it specifies the damping ratio passed to UIKit. */
   CGFloat springDampingRatio;

diff --git a/ComponentKit/Core/CKComponentBoundsAnimation.mm b/ComponentKit/Core/CKComponentBoundsAnimation.mm
@@ -24,13 +24,13 @@ void CKComponentBoundsAnimationApply(const CKComponentBoundsAnimation &animation
                           delay:animation.delay
          usingSpringWithDamping:animation.springDampingRatio
           initialSpringVelocity:animation.springInitialVelocity
-                        options:0
+                        options:animation.options
                      animations:animations
                      completion:completion];
   } else {
     [UIView animateWithDuration:animation.duration
                           delay:animation.delay
-                        options:0
+                        options:animation.options
                      animations:animations
                      completion:completion];
   }