Skip to content

Commit f5beceb

Browse files
woehrl01facebook-github-bot
authored andcommittedNov 24, 2017
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 facebook/yoga#665 Differential Revision: D6407982 Pulled By: emilsjolander fbshipit-source-id: ffa549a06f802263e3b8488e90756aa3f722d52d
1 parent 05e862d commit f5beceb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed
 

‎ReactCommon/yoga/yoga/Yoga.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1862,17 +1862,17 @@ static void YGNodelayoutImpl(const YGNodeRef node,
18621862

18631863
// STEP 2: DETERMINE AVAILABLE SIZE IN MAIN AND CROSS DIRECTIONS
18641864
const float minInnerWidth =
1865-
YGResolveValue(&node->style.minDimensions[YGDimensionWidth], parentWidth) - marginAxisRow -
1865+
YGResolveValue(&node->style.minDimensions[YGDimensionWidth], parentWidth) -
18661866
paddingAndBorderAxisRow;
18671867
const float maxInnerWidth =
1868-
YGResolveValue(&node->style.maxDimensions[YGDimensionWidth], parentWidth) - marginAxisRow -
1868+
YGResolveValue(&node->style.maxDimensions[YGDimensionWidth], parentWidth) -
18691869
paddingAndBorderAxisRow;
18701870
const float minInnerHeight =
18711871
YGResolveValue(&node->style.minDimensions[YGDimensionHeight], parentHeight) -
1872-
marginAxisColumn - paddingAndBorderAxisColumn;
1872+
paddingAndBorderAxisColumn;
18731873
const float maxInnerHeight =
18741874
YGResolveValue(&node->style.maxDimensions[YGDimensionHeight], parentHeight) -
1875-
marginAxisColumn - paddingAndBorderAxisColumn;
1875+
paddingAndBorderAxisColumn;
18761876
const float minInnerMainDim = isMainAxisRow ? minInnerWidth : minInnerHeight;
18771877
const float maxInnerMainDim = isMainAxisRow ? maxInnerWidth : maxInnerHeight;
18781878

0 commit comments

Comments
 (0)