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

Fixes #606 #610

Closed
kovpas wants to merge 4 commits from fix-606 into master
pull from: fix-606
merge into: DaddyFrosty:master
Conversation 34 Commits 4 Files Changed 2 +21 -4
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d12400c904 - Show all commits

4
YogaKit/Source/YGLayout.m
View File

@@ -102,6 +102,7 @@ static YGConfigRef globalConfig;
@interface YGLayout () @interface YGLayout ()
@property (nonatomic, weak, readonly) UIView *view; @property (nonatomic, weak, readonly) UIView *view;
@property (nonatomic, assign, readonly) BOOL isUIView;
@end @end
@@ -126,6 +127,7 @@ static YGConfigRef globalConfig;
YGNodeSetContext(_node, (__bridge void *) view); YGNodeSetContext(_node, (__bridge void *) view);
_isEnabled = NO; _isEnabled = NO;
_isIncludedInLayout = YES; _isIncludedInLayout = YES;
_isUIView = [view isMemberOfClass:[UIView class]];
} }
return self; return self;
@@ -307,7 +309,7 @@ static YGSize YGMeasureView(
CGSize sizeThatFits = CGSizeZero; CGSize sizeThatFits = CGSizeZero;
// Fix for https://github.com/facebook/yoga/issues/606 // Fix for https://github.com/facebook/yoga/issues/606
if (![view isMemberOfClass:[UIView class]] || [view.subviews count] > 0) { if (!view.yoga.isUIView || [view.subviews count] > 0) {
sizeThatFits = [view sizeThatFits:(CGSize) { sizeThatFits = [view sizeThatFits:(CGSize) {
.width = constrainedWidth, .width = constrainedWidth,
.height = constrainedHeight, .height = constrainedHeight,