Permalink
Browse files

Fix align-content:strech overriding align-item

Summary:
Fix for #413. This was a hangover from a previous attept to fix other align-content problems.
Closes facebook/yoga#417

Reviewed By: astreet

Differential Revision: D4604727

Pulled By: emilsjolander

fbshipit-source-id: 92fd31a385d8182c6b201c891d5ae478372d525d
  • Loading branch information...
woehrl01 authored and facebook-github-bot committed Feb 23, 2017
1 parent 4a4dddb commit 1f456365e88de3843169e81eb40b4a50feaf69c9
Showing with 1 addition and 2 deletions.
  1. +1 −2 ReactCommon/yoga/yoga/Yoga.c
@@ -2666,8 +2666,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
}
// STEP 8: MULTI-LINE CONTENT ALIGNMENT
if (performLayout &&
(lineCount > 1 || node->style.alignContent == YGAlignStretch || YGIsBaselineLayout(node)) &&
if (performLayout && (lineCount > 1 || YGIsBaselineLayout(node)) &&
!YGFloatIsUndefined(availableInnerCrossDim)) {
const float remainingAlignContentDim = availableInnerCrossDim - totalLineCrossDim;

0 comments on commit 1f45636

Please sign in to comment.