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

[WEEX-453][iOS] transform/transformOrigin conflict when updateStyles #1260

Merged
merged 1 commit into from
Jun 14, 2018
Merged

[WEEX-453][iOS] transform/transformOrigin conflict when updateStyles #1260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,14 +251,13 @@ - (void)_updateViewStyles:(NSDictionary *)styles
}
}
if (styles[@"transform"]) {
_transform = [[WXTransform alloc] initWithCSSValue:[WXConvert NSString:styles[@"transform"]] origin:[WXConvert NSString:self.styles[@"transformOrigin"]] instance:self.weexInstance];
id transformOrigin = styles[@"transformOrigin"] ?: self.styles[@"transformOrigin"];
_transform = [[WXTransform alloc] initWithCSSValue:[WXConvert NSString:styles[@"transform"]] origin:[WXConvert NSString:transformOrigin] instance:self.weexInstance];
if (!CGRectEqualToRect(self.calculatedFrame, CGRectZero)) {
[_transform applyTransformForView:_view];
[_layer setNeedsDisplay];
}
}

if (styles[@"transformOrigin"]) {
}else if (styles[@"transformOrigin"]) {
[_transform setTransformOrigin:[WXConvert NSString:styles[@"transformOrigin"]]];
if (!CGRectEqualToRect(self.calculatedFrame, CGRectZero)) {
[_transform applyTransformForView:_view];
Expand Down