Skip to content

Commit b2a2519

Browse files
sherginfacebook-github-bot
authored andcommittedJan 8, 2018
Proper usage CGFLOAT_MAX vs INFINITY inside RCTSurface
Summary: See `RCTShadowView+Layout.m` for more info about differences between CGFLOAT_MAX and INFINITY in Yoga and UIKit. Reviewed By: mmmulani Differential Revision: D6665635 fbshipit-source-id: 270ba5366c3dfe78e38474de5380d7d5d251e628
1 parent f96f9c5 commit b2a2519

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed
 

‎React/Base/Surface/RCTSurface.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ NS_ASSUME_NONNULL_BEGIN
8080

8181
/**
8282
* Previously set `maximumSize` layout constraint.
83-
* Defaults to `{INFINITY, INFINITY}`.
83+
* Defaults to `{CGFLOAT_MAX, CGFLOAT_MAX}`.
8484
*/
8585
@property (atomic, assign, readonly) CGSize maximumSize;
8686

‎React/Base/Surface/RCTSurface.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
6767
_rootShadowViewDidStartLayingOutSemaphore = dispatch_semaphore_create(0);
6868

6969
_minimumSize = CGSizeZero;
70-
_maximumSize = CGSizeMake(INFINITY, INFINITY);
70+
_maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
7171

7272
[[NSNotificationCenter defaultCenter] addObserver:self
7373
selector:@selector(handleBridgeWillLoadJavaScriptNotification:)

‎React/Base/Surface/RCTSurfaceRootShadowView.m

+12-9
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
#import "RCTSurfaceRootShadowView.h"
1111

12-
#import <React/RCTUIManagerUtils.h>
13-
1412
#import "RCTI18nUtil.h"
13+
#import "RCTShadowView+Layout.h"
14+
#import "RCTUIManagerUtils.h"
1515

1616
@implementation RCTSurfaceRootShadowView {
1717
CGSize _intrinsicSize;
@@ -25,7 +25,7 @@ - (instancetype)init
2525
self.viewName = @"RCTSurfaceRootView";
2626
_baseDirection = [[RCTI18nUtil sharedInstance] isRTL] ? YGDirectionRTL : YGDirectionLTR;
2727
_minimumSize = CGSizeZero;
28-
_maximumSize = CGSizeMake(INFINITY, INFINITY);
28+
_maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
2929

3030
self.alignSelf = YGAlignStretch;
3131
self.flex = 1;
@@ -45,14 +45,17 @@ - (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)atIndex
4545

4646
- (void)calculateLayoutWithMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximimSize
4747
{
48-
// Treating `INFINITY` as `YGUndefined` (which equals `NAN`).
49-
float availableWidth = isinf(maximimSize.width) ? YGUndefined : maximimSize.width;
50-
float availableHeight = isinf(maximimSize.height) ? YGUndefined : maximimSize.height;
48+
YGNodeRef yogaNode = self.yogaNode;
5149

52-
self.minWidth = (YGValue){isinf(minimumSize.width) ? YGUndefined : minimumSize.width, YGUnitPoint};
53-
self.minHeight = (YGValue){isinf(minimumSize.height) ? YGUndefined : minimumSize.height, YGUnitPoint};
50+
YGNodeStyleSetMinWidth(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(maximimSize.width));
51+
YGNodeStyleSetMinHeight(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(maximimSize.height));
5452

55-
YGNodeCalculateLayout(self.yogaNode, availableWidth, availableHeight, _baseDirection);
53+
YGNodeCalculateLayout(
54+
self.yogaNode,
55+
RCTYogaFloatFromCoreGraphicsFloat(maximimSize.width),
56+
RCTYogaFloatFromCoreGraphicsFloat(maximimSize.height),
57+
_baseDirection
58+
);
5659
}
5760

5861
- (NSSet<RCTShadowView *> *)collectViewsWithUpdatedFrames

‎React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ - (CGSize)sizeThatFits:(CGSize)size
8585
}
8686

8787
CGSize minimumSize = CGSizeZero;
88-
CGSize maximumSize = CGSizeMake(INFINITY, INFINITY);
88+
CGSize maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
8989

9090
if (_sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthExact) {
9191
minimumSize.width = size.width;

0 commit comments

Comments
 (0)
Please sign in to comment.