From 18cbf1617eb2ed790ed048115f25ed73b9165764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20W=C3=B6hrl?= Date: Fri, 24 Nov 2017 07:06:16 -0800 Subject: [PATCH] Fix justify content with min/max constraint parent Summary: The min/max inner width shouldn't take the margins into account. Adds a test for both cases. Fixes #664 Closes https://github.com/facebook/yoga/pull/665 Differential Revision: D6407982 Pulled By: emilsjolander fbshipit-source-id: ffa549a06f802263e3b8488e90756aa3f722d52d --- ReactCommon/yoga/yoga/Yoga.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp index 8ff8921abbd0ff..cc685f4ed0d94f 100644 --- a/ReactCommon/yoga/yoga/Yoga.cpp +++ b/ReactCommon/yoga/yoga/Yoga.cpp @@ -1862,17 +1862,17 @@ static void YGNodelayoutImpl(const YGNodeRef node, // STEP 2: DETERMINE AVAILABLE SIZE IN MAIN AND CROSS DIRECTIONS const float minInnerWidth = - YGResolveValue(&node->style.minDimensions[YGDimensionWidth], parentWidth) - marginAxisRow - + YGResolveValue(&node->style.minDimensions[YGDimensionWidth], parentWidth) - paddingAndBorderAxisRow; const float maxInnerWidth = - YGResolveValue(&node->style.maxDimensions[YGDimensionWidth], parentWidth) - marginAxisRow - + YGResolveValue(&node->style.maxDimensions[YGDimensionWidth], parentWidth) - paddingAndBorderAxisRow; const float minInnerHeight = YGResolveValue(&node->style.minDimensions[YGDimensionHeight], parentHeight) - - marginAxisColumn - paddingAndBorderAxisColumn; + paddingAndBorderAxisColumn; const float maxInnerHeight = YGResolveValue(&node->style.maxDimensions[YGDimensionHeight], parentHeight) - - marginAxisColumn - paddingAndBorderAxisColumn; + paddingAndBorderAxisColumn; const float minInnerMainDim = isMainAxisRow ? minInnerWidth : minInnerHeight; const float maxInnerMainDim = isMainAxisRow ? maxInnerWidth : maxInnerHeight;