DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Revert D5643382: [yoga][PR] Fix a typo in YogaKit,

Browse Source 
Summary:
This reverts commit 127b0c11dbfd76d298db823e65fd2f6e365642e7

bypass-lint

Differential Revision: D5643382

fbshipit-source-id: f25b04680428bcd4515c44741ed72a004be43ef1
This commit is contained in:
Hoa Dinh
2017-08-17 15:41:26 -07:00
committed by Facebook Github Bot
parent 18d19af7ec
commit 32f128640b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
YogaKit/Source/YGLayout.h
View File

@@ -23,7 +23,7 @@ YG_EXTERN_C_END
typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) { typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
YGDimensionFlexibilityFlexibleWidth = 1 << 0, YGDimensionFlexibilityFlexibleWidth = 1 << 0,
YGDimensionFlexibilityFlexibleHeight = 1 << 1, YGDimensionFlexibilityFlexibleHeigth = 1 << 1,
}; };
@interface YGLayout : NSObject @interface YGLayout : NSObject

2
YogaKit/Source/YGLayout.m
View File

@@ -254,7 +254,7 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
if (dimensionFlexibility & YGDimensionFlexibilityFlexibleWidth) { if (dimensionFlexibility & YGDimensionFlexibilityFlexibleWidth) {
size.width = YGUndefined; size.width = YGUndefined;
} }
if (dimensionFlexibility & YGDimensionFlexibilityFlexibleHeight) { if (dimensionFlexibility & YGDimensionFlexibilityFlexibleHeigth) {
size.height = YGUndefined; size.height = YGUndefined;
} }
[self calculateLayoutWithSize:size]; [self calculateLayoutWithSize:size];

4
YogaKit/Tests/YogaKitTests.m
View File

@@ -181,7 +181,7 @@
view.yoga.height = YGPointValue(100); view.yoga.height = YGPointValue(100);
[container addSubview:view]; [container addSubview:view];
[container.yoga applyLayoutPreservingOrigin:YES dimensionFlexibility:YGDimensionFlexibilityFlexibleHeight]; [container.yoga applyLayoutPreservingOrigin:YES dimensionFlexibility:YGDimensionFlexibilityFlexibleHeigth];
XCTAssertEqual(200, container.frame.size.width); XCTAssertEqual(200, container.frame.size.width);
XCTAssertEqual(100, container.frame.size.height); XCTAssertEqual(100, container.frame.size.height);
} }
@@ -197,7 +197,7 @@
view.yoga.height = YGPointValue(100); view.yoga.height = YGPointValue(100);
[container addSubview:view]; [container addSubview:view];
[container.yoga applyLayoutPreservingOrigin:YES dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth | YGDimensionFlexibilityFlexibleHeight]; [container.yoga applyLayoutPreservingOrigin:YES dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth | YGDimensionFlexibilityFlexibleHeigth];
XCTAssertEqual(100, container.frame.size.width); XCTAssertEqual(100, container.frame.size.width);
XCTAssertEqual(100, container.frame.size.height); XCTAssertEqual(100, container.frame.size.height);
} }