Merge pull request #211 from iohin/master

fixed crash with nan dimensions
layoutBox · Jan 20, 2023 · f6a261c · f6a261c
2 parents e9100fc + 551371c
commit f6a261c
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/Sources/YogaKit/YGLayout.mm b/Sources/YogaKit/YGLayout.mm
@@ -502,11 +502,17 @@ static void YGApplyLayoutToViewHierarchy(UIView *view, BOOL preserveOrigin)
     YGNodeLayoutGetLeft(node),
     YGNodeLayoutGetTop(node),
   };
-
-  const CGPoint bottomRight = {
+  CGPoint bottomRight = {
     topLeft.x + YGNodeLayoutGetWidth(node),
     topLeft.y + YGNodeLayoutGetHeight(node),
   };
+
+  if (isnan(bottomRight.x)) {
+    bottomRight.x = 0;
+  }
+  if (isnan(bottomRight.y)) {
+    bottomRight.y = 0;
+  }
 
   const CGPoint origin = preserveOrigin ? view.frame.origin : CGPointZero;
   view.frame = (CGRect) {
@@ -515,8 +521,8 @@ static void YGApplyLayoutToViewHierarchy(UIView *view, BOOL preserveOrigin)
       .y = YGRoundPixelValue(topLeft.y + origin.y),
     },
     .size = {
-      .width = YGRoundPixelValue(bottomRight.x) - YGRoundPixelValue(topLeft.x),
-      .height = YGRoundPixelValue(bottomRight.y) - YGRoundPixelValue(topLeft.y),
+      .width = MAX(0, YGRoundPixelValue(bottomRight.x) - YGRoundPixelValue(topLeft.x)),
+      .height = MAX(0, YGRoundPixelValue(bottomRight.y) - YGRoundPixelValue(topLeft.y)),
     },
   };