Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

Fix animation needlayout #2585

Merged
merged 2 commits into from
Jun 20, 2019
Merged

Fix animation needlayout #2585

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e389f7
[iOS] Fix bug that 'width' & 'height' style value cannot be retrieved…
Jun 20, 2019
2ecdcde
[iOS] Fix bug that 'width' & 'height' style value cannot be retrieved…
Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#import "WXUtility.h"
#import "WXLength.h"
#import "WXTransition.h"
#import "WXComponent+Layout.h"

@interface WXAnimationInfo : NSObject<NSCopying>

Expand Down Expand Up @@ -332,7 +333,16 @@ - (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];
}
if (oldStyleValue == nil) {
oldStyleValue = @"0.0";
}
[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];
Expand Down