LayoutAnimation: replace implementation to fix broken duration/delay

Author: ptmt

React/Views/NSView+NSViewAnimationWithBlocks.h

@@ -1,61 +1,70 @@
 //
-//  NSView+NSViewAnimationWithBlocks.h
-//  Mail
-//
-//  Created by Robert Widmann on 7/13/12.
-//  Copyright (c) 2012 CodaFi Inc. All rights reserved.
-//
-//  Taken from //  Taken from https://github.com/jasonwiener/Mail/
+//  Taken from
+//  https://github.com/BigZaphod/Chameleon/blob/master/UIKit/Classes/UIViewAnimationGroup.m
+
 
 #import <Cocoa/Cocoa.h>
 
 typedef NSInteger NSViewAnimationTransition;
 
 enum NSViewAnimationTransition{
-    NSViewAnimationTransitionNone,
-    NSViewAnimationTransitionFlipFromLeft,
-    NSViewAnimationTransitionFlipFromRight,
-    NSViewAnimationTransitionCurlUp,
-    NSViewAnimationTransitionCurlDown,
+  NSViewAnimationTransitionNone,
+  NSViewAnimationTransitionFlipFromLeft,
+  NSViewAnimationTransitionFlipFromRight,
+  NSViewAnimationTransitionCurlUp,
+  NSViewAnimationTransitionCurlDown,
+};
+
+typedef NS_ENUM(NSInteger, NSViewAnimationGroupTransition) {
+  NSViewAnimationGroupTransitionNone,
+  NSViewAnimationGroupTransitionFlipFromLeft,
+  NSViewAnimationGroupTransitionFlipFromRight,
+  NSViewAnimationGroupTransitionCurlUp,
+  NSViewAnimationGroupTransitionCurlDown,
+  NSViewAnimationGroupTransitionFlipFromTop,
+  NSViewAnimationGroupTransitionFlipFromBottom,
+  NSViewAnimationGroupTransitionCrossDissolve,
 };
 
 typedef NSUInteger NSViewAnimationOptions;
 
 enum NSViewAnimationOptions{
-    NSViewAnimationOptionLayoutSubviews            = 1 <<  0,
-    NSViewAnimationOptionAllowUserInteraction      = 1 <<  1, // turn on user interaction while animating
-    NSViewAnimationOptionBeginFromCurrentState     = 1 <<  2, // start all views from current value, not initial value
-    NSViewAnimationOptionRepeat                    = 1 <<  3, // repeat animation indefinitely
-    NSViewAnimationOptionAutoreverse               = 1 <<  4, // if repeat, run animation back and forth
-    NSViewAnimationOptionOverrideInheritedDuration = 1 <<  5, // ignore nested duration
-    NSViewAnimationOptionOverrideInheritedCurve    = 1 <<  6, // ignore nested curve
-    NSViewAnimationOptionAllowAnimatedContent      = 1 <<  7, // animate contents (applies to transitions only)
-    NSViewAnimationOptionShowHideTransitionViews   = 1 <<  8, // flip to/from hidden state instead of adding/removing
-
-    NSViewAnimationOptionCurveEaseInOut            = 0 << 16, // default
-    NSViewAnimationOptionCurveEaseIn               = 1 << 16,
-    NSViewAnimationOptionCurveEaseOut              = 2 << 16,
-    NSViewAnimationOptionCurveLinear               = 3 << 16,
-
-    NSViewAnimationOptionTransitionNone            = 0 << 20, // default
-    NSViewAnimationOptionTransitionFlipFromLeft    = 1 << 20,
-    NSViewAnimationOptionTransitionFlipFromRight   = 2 << 20,
-    NSViewAnimationOptionTransitionCurlUp          = 3 << 20,
-    NSViewAnimationOptionTransitionCurlDown        = 4 << 20,
-    NSViewAnimationOptionTransitionCrossDissolve   = 5 << 20,
-    NSViewAnimationOptionTransitionFlipFromTop     = 6 << 20,
-    NSViewAnimationOptionTransitionFlipFromBottom  = 7 << 20,
+  NSViewAnimationOptionLayoutSubviews            = 1 <<  0,
+  NSViewAnimationOptionAllowUserInteraction      = 1 <<  1, // turn on user interaction while animating
+  NSViewAnimationOptionBeginFromCurrentState     = 1 <<  2, // start all views from current value, not initial value
+  NSViewAnimationOptionRepeat                    = 1 <<  3, // repeat animation indefinitely
+  NSViewAnimationOptionAutoreverse               = 1 <<  4, // if repeat, run animation back and forth
+  NSViewAnimationOptionOverrideInheritedDuration = 1 <<  5, // ignore nested duration
+  NSViewAnimationOptionOverrideInheritedCurve    = 1 <<  6, // ignore nested curve
+  NSViewAnimationOptionAllowAnimatedContent      = 1 <<  7, // animate contents (applies to transitions only)
+  NSViewAnimationOptionShowHideTransitionViews   = 1 <<  8, // flip to/from hidden state instead of adding/removing
+
+  NSViewAnimationOptionCurveEaseInOut            = 0 << 16, // default
+  NSViewAnimationOptionCurveEaseIn               = 1 << 16,
+  NSViewAnimationOptionCurveEaseOut              = 2 << 16,
+  NSViewAnimationOptionCurveLinear               = 3 << 16,
+
+  NSViewAnimationOptionTransitionNone            = 0 << 20, // default
+  NSViewAnimationOptionTransitionFlipFromLeft    = 1 << 20,
+  NSViewAnimationOptionTransitionFlipFromRight   = 2 << 20,
+  NSViewAnimationOptionTransitionCurlUp          = 3 << 20,
+  NSViewAnimationOptionTransitionCurlDown        = 4 << 20,
+  NSViewAnimationOptionTransitionCrossDissolve   = 5 << 20,
+  NSViewAnimationOptionTransitionFlipFromTop     = 6 << 20,
+  NSViewAnimationOptionTransitionFlipFromBottom  = 7 << 20,
 };
 
 typedef NSInteger NSViewAnimationCurve;
 
 enum NSViewAnimationCurve{
-    NSViewAnimationCurveEaseInOut,         // slow at beginning and end
-    NSViewAnimationCurveEaseIn,            // slow at beginning
-    NSViewAnimationCurveEaseOut,           // slow at end
-    NSViewAnimationCurveLinear
+  NSViewAnimationCurveEaseInOut,         // slow at beginning and end
+  NSViewAnimationCurveEaseIn,            // slow at beginning
+  NSViewAnimationCurveEaseOut,           // slow at end
+  NSViewAnimationCurveLinear
 };
 
