Skip to content

Commit e93ccfd

Browse files
woehrl01facebook-github-bot
authored andcommitted
Fix wraping calculation if min-size constraint exists
Summary: Fixes #261 Closes facebook/yoga#262 Reviewed By: splhack Differential Revision: D4245200 Pulled By: emilsjolander fbshipit-source-id: 77d802d71010ed426511d6a01e6de1e7c9194179
1 parent 302d42d commit e93ccfd

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

ReactCommon/yoga/yoga/Yoga.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1984,8 +1984,9 @@ static void YGNodelayoutImpl(const YGNodeRef node,
19841984
child->lineIndex = lineCount;
19851985

19861986
if (child->style.positionType != YGPositionTypeAbsolute) {
1987-
const float outerFlexBasis = child->layout.computedFlexBasis +
1988-
YGNodeMarginForAxis(child, mainAxis, availableInnerWidth);
1987+
const float outerFlexBasis =
1988+
fmaxf(YGValueResolve(&child->style.minDimensions[dim[mainAxis]], mainAxisParentSize), child->layout.computedFlexBasis) +
1989+
YGNodeMarginForAxis(child, mainAxis, availableInnerWidth);
19891990

19901991
// If this is a multi-line flow and this item pushes us over the
19911992
// available size, we've

0 commit comments

Comments
 (0)