* [ios] fix issue transform does not work while initialized.

alibaba · Sep 4, 2016 · c36f1bf · c36f1bf
1 parent 2191090
commit c36f1bf
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXCellComponent.m
@@ -37,6 +37,8 @@ - (void)dealloc
 
 - (void)_frameDidCalculated:(BOOL)isChanged
 {
+    [super _frameDidCalculated:isChanged];
+
     if (isChanged) {
         [self.list cellDidLayout:self];
     }

diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
@@ -61,6 +61,8 @@ - (instancetype)initWithRef:(NSString *)ref type:(NSString *)type styles:(NSDict
 
 - (void)_frameDidCalculated:(BOOL)isChanged
 {
+    [super _frameDidCalculated:isChanged];
+
     if (isChanged) {
         [self.list headerDidLayout:self];
     }

diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -340,6 +340,7 @@ - (void)syncTextStorageForView
 
 - (void)_frameDidCalculated:(BOOL)isChanged
 {
+    [super _frameDidCalculated:isChanged];
     [self syncTextStorageForView];
 }
 

diff --git a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
@@ -11,6 +11,7 @@
 #import "WXTransform.h"
 #import "WXAssert.h"
 #import "WXComponent_internal.h"
+#import "WXSDKInstance_private.h"
 
 @implementation WXComponent (Layout)
 
@@ -96,6 +97,18 @@ - (NSUInteger)_childrenCountForLayout
 - (void)_frameDidCalculated:(BOOL)isChanged
 {
     WXAssertComponentThread();
+
+    if ([self isViewLoaded] && isChanged && [self isViewFrameSyncWithCalculated]) {
+
+        [self.weexInstance.componentManager _addUITask:^{
+            self.view.frame = _calculatedFrame;
+            if (_transform) {
+                _layer.transform = [[WXTransform new] getTransform:_transform withView:_view withOrigin:_transformOrigin];
+            }
+
+            [_layer setNeedsDisplay];
+        }];
+    }
 }
 
 - (void)_calculateFrameWithSuperAbsolutePosition:(CGPoint)superAbsolutePosition
@@ -159,16 +172,6 @@ - (void)_layoutDidFinish
 {
     WXAssertMainThread();
 
-    if ([self isViewLoaded] && !CGRectEqualToRect(_calculatedFrame, self.view.frame)
-        && [self isViewFrameSyncWithCalculated]) {
-        self.view.frame = _calculatedFrame;
-        // transform does not belong to layout, move it to other place hopefully
-        if (_transform) {
-            _layer.transform = [[WXTransform new] getTransform:_transform withView:self.view withOrigin:_transformOrigin];
-        }
-        [_layer setNeedsDisplay];
-    }
-
     if (_positionType == WXPositionTypeSticky) {
         [self.ancestorScroller adjustSticky];
     }

diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -21,6 +21,7 @@
 #import "WXAssert.h"
 #import "WXThreadSafeMutableDictionary.h"
 #import "WXThreadSafeMutableArray.h"
+#import "WXTransform.h"
 #import <pthread/pthread.h>
 
 #pragma clang diagnostic ignored "-Wincomplete-implementation"
@@ -187,6 +188,10 @@ - (UIView *)view
             _view.backgroundColor = _backgroundColor;
         }
 
+        if (_transform) {
+            _layer.transform = [[WXTransform new] getTransform:_transform withView:_view withOrigin:_transformOrigin];
+        }
+
         _view.wx_component = self;
         _view.wx_ref = self.ref;
         _layer.wx_component = self;