+extern BOOL NSViewAnimationOptionIsSet(NSViewAnimationOptions options, NSViewAnimationOptions option);
+
 @interface NSView (NSViewAnimationWithBlocks)
 
 + (void)animateWithDuration:(NSTimeInterval)duration delay:(NSTimeInterval)delay options:(NSViewAnimationOptions)options animations:(void (^)(void))animations completion:(void (^)(BOOL finished))completion;
@@ -66,23 +75,14 @@ enum NSViewAnimationCurve{
 
 + (void)beginAnimations:(NSString *)animationID context:(void *)context;
 + (void)commitAnimations;
-+ (void)setAnimationBeginsFromCurrentState:(BOOL)beginFromCurrentState;
-+ (void)setAnimationCurve:(NSViewAnimationCurve)curve;
-+ (void)setAnimationDelay:(NSTimeInterval)delay;
-+ (void)setAnimationDelegate:(id)delegate;
-+ (void)setAnimationDidStopSelector:(SEL)selector;
-+ (void)setAnimationDuration:(NSTimeInterval)duration;
-+ (void)setAnimationRepeatAutoreverses:(BOOL)repeatAutoreverses;
-+ (void)setAnimationRepeatCount:(float)repeatCount;
-+ (void)setAnimationWillStartSelector:(SEL)selector;
 + (BOOL)areAnimationsEnabled;
 + (void)setAnimationsEnabled:(BOOL)enabled;
 
 @end
 
 @interface NSViewBlockAnimationDelegate : NSObject {
-    void (^_completion)(BOOL finished);
-    BOOL _ignoreInteractionEvents;
+  void (^_completion)(BOOL finished);
+  BOOL _ignoreInteractionEvents;
 }
 
 @property (nonatomic, copy) void (^completion)(BOOL finished);
@@ -92,29 +92,24 @@ enum NSViewAnimationCurve{
 
 @end
 
-@interface NSViewAnimationGroup : NSObject {
-@private
-    NSString *_name;
-    void *_context;
-    NSUInteger _waitingAnimations;
-    BOOL _didSendStartMessage;
-    NSTimeInterval _animationDelay;
-    NSTimeInterval _animationDuration;
-    NSViewAnimationCurve _animationCurve;
-    NSViewAnimationTransition _transitionType;
-    id _animationDelegate;
-    SEL _animationDidStopSelector;
-    SEL _animationWillStartSelector;
-    BOOL _animationBeginsFromCurrentState;
-    BOOL _animationRepeatAutoreverses;
-    float _animationRepeatCount;
-    CFTimeInterval _animationBeginTime;
-    CALayer *_transitionLayer;
-    BOOL _transitionShouldCache;
-    NSMutableSet *_animatingViews;
-}
-
-+ (id)animationGroupWithName:(NSString *)theName context:(void *)theContext;
+@interface NSViewAnimationGroup : NSObject
+
+@property (nonatomic, copy) NSString *name;
+@property (nonatomic, assign) void *context;
+@property (nonatomic, copy) void (^completionBlock)(BOOL finished);
+@property (nonatomic, assign) BOOL allowUserInteraction;
+@property (nonatomic, assign) BOOL beginsFromCurrentState;
+@property (nonatomic, assign) NSViewAnimationCurve curve;
+@property (nonatomic, assign) NSTimeInterval delay;
+@property (nonatomic, strong) id delegate;
+@property (nonatomic, assign) SEL didStopSelector;
+@property (nonatomic, assign) SEL willStartSelector;
+@property (nonatomic, assign) NSTimeInterval duration;
+@property (nonatomic, assign) BOOL repeatAutoreverses;
+@property (nonatomic, assign) float repeatCount;
+@property (nonatomic, assign) NSViewAnimationGroupTransition transition;
+
+- (id)initWithAnimationOptions:(NSViewAnimationOptions)options;
 
 - (id)actionForView:(NSView *)view forKey:(NSString *)keyPath;