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

Yoga float vs. CoreGraphics float in RCTWrapper 

Summary: See RCTYogaFloatFromCoreGraphicsFloat for more details.

Differential Revision: D6677092

fbshipit-source-id: ca1b2634c903277f529c57557055760a9bf48f28
This commit is contained in:
Valentin Shergin 2018-01-08 14:43:18 -08:00 committed by Facebook Github Bot
parent c75612219e
commit 870bc4807a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Libraries/Wrapper/RCTWrapperShadowView.m
View File

@ -4,6 +4,7 @@
#import <React/RCTBridge.h> #import <React/RCTBridge.h>
#import <React/RCTUIManager.h> #import <React/RCTUIManager.h>
#import <React/RCTShadowView+Layout.h>
#import "RCTWrapperView.h" #import "RCTWrapperView.h"
@ -27,7 +28,7 @@
static YGSize RCTWrapperShadowViewMeasure(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode) static YGSize RCTWrapperShadowViewMeasure(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode)
{ {
CGSize minimumSize = CGSizeMake(0, 0); CGSize minimumSize = CGSizeMake(0, 0);
CGSize maximumSize = CGSizeMake(INFINITY, INFINITY); CGSize maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
switch (widthMode) { switch (widthMode) {
case YGMeasureModeUndefined: case YGMeasureModeUndefined:
@ -55,7 +56,11 @@ static YGSize RCTWrapperShadowViewMeasure(YGNodeRef node, float width, YGMeasure
RCTWrapperShadowView *shadowView = (__bridge RCTWrapperShadowView *)YGNodeGetContext(node); RCTWrapperShadowView *shadowView = (__bridge RCTWrapperShadowView *)YGNodeGetContext(node);
CGSize size = [shadowView measureWithMinimumSize:minimumSize maximumSize:maximumSize]; CGSize size = [shadowView measureWithMinimumSize:minimumSize maximumSize:maximumSize];
return (YGSize){size.width, size.height};
return (YGSize){
RCTYogaFloatFromCoreGraphicsFloat(size.width),
RCTYogaFloatFromCoreGraphicsFloat(size.height)
};
} }
- (CGSize)measureWithMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize - (CGSize)measureWithMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize

2
Libraries/Wrapper/RCTWrapperView.m
View File

@ -77,7 +77,7 @@
- (CGSize)intrinsicContentSize - (CGSize)intrinsicContentSize
{ {
return [self sizeThatFits:CGSizeMake(INFINITY, INFINITY)]; return [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
} }
- (CGSize)sizeThatFits:(CGSize)size - (CGSize)sizeThatFits:(CGSize)size