Skip to content

Commit

Permalink
Fix align-content:strech overriding align-item
Browse files Browse the repository at this point in the history
Summary:
Fix for facebook#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 buildadm committed Mar 1, 2017
1 parent c86d8ba commit 06a5da5
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions ReactCommon/yoga/yoga/Yoga.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 06a5da5

Please sign in to comment.