Yoga: call getMeasure even when YGMeasureModeExactly (#100)

* Yoga: call getMeasure even when YGMeasureModeExactly * Revert "Yoga: call getMeasure even when YGMeasureModeExactly" This reverts commit fccb3a4. * Yoga: call getMeasure even when YGMeasureModeExactly
microsoft · Jul 2, 2019 · 3432672 · 3432672
1 parent b087e2f
commit 3432672
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp
@@ -1669,6 +1669,16 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(
       : YGFloatMax(
             0, availableHeight - marginAxisColumn - paddingAndBorderAxisColumn);
 
+  // Measure the text under the current constraints.
+  const YGSize measuredSize = marker::MarkerSection<YGMarkerMeasure>::wrap(
+      node,
+      node->getMeasure(),
+      node,
+      innerWidth,
+      widthMeasureMode,
+      innerHeight,
+      heightMeasureMode);
+
   if (widthMeasureMode == YGMeasureModeExactly &&
       heightMeasureMode == YGMeasureModeExactly) {
     // Don't bother sizing the text if both dimensions are already defined.
@@ -1689,16 +1699,6 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(
             ownerWidth),
         YGDimensionHeight);
   } else {
-    // Measure the text under the current constraints.
-    const YGSize measuredSize = marker::MarkerSection<YGMarkerMeasure>::wrap(
-        node,
-        node->getMeasure(),
-        node,
-        innerWidth,
-        widthMeasureMode,
-        innerHeight,
-        heightMeasureMode);
-
     node->setLayoutMeasuredDimension(
         YGNodeBoundAxis(
             node,