From 0a4ce80868ae2cc007540dc28455144f49fc40b6 Mon Sep 17 00:00:00 2001 From: Emil Sjolander Date: Fri, 12 May 2017 09:03:24 -0700 Subject: [PATCH] Fix typo causing wrapped children to be sized by wrong axis margin Reviewed By: passy Differential Revision: D5044470 fbshipit-source-id: 7d203dd48b258a5fe5c4b3c493099092a1d334db --- ReactCommon/yoga/yoga/Yoga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactCommon/yoga/yoga/Yoga.c b/ReactCommon/yoga/yoga/Yoga.c index 5fc7610e825..a7dd3f78226 100644 --- a/ReactCommon/yoga/yoga/Yoga.c +++ b/ReactCommon/yoga/yoga/Yoga.c @@ -2937,7 +2937,7 @@ static void YGNodelayoutImpl(const YGNodeRef node, if (!YGNodeIsStyleDimDefined(child, crossAxis, availableInnerCrossDim)) { const float childWidth = isMainAxisRow ? (child->layout.measuredDimensions[YGDimensionWidth] + - YGNodeMarginForAxis(child, crossAxis, availableInnerWidth)) + YGNodeMarginForAxis(child, mainAxis, availableInnerWidth)) : lineHeight; const float childHeight =