fix: some subview didn't enable yoga, and crash with NaN frame

2019-10-09 18:30:40 +08:00
parent 2ef674edd3
commit 9777dc0630
1 changed files with 6 additions and 2 deletions
--- a/YogaKit/Source/YGLayout.m
+++ b/YogaKit/Source/YGLayout.m
@@ -441,10 +441,14 @@ static CGFloat YGRoundPixelValue(CGFloat value)
 static void YGApplyLayoutToViewHierarchy(UIView *view, BOOL preserveOrigin)
 {
  NSCAssert([NSThread isMainThread], @"Framesetting should only be done on the main thread.");
-
+  
+  if (!view.isYogaEnabled) {
+    return;
+  }
+  
  const YGLayout *yoga = view.yoga;

-  if (!yoga.isIncludedInLayout) {
+  if (!yoga.isEnabled || !yoga.isIncludedInLayout) {
     return;
  }