Resolve root constrained size before informing delegate to resolve in…

…finite layout loop. (#1359)
TextureGroup · Mar 5, 2019 · 96e6a6c · 96e6a6c
1 parent 50e8dbf
commit 96e6a6c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Source/ASDisplayNode+Yoga.mm b/Source/ASDisplayNode+Yoga.mm
@@ -333,6 +333,10 @@ - (void)calculateLayoutFromYogaRoot:(ASSizeRange)rootConstrainedSize
     return;
   }
 
+  if (ASSizeRangeEqualToSizeRange(rootConstrainedSize, ASSizeRangeUnconstrained)) {
+    rootConstrainedSize = [self _locked_constrainedSizeForLayoutPass];
+  }
+
   [self willCalculateLayout:rootConstrainedSize];
   [self enumerateInterfaceStateDelegates:^(id<ASInterfaceStateDelegate>  _Nonnull delegate) {
     if ([delegate respondsToSelector:@selector(nodeWillCalculateLayout:)]) {
@@ -352,10 +356,6 @@ - (void)calculateLayoutFromYogaRoot:(ASSizeRange)rootConstrainedSize
     };
   });
 
-  if (ASSizeRangeEqualToSizeRange(rootConstrainedSize, ASSizeRangeUnconstrained)) {
-    rootConstrainedSize = [self _locked_constrainedSizeForLayoutPass];
-  }
-
   ASYogaLog("CALCULATING at Yoga root with constraint = {%@, %@}: %@",
             NSStringFromCGSize(rootConstrainedSize.min), NSStringFromCGSize(rootConstrainedSize.max), self);