status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed previously broken support for negative `scale` (`transform` style property) 

Summary:
closes #13081

UIExplorer, TransformExample
Closes https://github.com/facebook/react-native/pull/13083

Reviewed By: mmmulani

Differential Revision: D4758237

Pulled By: shergin

fbshipit-source-id: 58385a4cde7a739b6657c293c381644a92918265
This commit is contained in:
Sokovikov 2017-03-24 18:07:12 -07:00 committed by Facebook Github Bot
parent 09fe99972d
commit c87c4d052f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
React/Views/RCTConvert+Transform.m
View File

@ -63,6 +63,9 @@ static const NSUInteger kMatrixArrayLength = 4 * 4;
RCTLogWarn(@"[RCTConvert CATransform3D:] has deprecated a matrix as input. Pass an array of configs (which can contain a matrix key) instead."); RCTLogWarn(@"[RCTConvert CATransform3D:] has deprecated a matrix as input. Pass an array of configs (which can contain a matrix key) instead.");
return [self CATransform3DFromMatrix:json]; return [self CATransform3DFromMatrix:json];
} }
CGFloat zeroScaleThreshold = FLT_EPSILON;
for (NSDictionary *transformConfig in (NSArray<NSDictionary *> *)json) { for (NSDictionary *transformConfig in (NSArray<NSDictionary *> *)json) {
if (transformConfig.count != 1) { if (transformConfig.count != 1) {
RCTLogConvertError(json, @"a CATransform3D. You must specify exactly one property per transform object."); RCTLogConvertError(json, @"a CATransform3D. You must specify exactly one property per transform object.");
@ -90,15 +93,18 @@ static const NSUInteger kMatrixArrayLength = 4 * 4;
transform = CATransform3DRotate(transform, rotate, 0, 0, 1); transform = CATransform3DRotate(transform, rotate, 0, 0, 1);
} else if ([property isEqualToString:@"scale"]) { } else if ([property isEqualToString:@"scale"]) {
CGFloat scale = MAX([value floatValue], FLT_EPSILON); CGFloat scale = [value floatValue];
scale = ABS(scale) < zeroScaleThreshold ? zeroScaleThreshold : scale;
transform = CATransform3DScale(transform, scale, scale, 1); transform = CATransform3DScale(transform, scale, scale, 1);
} else if ([property isEqualToString:@"scaleX"]) { } else if ([property isEqualToString:@"scaleX"]) {
CGFloat scale = MAX([value floatValue], FLT_EPSILON); CGFloat scale = [value floatValue];
scale = ABS(scale) < zeroScaleThreshold ? zeroScaleThreshold : scale;
transform = CATransform3DScale(transform, scale, 1, 1); transform = CATransform3DScale(transform, scale, 1, 1);
} else if ([property isEqualToString:@"scaleY"]) { } else if ([property isEqualToString:@"scaleY"]) {
CGFloat scale = MAX([value floatValue], FLT_EPSILON); CGFloat scale = [value floatValue];
scale = ABS(scale) < zeroScaleThreshold ? zeroScaleThreshold : scale;
transform = CATransform3DScale(transform, 1, scale, 1); transform = CATransform3DScale(transform, 1, scale, 1);
} else if ([property isEqualToString:@"translate"]) { } else if ([property isEqualToString:@"translate"]) {