Revert "fix(ios): fix combined animation error (#941)"

This reverts commit 95bc07c.

ios/sdk/component/view/HippyView+HippyViewAnimation.h

@@ -29,12 +29,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface CAAnimation (OriginValue)
-
-- (void)setOriginToValue:(id)toValue;
-
-- (id)originToValue;
-
-@end
-
 NS_ASSUME_NONNULL_END

ios/sdk/component/view/HippyView+HippyViewAnimation.m

@@ -24,7 +24,6 @@
 #import "HippyView+HippyViewAnimation.h"
 #import "HippyExtAnimation.h"
 #import "HippyConvert.h"
-#import "objc/runtime.h"
 
 @implementation HippyView (HippyViewAnimation)
 
@@ -60,33 +59,9 @@ - (CAAnimation *)animation:(HippyExtAnimation *)animation keyPath:(NSString *)ke
         ani.fillMode = kCAFillModeForwards;
         ani.toValue = toValue;
         ani.fromValue = fromValue;
-        [ani setOriginToValue:@(animation.endValue)];
         return ani;
     }
     return nil;
 }
 
 @end
-
-@implementation CAAnimation(OriginValue)
-
-static NSString *const kOriginToValueKey = @"kOriginToValue";
-
-- (void)setOriginToValue:(id)toValue {
-    [self setValue:toValue forKey:kOriginToValueKey];
-}
-
-- (id)originToValue {
-    id value = [self valueForKey:kOriginToValueKey];
-    if (value) {
-        return value;
-    }
-    else if ([self respondsToSelector:@selector(toValue)]) {
-        value = [self performSelector:@selector(toValue)];
-        return value;
-    }
-    return nil;
-}
-
-@end
-

ios/sdk/module/animation/HippyExtAnimation.h

