Merge branch 'ios-feature-layoutanimation-0.16dev' of https://github.com/doumafang/incubator-weex into wip-us-0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/28ed1227 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/28ed1227 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/28ed1227 Branch: refs/heads/master Commit: 28ed12278c1b907f17d4985aaf614a007f9dd9ad Parents: 4b5672d 2985c58 Author: acton393 <zhangxing610...@gmail.com> Authored: Mon Sep 25 22:13:59 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Mon Sep 25 22:13:59 2017 +0800 ---------------------------------------------------------------------- .../Sources/Display/WXComponent+Display.m | 14 +------- .../Sources/Manager/WXComponentManager.m | 4 +-- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 38 +++++++++----------- ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 16 +++++++++ ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 24 +++++++++++++ 5 files changed, 59 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28ed1227/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28ed1227/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28ed1227/ios/sdk/WeexSDK/Sources/Model/WXComponent.m ---------------------------------------------------------------------- diff --cc ios/sdk/WeexSDK/Sources/Model/WXComponent.m index 2bad1c2,13affb8..1df3d93 --- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m +++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m @@@ -85,10 -85,8 +85,9 @@@ _attributes = attributes ? [NSMutableDictionary dictionaryWithDictionary:attributes] : [NSMutableDictionary dictionary]; _events = events ? [NSMutableArray arrayWithArray:events] : [NSMutableArray array]; _subcomponents = [NSMutableArray array]; - _absolutePosition = CGPointMake(NAN, NAN); + _displayType = WXDisplayTypeBlock; _isNeedJoinLayoutSystem = YES; _isLayoutDirty = YES; _isViewFrameSyncWithCalculated = YES;
