From 2e389f75d3c355f982aaccc905545f4618d5e691 Mon Sep 17 00:00:00 2001 From: "qianyuan.wqy" Date: Thu, 20 Jun 2019 11:45:09 +0800 Subject: [PATCH 1/2] [iOS] Fix bug that 'width' & 'height' style value cannot be retrieved from component styles dict. --- ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m index 36b2d78d89..1c14dfcd7a 100644 --- a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m +++ b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m @@ -25,6 +25,7 @@ #import "WXUtility.h" #import "WXLength.h" #import "WXTransition.h" +#import "WXComponent+Layout.h" @interface WXAnimationInfo : NSObject @@ -332,7 +333,13 @@ - (void)transitionWithArgs:(NSDictionary *)args withProperty:(NSString *)propert transitionDic:(NSMutableDictionary*)transitionDic { [transition.filterStyles setObject:args[@"styles"][property] forKey:property]; - [transition.oldFilterStyles setObject:target.styles[property] ?:@0 forKey:property]; + + id oldStyleValue = target.styles[property]; + if (oldStyleValue == nil) { + oldStyleValue = [target convertLayoutValueToStyleValue:property]; + } + [transition.oldFilterStyles setObject:oldStyleValue ?:@0 forKey:property]; + [target _modifyStyles:@{property:args[@"styles"][property]}]; [transitionDic setObject:@([args[@"duration"] doubleValue]) forKey:kWXTransitionDuration]; [transitionDic setObject:@([args[@"delay"] doubleValue]) forKey:kWXTransitionDelay]; From 2ecdcde64c8bff695dc1498e401cac777f9993a7 Mon Sep 17 00:00:00 2001 From: "qianyuan.wqy" Date: Thu, 20 Jun 2019 11:46:13 +0800 Subject: [PATCH 2/2] [iOS] Fix bug that 'width' & 'height' style value cannot be retrieved from component styles dict. --- ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m index 1c14dfcd7a..7c774554ad 100644 --- a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m +++ b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m @@ -338,6 +338,9 @@ - (void)transitionWithArgs:(NSDictionary *)args withProperty:(NSString *)propert if (oldStyleValue == nil) { oldStyleValue = [target convertLayoutValueToStyleValue:property]; } + if (oldStyleValue == nil) { + oldStyleValue = @"0.0"; + } [transition.oldFilterStyles setObject:oldStyleValue ?:@0 forKey:property]; [target _modifyStyles:@{property:args[@"styles"][property]}];