@@ -60,8 +60,6 @@ typedef NS_ENUM(NSInteger, HippyExtAnimationState) {
 @property (nonatomic, copy) NSNumber *parentAnimationId;
 @property (nonatomic, assign) HippyExtAnimationState state;
 
-+ (NSString *)convertAnimationKeyPathToViewProperty:(NSString *)keyPath;
-
 - (void)updateAnimation:(NSDictionary *)config;
 
 - (CAAnimation *)animationOfView:(UIView *)view forProp:(NSString *)prop;

ios/sdk/module/animation/HippyExtAnimation.m

@@ -53,12 +53,6 @@ + (NSDictionary *)animationKeyMap {
     return animationMap;
 }
 
-+ (NSString *)convertAnimationKeyPathToViewProperty:(NSString *)keyPath {
-    NSDictionary *map = [self animationKeyMap];
-    NSArray *keys = [map objectForKey:keyPath];
-    return [keys firstObject];
-}
-
 + (CGFloat)convertToRadians:(id)json {
     if ([json isKindOfClass:[NSString class]]) {
         NSString *stringValue = (NSString *)json;

ios/sdk/module/animation/HippyExtAnimationModule.m

@@ -327,7 +327,7 @@ - (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag {
     [_lock unlock];
 
     [self.bridge.uiManager executeBlockOnUIManagerQueue:^{
-        [self.bridge.uiManager updateViewsAfterAnimation:anim completion:^(HippyUIManager *uiManager) {
+        [self.bridge.uiManager updateViewsFromParams:params completion:^(HippyUIManager *uiManager) {
             UIView *view = [uiManager viewForHippyTag:viewId];
             [view.layer removeAnimationForKey:[NSString stringWithFormat:@"%@", animationId]];
             if (!CGPointEqualToPoint(view.layer.anchorPoint, CGPointMake(.5f, .5f))) {

ios/sdk/module/uimanager/HippyUIManager.h

@@ -153,11 +153,6 @@ HIPPY_EXTERN NSString *const HippyUIManagerRootViewKey;
 - (void)removeNativeNode:(HippyVirtualNode *)node;
 - (void)removeNativeNodeView:(UIView *)nodeView;
 - (void)updateViewsFromParams:(NSArray<HippyExtAnimationViewParams *> *)params completion:(HippyViewUpdateCompletedBlock)block;
-
-/**
- * param animation could be CABasicAnimation or CABasicAnimations within CAAnimationGroup
- */
-- (void)updateViewsAfterAnimation:(CAAnimation *)animation completion:(HippyViewUpdateCompletedBlock)block;
 - (void)updateViewWithHippyTag:(NSNumber *)hippyTag props:(NSDictionary *)pros;
 @end
 

ios/sdk/module/uimanager/HippyUIManager.mm

@@ -51,9 +51,6 @@
 #import "HippyMemoryOpt.h"
 #import "HippyDeviceBaseInfo.h"
 #import "HippyVirtualList.h"
-#import "HippyExtAnimation.h"
-#import "HippyConvert+Transform.h"
-#import "HippyView+HippyViewAnimation.h"
 
 @protocol HippyBaseListViewProtocol;
 
@@ -990,8 +987,7 @@ - (void)updateViewsFromParams:(NSArray<HippyExtAnimationViewParams *> *)params c
         } else {
             HippyAssert(NO, @"param.rootTag不应该为nil，保留现场，找mengyanluo");
         }
-        NSDictionary *updateParams = [param updateParams];
-        [self updateView:param.hippyTag viewName:nil props:updateParams];
+        [self updateView:param.hippyTag viewName:nil props:param.updateParams];
         if (block) {
             [[self completeBlocks] addObject:block];
         }
@@ -1002,51 +998,6 @@ - (void)updateViewsFromParams:(NSArray<HippyExtAnimationViewParams *> *)params c
     }
 }
 
-- (void)updateViewsAfterAnimation:(CAAnimation *)animation completion:(HippyViewUpdateCompletedBlock)block {
-    @try {
-        NSArray<CABasicAnimation *> *basicAnimations = nil;
-        if ([animation isKindOfClass:[CABasicAnimation class]]) {
-            basicAnimations = @[(CABasicAnimation *)animation];
-        }
-        else if ([animation isKindOfClass:[CAAnimationGroup class]]) {
-            basicAnimations = (NSArray<CABasicAnimation *> *)[(CAAnimationGroup *)animation animations];
-        }
-
-        NSMutableArray<NSDictionary *> *props = [NSMutableArray arrayWithCapacity:[basicAnimations count]];
-        NSNumber *viewId = [animation valueForKey:@"viewID"];
-        HippyShadowView *shadowView = [[self shadowViewRegistry] objectForKey:viewId];
-        NSDictionary *shadowViewOriginProps = [shadowView props];
-        NSMutableDictionary *propsAfterAnimation = [shadowViewOriginProps mutableCopy];
-        for (CABasicAnimation *basicAni in basicAnimations) {
-            NSString *keyPath = [basicAni keyPath];
-            NSString *property = [HippyExtAnimation convertAnimationKeyPathToViewProperty:keyPath]?:keyPath;
-            if (property) {
-                if ([HippyConvert canConvertPropertyWithTransform3D:property]) {
-                    NSDictionary *updateParams = [NSDictionary dictionaryWithObject:[basicAni toValue] forKey:property];
-                    [props addObject:updateParams];
-                }
-                else {
-                    [propsAfterAnimation setObject:[basicAni originToValue] forKey:property];
-                }
-            }
-        }
-        if ([props count] > 0) {
-            [propsAfterAnimation setObject:props forKey:@"transform"];
-        }
-        [self updateView:viewId viewName:nil props:propsAfterAnimation];
-        if (block) {
-            [[self completeBlocks] addObject:block];
-        }
-        [self _layoutAndMount];
-    }
-    @catch (NSException *exception) {
-#if HIPPY_DEBUG
-        NSError *error = HippyErrorWithMessageAndModuleName([exception reason], self.bridge.moduleName);
-        HippyFatal(error);
-#endif //HIPPY_DEBUG
-    }
-}
-
 - (void)updateViewWithHippyTag:(NSNumber *)hippyTag props:(NSDictionary *)pros {
     [self updateView:hippyTag viewName:nil props:pros];
 }

ios/sdk/utils/HippyConvert+Transform.h

@@ -27,5 +27,4 @@
 + (CATransform3D)CATransform3D:(id)json;
 + (CGFloat)convertToRadians:(id)json;
 + (CGFloat)convertDegToRadians:(CGFloat)deg;
-+ (BOOL)canConvertPropertyWithTransform3D:(NSString *)property;
 @end

ios/sdk/utils/HippyConvert+Transform.m

@@ -64,20 +64,8 @@ + (CATransform3D)CATransform3DFromMatrix:(id)json {
     return transform;
 }
 
-+ (BOOL)canConvertPropertyWithTransform3D:(NSString *)property {
-    static NSArray<NSString *> *props = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        props = @[@"matrix", @"perspective", @"rotate", @"rotateX", @"rotateY",
-                  @"rotateZ", @"scale", @"scaleX", @"scaleY", @"translate",
-                  @"translateX", @"translateY", @"translateZ", @"skewX", @"skewY"];
-    });
-    return [props containsObject:property];
-}
-
 + (CATransform3D)CATransform3D:(id)json {
     CATransform3D transform = CATransform3DIdentity;
-    //CATransform3D.m34 makes sure everything looks small in distance and big on the contrary
     transform.m34 = -1.0 / 500.0;
     if (!json) {
         return transform;
@@ -143,13 +131,15 @@ + (CATransform3D)CATransform3D:(id)json {
             CGFloat translateY = [HippyNilIfNull(array[1]) floatValue];
             CGFloat translateZ = array.count > 2 ? [HippyNilIfNull(array[2]) floatValue] : 0;
             transform = CATransform3DTranslate(transform, translateX, translateY, translateZ);
+
         } else if ([property isEqualToString:@"translateX"]) {
             CGFloat translate = [value floatValue];
             transform = CATransform3DTranslate(transform, translate, 0, 0);
 
         } else if ([property isEqualToString:@"translateY"]) {
             CGFloat translate = [value floatValue];
             transform = CATransform3DTranslate(transform, 0, translate, 0);
+
         } else if ([property isEqualToString:@"translateZ"]) {
             CGFloat translate = [value floatValue];
             transform = CATransform3DTranslate(transform, 0, 0, translate);

ios/sdk/utils/HippyConvert.h

@@ -93,6 +93,7 @@ typedef NSURL HippyFileURL;
 + (CGLineCap)CGLineCap:(id)json;
 + (CGLineJoin)CGLineJoin:(id)json;
 
+//+ (CATransform3D)CATransform3D:(id)json;
 + (CGAffineTransform)CGAffineTransform:(id)json;
 
 + (UIColor *)UIColor:(id)json;